CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-07-31 13:00:00 +02:00
Code Issues Projects Releases Wiki Activity

merge with 1.8.1h

Browse Source
This commit is contained in:
Jim Meyering
1993-10-24 21:30:08 +00:00
parent 3bc2827212
commit cfe240bbd8
22 changed files with 56 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/getusershell.c
+6 -2
View File
@@ -43,6 +43,8 @@ char *malloc ();
char *realloc ();
#endif
char *xstrdup ();
static int readname ();
/* List of shells to use if the shells file is missing. */
@@ -65,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 *
@@ -74,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;
}
@@ -85,7 +89,7 @@ getusershell ()
{
/* No shells file. Use the default list. */
default_index = 1;
return default_shells[0];
return xstrdup (default_shells[0]);
}
}
lib/putenv.c
+4 -1
View File
@@ -36,6 +36,8 @@ Cambridge, MA 02139, USA. */
/* Don't include stdlib.h for non-GNU C libraries because some of them
contain conflicting prototypes for getopt. */
#include <stdlib.h>
#else
char *malloc ();
#endif /* GNU C library. */
#ifndef STDC_HEADERS
@@ -104,7 +106,8 @@ putenv (string)
char **new_environ = (char **) malloc ((size + 2) * sizeof (char *));
if (new_environ == NULL)
return -1;
(void) bcopy ((char *) environ, (char *) new_environ, size * sizeof (char *));
(void) bcopy ((char *) environ, (char *) new_environ,
size * sizeof (char *));
new_environ[size] = (char *) string;
new_environ[size + 1] = NULL;
if (last_environ != NULL)
old/sh-utils/ChangeLog
+13
View File
@@ -1,3 +1,16 @@
Sun Oct 24 14:10:23 1993 Jim Meyering (meyering@comco.com)
* long-options.c: Save and restore optind, too.
* long-options.h: New file.
* long-options.c, echo.c, expr.c, printf.c, test.c, yes.c:
Include it instead of duplicating dcls.
* src/Makefile.in: Add dependencies for it.
Tue Oct 19 00:26:27 1993 Jim Meyering (meyering@comco.com)
* expr.c [!__STDC__]: Don't define away `const'. configure alone
decides whether to do that. From Francois Pinard.
Sat Oct 16 22:32:54 1993 Jim Meyering (meyering@comco.com)
* whoami.c (main): Cast printf arg UID so it matches the type
src/basename.c
+1 -1
View File
@@ -74,7 +74,7 @@ Usage: %s [OPTION]... PATH [SUFFIX]\n\
program_name);
if (status != 0)
fprintf (stderr, "\nTry `%s --help' for more information.\n",
fprintf (stderr, "Try `%s --help' for more information.\n",
program_name);
else
src/date.c
+1 -1
View File
@@ -230,7 +230,7 @@ Usage: %s [OPTION]... [+FORMAT] [MMDDhhmm[[CC]YY][.ss]]\n\
program_name);
if (status != 0)
fprintf (stderr, "\nTry `%s --help' for more information.\n",
fprintf (stderr, "Try `%s --help' for more information.\n",
program_name);
else
{
src/dirname.c
+1 -1
View File
@@ -63,7 +63,7 @@ Usage: %s [OPTION]... PATH\n\
program_name);
if (status != 0)
fprintf (stderr, "\nTry `%s --help' for more information.\n",
fprintf (stderr, "Try `%s --help' for more information.\n",
program_name);
else
src/echo.c
+2 -3
View File
@@ -31,6 +31,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#include <stdio.h>
#include <sys/types.h>
#include "system.h"
#include "long-options.h"
/* echo [-neE] [arg ...]
Output the ARGs. If -n is specified, the trailing newline is
@@ -71,8 +72,6 @@ on System V systems with the -E option.
/* The name this program was run with. */
char *program_name;
void parse_long_options ();
static void
usage (status)
int status;
@@ -83,7 +82,7 @@ Usage: %s [OPTION]... [STRING]...\n\
program_name);
if (status != 0)
fprintf (stderr, "\nTry `%s --help' for more information.\n",
fprintf (stderr, "Try `%s --help' for more information.\n",
program_name);
else
src/env.c
+3 -3
View File
@@ -201,7 +201,7 @@ Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n\
program_name);
if (status != 0)
fprintf (stderr, "\nTry `%s --help' for more information.\n",
fprintf (stderr, "Try `%s --help' for more information.\n",
program_name);
else
@@ -209,8 +209,8 @@ Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n\
\n\
-u, --unset NAME remove variable from the environment\n\
-i, --ignore-environment start with an empty environment\n\
--help display this help and exit\n\
--version output version information and exit\n\
--help display this help and exit\n\
--version output version information and exit\n\
\n\
A mere - implies -i. If no COMMAND, print the resulting environment.\n\
");
src/expr.c
+8 -7
View File
@@ -46,6 +46,7 @@
#include "system.h"
#include "version.h"
#include "long-option.h"
#if !defined (isascii) || defined (STDC_HEADERS)
#undef isascii
@@ -54,10 +55,6 @@
#define ISDIGIT(c) (isascii (c) && isdigit (c))
#if !__STDC__
#define const
#endif
#define NEW(type) ((type *) xmalloc (sizeof (type)))
#define OLD(x) free ((char *) x)
@@ -91,7 +88,6 @@ void error ();
char *xstrdup ();
char *strstr ();
char *xmalloc ();
void parse_long_options ();
static VALUE *docolon ();
static VALUE *eval ();
@@ -121,7 +117,7 @@ Usage: %s EXPRESSION\n\
program_name, program_name);
if (status != 0)
fprintf (stderr, "\nTry `%s --help' for more information.\n",
fprintf (stderr, "Try `%s --help' for more information.\n",
program_name);
else
{
@@ -155,7 +151,12 @@ separates increasing precedence groups. EXPRESSION may be:\n\
\n\
STRING : REGEXP anchored pattern match of REGEXP in STRING\n\
\n\
( EXPRESSION ) value of EXPRESSION\n\
match STRING REGEXP same as STRING : REGEXP\n\
substr STRING POS LENGTH substring of STRING, POS counted from 1\n\
index STRING CHARS index in STRING where any CHARS is found, or 0\n\
length STRING length of STRING\n\
\n\
( EXPRESSION ) value of EXPRESSION\n\
");
printf ("\
\n\
src/id.c
+1 -1
View File
@@ -369,7 +369,7 @@ Usage: %s [OPTION]... [USERNAME]\n\
program_name);
if (status != 0)
fprintf (stderr, "\nTry `%s --help' for more information.\n",
fprintf (stderr, "Try `%s --help' for more information.\n",
program_name);
else
src/logname.c
+1 -1
View File
@@ -59,7 +59,7 @@ Usage: %s [OPTION]...\n\
program_name);
if (status != 0)
fprintf (stderr, "\nTry `%s --help' for more information.\n",
fprintf (stderr, "Try `%s --help' for more information.\n",
program_name);
else
src/nice.c
+3 -3
View File
@@ -180,7 +180,7 @@ Usage: %s [OPTION]... [COMMAND [ARG]...]\n\
program_name);
if (status != 0)
fprintf (stderr, "\nTry `%s --help' for more information.\n",
fprintf (stderr, "Try `%s --help' for more information.\n",
program_name);
else
@@ -188,8 +188,8 @@ Usage: %s [OPTION]... [COMMAND [ARG]...]\n\
\n\
-ADJUST increment priority by ADJUST first\n\
-n, --adjustment ADJUST same as -ADJUST\n\
--help display this help and exit\n\
--version output version information and exit\n\
--help display this help and exit\n\
--version output version information and exit\n\
\n\
With no COMMAND, print the current scheduling priority. ADJUST is 10\n\
by default. Range goes from -20 (highest priority) to 19 (lowest).\n\
src/pathchk.c
+1 -1
View File
@@ -367,7 +367,7 @@ Usage: %s [OPTION]... PATH...\n\
program_name);
if (status != 0)
fprintf (stderr, "\nTry `%s --help' for more information.\n",
fprintf (stderr, "Try `%s --help' for more information.\n",
program_name);
else
src/printf.c
+2 -2
View File
@@ -61,6 +61,7 @@
#include "system.h"
#include "version.h"
#include "long-option.h"
#if !defined (isascii) || defined (STDC_HEADERS)
#undef isascii
@@ -82,7 +83,6 @@ unsigned long strtoul ();
char *xmalloc ();
void error ();
void parse_long_options ();
static double xstrtod ();
static int print_esc ();
@@ -111,7 +111,7 @@ Usage: %s FORMAT [ARGUMENT]...\n\
program_name, program_name);
if (status != 0)
fprintf (stderr, "\nTry `%s --help' for more information.\n",
fprintf (stderr, "Try `%s --help' for more information.\n",
program_name);
else
src/sleep.c
+1 -1
View File
@@ -63,7 +63,7 @@ Usage: %s [OPTION]... NUMBER[SUFFIX]\n\
program_name);
if (status != 0)
fprintf (stderr, "\nTry `%s --help' for more information.\n",
fprintf (stderr, "Try `%s --help' for more information.\n",
program_name);
else
src/stty.c
+1 -1
View File
@@ -452,7 +452,7 @@ Usage: %s [OPTION]... [SETTING]...\n\
program_name);
if (status != 0)
fprintf (stderr, "\nTry `%s --help' for more information.\n",
fprintf (stderr, "Try `%s --help' for more information.\n",
program_name);
else
{
src/su.c
+1 -1
View File
@@ -557,7 +557,7 @@ Usage: %s [OPTION]... [-] [USER [ARG]...]\n\
program_name);
if (status != 0)
fprintf (stderr, "\nTry `%s --help' for more information.\n",
fprintf (stderr, "Try `%s --help' for more information.\n",
program_name);
else
src/tee.c
+1 -1
View File
@@ -76,7 +76,7 @@ Usage: %s [OPTION]... [FILE]...\n\
program_name);
if (status != 0)
fprintf (stderr, "\nTry `%s --help' for more information.\n",
fprintf (stderr, "Try `%s --help' for more information.\n",
program_name);
else
src/test.c
+2 -2
View File
@@ -1008,7 +1008,7 @@ posixtest ()
}
#if defined (TEST_STANDALONE)
void parse_long_options ();
#include "long-option.h"
static void
usage (status)
@@ -1022,7 +1022,7 @@ Usage: %s EXPRESSION\n\
program_name, program_name);
if (status != 0)
fprintf (stderr, "\nTry `%s --help' for more information.\n",
fprintf (stderr, "Try `%s --help' for more information.\n",
program_name);
else
{
src/tty.c
+1 -1
View File
@@ -129,7 +129,7 @@ Usage: %s [OPTION]...\n\
program_name);
if (status != 0)
fprintf (stderr, "\nTry `%s --help' for more information.\n",
fprintf (stderr, "Try `%s --help' for more information.\n",
program_name);
else
src/uname.c
+1 -1
View File
@@ -194,7 +194,7 @@ Usage: %s [OPTION]...\n\
program_name);
if (status != 0)
fprintf (stderr, "\nTry `%s --help' for more information.\n",
fprintf (stderr, "Try `%s --help' for more information.\n",
program_name);
else
src/who.c
+1 -1
View File
@@ -468,7 +468,7 @@ Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n\
program_name);
if (status != 0)
fprintf (stderr, "\nTry `%s --help' for more information.\n",
fprintf (stderr, "Try `%s --help' for more information.\n",
program_name);
else