projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Renamed from strtoxmax.c, removing the old strtoimax.c.
[gnulib.git]
/
lib
/
getusershell.c
diff --git
a/lib/getusershell.c
b/lib/getusershell.c
index
35f72db
..
4816f96
100644
(file)
--- a/
lib/getusershell.c
+++ b/
lib/getusershell.c
@@
-22,11
+22,19
@@
#endif
#ifndef SHELLS_FILE
#endif
#ifndef SHELLS_FILE
+# ifndef __DJGPP__
/* File containing a list of nonrestricted shells, one per line. */
/* File containing a list of nonrestricted shells, one per line. */
-# define SHELLS_FILE "/etc/shells"
+# define SHELLS_FILE "/etc/shells"
+# else
+/* This is a horrible kludge. Isn't there a better way? */
+# define SHELLS_FILE "/dev/env/DJDIR/etc/shells"
+# endif
#endif
#include <stdio.h>
#endif
#include <stdio.h>
+#if HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
#include <ctype.h>
#include "xalloc.h"
#include <ctype.h>
#include "xalloc.h"
@@
-40,9
+48,17
@@
static int readname ();
static int readname ();
+#if ! defined ADDITIONAL_DEFAULT_SHELLS && defined __MSDOS__
+# define ADDITIONAL_DEFAULT_SHELLS \
+ "c:/dos/command.com", "c:/windows/command.com", "c:/command.com",
+#else
+# define ADDITIONAL_DEFAULT_SHELLS /* empty */
+#endif
+
/* List of shells to use if the shells file is missing. */
static char const* const default_shells[] =
{
/* List of shells to use if the shells file is missing. */
static char const* const default_shells[] =
{
+ ADDITIONAL_DEFAULT_SHELLS
"/bin/sh", "/bin/csh", "/usr/bin/sh", "/usr/bin/csh", NULL
};
"/bin/sh", "/bin/csh", "/usr/bin/sh", "/usr/bin/csh", NULL
};
@@
-100,10
+116,8
@@
void
setusershell ()
{
default_index = 0;
setusershell ()
{
default_index = 0;
- if (shellstream == NULL)
- shellstream = fopen (SHELLS_FILE, "r");
- else
- fseek (shellstream, 0L, 0);
+ if (shellstream)
+ rewind (shellstream);
}
/* Close the shells file. */
}
/* Close the shells file. */