/* for MSC (and compatible compilers), use routines supplied by RTL */
-# define CLEN(ptr) _mbclen((const uch *)(ptr))
# define PREINCSTR(ptr) (ptr = (char *)_mbsinc((const uch *)(ptr)))
# define MBSCHR(str, c) (char *)_mbschr((const uch *)(str), (c))
# define MBSRCHR(str, c) (char *)_mbsrchr((const uch *)(str), (c))
@@ -213,38 +209,6 @@
#if (defined(NTSD_EAS) && !defined(RESTORE_ACL))
# define RESTORE_ACL /* "restore ACLs" only needed when NTSD_EAS active */
#endif
-#if (!defined(NO_UNICODE_SUPPORT) && !defined(UNICODE_SUPPORT))
-# define UNICODE_SUPPORT /* enable UTF-8 filename support by default */
-#endif
-#if (defined(UNICODE_SUPPORT) && !defined(UNICODE_WCHAR))
-# define UNICODE_WCHAR /* wchar_t is UTF-16 encoded on WIN32 */
-#endif
-#ifdef UTF8_MAYBE_NATIVE
-# undef UTF8_MAYBE_NATIVE /* UTF-8 cannot be system charset on WIN32 */
-#endif
-
-/* The following compiler systems provide or use a runtime library with a
- * locale-aware isprint() implementation. For these systems, the "enhanced"
- * unprintable charcode detection in fnfilter() gets enabled.
- */
-#if (!defined(HAVE_WORKING_ISPRINT) && !defined(NO_WORKING_ISPRINT))
-# if defined(MSC) || defined(__BORLANDC__)
-# define HAVE_WORKING_ISPRINT
-# endif
-# if defined(__MINGW32__) && defined(__MSVCRT__)
-# define HAVE_WORKING_ISPRINT
-# endif
-#endif
-
-/* WIN32 runs solely on little-endian processors; enable support
- * for the 32-bit optimized CRC-32 C code by default.
- */
-#ifdef IZ_CRC_BE_OPTIMIZ
-# undef IZ_CRC_BE_OPTIMIZ
-#endif
-#if !defined(IZ_CRC_LE_OPTIMIZ) && !defined(NO_CRC_OPTIMIZ)
-# define IZ_CRC_LE_OPTIMIZ
-#endif
/* handlers for OEM <--> ANSI string conversions */
#ifdef __RSXNT__
@@ -390,6 +354,11 @@
modify [eax ecx edx]
# endif /* !USE_ZLIB */
# endif /* __386__ */
+
+# ifndef EPIPE
+# define EPIPE 29 /* Watcom 11.0c(+) errno.h contains this define */
+# endif
+# define PIPE_ERROR (errno == EPIPE)
#endif /* __WATCOMC__ */
#define SCREENWIDTH 80
@@ -400,174 +369,4 @@
#define SCREENLWRAP 1
#define TABSIZE 8
-
-/* 64-bit-Integers & Large File Support
- * (pasted here from Zip 3b, osdep.h - Myles Bennett 7-jun-2004)
- * (updated from Zip 3.0d - Ed Gordon 6-oct-2004)
- *
- * If this is set it is assumed that the port
- * supports 64-bit file calls. The types are
- * defined here. Any local implementations are
- * in w32i64.c and the prototypes for the calls are
- * in unzip.h. Note that a port must support
- * these calls fully or should not set
- * LARGE_FILE_SUPPORT.
- */
-
-/* Automatically set ZIP64_SUPPORT if supported */
-
-#ifndef NO_ZIP64_SUPPORT
-# ifndef ZIP64_SUPPORT
-# if defined(_MSC_VER) || defined(__MINGW32__) || defined(__CYGWIN__)
-# define ZIP64_SUPPORT
-# elif defined(__LCC__)
- /* LCC links against crtdll.dll -> no support of 64-bit offsets :( */
-# elif (defined(__WATCOMC__) && (__WATCOMC__ >= 1100))
-# define ZIP64_SUPPORT
-# elif (defined(__BORLANDC__) && (__BORLANDC__ >= 0x0520))
- /* Borland C RTL lacks any support to get/set 64-bit file pointer :( */
-# endif
-# endif
-#endif
-
-#ifdef ZIP64_SUPPORT
- /* base type for file offsets and file sizes */
-# if (defined(__GNUC__) || defined(ULONG_LONG_MAX))
- typedef long long zoff_t;
-# else
- /* all other compilers use this as intrinsic 64-bit type */
- typedef __int64 zoff_t;
-# endif
-# define ZOFF_T_DEFINED
-
- /* user-defined types and format strings for 64-bit numbers and
- * file pointer functions (these depend on the rtl library and library
- * headers used; they are NOT compiler-specific)
- */
-# if defined(_MSC_VER) || defined(__MINGW32__) || defined(__LCC__)
- /* MS C and VC, MinGW32, lcc32 */
- /* these systems use the Microsoft C RTL */
-
- /* 64-bit stat struct */
- typedef struct _stati64 z_stat;
-# define Z_STAT_DEFINED
-
-# ifdef __LCC__
- /* The LCC headers lack these declarations of MSC rtl functions in
- sys/stat.h. */
- struct _stati64 {
- unsigned int st_dev;
- unsigned short st_ino;
- unsigned short st_mode;
- short st_nlink;
- short st_uid;
- short st_gid;
- unsigned int st_rdev;
- __int64 st_size;
- time_t st_atime;
- time_t st_mtime;
- time_t st_ctime;
- };
- int _stati64(const char *, struct _stati64 *);
- int _fstati64(int, struct _stati64 *);
- __int64 _lseeki64(int, __int64, int);
-# endif /* __LCC__ */
-
- /* printf format size prefix for zoff_t values */
-# define FZOFFT_FMT "I64"
-# define FZOFFT_HEX_WID_VALUE "16"
-
-# define SHORTHDRSTATS "%9I64u %02u%c%02u%c%02u %02u:%02u %c"
-# define SHORTFILETRAILER " -------- -------\n%9I64u %9lu file%s\n"
-
-# elif (defined(__BORLANDC__) && (__BORLANDC__ >= 0x0520))
- /* Borland C 5.2 or newer */
-
- /* 64-bit stat struct */
- typedef struct stati64 z_stat;
-# define Z_STAT_DEFINED
-
- /* Borland C does not provide a 64-bit-capable _lseeki64(), so we
- need to use the stdio.h stream functions instead. */
-# ifndef USE_STRM_INPUT
-# define USE_STRM_INPUT
-# endif
-
- /* printf format size prefix for zoff_t values */
-# define FZOFFT_FMT "L"
-# define FZOFFT_HEX_WID_VALUE "16"
-
-# define SHORTHDRSTATS "%9Lu %02u%c%02u%c%02u %02u:%02u %c"
-# define SHORTFILETRAILER " -------- -------\n%9Lu %9lu file%s\n"
-
-# elif (defined(__WATCOMC__) && (__WATCOMC__ >= 1100))
- /* WATCOM C */
-
- /* 64-bit stat struct */
- typedef struct _stati64 z_stat;
-# define Z_STAT_DEFINED
-
- /* printf format size prefix for zoff_t values */
-# define FZOFFT_FMT "ll"
-# define FZOFFT_HEX_WID_VALUE "16"
-
-# define SHORTHDRSTATS "%9llu %02u%c%02u%c%02u %02u:%02u %c"
-# define SHORTFILETRAILER " -------- -------\n%9llu %9lu file%s\n"
-
-# elif (defined(__IBMC__) && (__IBMC__ >= 350))
- /* IBM C */
-
- /* 64-bit stat struct */
-
- /* printf format size prefix for zoff_t values */
-# define FZOFFT_FMT "I64"
-# define FZOFFT_HEX_WID_VALUE "16"
-
-# define SHORTHDRSTATS "%9I64u %02u%c%02u%c%02u %02u:%02u %c"
-# define SHORTFILETRAILER " -------- -------\n%9I64u %9lu file%s\n"
-
-# endif
-
-#endif
-
-/* If port has LARGE_FILE_SUPPORT then define here
- to make automatic unless overridden */
-
-#ifndef LARGE_FILE_SUPPORT
-# ifndef NO_LARGE_FILE_SUPPORT
-# if defined(_MSC_VER) || defined(__MINGW32__)
-# define LARGE_FILE_SUPPORT
-# elif defined(__LCC__)
- /* LCC links against crtdll.dll -> no support of 64-bit offsets :( */
-# elif defined(__CYGWIN__)
-# define LARGE_FILE_SUPPORT
-# elif (defined(__WATCOMC__) && (__WATCOMC__ >= 1100))
-# define LARGE_FILE_SUPPORT
-# elif (defined(__BORLANDC__) && (__BORLANDC__ >= 0x0520))
- /* Borland C RTL lacks any support to get/set 64-bit file pointer :( */
-# endif
-# endif
-#endif
-
-
-#ifndef LARGE_FILE_SUPPORT
- /* No Large File Support */
-
- /* base type for file offsets and file sizes */
- typedef long zoff_t;
-# define ZOFF_T_DEFINED
-
- /* stat struct */
- typedef struct stat z_stat;
-# define Z_STAT_DEFINED
-
-# define FZOFFT_FMT "l"
-# define FZOFFT_HEX_WID_VALUE "8"
-
-
-# define SHORTHDRSTATS "%9lu %02u%c%02u%c%02u %02u:%02u %c"
-# define SHORTFILETRAILER " -------- -------\n%9lu %9lu file%s\n"
-
-#endif /* LARGE_FILE_SUPPORT */
-
#endif /* !__w32cfg_h */
diff -Nru unzip-6.0/win32/win32.c unzip-6.0/win32/win32.c
--- unzip-6.0/win32/win32.c 2009-01-11 14:57:26.000000000 +0000
+++ unzip-6.0/win32/win32.c 2010-05-14 07:26:14.000000000 +0000
@@ -1,7 +1,7 @@
/*
- Copyright (c) 1990-2008 Info-ZIP. All rights reserved.
+ Copyright (c) 1990-2005 Info-ZIP. All rights reserved.
- See the accompanying file LICENSE, version 2007-Mar-04 or later
+ See the accompanying file LICENSE, version 2000-Apr-09 or later
(the contents of which are also included in unzip.h) for terms of use.
If, for some reason, all these files are missing, the Info-ZIP license
also may be found at: ftp://ftp.info-zip.org/pub/infozip/license.html
@@ -157,7 +157,7 @@
static void map2fat (char *pathcomp, char **pEndFAT);
-#if (defined(__MINGW32__) && !defined(USE_MINGW_GLOBBING))
+#ifdef __MINGW32__
int _CRT_glob = 0; /* suppress command line globbing by C RTL */
#endif
@@ -197,7 +197,7 @@
#else /* use generic API call */
- GetModuleFileName(NULL, G.filename, FILNAMSIZ);
+ GetModuleFileName(NULL, G.filename, FILNAMSIZ-1);
_ISO_INTERN(G.filename); /* translate to codepage of C rtl's stdio */
return G.filename;
#endif
@@ -221,7 +221,7 @@
{
zDIR *d; /* malloc'd return value */
char *p; /* malloc'd temporary string */
- WIN32_FIND_DATAA fd;
+ WIN32_FIND_DATA fd;
extent len = strlen(n);
/* Start searching for files in directory n */
@@ -242,7 +242,7 @@
}
strcpy(p+len, "/*");
- if (INVALID_HANDLE_VALUE == (d->d_hFindFile = FindFirstFileA(p, &fd))) {
+ if (INVALID_HANDLE_VALUE == (d->d_hFindFile = FindFirstFile(p, &fd))) {
free((zvoid *)d);
free((zvoid *)p);
return NULL;
@@ -271,9 +271,9 @@
d->d_first = 0;
else
{
- WIN32_FIND_DATAA fd;
+ WIN32_FIND_DATA fd;
- if ( !FindNextFileA(d->d_hFindFile, &fd) )
+ if ( !FindNextFile(d->d_hFindFile, &fd) )
return NULL;
ISO_TO_INTERN(fd.cFileName, d->d_name);
@@ -631,9 +631,6 @@
SYSTEMTIME w32tm;
FILETIME lft;
- /* The milliseconds field gets always initialized to 0. */
- w32tm.wMilliseconds = 0;
-
#ifdef __BORLANDC__ /* Borland C++ 5.x crashes when trying to reference tm */
if (utc < UTIME_1980_JAN_01_00_00)
utc = UTIME_1980_JAN_01_00_00;
@@ -809,9 +806,8 @@
#endif
if (!FileTimeToLocalFileTime(pft, &lft)) {
- /* if pft cannot be converted to local time, set ut to current time */
- time(ut);
- return FALSE;
+ /* if pft cannot be converted to local time, return current time */
+ return time(NULL);
}
FTTrace((stdout, "VFatFT2utime, feed for mktime()", 1, &lft));
#ifndef HAVE_MKTIME
@@ -996,7 +992,7 @@
/* Function SetFileSize() */
/**************************/
-int SetFileSize(FILE *file, zusz_t filesize)
+int SetFileSize(FILE *file, ulg filesize)
{
#ifdef __RSXNT__
/* RSXNT environment lacks a translation function from C file pointer
@@ -1007,9 +1003,6 @@
rommel@ars.de
*/
HANDLE os_fh;
-#ifdef Z_UINT8_DEFINED
- LARGE_INTEGER fsbuf;
-#endif
/* Win9x supports FAT file system, only; presetting file size does
not help to prevent fragmentation. */
@@ -1023,13 +1016,7 @@
*/
os_fh = (HANDLE)_get_osfhandle(fileno(file));
/* move file pointer behind the last byte of the expected file size */
-#ifdef Z_UINT8_DEFINED
- fsbuf.QuadPart = filesize;
- if ((SetFilePointer(os_fh, fsbuf.LowPart, &fsbuf.HighPart, FILE_BEGIN)
- == 0xFFFFFFFF) && GetLastError() != NO_ERROR)
-#else
- if (SetFilePointer(os_fh, (ulg)filesize, 0, FILE_BEGIN) == 0xFFFFFFFF)
-#endif
+ if (SetFilePointer(os_fh, filesize, 0, FILE_BEGIN) == 0xFFFFFFFF)
return -1;
/* extend/truncate file to the current position */
if (SetEndOfFile(os_fh) == 0)
@@ -1052,7 +1039,7 @@
FILETIME Modft; /* File time type defined in NT, `last modified' time */
FILETIME Accft; /* NT file time type, `last access' time */
FILETIME Creft; /* NT file time type, `file creation' time */
- HANDLE hFile = INVALID_HANDLE_VALUE; /* File handle defined in NT */
+ HANDLE hFile; /* File handle defined in NT */
int gotTime;
#ifdef NTSD_EAS
uch *ebSDptr;
@@ -1067,15 +1054,6 @@
# define Ansi_Fname G.filename
#endif
-#ifndef __RSXNT__
- if (IsWinNT()) {
- /* Truncate the file to the current position.
- * This is needed to remove excess allocation in case the
- * extraction has failed or stopped prematurely. */
- SetEndOfFile((HANDLE)_get_osfhandle(fileno(G.outfile)));
- }
-#endif
-
/* Close the file and then re-open it using the Win32
* CreateFile call, so that the file can be created
* with GENERIC_WRITE access, otherwise the SetFileTime
@@ -1086,18 +1064,13 @@
if (uO.cflag)
return;
- /* skip restoring time stamps on user's request */
- if (uO.D_flag <= 1) {
- gotTime = getNTfiletime(__G__ &Modft, &Accft, &Creft);
-
- /* open a handle to the file before processing extra fields;
- we do this in case new security on file prevents us from updating
- time stamps */
- hFile = CreateFileA(Ansi_Fname, GENERIC_WRITE, FILE_SHARE_WRITE, NULL,
- OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
- } else {
- gotTime = 0;
- }
+ gotTime = getNTfiletime(__G__ &Modft, &Accft, &Creft);
+
+ /* open a handle to the file before processing extra fields;
+ we do this in case new security on file prevents us from updating
+ time stamps */
+ hFile = CreateFile(Ansi_Fname, GENERIC_WRITE, FILE_SHARE_WRITE, NULL,
+ OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
/* sfield@microsoft.com: set attributes before time in case we decide to
support other filetime members later. This also allows us to apply
@@ -1107,8 +1080,8 @@
FILE_ATTRIBUTE_ARCHIVE appears in the attributes. This works well
as an optimization because FILE_ATTRIBUTE_ARCHIVE gets applied to the
file anyway, when it's created new. */
- if ((G.pInfo->file_attr & 0x7F) & ~FILE_ATTRIBUTE_ARCHIVE) {
- if (!SetFileAttributesA(Ansi_Fname, G.pInfo->file_attr & 0x7F))
+ if((G.pInfo->file_attr & 0x7F) & ~FILE_ATTRIBUTE_ARCHIVE) {
+ if (!SetFileAttributes(Ansi_Fname, G.pInfo->file_attr & 0x7F))
Info(slide, 1, ((char *)slide,
"\nwarning (%d): could not set file attributes\n",
(int)GetLastError()));
@@ -1133,24 +1106,21 @@
}
#endif /* NTSD_EAS */
- /* skip restoring time stamps on user's request */
- if (uO.D_flag <= 1) {
- if ( hFile == INVALID_HANDLE_VALUE )
- Info(slide, 1, ((char *)slide,
- "\nCreateFile() error %d when trying set file time\n",
- (int)GetLastError()));
- else {
- if (gotTime) {
- FILETIME *pModft = (gotTime & EB_UT_FL_MTIME) ? &Modft : NULL;
- FILETIME *pAccft = (gotTime & EB_UT_FL_ATIME) ? &Accft : NULL;
- FILETIME *pCreft = (gotTime & EB_UT_FL_CTIME) ? &Creft : NULL;
-
- if (!SetFileTime(hFile, pCreft, pAccft, pModft))
- Info(slide, 0, ((char *)slide,
- "\nSetFileTime failed: %d\n", (int)GetLastError()));
- }
- CloseHandle(hFile);
+ if ( hFile == INVALID_HANDLE_VALUE )
+ Info(slide, 1, ((char *)slide,
+ "\nCreateFile() error %d when trying set file time\n",
+ (int)GetLastError()));
+ else {
+ if (gotTime) {
+ FILETIME *pModft = (gotTime & EB_UT_FL_MTIME) ? &Modft : NULL;
+ FILETIME *pAccft = (gotTime & EB_UT_FL_ATIME) ? &Accft : NULL;
+ FILETIME *pCreft = (gotTime & EB_UT_FL_CTIME) ? &Creft : NULL;
+
+ if (!SetFileTime(hFile, pCreft, pAccft, pModft))
+ Info(slide, 0, ((char *)slide, "\nSetFileTime failed: %d\n",
+ (int)GetLastError()));
}
+ CloseHandle(hFile);
}
return;
@@ -1216,10 +1186,8 @@
d_entry->perms = G.pInfo->file_attr;
- d_entry->gotTime = (uO.D_flag <= 0
- ? getNTfiletime(__G__ &(d_entry->Modft),
- &(d_entry->Accft), &(d_entry->Creft))
- : 0);
+ d_entry->gotTime = getNTfiletime(__G__ &(d_entry->Modft),
+ &(d_entry->Accft), &(d_entry->Creft));
return PK_OK;
} /* end function defer_dir_attribs() */
@@ -1229,7 +1197,7 @@
direntry *d;
{
int errval;
- HANDLE hFile = INVALID_HANDLE_VALUE; /* File handle defined in NT */
+ HANDLE hFile; /* File handle defined in NT */
#ifdef __RSXNT__
char *ansi_name;
#endif
@@ -1247,21 +1215,18 @@
# define Ansi_Dirname d->fn
#endif
- /* Skip restoring directory time stamps on user' request. */
- if (uO.D_flag <= 0) {
- /* Open a handle to the directory before processing extra fields;
- we do this in case new security on file prevents us from updating
- time stamps.
- Although the WIN32 documentation recommends to use GENERIC_WRITE
- access flag to create the handle for SetFileTime(), this is too
- demanding for directories with the "read-only" attribute bit set.
- So we use the more specific flag FILE_WRITE_ATTRIBUTES here to
- request the minimum required access rights. (This problem is a
- Windows bug that has been silently fixed in Windows XP SP2.) */
- hFile = CreateFileA(Ansi_Dirname, FILE_WRITE_ATTRIBUTES,
- FILE_SHARE_READ|FILE_SHARE_WRITE, NULL,
- OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
- }
+ /* Open a handle to the directory before processing extra fields;
+ we do this in case new security on file prevents us from updating
+ time stamps.
+ Although the WIN32 documentation recommends to use GENERIC_WRITE
+ access flag to create the handle for SetFileTime(), this is too
+ demanding for directories with the "read-only" attribute bit set.
+ So we use the more specific flag FILE_WRITE_ATTRIBUTES here to
+ request the minimum required access rights. (This problem is a
+ Windows bug that has been silently fixed in Windows XP SP2.) */
+ hFile = CreateFile(Ansi_Dirname, FILE_WRITE_ATTRIBUTES,
+ FILE_SHARE_READ|FILE_SHARE_WRITE, NULL,
+ OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
#ifdef NTSD_EAS
if (NtAtt(d)->SDlen > 0) {
@@ -1289,33 +1254,30 @@
}
#endif /* NTSD_EAS */
- /* Skip restoring directory time stamps on user' request. */
- if (uO.D_flag <= 0) {
- if (hFile == INVALID_HANDLE_VALUE) {
- Info(slide, 1, ((char *)slide,
- "warning: CreateFile() error %d (set file times for %s)\n",
- (int)GetLastError(), FnFilter1(d->fn)));
- if (!errval)
- errval = PK_WARN;
- } else {
- if (NtAtt(d)->gotTime) {
- FILETIME *pModft = (NtAtt(d)->gotTime & EB_UT_FL_MTIME)
- ? &(NtAtt(d)->Modft) : NULL;
- FILETIME *pAccft = (NtAtt(d)->gotTime & EB_UT_FL_ATIME)
- ? &(NtAtt(d)->Accft) : NULL;
- FILETIME *pCreft = (NtAtt(d)->gotTime & EB_UT_FL_CTIME)
- ? &(NtAtt(d)->Creft) : NULL;
-
- if (!SetFileTime(hFile, pCreft, pAccft, pModft)) {
- Info(slide, 0, ((char *)slide,
- "warning: SetFileTime() for %s error %d\n",
- FnFilter1(d->fn), (int)GetLastError()));
- if (!errval)
- errval = PK_WARN;
- }
+ if (hFile == INVALID_HANDLE_VALUE) {
+ Info(slide, 1, ((char *)slide,
+ "warning: CreateFile() error %d (set file times for %s)\n",
+ (int)GetLastError(), FnFilter1(d->fn)));
+ if (!errval)
+ errval = PK_WARN;
+ } else {
+ if (NtAtt(d)->gotTime) {
+ FILETIME *pModft = (NtAtt(d)->gotTime & EB_UT_FL_MTIME)
+ ? &(NtAtt(d)->Modft) : NULL;
+ FILETIME *pAccft = (NtAtt(d)->gotTime & EB_UT_FL_ATIME)
+ ? &(NtAtt(d)->Accft) : NULL;
+ FILETIME *pCreft = (NtAtt(d)->gotTime & EB_UT_FL_CTIME)
+ ? &(NtAtt(d)->Creft) : NULL;
+
+ if (!SetFileTime(hFile, pCreft, pAccft, pModft)) {
+ Info(slide, 0, ((char *)slide,
+ "warning: SetFileTime() for %s error %d\n",
+ FnFilter1(d->fn), (int)GetLastError()));
+ if (!errval)
+ errval = PK_WARN;
}
- CloseHandle(hFile);
}
+ CloseHandle(hFile);
}
return errval;
@@ -1348,7 +1310,7 @@
#endif
/* open a handle to the file to prepare setting the mod-time stamp */
- hFile = CreateFileA(Ansi_Fname, GENERIC_WRITE, FILE_SHARE_WRITE, NULL,
+ hFile = CreateFile(Ansi_Fname, GENERIC_WRITE, FILE_SHARE_WRITE, NULL,
OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
if ( hFile == INVALID_HANDLE_VALUE ) {
errstat = -1;
@@ -1385,7 +1347,7 @@
rootPathName[2] = '/';
rootPathName[3] = '\0';
- return (GetDriveTypeA(rootPathName) == DRIVE_REMOVABLE);
+ return (GetDriveType(rootPathName) == DRIVE_REMOVABLE);
} /* end function isfloppy() */
@@ -1418,7 +1380,7 @@
name = ansi_name;
#endif
- if ((!strncmp(name, "//", 2) || !strncmp(name, "\\\\", 2)) &&
+ if ((!strncmp(name, "//", 2) || !strncmp(name,"\\\\", 2)) &&
(name[2] != '\0' && name[2] != '/' && name[2] != '\\')) {
/* GetFullPathname() and GetVolumeInformation() do not work
* on UNC names. For now, we return "error".
@@ -1431,7 +1393,7 @@
tmp0 = (char *)name;
else
{
- if (!GetFullPathNameA(name, MAX_PATH, tmp1, &tmp0))
+ if (!GetFullPathName(name, MAX_PATH, tmp1, &tmp0))
return FALSE;
tmp0 = &tmp1[0];
}
@@ -1441,10 +1403,10 @@
G.lastRootPath[2] = '/'; /* e.g. "A:/" */
G.lastRootPath[3] = '\0';
- if (!GetVolumeInformationA((LPCSTR)G.lastRootPath,
- (LPSTR)tmp1, (DWORD)MAX_PATH,
+ if (!GetVolumeInformation((LPCTSTR)G.lastRootPath,
+ (LPTSTR)tmp1, (DWORD)MAX_PATH,
&volSerNo, &maxCompLen, &fileSysFlags,
- (LPSTR)tmp2, (DWORD)MAX_PATH)) {
+ (LPTSTR)tmp2, (DWORD)MAX_PATH)) {
G.lastRootPath[0] = '\0';
return FALSE;
}
@@ -1832,7 +1794,7 @@
attribute need not be masked, since it does not prevent
modifications in the new directory. */
if(G.pInfo->file_attr & (0x7F & ~FILE_ATTRIBUTE_DIRECTORY)) {
- if (!SetFileAttributesA(Ansi_Fname, G.pInfo->file_attr & 0x7F))
+ if (!SetFileAttributes(Ansi_Fname, G.pInfo->file_attr & 0x7F))
Info(slide, 1, ((char *)slide,
"\nwarning (%d): could not set file attributes for %s\n",
(int)GetLastError(), FnFilter1(G.filename)));
@@ -1845,7 +1807,7 @@
/* set file attributes: */
if(G.pInfo->file_attr & (0x7F & ~FILE_ATTRIBUTE_DIRECTORY)) {
- if (!SetFileAttributesA(Ansi_Fname, G.pInfo->file_attr & 0x7F))
+ if (!SetFileAttributes(Ansi_Fname, G.pInfo->file_attr & 0x7F))
Info(slide, 1, ((char *)slide,
"\nwarning (%d): could not set file attributes for %s\n",
(int)GetLastError(), FnFilter1(G.filename)));
@@ -1913,7 +1875,7 @@
if (QCOND2)
Info(slide, 0, ((char *)slide, "labelling %s %-22s\n", drive,
FnFilter1(G.filename)));
- if (!SetVolumeLabelA(drive, Ansi_Fname)) {
+ if (!SetVolumeLabel(drive, Ansi_Fname)) {
Info(slide, 1, ((char *)slide,
"mapname: error setting volume label\n"));
return (error & ~MPN_MASK) | MPN_ERR_SKIP;
@@ -1957,7 +1919,7 @@
#endif
#ifdef DEBUG
- if (zstat(pathcomp, &G.statbuf) == 0) {
+ if (stat(pathcomp, &G.statbuf) == 0) {
Trace((stderr,
"maskDOSdevice() stat(\"%s\", buf) st_mode result: %X, %o\n",
FnFilter1(pathcomp), G.statbuf.st_mode, G.statbuf.st_mode));
@@ -1966,7 +1928,7 @@
FnFilter1(pathcomp)));
}
#endif
- if (zstat(pathcomp, &G.statbuf) == 0 && S_ISCHR(G.statbuf.st_mode)) {
+ if (stat(pathcomp, &G.statbuf) == 0 && S_ISCHR(G.statbuf.st_mode)) {
extent i;
/* pathcomp contains a name of a DOS character device (builtin or
@@ -2171,11 +2133,8 @@
if (MKDIR(G.buildpathFAT, 0777) == -1) { /* create the directory */
Info(slide, 1, ((char *)slide,
"checkdir error: cannot create %s\n\
- %s\n\
unable to process %s.\n",
- FnFilter2(G.buildpathFAT),
- strerror(errno),
- FnFilter1(G.filename)));
+ FnFilter2(G.buildpathFAT), FnFilter1(G.filename)));
free(G.buildpathHPFS);
free(G.buildpathFAT);
/* path didn't exist, tried to create, failed */
@@ -2204,11 +2163,8 @@
if (MKDIR(G.buildpathFAT, 0777) == -1) { /* create the directory */
Info(slide, 1, ((char *)slide,
"checkdir error: cannot create %s\n\
- %s\n\
unable to process %s.\n",
- FnFilter2(G.buildpathFAT),
- strerror(errno),
- FnFilter1(G.filename)));
+ FnFilter2(G.buildpathFAT), FnFilter1(G.filename)));
free(G.buildpathHPFS);
free(G.buildpathFAT);
/* path didn't exist, tried to create, failed */
@@ -2217,8 +2173,8 @@
G.created_dir = TRUE;
} else if (!S_ISDIR(G.statbuf.st_mode)) {
Info(slide, 1, ((char *)slide,
- "checkdir error: %s exists but is not directory\n\
- unable to process %s.\n",
+ "checkdir error: %s exists but is not directory\n \
+ unable to process %s.\n",
FnFilter2(G.buildpathFAT), FnFilter1(G.filename)));
free(G.buildpathHPFS);
free(G.buildpathFAT);
@@ -2228,7 +2184,7 @@
if (too_long) {
Info(slide, 1, ((char *)slide,
"checkdir error: path too long: %s\n",
- FnFilter1(G.buildpathHPFS)));
+ FnFilter1(G.buildpathHPFS)));
free(G.buildpathHPFS);
free(G.buildpathFAT);
/* no room for filenames: fatal */
@@ -2271,47 +2227,24 @@
int error = MPN_OK;
Trace((stderr, "appending filename [%s]\n", FnFilter1(pathcomp)));
- /* The buildpathHPFS buffer has been allocated large enough to
- * hold the complete combined name, so there is no need to check
- * for OS filename size limit overflow within the copy loop.
- */
while ((*G.endHPFS = *p++) != '\0') { /* copy to HPFS filename */
++G.endHPFS;
- }
- /* Now, check for OS filename size overflow. When detected, the
- * mapped HPFS name is truncated and a warning message is shown.
- */
- if ((G.endHPFS-G.buildpathHPFS) >= FILNAMSIZ) {
- G.buildpathHPFS[FILNAMSIZ-1] = '\0';
- Info(slide, 1, ((char *)slide,
- "checkdir warning: path too long; truncating\n \
- %s\n -> %s\n",
- FnFilter1(G.filename), FnFilter2(G.buildpathHPFS)));
- error = MPN_INF_TRUNC; /* filename truncated */
+ if ((G.endHPFS-G.buildpathHPFS) >= FILNAMSIZ) {
+ *--G.endHPFS = '\0';
+ Info(slide, 1, ((char *)slide,
+ "checkdir warning: path too long; truncating\n \
+ %s\n -> %s\n",
+ FnFilter1(G.filename), FnFilter2(G.buildpathHPFS)));
+ error = MPN_INF_TRUNC; /* filename truncated */
+ }
}
- /* The buildpathFAT buffer has the same allocated size as the
- * buildpathHPFS buffer, so there is no need for an overflow check
- * within the following copy loop, either.
- */
- if (G.pInfo->vollabel || !IsVolumeOldFAT(__G__ G.buildpathHPFS)) {
- /* copy to FAT filename, too */
+ if ( G.pInfo->vollabel || !IsVolumeOldFAT(__G__ G.buildpathHPFS)) {
p = pathcomp;
- while ((*G.endFAT = *p++) != '\0')
+ while ((*G.endFAT = *p++) != '\0') /* copy to FAT filename, too */
++G.endFAT;
} else
- /* map into FAT fn, update endFAT */
- map2fat(pathcomp, &G.endFAT);
-
- /* Check that the FAT path does not exceed the FILNAMSIZ limit, and
- * truncate when neccessary.
- * Note that truncation can only happen when the HPFS path (which is
- * never shorter than the FAT path) has been already truncated.
- * So, emission of the warning message and setting the error code
- * has already happened.
- */
- if ((G.endFAT-G.buildpathFAT) >= FILNAMSIZ)
- G.buildpathFAT[FILNAMSIZ-1] = '\0';
+ map2fat(pathcomp, &G.endFAT); /* map into FAT fn, update endFAT */
Trace((stderr, "buildpathHPFS: %s\nbuildpathFAT: %s\n",
FnFilter1(G.buildpathHPFS), FnFilter2(G.buildpathFAT)));
@@ -2354,7 +2287,7 @@
*G.buildpathHPFS = (char)ToLower(*G.rootpath);
else {
char tmpN[MAX_PATH], *tmpP;
- if (GetFullPathNameA(".", MAX_PATH, tmpN, &tmpP) > MAX_PATH)
+ if (GetFullPathName(".", MAX_PATH, tmpN, &tmpP) > MAX_PATH)
{ /* by definition of MAX_PATH we should never get here */
Info(slide, 1, ((char *)slide,
"checkdir warning: current dir path too long\n"));
@@ -2494,9 +2427,9 @@
int dateformat()
{
- char df[2]; /* LOCALE_IDATE has a maximum value of 2 */
+ TCHAR df[2]; /* LOCALE_IDATE has a maximum value of 2 */
- if (GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_IDATE, df, 2) != 0) {
+ if (GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_IDATE, df, 2) != 0) {
switch (df[0])
{
case '0':
@@ -2517,9 +2450,9 @@
char dateseparator()
{
- char df[2]; /* use only if it is one character */
+ TCHAR df[2]; /* use only if it is one character */
- if ((GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_SDATE, df, 2) != 0) &&
+ if ((GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SDATE, df, 2) != 0) &&
(df[0] != '\0'))
return df[0];
else
@@ -2689,7 +2622,7 @@
* are not stable but vary according to the seasonal change of "daylight
* saving time in effect / not in effect".
*
- * Other C runtime libs (CygWin), or the crtdll.dll supplied with Win9x/NT
+ * Other C runtime libs (CygWin, or the crtdll.dll supplied with Win9x/NT
* return the unix-time equivalent of the UTC FILETIME values as got back
* from the Win32 API call. This time, return values from NTFS are correct
* whereas utimes from files on (V)FAT volumes vary according to the DST
@@ -2712,9 +2645,9 @@
* detects the case and fills in reasonable values. Otherwise we get *
* effects like failure to extract to a root dir because it's not found. */
-int zstat_win32(__W32STAT_GLOBALS__ const char *path, z_stat *buf)
+int zstat_win32(__W32STAT_GLOBALS__ const char *path, struct stat *buf)
{
- if (!zstat(path, buf))
+ if (!stat(path, buf))
{
/* stat was successful, now redo the time-stamp fetches */
#ifndef NO_W32TIMES_IZFIX
@@ -2732,9 +2665,9 @@
#endif
TTrace((stdout, "stat(%s) finds modtime %08lx\n", path, buf->st_mtime));
- h = CreateFileA(Ansi_Path, GENERIC_READ,
- FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
- OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+ h = CreateFile(Ansi_Path, GENERIC_READ,
+ FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
+ OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
if (h != INVALID_HANDLE_VALUE) {
BOOL ftOK = GetFileTime(h, &Creft, &Accft, &Modft);
CloseHandle(h);
@@ -2797,11 +2730,11 @@
# define Ansi_Path path
#endif
- flags = GetFileAttributesA(Ansi_Path);
+ flags = GetFileAttributes(Ansi_Path);
if (flags != 0xFFFFFFFF && flags & FILE_ATTRIBUTE_DIRECTORY) {
Trace((stderr, "\nstat(\"%s\",...) failed on existing directory\n",
FnFilter1(path)));
- memset(buf, 0, sizeof(z_stat));
+ memset(buf, 0, sizeof(struct stat));
buf->st_atime = buf->st_ctime = buf->st_mtime =
dos_to_unix_time(DOSTIME_MINIMUM); /* 1-1-80 */
buf->st_mode = S_IFDIR | S_IREAD |
@@ -2917,8 +2850,8 @@
# ifdef PASSWD_FROM_STDIN
stin = GetStdHandle(STD_INPUT_HANDLE);
# else
- stin = CreateFileA("CONIN$", GENERIC_READ | GENERIC_WRITE,
- FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
+ stin = CreateFile("CONIN$", GENERIC_READ | GENERIC_WRITE,
+ FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
if (stin == INVALID_HANDLE_VALUE)
return -1;
# endif
@@ -2941,199 +2874,3 @@
return ret;
}
#endif /* !WINDLL */
-
-
-
-#if (defined(UNICODE_SUPPORT) && !defined(FUNZIP))
-/* convert wide character string to multi-byte character string */
-char *wide_to_local_string(wide_string, escape_all)
- ZCONST zwchar *wide_string;
- int escape_all;
-{
- int i;
- wchar_t wc;
- int bytes_char;
- int default_used;
- int wsize = 0;
- int max_bytes = 9;
- char buf[9];
- char *buffer = NULL;
- char *local_string = NULL;
-
- for (wsize = 0; wide_string[wsize]; wsize++) ;
-
- if (max_bytes < MB_CUR_MAX)
- max_bytes = MB_CUR_MAX;
-
- if ((buffer = (char *)malloc(wsize * max_bytes + 1)) == NULL) {
- return NULL;
- }
-
- /* convert it */
- buffer[0] = '\0';
- for (i = 0; i < wsize; i++) {
- if (sizeof(wchar_t) < 4 && wide_string[i] > 0xFFFF) {
- /* wchar_t probably 2 bytes */
- /* could do surrogates if state_dependent and wctomb can do */
- wc = zwchar_to_wchar_t_default_char;
- } else {
- wc = (wchar_t)wide_string[i];
- }
- /* Unter some vendor's C-RTL, the Wide-to-MultiByte conversion functions
- * (like wctomb() et. al.) do not use the same codepage as the other
- * string arguments I/O functions (fopen, mkdir, rmdir etc.).
- * Therefore, we have to fall back to the underlying Win32-API call to
- * achieve a consistent behaviour for all supported compiler environments.
- * Failing RTLs are for example:
- * Borland (locale uses OEM-CP as default, but I/O functions expect ANSI
- * names)
- * Watcom (only "C" locale, wctomb() always uses OEM CP)
- * (in other words: all supported environments except the Microsoft RTLs)
- */
- bytes_char = WideCharToMultiByte(
- CP_ACP, WC_COMPOSITECHECK,
- &wc, 1,
- (LPSTR)buf, sizeof(buf),
- NULL, &default_used);
- if (default_used)
- bytes_char = -1;
- if (escape_all) {
- if (bytes_char == 1 && (uch)buf[0] <= 0x7f) {
- /* ASCII */
- strncat(buffer, buf, 1);
- } else {
- /* use escape for wide character */
- char *escape_string = wide_to_escape_string(wide_string[i]);
- strcat(buffer, escape_string);
- free(escape_string);
- }
- } else if (bytes_char > 0) {
- /* multi-byte char */
- strncat(buffer, buf, bytes_char);
- } else {
- /* no MB for this wide */
- /* use escape for wide character */
- char *escape_string = wide_to_escape_string(wide_string[i]);
- strcat(buffer, escape_string);
- free(escape_string);
- }
- }
- if ((local_string = (char *)realloc(buffer, strlen(buffer) + 1)) == NULL) {
- free(buffer);
- return NULL;
- }
-
- return local_string;
-}
-
-
-#if 0
-wchar_t *utf8_to_wchar_string(utf8_string)
- char *utf8_string; /* path to get utf-8 name for */
-{
- wchar_t *qw;
- int ulen;
- int ulenw;
-
- if (utf8_string == NULL)
- return NULL;
-
- /* get length */
- ulenw = MultiByteToWideChar(
- CP_UTF8, /* UTF-8 code page */
- 0, /* flags for character-type options */
- utf8_string, /* string to convert */
- -1, /* string length (-1 = NULL terminated) */
- NULL, /* buffer */
- 0 ); /* buffer length (0 = return length) */
- if (ulenw == 0) {
- /* failed */
- return NULL;
- }
- ulenw++;
- /* get length in bytes */
- ulen = sizeof(wchar_t) * (ulenw + 1);
- if ((qw = (wchar_t *)malloc(ulen + 1)) == NULL) {
- return NULL;
- }
- /* convert multibyte to wide */
- ulen = MultiByteToWideChar(
- CP_UTF8, /* UTF-8 code page */
- 0, /* flags for character-type options */
- utf8_string, /* string to convert */
- -1, /* string length (-1 = NULL terminated) */
- qw, /* buffer */
- ulenw); /* buffer length (0 = return length) */
- if (ulen == 0) {
- /* failed */
- free(qw);
- return NULL;
- }
-
- return qw;
-}
-
-wchar_t *local_to_wchar_string(local_string)
- char *local_string; /* path of local name */
-{
- wchar_t *qw;
- int ulen;
- int ulenw;
-
- if (local_string == NULL)
- return NULL;
-
- /* get length */
- ulenw = MultiByteToWideChar(
- CP_ACP, /* ANSI code page */
- 0, /* flags for character-type options */
- local_string, /* string to convert */
- -1, /* string length (-1 = NULL terminated) */
- NULL, /* buffer */
- 0 ); /* buffer length (0 = return length) */
- if (ulenw == 0) {
- /* failed */
- return NULL;
- }
- ulenw++;
- /* get length in bytes */
- ulen = sizeof(wchar_t) * (ulenw + 1);
- if ((qw = (wchar_t *)malloc(ulen + 1)) == NULL) {
- return NULL;
- }
- /* convert multibyte to wide */
- ulen = MultiByteToWideChar(
- CP_ACP, /* ANSI code page */
- 0, /* flags for character-type options */
- local_string, /* string to convert */
- -1, /* string length (-1 = NULL terminated) */
- qw, /* buffer */
- ulenw); /* buffer length (0 = return length) */
- if (ulen == 0) {
- /* failed */
- free(qw);
- return NULL;
- }
-
- return qw;
-}
-#endif /* 0 */
-#endif /* UNICODE_SUPPORT && !FUNZIP */
-
-
-
-/* --------------------------------------------------- */
-/* Large File Support
- *
- * Initial functions by E. Gordon and R. Nausedat
- * 9/10/2003
- * Lifted from Zip 3b, win32.c and place here by Myles Bennett
- * 7/6/2004
- *
- * These implement 64-bit file support for Windows. The
- * defines and headers are in win32/w32cfg.h.
- *
- * Moved to win32i64.c by Mike White to avoid conflicts in
- * same name functions in WiZ using UnZip and Zip libraries.
- * 9/25/2003
- */
diff -Nru unzip-6.0/wince/intrface.cpp unzip-6.0/wince/intrface.cpp
--- unzip-6.0/wince/intrface.cpp 2009-01-29 21:16:26.000000000 +0000
+++ unzip-6.0/wince/intrface.cpp 2010-05-14 07:26:14.000000000 +0000
@@ -1,7 +1,7 @@
/*
- Copyright (c) 1990-2009 Info-ZIP. All rights reserved.
+ Copyright (c) 1990-2005 Info-ZIP. All rights reserved.
- See the accompanying file LICENSE, version 2009-Jan-02 or later
+ See the accompanying file LICENSE, version 2000-Apr-09 or later
(the contents of which are also included in unzip.h) for terms of use.
If, for some reason, all these files are missing, the Info-ZIP license
also may be found at: ftp://ftp.info-zip.org/pub/infozip/license.html
@@ -77,7 +77,6 @@
// iswild
// conv_to_rule
// GetPlatformLocalTimezone
-// wide_to_local_string
//
//
// Date Name History
@@ -88,10 +87,6 @@
// 12/01/02 Chr. Spieler Updated interface for UnZip 5.50
// 02/23/05 Chr. Spieler Modified and optimized utimeToFileTime() to support
// the NO_W32TIMES_IZFIX compilation option
-// 11/01/09 Chr. Spieler Added wide_to_local_string() conversion function
-// from win32.c, which is currently needed for the
-// new UTF-8 names support (until we manage to port
-// the complete UnZip code to native wide-char support).
//
//*****************************************************************************
@@ -200,18 +195,12 @@
int UZ_EXP UzpInput2(zvoid *pG, uch *buffer, int *size, int flag);
int UZ_EXP CheckForAbort2(zvoid *pG, int fnflag, ZCONST char *zfn,
ZCONST char *efn, ZCONST zvoid *details);
-int WINAPI UzpReplace(LPSTR szFile, unsigned nbufsiz);
+int WINAPI UzpReplace(LPSTR szFile);
void WINAPI UzpSound(void);
-#ifdef Z_UINT8_DEFINED
-void WINAPI SendAppMsg(z_uint8 uzSize, z_uint8 uzCompressedSize,
-#else
-void WINAPI SendAppMsg(ulg uzSize, ulg uzCompressedSize,
-#endif
- unsigned ratio,
+void WINAPI SendAppMsg(ulg dwSize, ulg dwCompressedSize, unsigned ratio,
unsigned month, unsigned day, unsigned year,
unsigned hour, unsigned minute, char uppercase,
- LPCSTR szPath, LPCSTR szMethod, ulg dwCRC,
- char chCrypt);
+ LPSTR szPath, LPSTR szMethod, ulg dwCRC, char chCrypt);
} // extern "C"
@@ -459,7 +448,6 @@
pG->lpUserFunctions->replace = UzpReplace;
pG->lpUserFunctions->sound = UzpSound;
pG->lpUserFunctions->SendApplicationMessage = SendAppMsg;
- pG->lpUserFunctions->SendApplicationMessage_i32 = NULL;
#if CRYPT
pG->decr_passwd = UzpPassword;
@@ -565,7 +553,7 @@
}
// Invalidate our file offset to show that we are starting a new operation.
- g_pExtractInfo->uzFileOffset = ~(zusz_t)0;
+ g_pExtractInfo->dwFileOffset = 0xFFFFFFFF;
// We wrap some exception handling around the entire Info-ZIP engine to be
// safe. Since we are running on a device with tight memory configurations,
@@ -619,11 +607,11 @@
static void SetCurrentFile(__GPRO)
{
// Reset all our counters as we about to process a new file.
- g_pExtractInfo->uzFileOffset = (zusz_t)G.pInfo->offset;
+ g_pExtractInfo->dwFileOffset = (DWORD)G.pInfo->offset;
g_pExtractInfo->dwFile++;
- g_pExtractInfo->uzBytesWrittenThisFile = 0;
- g_pExtractInfo->uzBytesWrittenPreviousFiles += g_pExtractInfo->uzBytesTotalThisFile;
- g_pExtractInfo->uzBytesTotalThisFile = G.lrec.ucsize;
+ g_pExtractInfo->dwBytesWrittenThisFile = 0;
+ g_pExtractInfo->dwBytesWrittenPreviousFiles += g_pExtractInfo->dwBytesTotalThisFile;
+ g_pExtractInfo->dwBytesTotalThisFile = G.lrec.ucsize;
g_pExtractInfo->szFile = G.filename;
g_pExtractInfo->fNewLineOfText = TRUE;
@@ -708,7 +696,7 @@
// When extracting, mapname() will get called for every file which in turn
// will call SetCurrentFile(). For testing though, mapname() never gets
// called so we need to be on the lookout for a new file.
- if (g_pExtractInfo->uzFileOffset != (zusz_t)((Uz_Globs*)pG)->pInfo->offset) {
+ if (g_pExtractInfo->dwFileOffset != (DWORD)((Uz_Globs*)pG)->pInfo->offset) {
SetCurrentFile((Uz_Globs*)pG);
}
@@ -806,7 +794,7 @@
return SendMessage(g_hWndMain, WM_PRIVATE, MSG_PROMPT_FOR_PASSWORD, (LPARAM)&di);
#else
- return IZ_PW_CANCELALL;
+ return -2;
#endif
}
@@ -850,12 +838,9 @@
}
//******************************************************************************
-int WINAPI UzpReplace(LPSTR szFile, unsigned nbufsiz) {
+int WINAPI UzpReplace(LPSTR szFile) {
// Pass control to our GUI thread which will prompt the user to overwrite.
- // The nbufsiz parameter is not needed here, because this program does not
- // (yet?) contain support for renaming the extraction target.
- return SendMessage(g_hWndMain, WM_PRIVATE, MSG_PROMPT_TO_REPLACE,
- (LPARAM)szFile);
+ return SendMessage(g_hWndMain, WM_PRIVATE, MSG_PROMPT_TO_REPLACE, (LPARAM)szFile);
}
//******************************************************************************
@@ -865,16 +850,10 @@
//******************************************************************************
// Called from LIST.C
-#ifdef Z_UINT8_DEFINED
-void WINAPI SendAppMsg(z_uint8 uzSize, z_uint8 uzCompressedSize,
-#else
-void WINAPI SendAppMsg(ulg uzSize, ulg uzCompressedSize,
-#endif
- unsigned ratio,
+void WINAPI SendAppMsg(ulg dwSize, ulg dwCompressedSize, unsigned ratio,
unsigned month, unsigned day, unsigned year,
unsigned hour, unsigned minute, char uppercase,
- LPCSTR szPath, LPCSTR szMethod, ulg dwCRC,
- char chCrypt)
+ LPSTR szPath, LPSTR szMethod, ulg dwCRC, char chCrypt)
{
// If we are out of memory, then just bail since we will only make things worse.
if (g_fOutOfMemory) {
@@ -886,8 +865,7 @@
// Allocate a FILE_NODE large enough to hold this file.
int length = strlen(szPath) + strlen(szMethod);
- g_pFileLast = (FILE_NODE*)new BYTE[sizeof(FILE_NODE) +
- (sizeof(CHAR) * length)];
+ g_pFileLast = (FILE_NODE*)new BYTE[sizeof(FILE_NODE) + (sizeof(CHAR) * length)];
// Bail out if we failed to allocate the node.
if (!g_pFileLast) {
@@ -901,8 +879,8 @@
}
// Fill in our node.
- g_pFileLast->uzSize = (zusz_t)uzSize;
- g_pFileLast->uzCompressedSize = (zusz_t)uzCompressedSize;
+ g_pFileLast->dwSize = dwSize;
+ g_pFileLast->dwCompressedSize = dwCompressedSize;
g_pFileLast->dwCRC = dwCRC;
g_pFileLast->szComment = NULL;
g_pFileLast->szType = NULL;
@@ -957,7 +935,7 @@
#endif
// Update our bytes written count.
- g_pExtractInfo->uzBytesWrittenThisFile += dwBytesWritten;
+ g_pExtractInfo->dwBytesWrittenThisFile += dwBytesWritten;
// Pass control to our GUI thread to do a partial update our progress dialog.
SendMessage(g_hWndMain, WM_PRIVATE, MSG_UPDATE_PROGRESS_PARTIAL,
@@ -988,13 +966,12 @@
// Check to see if we are expecting a compressed file comment string.
if (g_pFileLast) {
- char *p1, *p2;
// Calcalute the size of the buffer we will need to store this comment.
// We are going to convert all ASC values 0 - 31 (except tab, new line,
// and CR) to ^char.
int size = 1;
- for (p1 = buffer; *p1; INCSTR(p1)) {
+ for (char *p2, *p1 = buffer; *p1; INCSTR(p1)) {
size += ((*p1 >= 32) || (*p1 == '\t') ||
(*p1 == '\r') || (*p1 == '\n')) ? CLEN(p1) : 2;
}
@@ -1266,7 +1243,7 @@
}
//******************************************************************************
-int SetFileSize(FILE *file, zusz_t filesize)
+int SetFileSize(FILE *file, ulg filesize)
{
#if (defined(_WIN32_WCE) || defined(__RSXNT__))
// For native Windows CE, it is not known whether the API supports
@@ -1280,9 +1257,6 @@
rommel@ars.de
*/
HANDLE os_fh;
-#ifdef Z_UINT8_DEFINED
- LARGE_INTEGER fsbuf;
-#endif
/* Win9x supports FAT file system, only; presetting file size does
not help to prevent fragmentation. */
@@ -1296,13 +1270,7 @@
*/
os_fh = (HANDLE)_get_osfhandle(fileno(file));
/* move file pointer behind the last byte of the expected file size */
-#ifdef Z_UINT8_DEFINED
- fsbuf.QuadPart = filesize;
- if ((SetFilePointer(os_fh, fsbuf.LowPart, &fsbuf.HighPart, FILE_BEGIN)
- == 0xFFFFFFFF) && GetLastError() != NO_ERROR)
-#else
if (SetFilePointer(os_fh, filesize, 0, FILE_BEGIN) == 0xFFFFFFFF)
-#endif
return -1;
/* extend/truncate file to the current position */
if (SetEndOfFile(os_fh) == 0)
@@ -1317,60 +1285,57 @@
{
HANDLE hFile;
+ // Get the 3 time stamps for the file.
+ FILETIME ftCreated, ftAccessed, ftModified;
+ int timeFlags = GetFileTimes(__G__ &ftCreated, &ftAccessed, &ftModified);
+
TCHAR szFile[_MAX_PATH];
MBSTOTSTR(szFile, G.filename, countof(szFile));
- /* skip restoring time stamps on user's request */
- if (uO.D_flag <= 1) {
- // Get the 3 time stamps for the file.
- FILETIME ftCreated, ftAccessed, ftModified;
- int timeFlags = GetFileTimes(__G__ &ftCreated, &ftAccessed, &ftModified);
-
#if (defined(_WIN32_WCE) && (_WIN32_WCE < 211))
- // Cast the outfile to a HANDLE (since that is really what it is), and
- // flush the file. We need to flush, because any unsaved data that is
- // written to the file during CloseHandle() will step on the work done
- // by SetFileTime().
- hFile = (HANDLE)G.outfile;
- FlushFileBuffers(hFile);
+ // Cast the outfile to a HANDLE (since that is really what it is), and
+ // flush the file. We need to flush, because any unsaved data that is
+ // written to the file during CloseHandle() will step on the work done
+ // by SetFileTime().
+ hFile = (HANDLE)G.outfile;
+ FlushFileBuffers(hFile);
#else
- // Close the file and then re-open it using the Win32 CreateFile() call.
- // SetFileTime() requires a Win32 file HANDLE created with GENERIC_WRITE
- // access.
- fclose(G.outfile);
- hFile = CreateFile(szFile, GENERIC_WRITE, FILE_SHARE_WRITE, NULL,
- OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+ // Close the file and then re-open it using the Win32 CreateFile() call.
+ // SetFileTime() requires a Win32 file HANDLE created with GENERIC_WRITE
+ // access.
+ fclose(G.outfile);
+ hFile = CreateFile(szFile, GENERIC_WRITE, FILE_SHARE_WRITE, NULL,
+ OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
#endif
- // Set the file's date and time.
- if (hFile != INVALID_HANDLE_VALUE) {
-
- // Make sure we retrieved some valid time stamp(s)
- if (timeFlags) {
-
- // Set the various date and time fields.
- if (!SetFileTime(hFile,
- (timeFlags & EB_UT_FL_CTIME) ? &ftCreated : NULL,
- (timeFlags & EB_UT_FL_ATIME) ? &ftAccessed : NULL,
- (timeFlags & EB_UT_FL_MTIME) ? &ftModified : NULL))
- {
- DebugOut(TEXT("SetFileTime() failed [%u]"), GetLastError());
- }
-
- } else {
- DebugOut(TEXT("GetFileTimes() failed"));
+ // Set the file's date and time.
+ if (hFile != INVALID_HANDLE_VALUE) {
+
+ // Make sure we retrieved some valid time stamp(s)
+ if (timeFlags) {
+
+ // Set the various date and time fields.
+ if (!SetFileTime(hFile,
+ (timeFlags & EB_UT_FL_CTIME) ? &ftCreated : NULL,
+ (timeFlags & EB_UT_FL_ATIME) ? &ftAccessed : NULL,
+ (timeFlags & EB_UT_FL_MTIME) ? &ftModified : NULL))
+ {
+ DebugOut(TEXT("SetFileTime() failed [%u]"), GetLastError());
}
- // Close out file.
- CloseHandle(hFile);
-
} else {
- DebugOut(TEXT("CreateFile() failed [%u]"), GetLastError());
+ DebugOut(TEXT("GetFileTimes() failed"));
}
+
+ // Close out file.
+ CloseHandle(hFile);
+
+ } else {
+ DebugOut(TEXT("CreateFile() failed [%u]"), GetLastError());
}
// If the file was successfully written, then set the attributes.
@@ -1556,7 +1521,7 @@
// Check for a directory wack.
case '/':
*pOut = '\0';
- // Skip dir traversals unless they are explicitly allowed.
+ // Skip dir traversals unless they are explicitely allowed.
if (strcmp(pPathComp, ".") == 0) {
// don't bother appending "./" to the path
*pPathComp = '\0';
@@ -1736,7 +1701,7 @@
// Add trailing path separator
G.rootpath[G.rootlen++] = '\\';
- G.rootpath[G.rootlen] = '\0';
+ G.rootpath[G.rootlen] = '0';
break;
}
@@ -1795,79 +1760,3 @@
}
#endif /* !WINDLL */
#endif // !POCKET_UNZIP
-
-#if (defined(UNICODE_SUPPORT))
-/* convert wide character string to multi-byte character string */
-char *wide_to_local_string(ZCONST zwchar *wide_string,
- int escape_all)
-{
- int i;
- wchar_t wc;
- int bytes_char;
- int default_used;
- int wsize = 0;
- int max_bytes = 9;
- char buf[9];
- char *buffer = NULL;
- char *local_string = NULL;
-
- for (wsize = 0; wide_string[wsize]; wsize++) ;
-
- if (max_bytes < MB_CUR_MAX)
- max_bytes = MB_CUR_MAX;
-
- if ((buffer = (char *)malloc(wsize * max_bytes + 1)) == NULL) {
- return NULL;
- }
-
- /* convert it */
- buffer[0] = '\0';
- for (i = 0; i < wsize; i++) {
- if (sizeof(wchar_t) < 4 && wide_string[i] > 0xFFFF) {
- /* wchar_t probably 2 bytes */
- /* could do surrogates if state_dependent and wctomb can do */
- wc = zwchar_to_wchar_t_default_char;
- } else {
- wc = (wchar_t)wide_string[i];
- }
- /* The C-RTL under WinCE does not support the generic C-style
- * Wide-to-MultiByte conversion functions (like wctomb() et. al.).
- * Therefore, we have to fall back to the underlying WinCE-API call to
- * get WCHAR-to-ANSI translation done.
- */
- bytes_char = WideCharToMultiByte(
- CP_ACP, WC_COMPOSITECHECK,
- &wc, 1,
- (LPSTR)buf, sizeof(buf),
- NULL, &default_used);
- if (default_used)
- bytes_char = -1;
- if (escape_all) {
- if (bytes_char == 1 && (uch)buf[0] <= 0x7f) {
- /* ASCII */
- strncat(buffer, buf, 1);
- } else {
- /* use escape for wide character */
- char *escape_string = wide_to_escape_string(wide_string[i]);
- strcat(buffer, escape_string);
- free(escape_string);
- }
- } else if (bytes_char > 0) {
- /* multi-byte char */
- strncat(buffer, buf, bytes_char);
- } else {
- /* no MB for this wide */
- /* use escape for wide character */
- char *escape_string = wide_to_escape_string(wide_string[i]);
- strcat(buffer, escape_string);
- free(escape_string);
- }
- }
- if ((local_string = (char *)realloc(buffer, strlen(buffer) + 1)) == NULL) {
- free(buffer);
- return NULL;
- }
-
- return local_string;
-}
-#endif /* UNICODE_SUPPORT */
diff -Nru unzip-6.0/wince/intrface.h unzip-6.0/wince/intrface.h
--- unzip-6.0/wince/intrface.h 2005-05-18 09:21:24.000000000 +0000
+++ unzip-6.0/wince/intrface.h 2010-05-14 07:26:14.000000000 +0000
@@ -56,13 +56,13 @@
} OVERWRITE_MODE, *LPOVERWRITE_MODE;
typedef struct _EXTRACT_INFO {
- zusz_t uzByteCount; // Total bytes to extract/test
+ BOOL fExtract; // TRUE for extract, FALSE for test
DWORD dwFileCount; // Number of files to extract/test.
+ DWORD dwByteCount; // Total bytes to extract/test
LPSTR *szFileList; // ARGV list of files, NULL for all files.
- LPSTR szMappedPath; // Used to store mapped name. May be NULL.
- OVERWRITE_MODE overwriteMode; // How to handle file overwrites.
- BOOL fExtract; // TRUE for extract, FALSE for test
BOOL fRestorePaths; // TRUE to restore paths, FALSE to junk them.
+ OVERWRITE_MODE overwriteMode; // How to handle file overwrites.
+ LPSTR szMappedPath; // Used to store mapped name. May be NULL.
BOOL fAbort; // Set during operation by UI to abort.
int result; // Result code from extraction/test.
@@ -75,11 +75,11 @@
HWND hWndBytesProcessed;
// Values used to keep track of our progress.
- zusz_t uzBytesTotalThisFile;
- zusz_t uzBytesWrittenThisFile;
- zusz_t uzBytesWrittenPreviousFiles;
- zusz_t uzFileOffset;
+ DWORD dwFileOffset;
DWORD dwFile;
+ DWORD dwBytesTotalThisFile;
+ DWORD dwBytesWrittenThisFile;
+ DWORD dwBytesWrittenPreviousFiles;
LPCSTR szFile;
BOOL fNewLineOfText;
diff -Nru unzip-6.0/wince/punzip.htp unzip-6.0/wince/punzip.htp
--- unzip-6.0/wince/punzip.htp 2009-04-20 01:59:40.000000000 +0000
+++ unzip-6.0/wince/punzip.htp 2010-05-14 07:26:14.000000000 +0000
@@ -380,13 +380,13 @@
About Pocket UnZip
-Thank you for using Version 2.0 of Pocket UnZip for Windows
+
Thank you for using Version 1.1 of Pocket UnZip for Windows
CE.
Pocket UnZip was developed by Steve P. Miller. Although I'd
like to take full credit, I could not have done it without the
public decompression source code provided by the Info-ZIP group.
-Pocket UnZip uses version 6.0 of Info-ZIP's core decompression
+Pocket UnZip uses version 5.5 of Info-ZIP's core decompression
code. Many thanks go to Greg Roelofs and all the fine folks at
Info-ZIP.
@@ -400,13 +400,13 @@
Info-ZIP LICENSE file.
For the latest news, binaries, source code, and more
-information about the Info-ZIP group, visit
+information about the Info-ZIP group, visit
ftp://ftp.info-zip.org/pub/infozip/.
For more information about me, or to check out some of my
other applications (mostly Windows 95 / NT / CE), stop by my
personal web page at http://pobox.com/~stevemil/.
-Copyright © 1997-2009 Info-Zip. All Rights Reserved.
+Copyright © 1997-2005 Info-Zip. All Rights Reserved.