X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=lib%2Fsavedir.c;fp=lib%2Fsavedir.c;h=3604f622f2c53ddcbbbb747f0bcb5d7d5318b041;hb=20fcfc81ece044b8b0a6768ec6cf47be4e22a2e6;hp=6d5ed7f459a338de9eb973e1512c801ca75eacb8;hpb=d57728a6ca2413a7c564d8b7bb13d9e5a5a180f3;p=debian%2Fgzip

diff --git a/lib/savedir.c b/lib/savedir.c
index 6d5ed7f..3604f62 100644
--- a/lib/savedir.c
+++ b/lib/savedir.c
@@ -1,6 +1,6 @@
 /* savedir.c -- save the list of files in a directory in a string
 
-   Copyright (C) 1990, 1997-2001, 2003-2006, 2009-2013 Free Software
+   Copyright (C) 1990, 1997-2001, 2003-2006, 2009-2016 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -37,29 +37,71 @@
 
 #include "xalloc.h"
 
-#ifndef NAME_SIZE_DEFAULT
-# define NAME_SIZE_DEFAULT 512
+typedef struct
+{
+  char *name;
+#if D_INO_IN_DIRENT
+  ino_t ino;
+#endif
+} direntry_t;
+
+/* Compare the names of two directory entries */
+
+static int
+direntry_cmp_name (void const *a, void const *b)
+{
+  direntry_t const *dea = a;
+  direntry_t const *deb = b;
+
+  return strcmp (dea->name, deb->name);
+}
+
+#if D_INO_IN_DIRENT
+/* Compare the inode numbers of two directory entries */
+
+static int
+direntry_cmp_inode (void const *a, void const *b)
+{
+  direntry_t const *dea = a;
+  direntry_t const *deb = b;
+
+  return dea->ino < deb->ino ? -1 : dea->ino > deb->ino;
+}
 #endif
 
+typedef int (*comparison_function) (void const *, void const *);
+
+static comparison_function const comparison_function_table[] =
+  {
+    0,
+    direntry_cmp_name
+#if D_INO_IN_DIRENT
+    , direntry_cmp_inode
+#endif
+  };
+
 /* 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.
+   Returned values are sorted according to OPTION.
    Return NULL (setting errno) if DIRP cannot be read.
    If DIRP is NULL, return NULL without affecting errno.  */
 
 char *
-streamsavedir (DIR *dirp)
+streamsavedir (DIR *dirp, enum savedir_option option)
 {
-  char *name_space;
-  size_t allocated = NAME_SIZE_DEFAULT;
+  char *name_space = NULL;
+  size_t allocated = 0;
+  direntry_t *entries = NULL;
+  size_t entries_allocated = 0;
+  size_t entries_used = 0;
   size_t used = 0;
-  int save_errno;
+  int readdir_errno;
+  comparison_function cmp = comparison_function_table[option];
 
   if (dirp == NULL)
     return NULL;
 
-  name_space = xmalloc (allocated);
-
   for (;;)
     {
       struct dirent const *dp;
@@ -76,48 +118,65 @@ streamsavedir (DIR *dirp)
       if (entry[entry[0] != '.' ? 0 : entry[1] != '.' ? 1 : 2] != '\0')
         {
           size_t entry_size = _D_EXACT_NAMLEN (dp) + 1;
-          if (used + entry_size < used)
-            xalloc_die ();
-          if (allocated <= used + entry_size)
+          if (cmp)
+            {
+              if (entries_allocated == entries_used)
+                {
+                  size_t n = entries_allocated;
+                  entries = x2nrealloc (entries, &n, sizeof *entries);
+                  entries_allocated = n;
+                }
+              entries[entries_used].name = xstrdup (entry);
+#if D_INO_IN_DIRENT
+              entries[entries_used].ino = dp->d_ino;
+#endif
+              entries_used++;
+            }
+          else
             {
-              do
+              if (allocated - used <= entry_size)
                 {
-                  if (2 * allocated < allocated)
+                  size_t n = used + entry_size;
+                  if (n < used)
                     xalloc_die ();
-                  allocated *= 2;
+                  name_space = x2nrealloc (name_space, &n, 1);
+                  allocated = n;
                 }
-              while (allocated <= used + entry_size);
-
-              name_space = xrealloc (name_space, allocated);
+              memcpy (name_space + used, entry, entry_size);
             }
-          memcpy (name_space + used, entry, entry_size);
           used += entry_size;
         }
     }
-  name_space[used] = '\0';
-  save_errno = errno;
-  if (save_errno != 0)
+
+  readdir_errno = errno;
+  if (readdir_errno != 0)
     {
+      free (entries);
       free (name_space);
-      errno = save_errno;
+      errno = readdir_errno;
       return NULL;
     }
-  return name_space;
-}
-
-/* Like streamsavedir (DIRP), except also close DIRP.  */
 
-static char *
-savedirstream (DIR *dirp)
-{
-  char *name_space = streamsavedir (dirp);
-  if (dirp && closedir (dirp) != 0)
+  if (cmp)
     {
-      int save_errno = errno;
-      free (name_space);
-      errno = save_errno;
-      return NULL;
+      size_t i;
+
+      if (entries_used)
+        qsort (entries, entries_used, sizeof *entries, cmp);
+      name_space = xmalloc (used + 1);
+      used = 0;
+      for (i = 0; i < entries_used; i++)
+        {
+          char *dest = name_space + used;
+          used += stpcpy (dest, entries[i].name) - dest + 1;
+          free (entries[i].name);
+        }
+      free (entries);
     }
+  else if (used == allocated)
+    name_space = xrealloc (name_space, used + 1);
+
+  name_space[used] = '\0';
   return name_space;
 }
 
@@ -127,19 +186,21 @@ savedirstream (DIR *dirp)
    Return NULL (setting errno) if DIR cannot be opened, read, or closed.  */
 
 char *
-savedir (char const *dir)
+savedir (char const *dir, enum savedir_option option)
 {
-  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.  */
-
-/* deprecated */
-char *
-fdsavedir (int fd)
-{
-  return savedirstream (fdopendir (fd));
+  DIR *dirp = opendir (dir);
+  if (! dirp)
+    return NULL;
+  else
+    {
+      char *name_space = streamsavedir (dirp, option);
+      if (closedir (dirp) != 0)
+        {
+          int closedir_errno = errno;
+          free (name_space);
+          errno = closedir_errno;
+          return NULL;
+        }
+      return name_space;
+    }
 }