diff options
| author | Jim Meyering <jim@meyering.net> | 1994-04-25 18:34:37 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 1994-04-25 18:34:37 +0000 |
| commit | 085c609f77d5ea68b0bca13d4d0f204d129817b0 (patch) | |
| tree | 3052f0bd27d12c32a22f19d34cf58bc5a576380c | |
| parent | 36f920112bcda1cd28278ea2284196b2f5eda160 (diff) | |
| download | coreutils-085c609f77d5ea68b0bca13d4d0f204d129817b0.tar.xz | |
merge with 1.9.4g
| -rw-r--r-- | lib/getdate.y | 8 | ||||
| -rw-r--r-- | src/test.c | 7 |
2 files changed, 6 insertions, 9 deletions
diff --git a/lib/getdate.y b/lib/getdate.y index fd545d6ca..3159c6d9a 100644 --- a/lib/getdate.y +++ b/lib/getdate.y @@ -102,12 +102,6 @@ extern struct tm *localtime(); static int yylex (); static int yyerror (); -#if !defined(lint) && !defined(SABER) -static char RCS[] = - "$Header: str2date.y,v 2.1 90/09/06 08:15:06 cronan Exp $"; -#endif /* !defined(lint) && !defined(SABER) */ - - #define EPOCH 1970 #define HOUR(x) ((time_t)(x) * 60) #define SECSPERDAY (24L * 60L * 60L) @@ -904,7 +898,7 @@ get_date(p, now) if (! (tm = gmtime (&ftz.time))) return -1; - gmt = *tm; + gmt = *tm; /* Make a copy, in case localtime modifies *tm. */ if (! (tm = localtime (&ftz.time))) return -1; diff --git a/src/test.c b/src/test.c index 6cf8565f6..a53362db8 100644 --- a/src/test.c +++ b/src/test.c @@ -88,6 +88,9 @@ extern uid_t geteuid (); #define F_OK 0 #endif /* R_OK */ +/* This name is used solely when printing --version information. */ +#define COMMAND_NAME "test" + /* The following few defines control the truth and false output of each stage. TRUE and FALSE are what we use to compute the final output value. SHELL_BOOLEAN is the form which returns truth or falseness in shell terms. @@ -1122,7 +1125,7 @@ test_command (margc, margv) if (margv[0] && strcmp (margv[0], "[") == 0) { - parse_long_options (argc, argv, "test", usage); + parse_long_options (argc, argv, COMMAND_NAME, usage); --margc; @@ -1139,7 +1142,7 @@ test_command (margc, margv) if (pos >= argc) test_exit (SHELL_BOOLEAN (FALSE)); - parse_long_options (argc, argv, usage); + parse_long_options (argc, argv, COMMAND_NAME, usage); value = posixtest (); if (pos != argc) |