claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

More pbatard patches

Browse Source
This commit is contained in:
R. Bernstein
2012-03-03 20:18:57 -05:00
parent bf66def7c9
commit 603b32f77f
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/driver/MSWindows/win32.c
View File

@@ -357,7 +357,7 @@ free_win32 (void *p_user_data)
if( p_env->h_device_handle ) if( p_env->h_device_handle )
CloseHandle( p_env->h_device_handle ); CloseHandle( p_env->h_device_handle );
if( p_env->hASPI ) if( p_env->hASPI )
FreeLibrary( p_env->hASPI ); FreeLibrary( (HMODULE)p_env->hASPI );
free (p_env); free (p_env);
} }

9
lib/udf/udf.c
View File

@@ -1,5 +1,5 @@
/* /*
Copyright (C) 2005, 2008, 2010 Rocky Bernstein <rocky@gnu.org> Copyright (C) 2005, 2008, 2010, 2012 Rocky Bernstein <rocky@gnu.org>
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@
say opensolaris. */ say opensolaris. */
#include "udf_private.h" #include "udf_private.h"
#include <cdio/bytesex.h> #include <cdio/bytesex.h>
#include "filemode.h"
#ifdef HAVE_STRING_H #ifdef HAVE_STRING_H
# include <string.h> # include <string.h>
@@ -53,11 +54,13 @@ udf_get_posix_filemode(const udf_dirent_t *p_udf_dirent)
mode_t mode = 0; mode_t mode = 0;
if (udf_get_file_entry(p_udf_dirent, &udf_fe)) { if (udf_get_file_entry(p_udf_dirent, &udf_fe)) {
uint16_t i_flags;
uint32_t i_perms; uint32_t i_perms;
#ifdef S_ISUID
uint16_t i_flags;
i_perms = uint32_from_le(udf_fe.permissions);
i_flags = uint16_from_le(udf_fe.icb_tag.flags); i_flags = uint16_from_le(udf_fe.icb_tag.flags);
#endif
i_perms = uint32_from_le(udf_fe.permissions);
if (i_perms & FE_PERM_U_READ) mode |= S_IRUSR; if (i_perms & FE_PERM_U_READ) mode |= S_IRUSR;
if (i_perms & FE_PERM_U_WRITE) mode |= S_IWUSR; if (i_perms & FE_PERM_U_WRITE) mode |= S_IWUSR;

2
lib/udf/udf_time.c
View File

@@ -103,7 +103,7 @@ static time_t year_seconds[MAX_YEAR_SECONDS]= {
/*2038*/ SPY(68,17,0) /*2038*/ SPY(68,17,0)
}; };
#ifdef HAVE_TIMEZONE_VAR #if defined(HAVE_TIMEZONE_VAR) && !defined(_WIN32)
extern long timezone; extern long timezone;
#endif #endif