X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fsavedir.c;h=29b3842c04022bd00276b07cbf45b2c9febc6617;hb=cc3d34bc91283615d1472500d8acc5679ae308e2;hp=76634eef4e62d203b25e329ecf922d7b9d3e850b;hpb=667a7002bd3b1469c316ebc8bfa23ab18dcae98e;p=gnulib.git

diff --git a/lib/savedir.c b/lib/savedir.c
index 76634eef4..29b3842c0 100644
--- a/lib/savedir.c
+++ b/lib/savedir.c
@@ -1,5 +1,5 @@
 /* savedir.c -- save the list of files in a directory in a string
-   Copyright (C) 1990, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,13 +17,13 @@
 
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
 
-#ifdef HAVE_CONFIG_H
+#if HAVE_CONFIG_H
 # include <config.h>
 #endif
 
 #include <sys/types.h>
 
-#ifdef HAVE_UNISTD_H
+#if HAVE_UNISTD_H
 # include <unistd.h>
 #endif
 
@@ -62,7 +62,9 @@ char *realloc ();
 # define NULL 0
 #endif
 
+#ifndef stpcpy
 char *stpcpy ();
+#endif
 
 #include "savedir.h"
 
@@ -74,9 +76,7 @@ char *stpcpy ();
    Return NULL if DIR cannot be opened or if out of memory. */
 
 char *
-savedir (dir, name_size)
-     const char *dir;
-     unsigned int name_size;
+savedir (const char *dir, off_t name_size)
 {
   DIR *dirp;
   struct dirent *dp;
@@ -87,6 +87,10 @@ savedir (dir, name_size)
   if (dirp == NULL)
     return NULL;
 
+  /* Be sure name_size is at least `1' so there's room for
+     the final NUL byte.  */
+  name_size += !name_size;
+
   name_space = (char *) malloc (name_size);
   if (name_space == NULL)
     {
@@ -102,7 +106,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) + NAMLEN (dp) + 2;
+	  off_t size_needed = (namep - name_space) + NAMLEN (dp) + 2;
 
 	  if (size_needed > name_size)
 	    {