From: François Pinard Date: Wed, 16 Nov 1994 02:43:24 +0000 (+0000) Subject: *** empty log message *** X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=72e7c861e33d61f3ed71e07ef9ba3b43d97441d2;p=chaz%2Ftar *** empty log message *** --- diff --git a/src/create.c b/src/create.c index 639507c..0bf8a70 100644 --- a/src/create.c +++ b/src/create.c @@ -60,28 +60,6 @@ struct utimbuf #endif -#if defined(_POSIX_VERSION) || defined(DIRENT) -#include -#ifdef direct -#undef direct -#endif /* direct */ -#define direct dirent -#define DP_NAMELEN(x) strlen((x)->d_name) -#endif /* _POSIX_VERSION or DIRENT */ -#if !defined(_POSIX_VERSION) && !defined(DIRENT) && defined(BSD42) -#include -#define DP_NAMELEN(x) (x)->d_namlen -#endif /* not _POSIX_VERSION and BSD42 */ -#ifdef __MSDOS__ -#include "msd_dir.h" -#define DP_NAMELEN(x) (x)->d_namlen -#define direct dirent -#endif -#if defined(USG) && !defined(_POSIX_VERSION) && !defined(DIRENT) -#include -#define DP_NAMELEN(x) strlen((x)->d_name) -#endif /* USG and not _POSIX_VERSION and not DIRENT */ - extern struct stat hstat; /* Stat struct corresponding */ #ifndef __MSDOS__ @@ -686,7 +664,7 @@ dump_file (p, curdev, toplevel) else if (S_ISDIR (hstat.st_mode)) { register DIR *dirp; - register struct direct *d; + register struct dirent *d; char *namebuf; int buflen; register int len; @@ -831,9 +809,9 @@ dump_file (p, curdev, toplevel) if (is_dot_or_dotdot (d->d_name)) continue; - if (DP_NAMELEN (d) + len >= buflen) + if (NLENGTH (d) + len >= buflen) { - buflen = len + DP_NAMELEN (d); + buflen = len + NLENGTH (d); namebuf = ck_realloc (namebuf, buflen + 1); /* namebuf[len]='\0'; msg("file name %s%s too long",