X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fsavedir.c;h=d930fb4af273af105ae895fccdb34f1f1ac65476;hb=50bbfa997cdf1e76af526569e1e3dbbadd1bdebd;hp=5a9c339d8cf4ff3a6ad2e7257d7c8ebc95b0e5bb;hpb=67f394c1d2be473276ccd5e071f986511a13e212;p=gnulib.git diff --git a/lib/savedir.c b/lib/savedir.c index 5a9c339d8..d930fb4af 100644 --- a/lib/savedir.c +++ b/lib/savedir.c @@ -1,5 +1,7 @@ /* savedir.c -- save the list of files in a directory in a string - Copyright (C) 1990, 1997, 1998 Free Software Foundation, Inc. + + Copyright (C) 1990, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, + 2006 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 @@ -13,123 +15,123 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /* Written by David MacKenzie . */ -#if HAVE_CONFIG_H -# include -#endif +#include + +#include "savedir.h" #include -#if HAVE_UNISTD_H -# include -#endif +#include -#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 +#include +#ifndef _D_EXACT_NAMLEN +# define _D_EXACT_NAMLEN(dp) strlen ((dp)->d_name) #endif -#ifdef CLOSEDIR_VOID -/* Fake a return value. */ -# define CLOSEDIR(d) (closedir (d), 0) -#else -# define CLOSEDIR(d) closedir (d) -#endif +#include +#include +#include -#ifdef STDC_HEADERS -# include -# include -#else -char *malloc (); -char *realloc (); -#endif -#ifndef NULL -# define NULL 0 -#endif +#include "openat.h" +#include "xalloc.h" -#ifndef stpcpy -char *stpcpy (); +#ifndef NAME_SIZE_DEFAULT +# define NAME_SIZE_DEFAULT 512 #endif -#include "savedir.h" +/* The results of opendir() in this file are not used with dirfd and fchdir, + therefore save some unnecessary work in fchdir.c. */ +#undef opendir +#undef closedir -/* Return a freshly allocated string containing the filenames - in directory DIR, separated by '\0' characters; +/* Return a freshly allocated string containing the file names + in directory DIRP, separated by '\0' characters; the end is marked by two '\0' characters in a row. - NAME_SIZE is the number of bytes to initially allocate - for the string; it will be enlarged as needed. - Return NULL if DIR cannot be opened or if out of memory. */ + Return NULL (setting errno) if DIRP cannot be read or closed. + If DIRP is NULL, return NULL without affecting errno. */ -char * -savedir (dir, name_size) - const char *dir; - unsigned int name_size; +static char * +savedirstream (DIR *dirp) { - DIR *dirp; - struct dirent *dp; char *name_space; - char *namep; + size_t allocated = NAME_SIZE_DEFAULT; + size_t used = 0; + int save_errno; - dirp = opendir (dir); if (dirp == NULL) return NULL; - name_space = (char *) malloc (name_size); - if (name_space == NULL) - { - closedir (dirp); - return NULL; - } - namep = name_space; + name_space = xmalloc (allocated); - while ((dp = readdir (dirp)) != NULL) + for (;;) { - /* Skip "." and ".." (some NFS filesystems' directories lack them). */ - if (dp->d_name[0] != '.' - || (dp->d_name[1] != '\0' - && (dp->d_name[1] != '.' || dp->d_name[2] != '\0'))) + struct dirent const *dp; + char const *entry; + + errno = 0; + dp = readdir (dirp); + if (! dp) + break; + + /* Skip "", ".", and "..". "" is returned by at least one buggy + implementation: Solaris 2.4 readdir on NFS file systems. */ + entry = dp->d_name; + if (entry[entry[0] != '.' ? 0 : entry[1] != '.' ? 1 : 2] != '\0') { - unsigned size_needed = (namep - name_space) + NAMLEN (dp) + 2; - - if (size_needed > name_size) + size_t entry_size = _D_EXACT_NAMLEN (dp) + 1; + if (used + entry_size < used) + xalloc_die (); + if (allocated <= used + entry_size) { - char *new_name_space; - - while (size_needed > name_size) - name_size += 1024; - - new_name_space = realloc (name_space, name_size); - if (new_name_space == NULL) + do { - closedir (dirp); - return NULL; + if (2 * allocated < allocated) + xalloc_die (); + allocated *= 2; } - namep += new_name_space - name_space; - name_space = new_name_space; + while (allocated <= used + entry_size); + + name_space = xrealloc (name_space, allocated); } - namep = stpcpy (namep, dp->d_name) + 1; + memcpy (name_space + used, entry, entry_size); + used += entry_size; } } - *namep = '\0'; - if (CLOSEDIR (dirp)) + name_space[used] = '\0'; + save_errno = errno; + if (closedir (dirp) != 0) + save_errno = errno; + if (save_errno != 0) { free (name_space); + errno = save_errno; return NULL; } return name_space; } + +/* Return a freshly allocated string containing the file names + in directory DIR, separated by '\0' characters; + the end is marked by two '\0' characters in a row. + Return NULL (setting errno) if DIR cannot be opened, read, or closed. */ + +char * +savedir (char const *dir) +{ + return savedirstream (opendir (dir)); +} + +/* Return a freshly allocated string containing the file names + in directory FD, separated by '\0' characters; + the end is marked by two '\0' characters in a row. + Return NULL (setting errno) if FD cannot be read or closed. */ + +char * +fdsavedir (int fd) +{ + return savedirstream (fdopendir (fd)); +}