annotate lib/getusershell.c @ 17363:5a51fb7777a9

sys_select, sys_time: port 2013-01-30 Solaris 2.6 fix to Cygwin Problem reported by Marco Atzeri in <http://lists.gnu.org/archive/html/bug-gnulib/2013-03/msg00000.html>. * lib/sys_select.in.h [HAVE_SYS_SELECT_H && _CYGWIN_SYS_TIME_H]: Simply delegate to the system <sys/select.h> in this case too. Also, pay attention to _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H only if OSF/1, since otherwise Cygwin breaks, and it doesn't seem to be needed on Solaris either. * lib/sys_time.in.h [_CYGWIN_SYS_TIME_H]: Simply delgate to the system <sys/time.h> in this case.
author Paul Eggert <eggert@cs.ucla.edu>
date Tue, 19 Mar 2013 09:08:47 -0700
parents e542fd46ad6f
children 344018b6e5d7
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
1 /* getusershell.c -- Return names of valid user shells.
5318
7c24a825b51d Remove dependencies on unlocked-io.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4827
diff changeset
2
17249
e542fd46ad6f maint: update all copyright year number ranges
Eric Blake <eblake@redhat.com>
parents: 16235
diff changeset
3 Copyright (C) 1991, 1997, 2000-2001, 2003-2006, 2008-2013 Free Software
12518
b5e42ef33b49 update nearly all FSF copyright year lists to include 2009
Jim Meyering <meyering@redhat.com>
parents: 12421
diff changeset
4 Foundation, Inc.
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
5
9309
bbbbbf4cd1c5 Change copyright notice from GPLv2+ to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents: 7302
diff changeset
6 This program is free software: you can redistribute it and/or modify
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
7 it under the terms of the GNU General Public License as published by
9309
bbbbbf4cd1c5 Change copyright notice from GPLv2+ to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents: 7302
diff changeset
8 the Free Software Foundation; either version 3 of the License, or
bbbbbf4cd1c5 Change copyright notice from GPLv2+ to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents: 7302
diff changeset
9 (at your option) any later version.
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
10
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
11 This program is distributed in the hope that it will be useful,
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
12 but WITHOUT ANY WARRANTY; without even the implied warranty of
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
14 GNU General Public License for more details.
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
15
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
16 You should have received a copy of the GNU General Public License
9309
bbbbbf4cd1c5 Change copyright notice from GPLv2+ to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents: 7302
diff changeset
17 along with this program. If not, see <http://www.gnu.org/licenses/>. */
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
18
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
19 /* Written by David MacKenzie <djm@gnu.ai.mit.edu> */
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
20
7302
8a1a9361108c * _fpending.c: Include <config.h> unconditionally, since we no
Paul Eggert <eggert@cs.ucla.edu>
parents: 6927
diff changeset
21 #include <config.h>
125
539738c0b6c2 merge with 1.8.1d
Jim Meyering <jim@meyering.net>
parents: 16
diff changeset
22
10666
d162e4057aa8 Add getusershell(), setusershell(), endusershell() declarations to <unistd.h>.
Bruno Haible <bruno@clisp.org>
parents: 9309
diff changeset
23 /* Specification. */
d162e4057aa8 Add getusershell(), setusershell(), endusershell() declarations to <unistd.h>.
Bruno Haible <bruno@clisp.org>
parents: 9309
diff changeset
24 #include <unistd.h>
d162e4057aa8 Add getusershell(), setusershell(), endusershell() declarations to <unistd.h>.
Bruno Haible <bruno@clisp.org>
parents: 9309
diff changeset
25
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
26 #ifndef SHELLS_FILE
3052
5d2b5bde7c6f [!SHELLS_FILE && __DJGPP__]: Define
Jim Meyering <jim@meyering.net>
parents: 2966
diff changeset
27 # ifndef __DJGPP__
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
28 /* File containing a list of nonrestricted shells, one per line. */
3052
5d2b5bde7c6f [!SHELLS_FILE && __DJGPP__]: Define
Jim Meyering <jim@meyering.net>
parents: 2966
diff changeset
29 # define SHELLS_FILE "/etc/shells"
5d2b5bde7c6f [!SHELLS_FILE && __DJGPP__]: Define
Jim Meyering <jim@meyering.net>
parents: 2966
diff changeset
30 # else
5d2b5bde7c6f [!SHELLS_FILE && __DJGPP__]: Define
Jim Meyering <jim@meyering.net>
parents: 2966
diff changeset
31 /* This is a horrible kludge. Isn't there a better way? */
5d2b5bde7c6f [!SHELLS_FILE && __DJGPP__]: Define
Jim Meyering <jim@meyering.net>
parents: 2966
diff changeset
32 # define SHELLS_FILE "/dev/env/DJDIR/etc/shells"
5d2b5bde7c6f [!SHELLS_FILE && __DJGPP__]: Define
Jim Meyering <jim@meyering.net>
parents: 2966
diff changeset
33 # endif
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
34 #endif
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
35
4655
4f71e1292ad1 Remove K&R cruft.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4541
diff changeset
36 #include <stdlib.h>
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
37 #include <ctype.h>
5318
7c24a825b51d Remove dependencies on unlocked-io.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4827
diff changeset
38
6275
fd0ccce602e4 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 5848
diff changeset
39 #include "stdio--.h"
2654
c0220b12ea7d (xmalloc, xrealloc): Remove functions.
Jim Meyering <jim@meyering.net>
parents: 1041
diff changeset
40 #include "xalloc.h"
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
41
5318
7c24a825b51d Remove dependencies on unlocked-io.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4827
diff changeset
42 #if USE_UNLOCKED_IO
7c24a825b51d Remove dependencies on unlocked-io.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4827
diff changeset
43 # include "unlocked-io.h"
7c24a825b51d Remove dependencies on unlocked-io.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4827
diff changeset
44 #endif
7c24a825b51d Remove dependencies on unlocked-io.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4827
diff changeset
45
4656
4f4fb4d3874d (readname, default_index, line_size, readname):
Paul Eggert <eggert@cs.ucla.edu>
parents: 4655
diff changeset
46 static size_t readname (char **, size_t *, FILE *);
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
47
3052
5d2b5bde7c6f [!SHELLS_FILE && __DJGPP__]: Define
Jim Meyering <jim@meyering.net>
parents: 2966
diff changeset
48 #if ! defined ADDITIONAL_DEFAULT_SHELLS && defined __MSDOS__
5d2b5bde7c6f [!SHELLS_FILE && __DJGPP__]: Define
Jim Meyering <jim@meyering.net>
parents: 2966
diff changeset
49 # define ADDITIONAL_DEFAULT_SHELLS \
5d2b5bde7c6f [!SHELLS_FILE && __DJGPP__]: Define
Jim Meyering <jim@meyering.net>
parents: 2966
diff changeset
50 "c:/dos/command.com", "c:/windows/command.com", "c:/command.com",
5d2b5bde7c6f [!SHELLS_FILE && __DJGPP__]: Define
Jim Meyering <jim@meyering.net>
parents: 2966
diff changeset
51 #else
5d2b5bde7c6f [!SHELLS_FILE && __DJGPP__]: Define
Jim Meyering <jim@meyering.net>
parents: 2966
diff changeset
52 # define ADDITIONAL_DEFAULT_SHELLS /* empty */
5d2b5bde7c6f [!SHELLS_FILE && __DJGPP__]: Define
Jim Meyering <jim@meyering.net>
parents: 2966
diff changeset
53 #endif
5d2b5bde7c6f [!SHELLS_FILE && __DJGPP__]: Define
Jim Meyering <jim@meyering.net>
parents: 2966
diff changeset
54
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
55 /* List of shells to use if the shells file is missing. */
16
01c6d40adf9d Make tables static and const when possible.
Jim Meyering <jim@meyering.net>
parents: 9
diff changeset
56 static char const* const default_shells[] =
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
57 {
3052
5d2b5bde7c6f [!SHELLS_FILE && __DJGPP__]: Define
Jim Meyering <jim@meyering.net>
parents: 2966
diff changeset
58 ADDITIONAL_DEFAULT_SHELLS
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
59 "/bin/sh", "/bin/csh", "/usr/bin/sh", "/usr/bin/csh", NULL
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
60 };
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
61
16235
18a38c9615f0 In commentary, do not use ` to quote.
Paul Eggert <eggert@cs.ucla.edu>
parents: 16201
diff changeset
62 /* Index of the next shell in 'default_shells' to return.
18a38c9615f0 In commentary, do not use ` to quote.
Paul Eggert <eggert@cs.ucla.edu>
parents: 16201
diff changeset
63 0 means we are not using 'default_shells'. */
4656
4f4fb4d3874d (readname, default_index, line_size, readname):
Paul Eggert <eggert@cs.ucla.edu>
parents: 4655
diff changeset
64 static size_t default_index = 0;
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
65
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
66 /* Input stream from the shells file. */
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
67 static FILE *shellstream = NULL;
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
68
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
69 /* Line of input from the shells file. */
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
70 static char *line = NULL;
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
71
16235
18a38c9615f0 In commentary, do not use ` to quote.
Paul Eggert <eggert@cs.ucla.edu>
parents: 16201
diff changeset
72 /* Number of bytes allocated for 'line'. */
4656
4f4fb4d3874d (readname, default_index, line_size, readname):
Paul Eggert <eggert@cs.ucla.edu>
parents: 4655
diff changeset
73 static size_t line_size = 0;
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
74
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
75 /* Return an entry from the shells file, ignoring comment lines.
167
720342e1a089 merge with 1.8.1h
Jim Meyering <jim@meyering.net>
parents: 125
diff changeset
76 If the file doesn't exist, use the list in DEFAULT_SHELLS (above).
720342e1a089 merge with 1.8.1h
Jim Meyering <jim@meyering.net>
parents: 125
diff changeset
77 In any case, the returned string is in memory allocated through malloc.
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
78 Return NULL if there are no more entries. */
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
79
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
80 char *
4655
4f71e1292ad1 Remove K&R cruft.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4541
diff changeset
81 getusershell (void)
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
82 {
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
83 if (default_index > 0)
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
84 {
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
85 if (default_shells[default_index])
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 10666
diff changeset
86 /* Not at the end of the list yet. */
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 10666
diff changeset
87 return xstrdup (default_shells[default_index++]);
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
88 return NULL;
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
89 }
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
90
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
91 if (shellstream == NULL)
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
92 {
6275
fd0ccce602e4 Sync from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 5848
diff changeset
93 shellstream = fopen (SHELLS_FILE, "r");
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
94 if (shellstream == NULL)
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 10666
diff changeset
95 {
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 10666
diff changeset
96 /* No shells file. Use the default list. */
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 10666
diff changeset
97 default_index = 1;
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 10666
diff changeset
98 return xstrdup (default_shells[0]);
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 10666
diff changeset
99 }
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
100 }
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
101
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
102 while (readname (&line, &line_size, shellstream))
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
103 {
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
104 if (*line != '#')
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 10666
diff changeset
105 return line;
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
106 }
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 10666
diff changeset
107 return NULL; /* End of file. */
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
108 }
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
109
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
110 /* Rewind the shells file. */
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
111
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
112 void
4655
4f71e1292ad1 Remove K&R cruft.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4541
diff changeset
113 setusershell (void)
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
114 {
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
115 default_index = 0;
2966
8d2c63fa3a16 (setusershell): Use rewind rather than
Jim Meyering <jim@meyering.net>
parents: 2928
diff changeset
116 if (shellstream)
8d2c63fa3a16 (setusershell): Use rewind rather than
Jim Meyering <jim@meyering.net>
parents: 2928
diff changeset
117 rewind (shellstream);
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
118 }
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
119
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
120 /* Close the shells file. */
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
121
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
122 void
4655
4f71e1292ad1 Remove K&R cruft.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4541
diff changeset
123 endusershell (void)
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
124 {
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
125 if (shellstream)
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
126 {
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
127 fclose (shellstream);
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
128 shellstream = NULL;
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
129 }
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
130 }
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
131
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
132 /* Read a line from STREAM, removing any newline at the end.
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
133 Place the result in *NAME, which is malloc'd
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
134 and/or realloc'd as necessary and can start out NULL,
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
135 and whose size is passed and returned in *SIZE.
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
136
4656
4f4fb4d3874d (readname, default_index, line_size, readname):
Paul Eggert <eggert@cs.ucla.edu>
parents: 4655
diff changeset
137 Return the number of bytes placed in *NAME
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
138 if some nonempty sequence was found, otherwise 0. */
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
139
4656
4f4fb4d3874d (readname, default_index, line_size, readname):
Paul Eggert <eggert@cs.ucla.edu>
parents: 4655
diff changeset
140 static size_t
4f4fb4d3874d (readname, default_index, line_size, readname):
Paul Eggert <eggert@cs.ucla.edu>
parents: 4655
diff changeset
141 readname (char **name, size_t *size, FILE *stream)
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
142 {
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
143 int c;
4656
4f4fb4d3874d (readname, default_index, line_size, readname):
Paul Eggert <eggert@cs.ucla.edu>
parents: 4655
diff changeset
144 size_t name_index = 0;
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
145
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
146 /* Skip blank space. */
6927
fa896bb33133 * lib/memcasecmp.c: Include <limits.h>.
Paul Eggert <eggert@cs.ucla.edu>
parents: 6275
diff changeset
147 while ((c = getc (stream)) != EOF && isspace (c))
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
148 /* Do nothing. */ ;
790
8f31f8f77f98 remove trailing blanks
Jim Meyering <jim@meyering.net>
parents: 653
diff changeset
149
4827
a6d03da0fa67 Simplify the code by using new xalloc.h features.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4656
diff changeset
150 for (;;)
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
151 {
4827
a6d03da0fa67 Simplify the code by using new xalloc.h features.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4656
diff changeset
152 if (*size <= name_index)
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 10666
diff changeset
153 *name = x2nrealloc (*name, size, sizeof **name);
6927
fa896bb33133 * lib/memcasecmp.c: Include <limits.h>.
Paul Eggert <eggert@cs.ucla.edu>
parents: 6275
diff changeset
154 if (c == EOF || isspace (c))
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 10666
diff changeset
155 break;
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
156 (*name)[name_index++] = c;
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
157 c = getc (stream);
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
158 }
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
159 (*name)[name_index] = '\0';
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
160 return name_index;
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
161 }
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
162
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
163 #ifdef TEST
4655
4f71e1292ad1 Remove K&R cruft.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4541
diff changeset
164 int
4f71e1292ad1 Remove K&R cruft.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4541
diff changeset
165 main (void)
9
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
166 {
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
167 char *s;
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
168
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
169 while (s = getusershell ())
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
170 puts (s);
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
171 exit (0);
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
172 }
f8dce34b5ab0 Initial revision
Jim Meyering <jim@meyering.net>
parents:
diff changeset
173 #endif