diff options
Diffstat (limited to 'coreutils')
| -rw-r--r-- | coreutils/date.c | 7 | ||||
| -rw-r--r-- | coreutils/touch.c | 42 | ||||
| -rw-r--r-- | coreutils/uname.c | 4 |
3 files changed, 36 insertions, 17 deletions
diff --git a/coreutils/date.c b/coreutils/date.c index 7f2a5b3..09ced0e 100644 --- a/coreutils/date.c +++ b/coreutils/date.c @@ -142,12 +142,11 @@ int date_main(int argc UNUSED_PARAM, char **argv) } else { parse_datestr(date_str, &tm_time); } + /* Correct any day of week and day of year etc. fields */ tm_time.tm_isdst = -1; /* Be sure to recheck dst */ - tm = mktime(&tm_time); - if (tm < 0) { - bb_error_msg_and_die(bb_msg_invalid_date, date_str); - } + tm = validate_tm_time(date_str, &tm_time); + maybe_set_utc(opt); /* if setting time, set it */ diff --git a/coreutils/touch.c b/coreutils/touch.c index 7d434a2..1b4a5f0 100644 --- a/coreutils/touch.c +++ b/coreutils/touch.c @@ -41,31 +41,34 @@ int touch_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int touch_main(int argc UNUSED_PARAM, char **argv) { #if ENABLE_DESKTOP -#if ENABLE_LONG_OPTS - static const char longopts[] ALIGN1 = +# if ENABLE_LONG_OPTS + static const char touch_longopts[] ALIGN1 = /* name, has_arg, val */ "no-create\0" No_argument "c" "reference\0" Required_argument "r" + "date\0" Required_argument "d" ; -#endif +# endif struct utimbuf timebuf; char *reference_file = NULL; + char *date_str = NULL; #else -#define reference_file NULL -#define timebuf (*(struct utimbuf*)NULL) +# define reference_file NULL +# define date_str NULL +# define timebuf (*(struct utimbuf*)NULL) #endif int fd; int status = EXIT_SUCCESS; int opts; -#if ENABLE_DESKTOP -#if ENABLE_LONG_OPTS - applet_long_options = longopts; +#if ENABLE_DESKTOP && ENABLE_LONG_OPTS + applet_long_options = touch_longopts; #endif -#endif - opts = getopt32(argv, "c" IF_DESKTOP("r:") + opts = getopt32(argv, "c" IF_DESKTOP("r:d:") /*ignored:*/ "fma" - IF_DESKTOP(, &reference_file)); + IF_DESKTOP(, &reference_file) + IF_DESKTOP(, &date_str) + ); opts &= 1; /* only -c bit is left */ argv += optind; @@ -80,6 +83,23 @@ int touch_main(int argc UNUSED_PARAM, char **argv) timebuf.modtime = stbuf.st_mtime; } + if (date_str) { + struct tm tm_time; + time_t t; + + //time(&t); + //localtime_r(&t, &tm_time); + memset(&tm_time, 0, sizeof(tm_time)); + parse_datestr(date_str, &tm_time); + + /* Correct any day of week and day of year etc. fields */ + tm_time.tm_isdst = -1; /* Be sure to recheck dst */ + t = validate_tm_time(date_str, &tm_time); + + timebuf.actime = t; + timebuf.modtime = t; + } + do { if (utime(*argv, reference_file ? &timebuf : NULL)) { if (errno == ENOENT) { /* no such file */ diff --git a/coreutils/uname.c b/coreutils/uname.c index df45660..8453bcc 100644 --- a/coreutils/uname.c +++ b/coreutils/uname.c @@ -74,7 +74,7 @@ int uname_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int uname_main(int argc UNUSED_PARAM, char **argv) { #if ENABLE_LONG_OPTS - static const char longopts[] ALIGN1 = + static const char uname_longopts[] ALIGN1 = /* name, has_arg, val */ "all\0" No_argument "a" "kernel-name\0" No_argument "s" @@ -97,7 +97,7 @@ int uname_main(int argc UNUSED_PARAM, char **argv) const unsigned short *delta; unsigned toprint; - IF_LONG_OPTS(applet_long_options = longopts); + IF_LONG_OPTS(applet_long_options = uname_longopts); toprint = getopt32(argv, options); if (argv[optind]) { /* coreutils-6.9 compat */ |