projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Include config.h.
[gnulib.git]
/
lib
/
savedir.c
diff --git
a/lib/savedir.c
b/lib/savedir.c
index
fce61da
..
1992cf5
100644
(file)
--- a/
lib/savedir.c
+++ b/
lib/savedir.c
@@
-15,30
+15,36
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-/* Written by David MacKenzie <djm@ai.mit.edu>. */
+/* Written by David MacKenzie <djm@
gnu.
ai.mit.edu>. */
-#include <sys/types.h>
-#ifdef DIRENT
-#include <dirent.h>
-#ifdef direct
-#undef direct
+#ifdef HAVE_CONFIG_H
+#include <config.h>
#endif
#endif
-#define direct dirent
-#define NLENGTH(direct) (strlen((direct)->d_name))
-#else
-#define NLENGTH(direct) ((direct)->d_namlen)
-#ifdef USG
-#ifdef SYSNDIR
-#include <sys/ndir.h>
-#else
-#include <ndir.h>
+
+#include <sys/types.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
#endif
#endif
+
+#if HAVE_DIRENT_H
+# include <dirent.h>
+# define NAMLEN(dirent) strlen((dirent)->d_name)
#else
#else
-#include <sys/dir.h>
-#endif
+# 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
#endif
-#ifdef
VOID_CLOSEDIR
+#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
@@
-51,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 ();
@@
-71,7
+77,7
@@
savedir (dir, name_size)
unsigned name_size;
{
DIR *dirp;
unsigned name_size;
{
DIR *dirp;
- struct dire
c
t *dp;
+ struct dire
n
t *dp;
char *name_space;
char *namep;
char *name_space;
char *namep;
@@
-94,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)
{