2016-11-18 14:40:05 +01:00
|
|
|
/*
|
|
|
|
Kolibri OS port for gcc 5.4
|
|
|
|
|
|
|
|
Started by Siemargl @Nov 2016
|
|
|
|
Borrowed code parts from other unzip ports
|
|
|
|
|
|
|
|
howto make:
|
|
|
|
go in unzip60 directory (below this file) and
|
|
|
|
>make -f kolibri\makefile.gcc
|
|
|
|
|
|
|
|
Contains:
|
|
|
|
version()
|
|
|
|
mapattr()
|
2016-11-23 12:15:33 +01:00
|
|
|
mapname()
|
2016-11-18 14:40:05 +01:00
|
|
|
checkdir()
|
2016-11-23 12:15:33 +01:00
|
|
|
close_outfile()
|
|
|
|
get_extattribs()
|
|
|
|
do_wild()
|
2016-11-18 14:40:05 +01:00
|
|
|
|
2016-11-23 12:15:33 +01:00
|
|
|
todo
|
|
|
|
russian filenames in arh
|
|
|
|
datetime restore
|
|
|
|
overwrite request not in stderr
|
|
|
|
|
|
|
|
too many open files error EMFILE when DEBUG - error in newlib open. fixed
|
|
|
|
-d dir error. Use -ddir or -d dir/
|
|
|
|
|
|
|
|
release, sizing removing old compression methods or zlib
|
2016-11-18 14:40:05 +01:00
|
|
|
*/
|
|
|
|
|
|
|
|
#define FATTR FS_HIDDEN+FS_SYSTEM+FS_SUBDIR
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#define UNZIP_INTERNAL
|
|
|
|
#include "unzip.h"
|
|
|
|
|
|
|
|
// Siemargl fork of Kolibri system API
|
|
|
|
#include "kos32sys1.h"
|
|
|
|
|
|
|
|
/********************************************************************************************************************/
|
|
|
|
/*** Function version() */
|
|
|
|
/********************************************************************************************************************/
|
|
|
|
|
|
|
|
void version(__G)
|
|
|
|
__GDEF
|
|
|
|
{
|
|
|
|
sprintf((char *)slide, LoadFarString(CompiledWith),
|
|
|
|
#if defined(__TINYC__)
|
|
|
|
"TinyC", "",
|
|
|
|
#elif defined(__GNUC__)
|
|
|
|
"GNU C ", __VERSION__,
|
|
|
|
#else
|
|
|
|
"(unknown compiler) ","",
|
|
|
|
#endif
|
|
|
|
"KolibriOS ",
|
|
|
|
|
|
|
|
#ifdef __POWERPC__
|
|
|
|
"(PowerPC)",
|
|
|
|
#else
|
|
|
|
# ifdef __INTEL__
|
|
|
|
"(x86)",
|
|
|
|
# else
|
|
|
|
"(unknown)", /* someday we may have other architectures... */
|
|
|
|
# endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef __DATE__
|
|
|
|
" on ", __DATE__
|
|
|
|
#else
|
|
|
|
"", ""
|
|
|
|
#endif
|
|
|
|
);
|
|
|
|
|
|
|
|
(*G.message)((zvoid *)&G, slide, (ulg)strlen((char *)slide), 0);
|
|
|
|
|
|
|
|
} /* end function version() */
|
|
|
|
|
|
|
|
|
|
|
|
/********************************************************************************************************************/
|
|
|
|
/*** Function mapattr() */
|
|
|
|
/********************************************************************************************************************/
|
|
|
|
|
|
|
|
/* Identical to MS-DOS, OS/2 versions. However, NT has a lot of extra
|
|
|
|
* permission stuff, so this function should probably be extended in the
|
|
|
|
* future. */
|
|
|
|
|
|
|
|
int mapattr(__G)
|
|
|
|
__GDEF
|
|
|
|
{
|
|
|
|
/* set archive bit for file entries (file is not backed up): */
|
|
|
|
G.pInfo->file_attr = ((unsigned)G.crec.external_file_attributes |
|
|
|
|
(G.crec.external_file_attributes & FS_SUBDIR ?
|
|
|
|
0 : FS_ARCHIV)) & 0xff;
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
} /* end function mapattr() */
|
|
|
|
|
|
|
|
|
|
|
|
/********************************************************************************************************************/
|
2016-11-18 17:37:20 +01:00
|
|
|
/*** Function mapname() */
|
2016-11-18 14:40:05 +01:00
|
|
|
/********************************************************************************************************************/
|
|
|
|
|
|
|
|
int mapname(__G__ renamed)
|
|
|
|
__GDEF
|
|
|
|
int renamed;
|
|
|
|
/*
|
|
|
|
* returns:
|
|
|
|
* MPN_OK - no problem detected
|
|
|
|
* MPN_INF_TRUNC - caution (truncated filename)
|
|
|
|
* MPN_INF_SKIP - info "skip entry" (dir doesn't exist)
|
|
|
|
* MPN_ERR_SKIP - error -> skip entry
|
|
|
|
* MPN_ERR_TOOLONG - error -> path is too long
|
|
|
|
* MPN_NOMEM - error (memory allocation failed) -> skip entry
|
|
|
|
* [also MPN_VOL_LABEL, MPN_CREATED_DIR]
|
|
|
|
*/
|
|
|
|
{
|
|
|
|
char pathcomp[FILNAMSIZ]; /* path-component buffer */
|
|
|
|
char *pp, *cp=(char *)NULL; /* character pointers */
|
|
|
|
char *lastsemi=(char *)NULL; /* pointer to last semi-colon in pathcomp */
|
|
|
|
#ifdef ACORN_FTYPE_NFS
|
|
|
|
char *lastcomma=(char *)NULL; /* pointer to last comma in pathcomp */
|
|
|
|
RO_extra_block *ef_spark; /* pointer Acorn FTYPE ef block */
|
|
|
|
#endif
|
|
|
|
int killed_ddot = FALSE; /* is set when skipping "../" pathcomp */
|
|
|
|
int error = MPN_OK;
|
|
|
|
register unsigned workch; /* hold the character being tested */
|
|
|
|
|
|
|
|
|
|
|
|
/*---------------------------------------------------------------------------
|
|
|
|
Initialize various pointers and counters and stuff.
|
|
|
|
---------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
if (G.pInfo->vollabel)
|
|
|
|
return MPN_VOL_LABEL; /* can't set disk volume labels in Unix */
|
|
|
|
|
|
|
|
/* can create path as long as not just freshening, or if user told us */
|
|
|
|
G.create_dirs = (!uO.fflag || renamed);
|
|
|
|
|
|
|
|
G.created_dir = FALSE; /* not yet */
|
|
|
|
|
|
|
|
/* user gave full pathname: don't prepend rootpath */
|
|
|
|
G.renamed_fullpath = (renamed && (*G.filename == '/'));
|
|
|
|
|
|
|
|
if (checkdir(__G__ (char *)NULL, INIT) == MPN_NOMEM)
|
|
|
|
return MPN_NOMEM; /* initialize path buffer, unless no memory */
|
|
|
|
|
|
|
|
*pathcomp = '\0'; /* initialize translation buffer */
|
|
|
|
pp = pathcomp; /* point to translation buffer */
|
|
|
|
if (uO.jflag) /* junking directories */
|
|
|
|
cp = (char *)strrchr(G.filename, '/');
|
|
|
|
if (cp == (char *)NULL) /* no '/' or not junking dirs */
|
|
|
|
cp = G.filename; /* point to internal zipfile-member pathname */
|
|
|
|
else
|
|
|
|
++cp; /* point to start of last component of path */
|
|
|
|
|
|
|
|
/*---------------------------------------------------------------------------
|
|
|
|
Begin main loop through characters in filename.
|
|
|
|
---------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
while ((workch = (uch)*cp++) != 0) {
|
|
|
|
|
|
|
|
switch (workch) {
|
|
|
|
case '/': /* can assume -j flag not given */
|
|
|
|
*pp = '\0';
|
|
|
|
if (strcmp(pathcomp, ".") == 0) {
|
|
|
|
/* don't bother appending "./" to the path */
|
|
|
|
*pathcomp = '\0';
|
|
|
|
} else if (!uO.ddotflag && strcmp(pathcomp, "..") == 0) {
|
|
|
|
/* "../" dir traversal detected, skip over it */
|
|
|
|
*pathcomp = '\0';
|
|
|
|
killed_ddot = TRUE; /* set "show message" flag */
|
|
|
|
}
|
|
|
|
/* when path component is not empty, append it now */
|
|
|
|
if (*pathcomp != '\0' &&
|
|
|
|
((error = checkdir(__G__ pathcomp, APPEND_DIR))
|
|
|
|
& MPN_MASK) > MPN_INF_TRUNC)
|
|
|
|
return error;
|
|
|
|
pp = pathcomp; /* reset conversion buffer for next piece */
|
|
|
|
lastsemi = (char *)NULL; /* leave direct. semi-colons alone */
|
|
|
|
break;
|
|
|
|
|
|
|
|
#ifdef __CYGWIN__ /* Cygwin runs on Win32, apply FAT/NTFS filename rules */
|
|
|
|
case ':': /* drive spec not stored, so no colon allowed */
|
|
|
|
case '\\': /* '\\' may come as normal filename char (not */
|
|
|
|
case '<': /* dir sep char!) from unix-like file system */
|
|
|
|
case '>': /* no redirection symbols allowed either */
|
|
|
|
case '|': /* no pipe signs allowed */
|
|
|
|
case '"': /* no double quotes allowed */
|
|
|
|
case '?': /* no wildcards allowed */
|
|
|
|
case '*':
|
|
|
|
*pp++ = '_'; /* these rules apply equally to FAT and NTFS */
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
case ';': /* VMS version (or DEC-20 attrib?) */
|
|
|
|
lastsemi = pp;
|
|
|
|
*pp++ = ';'; /* keep for now; remove VMS ";##" */
|
|
|
|
break; /* later, if requested */
|
|
|
|
|
|
|
|
#ifdef ACORN_FTYPE_NFS
|
|
|
|
case ',': /* NFS filetype extension */
|
|
|
|
lastcomma = pp;
|
|
|
|
*pp++ = ','; /* keep for now; may need to remove */
|
|
|
|
break; /* later, if requested */
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef MTS
|
|
|
|
case ' ': /* change spaces to underscore under */
|
|
|
|
*pp++ = '_'; /* MTS; leave as spaces under Unix */
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
default:
|
|
|
|
/* disable control character filter when requested,
|
|
|
|
* else allow 8-bit characters (e.g. UTF-8) in filenames:
|
|
|
|
*/
|
2016-11-18 17:37:20 +01:00
|
|
|
if ((isprint(workch) || (128 <= workch && workch <= 254)))
|
|
|
|
*pp++ = (char)workch;
|
2016-11-18 14:40:05 +01:00
|
|
|
/*kos
|
|
|
|
if (uO.cflxflag ||
|
|
|
|
(isprint(workch) || (128 <= workch && workch <= 254)))
|
|
|
|
*pp++ = (char)workch;
|
|
|
|
*/
|
|
|
|
} /* end switch */
|
|
|
|
|
|
|
|
} /* end while loop */
|
|
|
|
|
|
|
|
/* Show warning when stripping insecure "parent dir" path components */
|
|
|
|
if (killed_ddot && QCOND2) {
|
|
|
|
Info(slide, 0, ((char *)slide,
|
|
|
|
"warning: skipped \"../\" path component(s) in %s\n",
|
|
|
|
FnFilter1(G.filename)));
|
|
|
|
if (!(error & ~MPN_MASK))
|
|
|
|
error = (error & MPN_MASK) | PK_WARN;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*---------------------------------------------------------------------------
|
|
|
|
Report if directory was created (and no file to create: filename ended
|
|
|
|
in '/'), check name to be sure it exists, and combine path and name be-
|
|
|
|
fore exiting.
|
|
|
|
---------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
if (G.filename[strlen(G.filename) - 1] == '/') {
|
|
|
|
checkdir(__G__ G.filename, GETPATH);
|
|
|
|
if (G.created_dir) {
|
|
|
|
if (QCOND2) {
|
|
|
|
Info(slide, 0, ((char *)slide, " creating: %s\n",
|
|
|
|
FnFilter1(G.filename)));
|
|
|
|
}
|
|
|
|
#ifndef NO_CHMOD
|
|
|
|
/* Filter out security-relevant attributes bits. */
|
|
|
|
G.pInfo->file_attr = filtattr(__G__ G.pInfo->file_attr);
|
|
|
|
/* When extracting non-UNIX directories or when extracting
|
|
|
|
* without UID/GID restoration or SGID preservation, any
|
|
|
|
* SGID flag inherited from the parent directory should be
|
|
|
|
* maintained to allow files extracted into this new folder
|
|
|
|
* to inherit the GID setting from the parent directory.
|
|
|
|
*/
|
|
|
|
if (G.pInfo->hostnum != UNIX_ || !(uO.X_flag || uO.K_flag)) {
|
|
|
|
/* preserve SGID bit when inherited from parent dir */
|
|
|
|
if (!SSTAT(G.filename, &G.statbuf)) {
|
|
|
|
G.pInfo->file_attr |= G.statbuf.st_mode & S_ISGID;
|
|
|
|
} else {
|
|
|
|
perror("Could not read directory attributes");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* set approx. dir perms (make sure can still read/write in dir) */
|
|
|
|
if (chmod(G.filename, G.pInfo->file_attr | 0700))
|
|
|
|
perror("chmod (directory attributes) error");
|
|
|
|
#endif
|
|
|
|
/* set dir time (note trailing '/') */
|
|
|
|
return (error & ~MPN_MASK) | MPN_CREATED_DIR;
|
|
|
|
}
|
|
|
|
/* dir existed already; don't look for data to extract */
|
|
|
|
return (error & ~MPN_MASK) | MPN_INF_SKIP;
|
|
|
|
}
|
|
|
|
|
|
|
|
*pp = '\0'; /* done with pathcomp: terminate it */
|
|
|
|
|
|
|
|
/* if not saving them, remove VMS version numbers (appended ";###") */
|
|
|
|
if (!uO.V_flag && lastsemi) {
|
|
|
|
pp = lastsemi + 1;
|
|
|
|
while (isdigit((uch)(*pp)))
|
|
|
|
++pp;
|
|
|
|
if (*pp == '\0') /* only digits between ';' and end: nuke */
|
|
|
|
*lastsemi = '\0';
|
|
|
|
}
|
|
|
|
|
|
|
|
/* On UNIX (and compatible systems), "." and ".." are reserved for
|
|
|
|
* directory navigation and cannot be used as regular file names.
|
|
|
|
* These reserved one-dot and two-dot names are mapped to "_" and "__".
|
|
|
|
*/
|
|
|
|
if (strcmp(pathcomp, ".") == 0)
|
|
|
|
*pathcomp = '_';
|
|
|
|
else if (strcmp(pathcomp, "..") == 0)
|
|
|
|
strcpy(pathcomp, "__");
|
|
|
|
|
|
|
|
#ifdef ACORN_FTYPE_NFS
|
|
|
|
/* translate Acorn filetype information if asked to do so */
|
|
|
|
if (uO.acorn_nfs_ext &&
|
|
|
|
(ef_spark = (RO_extra_block *)
|
|
|
|
getRISCOSexfield(G.extra_field, G.lrec.extra_field_length))
|
|
|
|
!= (RO_extra_block *)NULL)
|
|
|
|
{
|
|
|
|
/* file *must* have a RISC OS extra field */
|
|
|
|
long ft = (long)makelong(ef_spark->loadaddr);
|
|
|
|
/*32-bit*/
|
|
|
|
if (lastcomma) {
|
|
|
|
pp = lastcomma + 1;
|
|
|
|
while (isxdigit((uch)(*pp))) ++pp;
|
|
|
|
if (pp == lastcomma+4 && *pp == '\0') *lastcomma='\0'; /* nuke */
|
|
|
|
}
|
|
|
|
if ((ft & 1<<31)==0) ft=0x000FFD00;
|
|
|
|
sprintf(pathcomp+strlen(pathcomp), ",%03x", (int)(ft>>8) & 0xFFF);
|
|
|
|
}
|
|
|
|
#endif /* ACORN_FTYPE_NFS */
|
|
|
|
|
|
|
|
if (*pathcomp == '\0') {
|
|
|
|
Info(slide, 1, ((char *)slide, "mapname: conversion of %s failed\n",
|
|
|
|
FnFilter1(G.filename)));
|
|
|
|
return (error & ~MPN_MASK) | MPN_ERR_SKIP;
|
|
|
|
}
|
|
|
|
|
|
|
|
checkdir(__G__ pathcomp, APPEND_NAME); /* returns 1 if truncated: care? */
|
|
|
|
checkdir(__G__ G.filename, GETPATH);
|
|
|
|
|
|
|
|
return error;
|
|
|
|
|
|
|
|
} /* end function mapname() */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#if 0 /*========== NOTES ==========*/
|
|
|
|
|
|
|
|
extract-to dir: a:path/
|
|
|
|
buildpath: path1/path2/ ... (NULL-terminated)
|
|
|
|
pathcomp: filename
|
|
|
|
|
|
|
|
mapname():
|
|
|
|
loop over chars in zipfile member name
|
|
|
|
checkdir(path component, COMPONENT | CREATEDIR) --> map as required?
|
|
|
|
(d:/tmp/unzip/) (disk:[tmp.unzip.)
|
|
|
|
(d:/tmp/unzip/jj/) (disk:[tmp.unzip.jj.)
|
|
|
|
(d:/tmp/unzip/jj/temp/) (disk:[tmp.unzip.jj.temp.)
|
|
|
|
finally add filename itself and check for existence? (could use with rename)
|
|
|
|
(d:/tmp/unzip/jj/temp/msg.outdir) (disk:[tmp.unzip.jj.temp]msg.outdir)
|
|
|
|
checkdir(name, GETPATH) --> copy path to name and free space
|
|
|
|
|
|
|
|
#endif /* 0 */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2016-11-18 17:37:20 +01:00
|
|
|
/********************************************************************************************************************/
|
|
|
|
/*** Function checkdir() */
|
|
|
|
/********************************************************************************************************************/
|
|
|
|
|
2016-11-18 14:40:05 +01:00
|
|
|
|
|
|
|
int checkdir(__G__ pathcomp, flag)
|
|
|
|
__GDEF
|
|
|
|
char *pathcomp;
|
|
|
|
int flag;
|
|
|
|
/*
|
|
|
|
* returns:
|
|
|
|
* MPN_OK - no problem detected
|
|
|
|
* MPN_INF_TRUNC - (on APPEND_NAME) truncated filename
|
|
|
|
* MPN_INF_SKIP - path doesn't exist, not allowed to create
|
|
|
|
* MPN_ERR_SKIP - path doesn't exist, tried to create and failed; or path
|
|
|
|
* exists and is not a directory, but is supposed to be
|
|
|
|
* MPN_ERR_TOOLONG - path is too long
|
|
|
|
* MPN_NOMEM - can't allocate memory for filename buffers
|
|
|
|
*/
|
|
|
|
{
|
|
|
|
/* static int rootlen = 0; */ /* length of rootpath */
|
|
|
|
/* static char *rootpath; */ /* user's "extract-to" directory */
|
|
|
|
/* static char *buildpath; */ /* full path (so far) to extracted file */
|
|
|
|
/* static char *end; */ /* pointer to end of buildpath ('\0') */
|
|
|
|
|
|
|
|
# define FN_MASK 7
|
|
|
|
# define FUNCTION (flag & FN_MASK)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*---------------------------------------------------------------------------
|
|
|
|
APPEND_DIR: append the path component to the path being built and check
|
|
|
|
for its existence. If doesn't exist and we are creating directories, do
|
|
|
|
so for this one; else signal success or error as appropriate.
|
|
|
|
---------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
if (FUNCTION == APPEND_DIR) {
|
|
|
|
int too_long = FALSE;
|
|
|
|
#ifdef SHORT_NAMES
|
|
|
|
char *old_end = end;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
Trace((stderr, "appending dir segment [%s]\n", FnFilter1(pathcomp)));
|
|
|
|
while ((*G.end = *pathcomp++) != '\0')
|
|
|
|
++G.end;
|
|
|
|
#ifdef SHORT_NAMES /* path components restricted to 14 chars, typically */
|
|
|
|
if ((G.end-old_end) > FILENAME_MAX) /* GRR: proper constant? */
|
|
|
|
*(G.end = old_end + FILENAME_MAX) = '\0';
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* GRR: could do better check, see if overrunning buffer as we go:
|
|
|
|
* check end-buildpath after each append, set warning variable if
|
|
|
|
* within 20 of FILNAMSIZ; then if var set, do careful check when
|
|
|
|
* appending. Clear variable when begin new path. */
|
|
|
|
|
|
|
|
/* next check: need to append '/', at least one-char name, '\0' */
|
|
|
|
if ((G.end-G.buildpath) > FILNAMSIZ-3)
|
|
|
|
too_long = TRUE; /* check if extracting dir? */
|
|
|
|
if (SSTAT(G.buildpath, &G.statbuf)) { /* path doesn't exist */
|
|
|
|
if (!G.create_dirs) { /* told not to create (freshening) */
|
|
|
|
free(G.buildpath);
|
|
|
|
return MPN_INF_SKIP; /* path doesn't exist: nothing to do */
|
|
|
|
}
|
|
|
|
if (too_long) {
|
|
|
|
Info(slide, 1, ((char *)slide,
|
|
|
|
"checkdir error: path too long: %s\n",
|
|
|
|
FnFilter1(G.buildpath)));
|
|
|
|
free(G.buildpath);
|
|
|
|
/* no room for filenames: fatal */
|
|
|
|
return MPN_ERR_TOOLONG;
|
|
|
|
}
|
|
|
|
if (mkdir(G.buildpath, 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.buildpath),
|
|
|
|
strerror(errno),
|
|
|
|
FnFilter1(G.filename)));
|
|
|
|
free(G.buildpath);
|
|
|
|
/* path didn't exist, tried to create, failed */
|
|
|
|
return MPN_ERR_SKIP;
|
|
|
|
}
|
|
|
|
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",
|
|
|
|
FnFilter2(G.buildpath), FnFilter1(G.filename)));
|
|
|
|
free(G.buildpath);
|
|
|
|
/* path existed but wasn't dir */
|
|
|
|
return MPN_ERR_SKIP;
|
|
|
|
}
|
|
|
|
if (too_long) {
|
|
|
|
Info(slide, 1, ((char *)slide,
|
|
|
|
"checkdir error: path too long: %s\n", FnFilter1(G.buildpath)));
|
|
|
|
free(G.buildpath);
|
|
|
|
/* no room for filenames: fatal */
|
|
|
|
return MPN_ERR_TOOLONG;
|
|
|
|
}
|
|
|
|
*G.end++ = '/';
|
|
|
|
*G.end = '\0';
|
|
|
|
Trace((stderr, "buildpath now = [%s]\n", FnFilter1(G.buildpath)));
|
|
|
|
return MPN_OK;
|
|
|
|
|
|
|
|
} /* end if (FUNCTION == APPEND_DIR) */
|
|
|
|
|
|
|
|
/*---------------------------------------------------------------------------
|
|
|
|
GETPATH: copy full path to the string pointed at by pathcomp, and free
|
|
|
|
G.buildpath.
|
|
|
|
---------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
if (FUNCTION == GETPATH) {
|
|
|
|
strcpy(pathcomp, G.buildpath);
|
|
|
|
Trace((stderr, "getting and freeing path [%s]\n",
|
|
|
|
FnFilter1(pathcomp)));
|
|
|
|
free(G.buildpath);
|
|
|
|
G.buildpath = G.end = (char *)NULL;
|
|
|
|
return MPN_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*---------------------------------------------------------------------------
|
|
|
|
APPEND_NAME: assume the path component is the filename; append it and
|
|
|
|
return without checking for existence.
|
|
|
|
---------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
if (FUNCTION == APPEND_NAME) {
|
|
|
|
#ifdef SHORT_NAMES
|
|
|
|
char *old_end = end;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
Trace((stderr, "appending filename [%s]\n", FnFilter1(pathcomp)));
|
|
|
|
while ((*G.end = *pathcomp++) != '\0') {
|
|
|
|
++G.end;
|
|
|
|
#ifdef SHORT_NAMES /* truncate name at 14 characters, typically */
|
|
|
|
if ((G.end-old_end) > FILENAME_MAX) /* GRR: proper constant? */
|
|
|
|
*(G.end = old_end + FILENAME_MAX) = '\0';
|
|
|
|
#endif
|
|
|
|
if ((G.end-G.buildpath) >= FILNAMSIZ) {
|
|
|
|
*--G.end = '\0';
|
|
|
|
Info(slide, 0x201, ((char *)slide,
|
|
|
|
"checkdir warning: path too long; truncating\n\
|
|
|
|
%s\n -> %s\n",
|
|
|
|
FnFilter1(G.filename), FnFilter2(G.buildpath)));
|
|
|
|
return MPN_INF_TRUNC; /* filename truncated */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Trace((stderr, "buildpath now = [%s]\n", FnFilter1(G.buildpath)));
|
|
|
|
/* could check for existence here, prompt for new name... */
|
|
|
|
return MPN_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*---------------------------------------------------------------------------
|
|
|
|
INIT: allocate and initialize buffer space for the file currently being
|
|
|
|
extracted. If file was renamed with an absolute path, don't prepend the
|
|
|
|
extract-to path.
|
|
|
|
---------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
/* GRR: for VMS and TOPS-20, add up to 13 to strlen */
|
|
|
|
|
|
|
|
if (FUNCTION == INIT) {
|
|
|
|
Trace((stderr, "initializing buildpath to "));
|
|
|
|
#ifdef ACORN_FTYPE_NFS
|
|
|
|
if ((G.buildpath = (char *)malloc(strlen(G.filename)+G.rootlen+
|
|
|
|
(uO.acorn_nfs_ext ? 5 : 1)))
|
|
|
|
#else
|
|
|
|
if ((G.buildpath = (char *)malloc(strlen(G.filename)+G.rootlen+1))
|
|
|
|
#endif
|
|
|
|
== (char *)NULL)
|
|
|
|
return MPN_NOMEM;
|
|
|
|
if ((G.rootlen > 0) && !G.renamed_fullpath) {
|
|
|
|
strcpy(G.buildpath, G.rootpath);
|
|
|
|
G.end = G.buildpath + G.rootlen;
|
|
|
|
} else {
|
|
|
|
*G.buildpath = '\0';
|
|
|
|
G.end = G.buildpath;
|
|
|
|
}
|
|
|
|
Trace((stderr, "[%s]\n", FnFilter1(G.buildpath)));
|
|
|
|
return MPN_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*---------------------------------------------------------------------------
|
|
|
|
ROOT: if appropriate, store the path in rootpath and create it if
|
|
|
|
necessary; else assume it's a zipfile member and return. This path
|
|
|
|
segment gets used in extracting all members from every zipfile specified
|
|
|
|
on the command line.
|
|
|
|
---------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
#if (!defined(SFX) || defined(SFX_EXDIR))
|
|
|
|
if (FUNCTION == ROOT) {
|
|
|
|
Trace((stderr, "initializing root path to [%s]\n",
|
|
|
|
FnFilter1(pathcomp)));
|
|
|
|
if (pathcomp == (char *)NULL) {
|
|
|
|
G.rootlen = 0;
|
|
|
|
return MPN_OK;
|
|
|
|
}
|
|
|
|
if (G.rootlen > 0) /* rootpath was already set, nothing to do */
|
|
|
|
return MPN_OK;
|
|
|
|
if ((G.rootlen = strlen(pathcomp)) > 0) {
|
|
|
|
char *tmproot;
|
|
|
|
|
|
|
|
if ((tmproot = (char *)malloc(G.rootlen+2)) == (char *)NULL) {
|
|
|
|
G.rootlen = 0;
|
|
|
|
return MPN_NOMEM;
|
|
|
|
}
|
|
|
|
strcpy(tmproot, pathcomp);
|
|
|
|
if (tmproot[G.rootlen-1] == '/') {
|
|
|
|
tmproot[--G.rootlen] = '\0';
|
|
|
|
}
|
|
|
|
if (G.rootlen > 0 && (SSTAT(tmproot, &G.statbuf) ||
|
|
|
|
!S_ISDIR(G.statbuf.st_mode)))
|
|
|
|
{ /* path does not exist */
|
|
|
|
if (!G.create_dirs /* || iswild(tmproot) */ ) {
|
|
|
|
free(tmproot);
|
|
|
|
G.rootlen = 0;
|
|
|
|
/* skip (or treat as stored file) */
|
|
|
|
return MPN_INF_SKIP;
|
|
|
|
}
|
|
|
|
/* create the directory (could add loop here scanning tmproot
|
|
|
|
* to create more than one level, but why really necessary?) */
|
|
|
|
if (mkdir(tmproot, 0777) == -1) {
|
|
|
|
Info(slide, 1, ((char *)slide,
|
|
|
|
"checkdir: cannot create extraction directory: %s\n\
|
|
|
|
%s\n",
|
|
|
|
FnFilter1(tmproot), strerror(errno)));
|
|
|
|
free(tmproot);
|
|
|
|
G.rootlen = 0;
|
|
|
|
/* path didn't exist, tried to create, and failed: */
|
|
|
|
/* file exists, or 2+ subdir levels required */
|
|
|
|
return MPN_ERR_SKIP;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
tmproot[G.rootlen++] = '/';
|
|
|
|
tmproot[G.rootlen] = '\0';
|
|
|
|
if ((G.rootpath = (char *)realloc(tmproot, G.rootlen+1)) == NULL) {
|
|
|
|
free(tmproot);
|
|
|
|
G.rootlen = 0;
|
|
|
|
return MPN_NOMEM;
|
|
|
|
}
|
|
|
|
Trace((stderr, "rootpath now = [%s]\n", FnFilter1(G.rootpath)));
|
|
|
|
}
|
|
|
|
return MPN_OK;
|
|
|
|
}
|
|
|
|
#endif /* !SFX || SFX_EXDIR */
|
|
|
|
|
|
|
|
/*---------------------------------------------------------------------------
|
|
|
|
END: free rootpath, immediately prior to program exit.
|
|
|
|
---------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
if (FUNCTION == END) {
|
|
|
|
Trace((stderr, "freeing rootpath\n"));
|
|
|
|
if (G.rootlen > 0) {
|
|
|
|
free(G.rootpath);
|
|
|
|
G.rootlen = 0;
|
|
|
|
}
|
|
|
|
return MPN_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
return MPN_INVALID; /* should never reach */
|
|
|
|
|
|
|
|
} /* end function checkdir() */
|
|
|
|
|
|
|
|
static int get_extattribs OF((__GPRO__ iztimes *pzt, ulg z_uidgid[2]));
|
|
|
|
|
|
|
|
static int get_extattribs(__G__ pzt, z_uidgid)
|
|
|
|
__GDEF
|
|
|
|
iztimes *pzt;
|
|
|
|
ulg z_uidgid[2];
|
|
|
|
{
|
|
|
|
/*---------------------------------------------------------------------------
|
|
|
|
Convert from MSDOS-format local time and date to Unix-format 32-bit GMT
|
|
|
|
time: adjust base year from 1980 to 1970, do usual conversions from
|
|
|
|
yy/mm/dd hh:mm:ss to elapsed seconds, and account for timezone and day-
|
|
|
|
light savings time differences. If we have a Unix extra field, however,
|
|
|
|
we're laughing: both mtime and atime are ours. On the other hand, we
|
|
|
|
then have to check for restoration of UID/GID.
|
|
|
|
---------------------------------------------------------------------------*/
|
|
|
|
int have_uidgid_flg;
|
|
|
|
unsigned eb_izux_flg;
|
|
|
|
|
|
|
|
eb_izux_flg = 0; // kos32
|
|
|
|
/*
|
|
|
|
(G.extra_field ? ef_scan_for_izux(G.extra_field,
|
|
|
|
G.lrec.extra_field_length, 0, G.lrec.last_mod_dos_datetime,
|
|
|
|
#ifdef IZ_CHECK_TZ
|
|
|
|
(G.tz_is_valid ? pzt : NULL),
|
|
|
|
#else
|
|
|
|
pzt,
|
|
|
|
#endif
|
|
|
|
z_uidgid) : 0);
|
|
|
|
*/
|
|
|
|
if (eb_izux_flg & EB_UT_FL_MTIME) {
|
|
|
|
TTrace((stderr, "\nget_extattribs: Unix e.f. modif. time = %ld\n",
|
|
|
|
pzt->mtime));
|
|
|
|
} else {
|
|
|
|
pzt->mtime = dos_to_unix_time(G.lrec.last_mod_dos_datetime);
|
|
|
|
}
|
|
|
|
if (eb_izux_flg & EB_UT_FL_ATIME) {
|
|
|
|
TTrace((stderr, "get_extattribs: Unix e.f. access time = %ld\n",
|
|
|
|
pzt->atime));
|
|
|
|
} else {
|
|
|
|
pzt->atime = pzt->mtime;
|
|
|
|
TTrace((stderr, "\nget_extattribs: modification/access times = %ld\n",
|
|
|
|
pzt->mtime));
|
|
|
|
}
|
|
|
|
|
|
|
|
/* if -X option was specified and we have UID/GID info, restore it */
|
|
|
|
have_uidgid_flg =
|
|
|
|
#ifdef RESTORE_UIDGID
|
|
|
|
(uO.X_flag && (eb_izux_flg & EB_UX2_VALID));
|
|
|
|
#else
|
|
|
|
0;
|
|
|
|
#endif
|
|
|
|
return have_uidgid_flg;
|
|
|
|
}
|
|
|
|
|
|
|
|
/****************************/
|
|
|
|
/* Function close_outfile() */
|
|
|
|
/****************************/
|
|
|
|
|
|
|
|
void close_outfile(__G) /* GRR: change to return PK-style warning level */
|
|
|
|
__GDEF
|
|
|
|
{
|
|
|
|
union {
|
|
|
|
iztimes t3; /* mtime, atime, ctime */
|
|
|
|
ztimbuf t2; /* modtime, actime */
|
|
|
|
} zt;
|
|
|
|
ulg z_uidgid[2];
|
|
|
|
int have_uidgid_flg;
|
|
|
|
|
|
|
|
have_uidgid_flg = get_extattribs(__G__ &(zt.t3), z_uidgid);
|
|
|
|
|
|
|
|
/*---------------------------------------------------------------------------
|
|
|
|
If symbolic links are supported, allocate storage for a symlink control
|
|
|
|
structure, put the uncompressed "data" and other required info in it, and
|
|
|
|
add the structure to the "deferred symlinks" chain. Since we know it's a
|
|
|
|
symbolic link to start with, we shouldn't have to worry about overflowing
|
|
|
|
unsigned ints with unsigned longs.
|
|
|
|
---------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
#ifdef SYMLINKS
|
|
|
|
if (G.symlnk) {
|
|
|
|
extent ucsize = (extent)G.lrec.ucsize;
|
|
|
|
# ifdef SET_SYMLINK_ATTRIBS
|
|
|
|
extent attribsize = sizeof(unsigned) +
|
|
|
|
(have_uidgid_flg ? sizeof(z_uidgid) : 0);
|
|
|
|
# else
|
|
|
|
extent attribsize = 0;
|
|
|
|
# endif
|
|
|
|
/* size of the symlink entry is the sum of
|
|
|
|
* (struct size (includes 1st '\0') + 1 additional trailing '\0'),
|
|
|
|
* system specific attribute data size (might be 0),
|
|
|
|
* and the lengths of name and link target.
|
|
|
|
*/
|
|
|
|
extent slnk_entrysize = (sizeof(slinkentry) + 1) + attribsize +
|
|
|
|
ucsize + strlen(G.filename);
|
|
|
|
slinkentry *slnk_entry;
|
|
|
|
|
|
|
|
if (slnk_entrysize < ucsize) {
|
|
|
|
Info(slide, 0x201, ((char *)slide,
|
|
|
|
"warning: symbolic link (%s) failed: mem alloc overflow\n",
|
|
|
|
FnFilter1(G.filename)));
|
|
|
|
fclose(G.outfile);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((slnk_entry = (slinkentry *)malloc(slnk_entrysize)) == NULL) {
|
|
|
|
Info(slide, 0x201, ((char *)slide,
|
|
|
|
"warning: symbolic link (%s) failed: no mem\n",
|
|
|
|
FnFilter1(G.filename)));
|
|
|
|
fclose(G.outfile);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
slnk_entry->next = NULL;
|
|
|
|
slnk_entry->targetlen = ucsize;
|
|
|
|
slnk_entry->attriblen = attribsize;
|
|
|
|
# ifdef SET_SYMLINK_ATTRIBS
|
|
|
|
memcpy(slnk_entry->buf, &(G.pInfo->file_attr),
|
|
|
|
sizeof(unsigned));
|
|
|
|
if (have_uidgid_flg)
|
|
|
|
memcpy(slnk_entry->buf + 4, z_uidgid, sizeof(z_uidgid));
|
|
|
|
# endif
|
|
|
|
slnk_entry->target = slnk_entry->buf + slnk_entry->attriblen;
|
|
|
|
slnk_entry->fname = slnk_entry->target + ucsize + 1;
|
|
|
|
strcpy(slnk_entry->fname, G.filename);
|
|
|
|
|
|
|
|
/* move back to the start of the file to re-read the "link data" */
|
|
|
|
rewind(G.outfile);
|
|
|
|
|
|
|
|
if (fread(slnk_entry->target, 1, ucsize, G.outfile) != ucsize)
|
|
|
|
{
|
|
|
|
Info(slide, 0x201, ((char *)slide,
|
|
|
|
"warning: symbolic link (%s) failed\n",
|
|
|
|
FnFilter1(G.filename)));
|
|
|
|
free(slnk_entry);
|
|
|
|
fclose(G.outfile);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
fclose(G.outfile); /* close "link" file for good... */
|
|
|
|
slnk_entry->target[ucsize] = '\0';
|
|
|
|
if (QCOND2)
|
|
|
|
Info(slide, 0, ((char *)slide, "-> %s ",
|
|
|
|
FnFilter1(slnk_entry->target)));
|
|
|
|
/* add this symlink record to the list of deferred symlinks */
|
|
|
|
if (G.slink_last != NULL)
|
|
|
|
G.slink_last->next = slnk_entry;
|
|
|
|
else
|
|
|
|
G.slink_head = slnk_entry;
|
|
|
|
G.slink_last = slnk_entry;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif /* SYMLINKS */
|
|
|
|
|
|
|
|
#ifdef QLZIP
|
|
|
|
if (G.extra_field) {
|
|
|
|
static void qlfix OF((__GPRO__ uch *ef_ptr, unsigned ef_len));
|
|
|
|
|
|
|
|
qlfix(__G__ G.extra_field, G.lrec.extra_field_length);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if (defined(NO_FCHOWN))
|
|
|
|
fclose(G.outfile);
|
2016-11-23 12:15:33 +01:00
|
|
|
Trace((stdout, "File (%s) closed\n", FnFilter1(G.filename)));
|
2016-11-18 14:40:05 +01:00
|
|
|
#endif
|
|
|
|
|
|
|
|
// kos. add set file datetime ?
|
|
|
|
#ifndef KOS32
|
|
|
|
/* if -X option was specified and we have UID/GID info, restore it */
|
|
|
|
if (have_uidgid_flg
|
|
|
|
/* check that both uid and gid values fit into their data sizes */
|
|
|
|
&& ((ulg)(uid_t)(z_uidgid[0]) == z_uidgid[0])
|
|
|
|
&& ((ulg)(gid_t)(z_uidgid[1]) == z_uidgid[1])) {
|
|
|
|
TTrace((stderr, "close_outfile: restoring Unix UID/GID info\n"));
|
|
|
|
#if (defined(NO_FCHOWN))
|
|
|
|
if (chown(G.filename, (uid_t)z_uidgid[0], (gid_t)z_uidgid[1]))
|
|
|
|
#else
|
|
|
|
if (fchown(fileno(G.outfile), (uid_t)z_uidgid[0], (gid_t)z_uidgid[1]))
|
|
|
|
#endif
|
|
|
|
{
|
|
|
|
if (uO.qflag)
|
|
|
|
Info(slide, 0x201, ((char *)slide, CannotSetItemUidGid,
|
|
|
|
z_uidgid[0], z_uidgid[1], FnFilter1(G.filename),
|
|
|
|
strerror(errno)));
|
|
|
|
else
|
|
|
|
Info(slide, 0x201, ((char *)slide, CannotSetUidGid,
|
|
|
|
z_uidgid[0], z_uidgid[1], strerror(errno)));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#if (!defined(NO_FCHOWN) && defined(NO_FCHMOD))
|
|
|
|
fclose(G.outfile);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if (!defined(NO_FCHOWN) && !defined(NO_FCHMOD))
|
|
|
|
/*---------------------------------------------------------------------------
|
|
|
|
Change the file permissions from default ones to those stored in the
|
|
|
|
zipfile.
|
|
|
|
---------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
if (fchmod(fileno(G.outfile), filtattr(__G__ G.pInfo->file_attr)))
|
|
|
|
perror("fchmod (file attributes) error");
|
|
|
|
|
|
|
|
fclose(G.outfile);
|
|
|
|
#endif /* !NO_FCHOWN && !NO_FCHMOD */
|
|
|
|
|
|
|
|
/* skip restoring time stamps on user's request */
|
|
|
|
if (uO.D_flag <= 1) {
|
|
|
|
/* set the file's access and modification times */
|
|
|
|
if (utime(G.filename, &(zt.t2))) {
|
|
|
|
if (uO.qflag)
|
|
|
|
Info(slide, 0x201, ((char *)slide, CannotSetItemTimestamps,
|
|
|
|
FnFilter1(G.filename), strerror(errno)));
|
|
|
|
else
|
|
|
|
Info(slide, 0x201, ((char *)slide, CannotSetTimestamps,
|
|
|
|
strerror(errno)));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#if (defined(NO_FCHOWN) || defined(NO_FCHMOD))
|
|
|
|
/*---------------------------------------------------------------------------
|
|
|
|
Change the file permissions from default ones to those stored in the
|
|
|
|
zipfile.
|
|
|
|
---------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
#ifndef NO_CHMOD
|
|
|
|
if (chmod(G.filename, filtattr(__G__ G.pInfo->file_attr)))
|
|
|
|
perror("chmod (file attributes) error");
|
|
|
|
#endif
|
|
|
|
#endif /* NO_FCHOWN || NO_FCHMOD */
|
|
|
|
|
|
|
|
#endif // 0
|
|
|
|
|
|
|
|
} /* end function close_outfile() */
|
|
|
|
|
|
|
|
|
|
|
|
/**********************/
|
|
|
|
/* Function do_wild() */ /* for porting: dir separator; match(ignore_case) */
|
|
|
|
/**********************/
|
|
|
|
|
|
|
|
char *do_wild(__G__ wildspec)
|
|
|
|
__GDEF
|
|
|
|
ZCONST char *wildspec; /* only used first time on a given dir */
|
|
|
|
{
|
|
|
|
/* these statics are now declared in SYSTEM_SPECIFIC_GLOBALS in unxcfg.h:
|
|
|
|
static DIR *wild_dir = (DIR *)NULL;
|
|
|
|
static ZCONST char *wildname;
|
|
|
|
static char *dirname, matchname[FILNAMSIZ];
|
|
|
|
static int notfirstcall=FALSE, have_dirname, dirnamelen;
|
|
|
|
*/
|
|
|
|
struct dirent *file;
|
|
|
|
|
|
|
|
/* Even when we're just returning wildspec, we *always* do so in
|
|
|
|
* matchname[]--calling routine is allowed to append four characters
|
|
|
|
* to the returned string, and wildspec may be a pointer to argv[].
|
|
|
|
*/
|
|
|
|
if (!G.notfirstcall) { /* first call: must initialize everything */
|
|
|
|
G.notfirstcall = TRUE;
|
|
|
|
|
|
|
|
if (!iswild(wildspec)) {
|
|
|
|
strncpy(G.matchname, wildspec, FILNAMSIZ);
|
|
|
|
G.matchname[FILNAMSIZ-1] = '\0';
|
|
|
|
G.have_dirname = FALSE;
|
|
|
|
G.wild_dir = NULL;
|
|
|
|
return G.matchname;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* break the wildspec into a directory part and a wildcard filename */
|
|
|
|
if ((G.wildname = (ZCONST char *)strrchr(wildspec, '/')) == NULL) {
|
|
|
|
G.dirname = ".";
|
|
|
|
G.dirnamelen = 1;
|
|
|
|
G.have_dirname = FALSE;
|
|
|
|
G.wildname = wildspec;
|
|
|
|
} else {
|
|
|
|
++G.wildname; /* point at character after '/' */
|
|
|
|
G.dirnamelen = G.wildname - wildspec;
|
|
|
|
if ((G.dirname = (char *)malloc(G.dirnamelen+1)) == (char *)NULL) {
|
|
|
|
Info(slide, 0x201, ((char *)slide,
|
|
|
|
"warning: cannot allocate wildcard buffers\n"));
|
|
|
|
strncpy(G.matchname, wildspec, FILNAMSIZ);
|
|
|
|
G.matchname[FILNAMSIZ-1] = '\0';
|
|
|
|
return G.matchname; /* but maybe filespec was not a wildcard */
|
|
|
|
}
|
|
|
|
strncpy(G.dirname, wildspec, G.dirnamelen);
|
|
|
|
G.dirname[G.dirnamelen] = '\0'; /* terminate for strcpy below */
|
|
|
|
G.have_dirname = TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((G.wild_dir = (zvoid *)opendir(G.dirname)) != (zvoid *)NULL) {
|
|
|
|
while ((file = readdir((DIR *)G.wild_dir)) !=
|
|
|
|
(struct dirent *)NULL) {
|
|
|
|
Trace((stderr, "do_wild: readdir returns %s\n",
|
|
|
|
FnFilter1(file->d_name)));
|
|
|
|
if (file->d_name[0] == '.' && G.wildname[0] != '.')
|
|
|
|
continue; /* Unix: '*' and '?' do not match leading dot */
|
|
|
|
if (match(file->d_name, G.wildname, 0 WISEP) &&/*0=case sens.*/
|
|
|
|
/* skip "." and ".." directory entries */
|
|
|
|
strcmp(file->d_name, ".") && strcmp(file->d_name, "..")) {
|
|
|
|
Trace((stderr, "do_wild: match() succeeds\n"));
|
|
|
|
if (G.have_dirname) {
|
|
|
|
strcpy(G.matchname, G.dirname);
|
|
|
|
strcpy(G.matchname+G.dirnamelen, file->d_name);
|
|
|
|
} else
|
|
|
|
strcpy(G.matchname, file->d_name);
|
|
|
|
return G.matchname;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* if we get to here directory is exhausted, so close it */
|
|
|
|
closedir((DIR *)G.wild_dir);
|
|
|
|
G.wild_dir = (zvoid *)NULL;
|
|
|
|
}
|
|
|
|
Trace((stderr, "do_wild: opendir(%s) returns NULL\n",
|
|
|
|
FnFilter1(G.dirname)));
|
|
|
|
|
|
|
|
/* return the raw wildspec in case that works (e.g., directory not
|
|
|
|
* searchable, but filespec was not wild and file is readable) */
|
|
|
|
strncpy(G.matchname, wildspec, FILNAMSIZ);
|
|
|
|
G.matchname[FILNAMSIZ-1] = '\0';
|
|
|
|
return G.matchname;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* last time through, might have failed opendir but returned raw wildspec */
|
|
|
|
if ((DIR *)G.wild_dir == (DIR *)NULL) {
|
|
|
|
G.notfirstcall = FALSE; /* nothing left--reset for new wildspec */
|
|
|
|
if (G.have_dirname)
|
|
|
|
free(G.dirname);
|
|
|
|
return (char *)NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If we've gotten this far, we've read and matched at least one entry
|
|
|
|
* successfully (in a previous call), so dirname has been copied into
|
|
|
|
* matchname already.
|
|
|
|
*/
|
|
|
|
while ((file = readdir((DIR *)G.wild_dir)) != (struct dirent *)NULL) {
|
|
|
|
Trace((stderr, "do_wild: readdir returns %s\n",
|
|
|
|
FnFilter1(file->d_name)));
|
|
|
|
if (file->d_name[0] == '.' && G.wildname[0] != '.')
|
|
|
|
continue; /* Unix: '*' and '?' do not match leading dot */
|
|
|
|
if (match(file->d_name, G.wildname, 0 WISEP)) { /* 0 == case sens. */
|
|
|
|
Trace((stderr, "do_wild: match() succeeds\n"));
|
|
|
|
if (G.have_dirname) {
|
|
|
|
/* strcpy(G.matchname, G.dirname); */
|
|
|
|
strcpy(G.matchname+G.dirnamelen, file->d_name);
|
|
|
|
} else
|
|
|
|
strcpy(G.matchname, file->d_name);
|
|
|
|
return G.matchname;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
closedir((DIR *)G.wild_dir); /* at least one entry read; nothing left */
|
|
|
|
G.wild_dir = (zvoid *)NULL;
|
|
|
|
G.notfirstcall = FALSE; /* reset for new wildspec */
|
|
|
|
if (G.have_dirname)
|
|
|
|
free(G.dirname);
|
|
|
|
return (char *)NULL;
|
|
|
|
|
|
|
|
} /* end function do_wild() */
|
|
|
|
|