From 180239d459deeb88e364969a142ad19403e7b1b1 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Mon, 17 Oct 1994 14:01:44 +0000 Subject: [PATCH] . --- lib/Makefile.in | 4 ++-- lib/savedir.c | 34 +++++++++++++++++----------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lib/Makefile.in b/lib/Makefile.in index 9c7cab928d..de33685a13 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -80,11 +80,11 @@ clean: mostlyclean: clean distclean: clean - rm -f Makefile *.tab.c getdate.c *posixtm.c \ + rm -f Makefile *.tab.c tposixtm.c \ safe-stat.c safe-stat.h safe-lstat.c safe-lstat.h realclean: distclean - rm -f TAGS + rm -f TAGS getdate.c posixtm.c distdir = ../`cat ../distname`/$(subdir) dist: $(DISTFILES) diff --git a/lib/savedir.c b/lib/savedir.c index 32c793b607..9a5736451c 100644 --- a/lib/savedir.c +++ b/lib/savedir.c @@ -27,22 +27,22 @@ #include #endif -#ifdef HAVE_DIRENT_H -#include -#define NLENGTH(direct) (strlen((direct)->d_name)) -#else /* not HAVE_DIRENT_H */ -#define dirent direct -#define NLENGTH(direct) ((direct)->d_namlen) -#ifdef HAVE_SYS_NDIR_H -#include -#endif /* HAVE_SYS_NDIR_H */ -#ifdef HAVE_SYS_DIR_H -#include -#endif /* HAVE_SYS_DIR_H */ -#ifdef HAVE_NDIR_H -#include -#endif /* HAVE_NDIR_H */ -#endif /* HAVE_DIRENT_H */ +#if HAVE_DIRENT_H +# include +# define NAMLEN(dirent) strlen((dirent)->d_name) +#else +# define dirent direct +# define NAMLEN(dirent) (dirent)->d_namlen +# if HAVE_SYS_NDIR_H +# include +# endif +# if HAVE_SYS_DIR_H +# include +# endif +# if HAVE_NDIR_H +# include +# endif +#endif #ifdef CLOSEDIR_VOID /* Fake a return value. */ @@ -100,7 +100,7 @@ savedir (dir, name_size) || (dp->d_name[1] != '\0' && (dp->d_name[1] != '.' || dp->d_name[2] != '\0'))) { - unsigned size_needed = (namep - name_space) + NLENGTH (dp) + 2; + unsigned size_needed = (namep - name_space) + NAMLEN (dp) + 2; if (size_needed > name_size) { -- 2.30.2