X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgetusershell.c;h=9eb2520b0df61b46ba4ca7b848827dce80327ef4;hb=fb2a33bb98f09325349f84f1007035e415d8175f;hp=1dee6e7ab8a782bc789e088b80888bd61387018d;hpb=29e59276fc2d28fcbede9bad652e0e648d33fc5f;p=gnulib.git

diff --git a/lib/getusershell.c b/lib/getusershell.c
index 1dee6e7ab..9eb2520b0 100644
--- a/lib/getusershell.c
+++ b/lib/getusershell.c
@@ -17,6 +17,17 @@
 
 /* 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>
+#else
+#include "config.h"
+#endif
+#endif
+
 #ifndef SHELLS_FILE
 /* File containing a list of nonrestricted shells, one per line. */
 #define SHELLS_FILE "/etc/shells"
@@ -32,6 +43,8 @@ char *malloc ();
 char *realloc ();
 #endif
 
+char *xstrdup ();
+
 static int readname ();
 
 /* List of shells to use if the shells file is missing. */
@@ -54,6 +67,8 @@ static char *line = NULL;
 static int line_size = 0;
 
 /* Return an entry from the shells file, ignoring comment lines.
+   If the file doesn't exist, use the list in DEFAULT_SHELLS (above).
+   In any case, the returned string is in memory allocated through malloc.
    Return NULL if there are no more entries.  */
 
 char *
@@ -63,7 +78,7 @@ getusershell ()
     {
       if (default_shells[default_index])
 	/* Not at the end of the list yet.  */
-	return default_shells[default_index++];
+	return xstrdup (default_shells[default_index++]);
       return NULL;
     }
 
@@ -74,7 +89,7 @@ getusershell ()
 	{
 	  /* No shells file.  Use the default list.  */
 	  default_index = 1;
-	  return default_shells[0];
+	  return xstrdup (default_shells[0]);
 	}
     }