diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2017-01-14 23:15:43 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-01-14 23:59:01 -0800 |
commit | 0b61395910b8640dd0215279101db920fe0a3e06 (patch) | |
tree | 8c371ec24fbd7ab33a51e700908143c092afae15 /src | |
parent | 103d2b92da4bd5582dc598690458b07612ec846c (diff) | |
download | coreutils-0b61395910b8640dd0215279101db920fe0a3e06.tar.xz |
date: new option spelling --rfc-email
* NEWS:
* doc/coreutils.texi (Time conversion specifiers)
(Options for date, Examples of date): Document this.
* src/date.c (rfc_email_format): Rename from rfc_2822_format.
All uses changed.
(usage, long_options): Support --rfc-email.
Diffstat (limited to 'src')
-rw-r--r-- | src/date.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/date.c b/src/date.c index ddc702fc7..eed09016d 100644 --- a/src/date.c +++ b/src/date.c @@ -72,8 +72,8 @@ static enum Time_spec const time_spec[] = }; ARGMATCH_VERIFY (time_spec_string, time_spec); -/* A format suitable for Internet RFC 2822. */ -static char const rfc_2822_format[] = "%a, %d %b %Y %H:%M:%S %z"; +/* A format suitable for Internet RFCs 5322, 2822, and 822. */ +static char const rfc_email_format[] = "%a, %d %b %Y %H:%M:%S %z"; /* For long options that have no equivalent short option, use a non-character as a pseudo short option, starting with CHAR_MAX + 1. */ @@ -92,6 +92,7 @@ static struct option const long_options[] = {"file", required_argument, NULL, 'f'}, {"iso-8601", optional_argument, NULL, 'I'}, {"reference", required_argument, NULL, 'r'}, + {"rfc-email", no_argument, NULL, 'R'}, {"rfc-822", no_argument, NULL, 'R'}, {"rfc-2822", no_argument, NULL, 'R'}, {"rfc-3339", required_argument, NULL, RFC_3339_OPTION}, @@ -155,7 +156,7 @@ Display the current time in the given FORMAT, or set the system date.\n\ Example: 2006-08-14T02:34:56-06:00\n\ "), stdout); fputs (_("\ - -R, --rfc-2822 output date and time in RFC 2822 format.\n\ + -R, --rfc-email output date and time in RFC 5322 format.\n\ Example: Mon, 14 Aug 2006 02:34:56 -0600\n\ "), stdout); fputs (_("\ @@ -414,7 +415,7 @@ main (int argc, char **argv) reference = optarg; break; case 'R': - new_format = rfc_2822_format; + new_format = rfc_email_format; break; case 's': set_datestr = optarg; @@ -580,10 +581,10 @@ show_date (const char *format, struct timespec when, timezone_t tz) if (localtime_rz (tz, &when.tv_sec, &tm)) { - if (format == rfc_2822_format) + if (format == rfc_email_format) setlocale (LC_TIME, "C"); fprintftime (stdout, format, &tm, tz, when.tv_nsec); - if (format == rfc_2822_format) + if (format == rfc_email_format) setlocale (LC_TIME, ""); fputc ('\n', stdout); return true; |