Magellan Linux

Diff of /trunk/mkinitrd-magellan/busybox/coreutils/date.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 532 by niro, Sat Sep 1 22:45:15 2007 UTC revision 816 by niro, Fri Apr 24 18:33:46 2009 UTC
# Line 5  Line 5 
5   * by Matthew Grant <grantma@anathoth.gen.nz>   * by Matthew Grant <grantma@anathoth.gen.nz>
6   *   *
7   * iso-format handling added by Robert Griebl <griebl@gmx.de>   * iso-format handling added by Robert Griebl <griebl@gmx.de>
8   * bugfixes and cleanup by Bernhard Fischer   * bugfixes and cleanup by Bernhard Reutner-Fischer
9   *   *
10   * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.   * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
11  */  */
12    
13  #include "busybox.h"  #include "libbb.h"
14    
15  /* This 'date' command supports only 2 time setting formats,  /* This 'date' command supports only 2 time setting formats,
16     all the GNU strftime stuff (its in libc, lets use it),     all the GNU strftime stuff (its in libc, lets use it),
# Line 32  Line 32 
32  #define DATE_OPT_TIMESPEC 0x20  #define DATE_OPT_TIMESPEC 0x20
33  #define DATE_OPT_HINT 0x40  #define DATE_OPT_HINT 0x40
34    
 static void xputenv(char *s)  
 {  
  if (putenv(s) != 0)  
  bb_error_msg_and_die(bb_msg_memory_exhausted);  
 }  
   
35  static void maybe_set_utc(int opt)  static void maybe_set_utc(int opt)
36  {  {
37   if (opt & DATE_OPT_UTC)   if (opt & DATE_OPT_UTC)
38   xputenv("TZ=UTC0");   putenv((char*)"TZ=UTC0");
39  }  }
40    
41  int date_main(int argc, char **argv)  int date_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
42    int date_main(int argc UNUSED_PARAM, char **argv)
43  {  {
  time_t tm;  
44   struct tm tm_time;   struct tm tm_time;
45     time_t tm;
46   unsigned opt;   unsigned opt;
47   int ifmt = -1;   int ifmt = -1;
48   char *date_str = NULL;   char *date_str;
49   char *date_fmt = NULL;   char *fmt_dt2str;
50   char *filename = NULL;   char *fmt_str2dt;
51   char *isofmt_arg;   char *filename;
52   char *hintfmt_arg;   char *isofmt_arg = NULL;
53    
54   opt_complementary = "?:d--s:s--d"   opt_complementary = "d--s:s--d"
55   USE_FEATURE_DATE_ISOFMT(":R--I:I--R");   USE_FEATURE_DATE_ISOFMT(":R--I:I--R");
56   opt = getopt32(argc, argv, "Rs:ud:r:"   opt = getopt32(argv, "Rs:ud:r:"
57   USE_FEATURE_DATE_ISOFMT("I::D:"),   USE_FEATURE_DATE_ISOFMT("I::D:"),
58   &date_str, &date_str, &filename   &date_str, &date_str, &filename
59   USE_FEATURE_DATE_ISOFMT(, &isofmt_arg, &hintfmt_arg));   USE_FEATURE_DATE_ISOFMT(, &isofmt_arg, &fmt_str2dt));
60     argv += optind;
61   maybe_set_utc(opt);   maybe_set_utc(opt);
62    
63   if (ENABLE_FEATURE_DATE_ISOFMT && (opt & DATE_OPT_TIMESPEC)) {   if (ENABLE_FEATURE_DATE_ISOFMT && (opt & DATE_OPT_TIMESPEC)) {
64   if (!isofmt_arg) {   ifmt = 0; /* default is date */
65   ifmt = 0; /* default is date */   if (isofmt_arg) {
66   } else {   static const char isoformats[] ALIGN1 =
67   const char * const isoformats[] =   "date\0""hours\0""minutes\0""seconds\0";
68   {"date", "hours", "minutes", "seconds"};   ifmt = index_in_strings(isoformats, isofmt_arg);
69     if (ifmt < 0)
  for (ifmt = 0; ifmt < 4; ifmt++)  
  if (!strcmp(isofmt_arg, isoformats[ifmt])) {  
  break;  
  }  
  if (ifmt == 4) /* parse error */  
70   bb_show_usage();   bb_show_usage();
71   }   }
72   }   }
73    
74   /* XXX, date_fmt == NULL from this always */   fmt_dt2str = NULL;
75   if ((date_fmt == NULL) && (optind < argc) && (argv[optind][0] == '+')) {   if (argv[0] && argv[0][0] == '+') {
76   date_fmt = &argv[optind][1]; /* Skip over the '+' */   fmt_dt2str = &argv[0][1]; /* Skip over the '+' */
77   } else if (date_str == NULL) {   argv++;
78     }
79     if (!(opt & (DATE_OPT_SET | DATE_OPT_DATE))) {
80   opt |= DATE_OPT_SET;   opt |= DATE_OPT_SET;
81   date_str = argv[optind];   date_str = argv[0]; /* can be NULL */
82     if (date_str)
83     argv++;
84   }   }
85     if (*argv)
86     bb_show_usage();
87    
88   /* Now we have parsed all the information except the date format   /* Now we have parsed all the information except the date format
89     which depends on whether the clock is being set or read */     which depends on whether the clock is being set or read */
90    
91   if (filename) {   if (opt & DATE_OPT_REFERENCE) {
92   struct stat statbuf;   struct stat statbuf;
93   xstat(filename, &statbuf);   xstat(filename, &statbuf);
94   tm = statbuf.st_mtime;   tm = statbuf.st_mtime;
95   } else   } else
96   time(&tm);   time(&tm);
97   memcpy(&tm_time, localtime(&tm), sizeof(tm_time));   memcpy(&tm_time, localtime(&tm), sizeof(tm_time));
98   /* Zero out fields - take her back to midnight! */  
99     /* If date string is given, update tm_time, and maybe set date */
100   if (date_str != NULL) {   if (date_str != NULL) {
101     /* Zero out fields - take her back to midnight! */
102   tm_time.tm_sec = 0;   tm_time.tm_sec = 0;
103   tm_time.tm_min = 0;   tm_time.tm_min = 0;
104   tm_time.tm_hour = 0;   tm_time.tm_hour = 0;
105    
106   /* Process any date input to UNIX time since 1 Jan 1970 */   /* Process any date input to UNIX time since 1 Jan 1970 */
107   if (ENABLE_FEATURE_DATE_ISOFMT && (opt & DATE_OPT_HINT)) {   if (ENABLE_FEATURE_DATE_ISOFMT && (opt & DATE_OPT_HINT)) {
108   strptime(date_str, hintfmt_arg, &tm_time);   if (strptime(date_str, fmt_str2dt, &tm_time) == NULL)
  } else if (strchr(date_str, ':') != NULL) {  
  /* Parse input and assign appropriately to tm_time */  
   
  if (sscanf(date_str, "%d:%d:%d", &tm_time.tm_hour, &tm_time.tm_min,  
  &tm_time.tm_sec) == 3) {  
  /* no adjustments needed */  
  } else if (sscanf(date_str, "%d:%d", &tm_time.tm_hour,  
  &tm_time.tm_min) == 2) {  
  /* no adjustments needed */  
  } else if (sscanf(date_str, "%d.%d-%d:%d:%d", &tm_time.tm_mon,  
  &tm_time.tm_mday, &tm_time.tm_hour,  
  &tm_time.tm_min, &tm_time.tm_sec) == 5) {  
  /* Adjust dates from 1-12 to 0-11 */  
  tm_time.tm_mon -= 1;  
  } else if (sscanf(date_str, "%d.%d-%d:%d", &tm_time.tm_mon,  
  &tm_time.tm_mday,  
  &tm_time.tm_hour, &tm_time.tm_min) == 4) {  
  /* Adjust dates from 1-12 to 0-11 */  
  tm_time.tm_mon -= 1;  
  } else if (sscanf(date_str, "%d.%d.%d-%d:%d:%d", &tm_time.tm_year,  
  &tm_time.tm_mon, &tm_time.tm_mday,  
  &tm_time.tm_hour, &tm_time.tm_min,  
  &tm_time.tm_sec) == 6) {  
  tm_time.tm_year -= 1900; /* Adjust years */  
  tm_time.tm_mon -= 1; /* Adjust dates from 1-12 to 0-11 */  
  } else if (sscanf(date_str, "%d.%d.%d-%d:%d", &tm_time.tm_year,  
  &tm_time.tm_mon, &tm_time.tm_mday,  
  &tm_time.tm_hour, &tm_time.tm_min) == 5) {  
  tm_time.tm_year -= 1900; /* Adjust years */  
  tm_time.tm_mon -= 1; /* Adjust dates from 1-12 to 0-11 */  
  } else {  
109   bb_error_msg_and_die(bb_msg_invalid_date, date_str);   bb_error_msg_and_die(bb_msg_invalid_date, date_str);
  }  
110   } else {   } else {
111   int nr;   char end = '\0';
112   char *cp;   const char *last_colon = strrchr(date_str, ':');
113    
114   nr = sscanf(date_str, "%2d%2d%2d%2d%d", &tm_time.tm_mon,   if (last_colon != NULL) {
115   &tm_time.tm_mday, &tm_time.tm_hour, &tm_time.tm_min,   /* Parse input and assign appropriately to tm_time */
  &tm_time.tm_year);  
   
  if (nr < 4 || nr > 5) {  
  bb_error_msg_and_die(bb_msg_invalid_date, date_str);  
  }  
116    
117   cp = strchr(date_str, '.');   if (sscanf(date_str, "%u:%u%c",
118   if (cp) {   &tm_time.tm_hour,
119   nr = sscanf(cp + 1, "%2d", &tm_time.tm_sec);   &tm_time.tm_min,
120   if (nr != 1) {   &end) >= 2) {
121     /* no adjustments needed */
122     } else if (sscanf(date_str, "%u.%u-%u:%u%c",
123     &tm_time.tm_mon, &tm_time.tm_mday,
124     &tm_time.tm_hour, &tm_time.tm_min,
125     &end) >= 4) {
126     /* Adjust dates from 1-12 to 0-11 */
127     tm_time.tm_mon -= 1;
128     } else if (sscanf(date_str, "%u.%u.%u-%u:%u%c", &tm_time.tm_year,
129     &tm_time.tm_mon, &tm_time.tm_mday,
130     &tm_time.tm_hour, &tm_time.tm_min,
131     &end) >= 5) {
132     tm_time.tm_year -= 1900; /* Adjust years */
133     tm_time.tm_mon -= 1; /* Adjust dates from 1-12 to 0-11 */
134     } else if (sscanf(date_str, "%u-%u-%u %u:%u%c", &tm_time.tm_year,
135     &tm_time.tm_mon, &tm_time.tm_mday,
136     &tm_time.tm_hour, &tm_time.tm_min,
137     &end) >= 5) {
138     tm_time.tm_year -= 1900; /* Adjust years */
139     tm_time.tm_mon -= 1; /* Adjust dates from 1-12 to 0-11 */
140    //TODO: coreutils 6.9 also accepts "YYYY-MM-DD HH" (no minutes)
141     } else {
142   bb_error_msg_and_die(bb_msg_invalid_date, date_str);   bb_error_msg_and_die(bb_msg_invalid_date, date_str);
143   }   }
144     if (end == ':') {
145     if (sscanf(last_colon + 1, "%u%c", &tm_time.tm_sec, &end) == 1)
146     end = '\0';
147     /* else end != NUL and we error out */
148     }
149     } else {
150     if (sscanf(date_str, "%2u%2u%2u%2u%u%c", &tm_time.tm_mon,
151     &tm_time.tm_mday, &tm_time.tm_hour, &tm_time.tm_min,
152     &tm_time.tm_year, &end) < 4)
153     bb_error_msg_and_die(bb_msg_invalid_date, date_str);
154     /* correct for century  - minor Y2K problem here? */
155     if (tm_time.tm_year >= 1900) {
156     tm_time.tm_year -= 1900;
157     }
158     /* adjust date */
159     tm_time.tm_mon -= 1;
160     if (end == '.') {
161     if (sscanf(strchr(date_str, '.') + 1, "%u%c",
162     &tm_time.tm_sec, &end) == 1)
163     end = '\0';
164     /* else end != NUL and we error out */
165     }
166   }   }
167     if (end != '\0') {
168   /* correct for century  - minor Y2K problem here? */   bb_error_msg_and_die(bb_msg_invalid_date, date_str);
  if (tm_time.tm_year >= 1900) {  
  tm_time.tm_year -= 1900;  
169   }   }
  /* adjust date */  
  tm_time.tm_mon -= 1;  
170   }   }
   
171   /* Correct any day of week and day of year etc. fields */   /* Correct any day of week and day of year etc. fields */
172   tm_time.tm_isdst = -1; /* Be sure to recheck dst. */   tm_time.tm_isdst = -1; /* Be sure to recheck dst. */
173   tm = mktime(&tm_time);   tm = mktime(&tm_time);
# Line 185  int date_main(int argc, char **argv) Line 185  int date_main(int argc, char **argv)
185   /* Display output */   /* Display output */
186    
187   /* Deal with format string */   /* Deal with format string */
188     if (fmt_dt2str == NULL) {
  if (date_fmt == NULL) {  
189   int i;   int i;
190   date_fmt = xzalloc(32);   fmt_dt2str = xzalloc(32);
191   if (ENABLE_FEATURE_DATE_ISOFMT && ifmt >= 0) {   if (ENABLE_FEATURE_DATE_ISOFMT && ifmt >= 0) {
192   strcpy(date_fmt, "%Y-%m-%d");   strcpy(fmt_dt2str, "%Y-%m-%d");
193   if (ifmt > 0) {   if (ifmt > 0) {
194   i = 8;   i = 8;
195   date_fmt[i++] = 'T';   fmt_dt2str[i++] = 'T';
196   date_fmt[i++] = '%';   fmt_dt2str[i++] = '%';
197   date_fmt[i++] = 'H';   fmt_dt2str[i++] = 'H';
198   if (ifmt > 1) {   if (ifmt > 1) {
199   date_fmt[i++] = ':';   fmt_dt2str[i++] = ':';
200   date_fmt[i++] = '%';   fmt_dt2str[i++] = '%';
201   date_fmt[i++] = 'M';   fmt_dt2str[i++] = 'M';
202     if (ifmt > 2) {
203     fmt_dt2str[i++] = ':';
204     fmt_dt2str[i++] = '%';
205     fmt_dt2str[i++] = 'S';
206     }
207   }   }
208   if (ifmt > 2) {   format_utc:
209   date_fmt[i++] = ':';   fmt_dt2str[i++] = '%';
210   date_fmt[i++] = '%';   fmt_dt2str[i] = (opt & DATE_OPT_UTC) ? 'Z' : 'z';
  date_fmt[i++] = 'S';  
  }  
 format_utc:  
  date_fmt[i++] = '%';  
  date_fmt[i] = (opt & DATE_OPT_UTC) ? 'Z' : 'z';  
211   }   }
212   } else if (opt & DATE_OPT_RFC2822) {   } else if (opt & DATE_OPT_RFC2822) {
213   /* Undo busybox.c for date -R */   /* Undo busybox.c for date -R */
214   if (ENABLE_LOCALE_SUPPORT)   if (ENABLE_LOCALE_SUPPORT)
215   setlocale(LC_TIME, "C");   setlocale(LC_TIME, "C");
216   strcpy(date_fmt, "%a, %d %b %Y %H:%M:%S ");   strcpy(fmt_dt2str, "%a, %d %b %Y %H:%M:%S ");
217   i = 22;   i = 22;
218   goto format_utc;   goto format_utc;
219   } else /* default case */   } else /* default case */
220   date_fmt = "%a %b %e %H:%M:%S %Z %Y";   fmt_dt2str = (char*)"%a %b %e %H:%M:%S %Z %Y";
221   }   }
222    
223   if (*date_fmt == '\0') {  #define date_buf bb_common_bufsiz1
224     if (*fmt_dt2str == '\0') {
225   /* With no format string, just print a blank line */   /* With no format string, just print a blank line */
226   *bb_common_bufsiz1 = 0;   date_buf[0] = '\0';
227   } else {   } else {
228   /* Handle special conversions */   /* Handle special conversions */
229     if (strncmp(fmt_dt2str, "%f", 2) == 0) {
230   if (strncmp(date_fmt, "%f", 2) == 0) {   fmt_dt2str = (char*)"%Y.%m.%d-%H:%M:%S";
  date_fmt = "%Y.%m.%d-%H:%M:%S";  
231   }   }
232    
233   /* Generate output string */   /* Generate output string */
234   strftime(bb_common_bufsiz1, 200, date_fmt, &tm_time);   strftime(date_buf, sizeof(date_buf), fmt_dt2str, &tm_time);
235   }   }
236   puts(bb_common_bufsiz1);   puts(date_buf);
237    
238   return EXIT_SUCCESS;   return EXIT_SUCCESS;
239  }  }

Legend:
Removed from v.532  
changed lines
  Added in v.816