projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New modules: utf8-ucs4, utf16-ucs4, ucs4-utf8, ucs4-utf16.
[gnulib.git]
/
lib
/
getusershell.c
diff --git
a/lib/getusershell.c
b/lib/getusershell.c
index
75163ac
..
019ec55
100644
(file)
--- a/
lib/getusershell.c
+++ b/
lib/getusershell.c
@@
-1,5
+1,5
@@
/* getusershell.c -- Return names of valid user shells.
/* getusershell.c -- Return names of valid user shells.
- Copyright (C) 1991, 1997, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1991, 1997, 2000
, 2001
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
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
@@
-22,12
+22,21
@@
#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 <ctype.h>
+#include "unlocked-io.h"
#include "xalloc.h"
#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
#include "xalloc.h"
#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
@@
-40,9
+49,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,16
+117,8
@@
void
setusershell ()
{
default_index = 0;
setusershell ()
{
default_index = 0;
- if (shellstream == NULL)
- shellstream = fopen (SHELLS_FILE, "r");
- else
- {
-#ifdef HAVE_FSEEKO
- fseeko (shellstream, 0, 0);
-#else
- fseek (shellstream, 0L, 0);
-#endif
- }
+ if (shellstream)
+ rewind (shellstream);
}
/* Close the shells file. */
}
/* Close the shells file. */