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

Add the -r option, patch from Rob with some help from myself.

Browse Source
This commit is contained in:
Glenn L McGrath 2004-02-17 12:22:21 +00:00
parent a8f756fc7f
commit 01cdb66987
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
coreutils/date.c
View File

@ -118,8 +118,9 @@ static struct tm *date_conv_ftime(struct tm *tm_time, const char *t_string)
#define DATE_OPT_SET 0x02 #define DATE_OPT_SET 0x02
#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
#ifdef CONFIG_FEATURE_DATE_ISOFMT #ifdef CONFIG_FEATURE_DATE_ISOFMT
# define DATE_OPT_TIMESPEC 0x10 # define DATE_OPT_TIMESPEC 0x20
#endif #endif
int date_main(int argc, char **argv) int date_main(int argc, char **argv)
@ -133,6 +134,7 @@ int date_main(int argc, char **argv)
time_t tm; time_t tm;
unsigned long opt; unsigned long opt;
struct tm tm_time; struct tm tm_time;
char *filename = NULL;
#ifdef CONFIG_FEATURE_DATE_ISOFMT #ifdef CONFIG_FEATURE_DATE_ISOFMT
int ifmt = 0; int ifmt = 0;
@ -143,8 +145,8 @@ int date_main(int argc, char **argv)
# define GETOPT_ISOFMT # define GETOPT_ISOFMT
#endif #endif
bb_opt_complementaly = "d~ds:s~ds"; bb_opt_complementaly = "d~ds:s~ds";
opt = bb_getopt_ulflags(argc, argv, "Rs:ud:" GETOPT_ISOFMT, opt = bb_getopt_ulflags(argc, argv, "Rs:ud:r:" GETOPT_ISOFMT,
&date_str, &date_str &date_str, &date_str, &filename
#ifdef CONFIG_FEATURE_DATE_ISOFMT #ifdef CONFIG_FEATURE_DATE_ISOFMT
, &isofmt_arg , &isofmt_arg
#endif #endif
@ -194,7 +196,12 @@ int date_main(int argc, char **argv)
/* Now we have parsed all the information except the date format /* Now we have parsed all the information except the date format
which depends on whether the clock is being set or read */ which depends on whether the clock is being set or read */
time(&tm); if(filename) {
struct stat statbuf;
if(stat(filename,&statbuf))
bb_perror_msg_and_die("File '%s' not found.\n",filename);
tm=statbuf.st_mtime;
} else time(&tm);
memcpy(&tm_time, localtime(&tm), sizeof(tm_time)); memcpy(&tm_time, localtime(&tm), sizeof(tm_time));
/* Zero out fields - take her back to midnight! */ /* Zero out fields - take her back to midnight! */
if (date_str != NULL) { if (date_str != NULL) {