projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(get_fs_usage) [STATFS_TRUNCATES_BLOCK_COUNTS]: Copy untruncated block
[gnulib.git]
/
lib
/
savedir.c
diff --git
a/lib/savedir.c
b/lib/savedir.c
index
b831c1f
..
1992cf5
100644
(file)
--- a/
lib/savedir.c
+++ b/
lib/savedir.c
@@
-18,14
+18,7
@@
/* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
#ifdef HAVE_CONFIG_H
/* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
#ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
- using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
- (which it would do because it found this file in $srcdir). */
#include <config.h>
#include <config.h>
-#else
-#include "config.h"
-#endif
#endif
#include <sys/types.h>
#endif
#include <sys/types.h>
@@
-34,24
+27,24
@@
#include <unistd.h>
#endif
#include <unistd.h>
#endif
-#if
def DIRENT
-#include <dirent.h>
-#
define NLENGTH(direct) (strlen((direct)->d_name)
)
-#else
/* not DIRENT */
-#define dirent direct
-#
define NLENGTH(direct) ((direct)->d_namlen)
-#
ifdef SYSNDIR
-#include <sys/ndir.h>
-#
endif /* SYSNDIR */
-#
ifdef SYSDIR
-#include <sys/dir.h>
-#
endif /* SYSDIR */
-#
ifdef NDIR
-#include <ndir.h>
-#
endif /* NDIR */
-#endif
/* DIRENT */
-
-#ifdef
VOID_CLOSEDIR
+#if
HAVE_DIRENT_H
+#
include <dirent.h>
+#
define NAMLEN(dirent) strlen((dirent)->d_name
)
+#else
+#
define dirent direct
+#
define NAMLEN(dirent) (dirent)->d_namlen
+#
if HAVE_SYS_NDIR_H
+#
include <sys/ndir.h>
+#
endif
+#
if HAVE_SYS_DIR_H
+#
include <sys/dir.h>
+#
endif
+#
if HAVE_NDIR_H
+#
include <ndir.h>
+#
endif
+#endif
+
+#ifdef
CLOSEDIR_VOID
/* Fake a return value. */
#define CLOSEDIR(d) (closedir (d), 0)
#else
/* Fake a return value. */
#define CLOSEDIR(d) (closedir (d), 0)
#else
@@
-64,10
+57,10
@@
#else
char *malloc ();
char *realloc ();
#else
char *malloc ();
char *realloc ();
+#endif
#ifndef NULL
#define NULL 0
#endif
#ifndef NULL
#define NULL 0
#endif
-#endif
char *stpcpy ();
char *stpcpy ();
@@
-107,7
+100,7
@@
savedir (dir, name_size)
|| (dp->d_name[1] != '\0'
&& (dp->d_name[1] != '.' || dp->d_name[2] != '\0')))
{
|| (dp->d_name[1] != '\0'
&& (dp->d_name[1] != '.' || dp->d_name[2] != '\0')))
{
- unsigned size_needed = (namep - name_space) + N
LENGTH
(dp) + 2;
+ unsigned size_needed = (namep - name_space) + N
AMLEN
(dp) + 2;
if (size_needed > name_size)
{
if (size_needed > name_size)
{