emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Walter Harms added -D to date, and I did a code cleanup while I was in the

Browse Source 
area.  Probably broke something...
This commit is contained in:
Rob Landley 2006-02-21 05:06:42 +00:00
parent bf28ed8834
commit c5789a6e23
2 changed files with 48 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
coreutils/date.c
View File

@ -6,20 +6,7 @@
* *
* iso-format handling added by Robert Griebl <griebl@gmx.de> * iso-format handling added by Robert Griebl <griebl@gmx.de>
* *
* This program is free software; you can redistribute it and/or modify * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/ */
#include <stdlib.h> #include <stdlib.h>
@ -31,7 +18,6 @@
#include <string.h> #include <string.h>
#include "busybox.h" #include "busybox.h"
/* This 'date' command supports only 2 time setting formats, /* This 'date' command supports only 2 time setting formats,
all the GNU strftime stuff (its in libc, lets use it), all the GNU strftime stuff (its in libc, lets use it),
setting time using UTC and displaying int, as well as setting time using UTC and displaying int, as well as
@ -123,9 +109,8 @@ static struct tm *date_conv_ftime(struct tm *tm_time, const char *t_string)
#define DATE_OPT_UTC 0x04 #define DATE_OPT_UTC 0x04
#define DATE_OPT_DATE 0x08 #define DATE_OPT_DATE 0x08
#define DATE_OPT_REFERENCE 0x10 #define DATE_OPT_REFERENCE 0x10
#ifdef CONFIG_FEATURE_DATE_ISOFMT #define DATE_OPT_TIMESPEC 0x20
# define DATE_OPT_TIMESPEC 0x20 #define DATE_OPT_HINT 0x40
#endif
int date_main(int argc, char **argv) int date_main(int argc, char **argv)
{ {
@ -133,63 +118,39 @@ int date_main(int argc, char **argv)
char *date_fmt = NULL; char *date_fmt = NULL;
int set_time; int set_time;
int utc; int utc;
#if 0
int use_arg = 0;
#endif
time_t tm; time_t tm;
unsigned long opt; unsigned long opt;
struct tm tm_time; struct tm tm_time;
char *filename = NULL; char *filename = NULL;
#ifdef CONFIG_FEATURE_DATE_ISOFMT
int ifmt = 0; int ifmt = 0;
char *isofmt_arg; char *isofmt_arg;
char *hintfmt_arg;
# define GETOPT_ISOFMT "I::"
#else
# define GETOPT_ISOFMT
#endif
bb_opt_complementally = "?:d--s:s--d"; bb_opt_complementally = "?:d--s:s--d";
opt = bb_getopt_ulflags(argc, argv, "Rs:ud:r:" GETOPT_ISOFMT, opt = bb_getopt_ulflags(argc, argv, "Rs:ud:r:"
USE_FEATURE_DATE_ISOFMT("I::D:"),
&date_str, &date_str, &filename &date_str, &date_str, &filename
#ifdef CONFIG_FEATURE_DATE_ISOFMT USE_FEATURE_DATE_ISOFMT(, &isofmt_arg, &hintfmt_arg));
, &isofmt_arg
#endif
);
set_time = opt & DATE_OPT_SET; set_time = opt & DATE_OPT_SET;
utc = opt & DATE_OPT_UTC; utc = opt & DATE_OPT_UTC;
if (utc && putenv("TZ=UTC0") != 0) { if (utc && putenv("TZ=UTC0") != 0) {
bb_error_msg_and_die(bb_msg_memory_exhausted); bb_error_msg_and_die(bb_msg_memory_exhausted);
} }
#if 0
use_arg = opt & DATE_OPT_DATE; if(ENABLE_FEATURE_DATE_ISOFMT && (opt & DATE_OPT_TIMESPEC)) {
#endif
#ifdef CONFIG_FEATURE_DATE_ISOFMT
if(opt & DATE_OPT_TIMESPEC) {
if (!isofmt_arg) { if (!isofmt_arg) {
ifmt = 1; ifmt = 1;
} else { } else {
int ifmt_len = bb_strlen(isofmt_arg); char *isoformats[]={"date","hours","minutes","seconds"};
for(ifmt = 4; ifmt;)
if (ifmt_len <= 4 if(!strcmp(isofmt_arg,isoformats[--ifmt]))
&& strncmp(isofmt_arg, "date", ifmt_len) == 0) { break;
ifmt = 1;
} else if (ifmt_len <= 5
&& strncmp(isofmt_arg, "hours", ifmt_len) == 0) {
ifmt = 2;
} else if (ifmt_len <= 7
&& strncmp(isofmt_arg, "minutes", ifmt_len) == 0) {
ifmt = 3;
} else if (ifmt_len <= 7
&& strncmp(isofmt_arg, "seconds", ifmt_len) == 0) {
ifmt = 4;
}
} }
if (!ifmt) { if (!ifmt) {
bb_show_usage(); bb_show_usage();
} }
} }
#endif
/* XXX, date_fmt == NULL from this always */ /* XXX, date_fmt == NULL from this always */
if ((date_fmt == NULL) && (optind < argc) && (argv[optind][0] == '+')) { if ((date_fmt == NULL) && (optind < argc) && (argv[optind][0] == '+')) {
@ -216,7 +177,9 @@ int date_main(int argc, char **argv)
tm_time.tm_hour = 0; tm_time.tm_hour = 0;
/* Process any date input to UNIX time since 1 Jan 1970 */ /* Process any date input to UNIX time since 1 Jan 1970 */
if (strchr(date_str, ':') != NULL) { if (ENABLE_FEATURE_DATE_ISOFMT && (opt & DATE_OPT_HINT)) {
strptime(date_str, hintfmt_arg, &tm_time);
} else if (strchr(date_str, ':') != NULL) {
date_conv_ftime(&tm_time, date_str); date_conv_ftime(&tm_time, date_str);
} else { } else {
date_conv_time(&tm_time, date_str); date_conv_time(&tm_time, date_str);
@ -242,49 +205,42 @@ int date_main(int argc, char **argv)
/* Deal with format string */ /* Deal with format string */
if (date_fmt == NULL) { if (date_fmt == NULL) {
#ifdef CONFIG_FEATURE_DATE_ISOFMT /* Start with the default case */
switch (ifmt) {
case 4: date_fmt = (opt & DATE_OPT_RFC2822 ?
date_fmt = utc ? "%Y-%m-%dT%H:%M:%SZ" : "%Y-%m-%dT%H:%M:%S%z";
break;
case 3:
date_fmt = utc ? "%Y-%m-%dT%H:%MZ" : "%Y-%m-%dT%H:%M%z";
break;
case 2:
date_fmt = utc ? "%Y-%m-%dT%HZ" : "%Y-%m-%dT%H%z";
break;
case 1:
date_fmt = "%Y-%m-%d";
break;
case 0:
default:
#endif
date_fmt = (opt & DATE_OPT_RFC2822 ?
(utc ? "%a, %d %b %Y %H:%M:%S GMT" : (utc ? "%a, %d %b %Y %H:%M:%S GMT" :
"%a, %d %b %Y %H:%M:%S %z") : "%a, %d %b %Y %H:%M:%S %z") :
"%a %b %e %H:%M:%S %Z %Y"); "%a %b %e %H:%M:%S %Z %Y");
#ifdef CONFIG_FEATURE_DATE_ISOFMT if (ENABLE_FEATURE_DATE_ISOFMT) {
break; if (ifmt == 4)
date_fmt = utc ? "%Y-%m-%dT%H:%M:%SZ" : "%Y-%m-%dT%H:%M:%S%z";
else if (ifmt == 3)
date_fmt = utc ? "%Y-%m-%dT%H:%MZ" : "%Y-%m-%dT%H:%M%z";
else if (ifmt == 2)
date_fmt = utc ? "%Y-%m-%dT%HZ" : "%Y-%m-%dT%H%z";
else if (ifmt == 1)
date_fmt = "%Y-%m-%d";
} }
#endif
} else if (*date_fmt == '\0') {
/* Imitate what GNU 'date' does with NO format string! */
printf("\n");
return EXIT_SUCCESS;
} }
if (*date_fmt == '\0') {
/* Handle special conversions */ /* With no format string, just print a blank line */
*bb_common_bufsiz1=0;
} else {
if (strncmp(date_fmt, "%f", 2) == 0) { /* Handle special conversions */
date_fmt = "%Y.%m.%d-%H:%M:%S";
}
{ if (strncmp(date_fmt, "%f", 2) == 0) {
/* Print OUTPUT (after ALL that!) */ date_fmt = "%Y.%m.%d-%H:%M:%S";
}
/* Generate output string */
strftime(bb_common_bufsiz1, 200, date_fmt, &tm_time); strftime(bb_common_bufsiz1, 200, date_fmt, &tm_time);
puts(bb_common_bufsiz1);
} }
puts(bb_common_bufsiz1);
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }

11
include/usage.h
View File

@ -332,10 +332,13 @@
"\nOptions:\n" \ "\nOptions:\n" \
"\t-R\t\tOutputs RFC-822 compliant date string\n" \ "\t-R\t\tOutputs RFC-822 compliant date string\n" \
"\t-d STRING\tDisplays time described by STRING, not `now'\n" \ "\t-d STRING\tDisplays time described by STRING, not `now'\n" \
USAGE_DATE_ISOFMT("\t-I[TIMESPEC]\tOutputs an ISO-8601 compliant date/time string\n" \ USAGE_DATE_ISOFMT( \
"\t\t\tTIMESPEC=`date' (or missing) for date only,\n" \ "\t-I[TIMESPEC]\tOutputs an ISO-8601 compliant date/time string\n" \
"\t\t\t`hours', `minutes', or `seconds' for date and,\n" \ "\t\t\tTIMESPEC=`date' (or missing) for date only,\n" \
"\t\t\ttime to the indicated precision\n") \ "\t\t\t`hours', `minutes', or `seconds' for date and,\n" \
"\t\t\ttime to the indicated precision\n" \
"\t-D hint\t\tUse 'hint' as date format, via strptime()\n" \
) \
"\t-s\t\tSets time described by STRING\n" \ "\t-s\t\tSets time described by STRING\n" \
"\t-r FILE\t\tDisplays the last modification time of FILE\n" \ "\t-r FILE\t\tDisplays the last modification time of FILE\n" \
"\t-u\t\tPrints or sets Coordinated Universal Time" "\t-u\t\tPrints or sets Coordinated Universal Time"