source: MondoRescue/branches/stable/mindi-busybox/coreutils/date.c@ 1770

Last change on this file since 1770 was 1770, checked in by Bruno Cornec, 16 years ago
  • Better output for mindi-busybox revision
  • Remove dummy file created on NFS - report from Arnaud Tiger <arnaud.tiger_at_hp.com>
  • strace useful for debug
  • fix new versions for pb (2.0.0 for mindi and 1.7.2 for mindi-busybox)
  • fix build process for mindi-busybox + options used in that version (dd for label-partitions-as-necessary)
  • fix typo in label-partitions-as-necessary which doesn't seem to work
  • Update to busybox 1.7.2
  • perl is now required at restore time to support uuid swap partitions (and will be used for many other thigs

in the future for sure)

  • next mindi version will be 2.0.0 due to all the changes made in it (udev may break working distros)
  • small optimization in mindi on keyboard handling (one single find instead of multiple)
  • better interaction for USB device when launching mindi manually
  • attempt to automatically guess block disk size for ramdisk
  • fix typos in bkphw
  • Fix the remaining problem with UUID support for swap partitions
  • Updates mondoarchive man page for USB support
  • Adds preliminary Hardware support to mindi (Proliant SSSTK)
  • Tries to add udev support also for rhel4
  • Fix UUID support which was still broken.
  • Be conservative in test for the start-nfs script
  • Update config file for mindi-busybox for 1.7.2 migration
  • Try to run around a busybox bug (1.2.2 pb on inexistant links)
  • Add build content for mindi-busybox in pb
  • Remove distributions content for mindi-busybox
  • Fix a warning on inexistant raidtab
  • Solve problem on tmpfs in restore init (Problem of inexistant symlink and busybox)
  • Create MONDO_CACHE and use it everywhere + creation at start
  • Really never try to eject a USB device
  • Fix a issue with &> usage (replaced with 1> and 2>)
  • Adds magic file to depllist in order to have file working + ldd which helps for debugging issues
  • tty modes correct to avoid sh error messages
  • Use ext3 normally and not ext2 instead
  • USB device should be corrected after reading (take 1st part)
  • Adds a mount_USB_here function derived from mount_CDROM_here
  • usb detection place before /dev detection in device name at restore time
  • Fix when restoring from USB: media is asked in interactive mode
  • Adds USB support for mondorestore
  • mount_cdrom => mount_media
  • elilo.efi is now searched throughout /boot/efi and not in a fixed place as there is no standard
  • untar-and-softlink => untar (+ interface change)
  • suppress useless softlinks creation/removal in boot process
  • avoids udevd messages on groups
  • Increase # of disks to 99 as in mindi at restore time (should be a conf file parameter)
  • skip existing big file creation
  • seems to work correctly for USB mindi boot
  • Adds group and tty link to udev conf
  • Always load usb-torage (even 2.6) to initiate USB bus discovery
  • Better printing of messages
  • Attempt to fix a bug in supporting OpenSusE 10.3 kernel for initramfs (mindi may now use multiple regex for kernel initrd detection)
  • Links were not correctly done as non relative for modules in mindi
  • exclusion of modules denied now works
  • Also create modules in their ordinary place, so that classical modprobe works + copy modules.dep
  • Fix bugs for DENY_MODS handling
  • Add device /dev/console for udev
  • ide-generic should now really be excluded
  • Fix a bug in major number for tty
  • If udev then adds modprobe/insmod to rootfs
  • tty0 is also cretaed with udev
  • ide-generic put rather in DENY_MODS
  • udevd remove from deplist s handled in mindi directly
  • better default for mindi when using --usb
  • Handles dynamically linked busybox (in case we want to use it soon ;-)
  • Adds fixed devices to create for udev
  • ide-generic should not be part of the initrd when using libata v2
  • support a dynamically linked udev (case on Ubuntu 7.10 and Mandriva 2008.0 so should be quite generic) This will give incitation to move to dyn. linked binaries in the initrd which will help for other tasks (ia6 4)
  • Improvement in udev support (do not use cl options not available in busybox)
  • Udev in mindi
    • auto creation of the right links at boot time with udev-links.conf(from Mandriva 2008.0)
    • rework startup of udev as current makes kernel crash (from Mandriva 2008.0)
    • add support for 64 bits udev
  • Try to render MyInsmod silent at boot time
  • Adds udev support (mandatory for newest distributions to avoid remapping of devices in a different way as on the original system)
  • We also need vaft format support for USB boot
  • Adds libusual support (Ubuntu 7.10 needs it for USB)
  • Improve Ubuntu/Debian keyboard detection and support
  • pbinit adapted to new pb (0.8.10). Filtering of docs done in it
  • Suppress some mondo warnings and errors on USB again
  • Tries to fix lack of files in deb mindi package
  • Verify should now work for USB devices
  • More log/mesages improvement for USB support
  • - Supress g_erase_tmpdir_and_scratchdir
  • Improve some log messages for USB support
  • Try to improve install in mindi to avoid issues with isolinux.cfg not installed vene if in the pkg :-(
  • Improve mindi-busybox build
  • In conformity with pb 0.8.9
  • Add support for Ubuntu 7.10 in build process
  • Add USB Key button to Menu UI (CD streamer removed)
  • Attempt to fix error messages on tmp/scratch files at the end by removing those dir at the latest possible.
  • Fix a bug linked to the size of the -E param which could be used (Arnaud Tiger/René Ribaud).
  • Integrate ~/.pbrc content into mondorescue.pb (required project-builder >= 0.8.7)
  • Put mondorescue in conformity with new pb filtering rules
  • Add USB support at restore time (no test done yet). New start-usb script PB varibale added where useful
  • Unmounting USB device before removal of temporary scratchdir
  • Stil refining USB copy back to mondo (one command was not executed)
  • No need to have the image subdor in the csratchdir when USB.
  • umount the USB partition before attempting to use it
  • Remove useless copy from mindi to mondo at end of USB handling

(risky merge, we are raising the limits of 2 diverging branches. The status of stable is not completely sure as such. Will need lots of tests, but it's not yet done :-()
(merge -r1692:1769 $SVN_M/branches/2.2.5)

File size: 6.4 KB
RevLine 
[821]1/* vi: set sw=4 ts=4: */
2/*
3 * Mini date implementation for busybox
4 *
5 * by Matthew Grant <grantma@anathoth.gen.nz>
6 *
7 * iso-format handling added by Robert Griebl <griebl@gmx.de>
[1770]8 * bugfixes and cleanup by Bernhard Fischer
[821]9 *
10 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
11*/
12
[1770]13#include "libbb.h"
[821]14
15/* This 'date' command supports only 2 time setting formats,
16 all the GNU strftime stuff (its in libc, lets use it),
[1770]17 setting time using UTC and displaying it, as well as
18 an RFC 2822 compliant date output for shell scripting
[821]19 mail commands */
20
21/* Input parsing code is always bulky - used heavy duty libc stuff as
22 much as possible, missed out a lot of bounds checking */
23
24/* Default input handling to save surprising some people */
25
26
27#define DATE_OPT_RFC2822 0x01
28#define DATE_OPT_SET 0x02
29#define DATE_OPT_UTC 0x04
30#define DATE_OPT_DATE 0x08
31#define DATE_OPT_REFERENCE 0x10
32#define DATE_OPT_TIMESPEC 0x20
33#define DATE_OPT_HINT 0x40
34
[1770]35static void maybe_set_utc(int opt)
36{
37 if (opt & DATE_OPT_UTC)
38 putenv((char*)"TZ=UTC0");
39}
40
41int date_main(int argc, char **argv);
[821]42int date_main(int argc, char **argv)
43{
[1770]44 time_t tm;
45 struct tm tm_time;
46 unsigned opt;
47 int ifmt = -1;
[821]48 char *date_str = NULL;
49 char *date_fmt = NULL;
50 char *filename = NULL;
51 char *isofmt_arg;
52 char *hintfmt_arg;
53
[1770]54 opt_complementary = "d--s:s--d"
55 USE_FEATURE_DATE_ISOFMT(":R--I:I--R");
56 opt = getopt32(argv, "Rs:ud:r:"
57 USE_FEATURE_DATE_ISOFMT("I::D:"),
58 &date_str, &date_str, &filename
59 USE_FEATURE_DATE_ISOFMT(, &isofmt_arg, &hintfmt_arg));
60 maybe_set_utc(opt);
[821]61
[1770]62 if (ENABLE_FEATURE_DATE_ISOFMT && (opt & DATE_OPT_TIMESPEC)) {
[821]63 if (!isofmt_arg) {
[1770]64 ifmt = 0; /* default is date */
[821]65 } else {
[1770]66 static const char *const isoformats[] = {
67 "date", "hours", "minutes", "seconds"
68 };
69
70 for (ifmt = 0; ifmt < 4; ifmt++)
71 if (!strcmp(isofmt_arg, isoformats[ifmt]))
72 goto found;
73 /* parse error */
[821]74 bb_show_usage();
[1770]75 found: ;
[821]76 }
77 }
78
79 /* XXX, date_fmt == NULL from this always */
80 if ((date_fmt == NULL) && (optind < argc) && (argv[optind][0] == '+')) {
81 date_fmt = &argv[optind][1]; /* Skip over the '+' */
82 } else if (date_str == NULL) {
[1770]83 opt |= DATE_OPT_SET;
[821]84 date_str = argv[optind];
85 }
86
87 /* Now we have parsed all the information except the date format
88 which depends on whether the clock is being set or read */
89
[1770]90 if (filename) {
[821]91 struct stat statbuf;
[1770]92 xstat(filename, &statbuf);
93 tm = statbuf.st_mtime;
94 } else
95 time(&tm);
[821]96 memcpy(&tm_time, localtime(&tm), sizeof(tm_time));
97 /* Zero out fields - take her back to midnight! */
98 if (date_str != NULL) {
99 tm_time.tm_sec = 0;
100 tm_time.tm_min = 0;
101 tm_time.tm_hour = 0;
102
103 /* Process any date input to UNIX time since 1 Jan 1970 */
104 if (ENABLE_FEATURE_DATE_ISOFMT && (opt & DATE_OPT_HINT)) {
105 strptime(date_str, hintfmt_arg, &tm_time);
106 } else if (strchr(date_str, ':') != NULL) {
[1770]107 /* Parse input and assign appropriately to tm_time */
108
109 if (sscanf(date_str, "%d:%d:%d", &tm_time.tm_hour, &tm_time.tm_min,
110 &tm_time.tm_sec) == 3) {
111 /* no adjustments needed */
112 } else if (sscanf(date_str, "%d:%d", &tm_time.tm_hour,
113 &tm_time.tm_min) == 2) {
114 /* no adjustments needed */
115 } else if (sscanf(date_str, "%d.%d-%d:%d:%d", &tm_time.tm_mon,
116 &tm_time.tm_mday, &tm_time.tm_hour,
117 &tm_time.tm_min, &tm_time.tm_sec) == 5) {
118 /* Adjust dates from 1-12 to 0-11 */
119 tm_time.tm_mon -= 1;
120 } else if (sscanf(date_str, "%d.%d-%d:%d", &tm_time.tm_mon,
121 &tm_time.tm_mday,
122 &tm_time.tm_hour, &tm_time.tm_min) == 4) {
123 /* Adjust dates from 1-12 to 0-11 */
124 tm_time.tm_mon -= 1;
125 } else if (sscanf(date_str, "%d.%d.%d-%d:%d:%d", &tm_time.tm_year,
126 &tm_time.tm_mon, &tm_time.tm_mday,
127 &tm_time.tm_hour, &tm_time.tm_min,
128 &tm_time.tm_sec) == 6) {
129 tm_time.tm_year -= 1900; /* Adjust years */
130 tm_time.tm_mon -= 1; /* Adjust dates from 1-12 to 0-11 */
131 } else if (sscanf(date_str, "%d.%d.%d-%d:%d", &tm_time.tm_year,
132 &tm_time.tm_mon, &tm_time.tm_mday,
133 &tm_time.tm_hour, &tm_time.tm_min) == 5) {
134 tm_time.tm_year -= 1900; /* Adjust years */
135 tm_time.tm_mon -= 1; /* Adjust dates from 1-12 to 0-11 */
136 } else {
137 bb_error_msg_and_die(bb_msg_invalid_date, date_str);
138 }
[821]139 } else {
[1770]140 int nr;
141 char *cp;
142
143 nr = sscanf(date_str, "%2d%2d%2d%2d%d", &tm_time.tm_mon,
144 &tm_time.tm_mday, &tm_time.tm_hour, &tm_time.tm_min,
145 &tm_time.tm_year);
146
147 if (nr < 4 || nr > 5) {
148 bb_error_msg_and_die(bb_msg_invalid_date, date_str);
149 }
150
151 cp = strchr(date_str, '.');
152 if (cp) {
153 nr = sscanf(cp + 1, "%2d", &tm_time.tm_sec);
154 if (nr != 1) {
155 bb_error_msg_and_die(bb_msg_invalid_date, date_str);
156 }
157 }
158
159 /* correct for century - minor Y2K problem here? */
160 if (tm_time.tm_year >= 1900) {
161 tm_time.tm_year -= 1900;
162 }
163 /* adjust date */
164 tm_time.tm_mon -= 1;
[821]165 }
166
167 /* Correct any day of week and day of year etc. fields */
168 tm_time.tm_isdst = -1; /* Be sure to recheck dst. */
169 tm = mktime(&tm_time);
170 if (tm < 0) {
171 bb_error_msg_and_die(bb_msg_invalid_date, date_str);
172 }
[1770]173 maybe_set_utc(opt);
[821]174
175 /* if setting time, set it */
[1770]176 if ((opt & DATE_OPT_SET) && stime(&tm) < 0) {
[821]177 bb_perror_msg("cannot set date");
178 }
179 }
180
181 /* Display output */
182
183 /* Deal with format string */
[1770]184
[821]185 if (date_fmt == NULL) {
[1770]186 int i;
187 date_fmt = xzalloc(32);
188 if (ENABLE_FEATURE_DATE_ISOFMT && ifmt >= 0) {
189 strcpy(date_fmt, "%Y-%m-%d");
190 if (ifmt > 0) {
191 i = 8;
192 date_fmt[i++] = 'T';
193 date_fmt[i++] = '%';
194 date_fmt[i++] = 'H';
195 if (ifmt > 1) {
196 date_fmt[i++] = ':';
197 date_fmt[i++] = '%';
198 date_fmt[i++] = 'M';
199 }
200 if (ifmt > 2) {
201 date_fmt[i++] = ':';
202 date_fmt[i++] = '%';
203 date_fmt[i++] = 'S';
204 }
205 format_utc:
206 date_fmt[i++] = '%';
207 date_fmt[i] = (opt & DATE_OPT_UTC) ? 'Z' : 'z';
208 }
209 } else if (opt & DATE_OPT_RFC2822) {
210 /* Undo busybox.c for date -R */
211 if (ENABLE_LOCALE_SUPPORT)
212 setlocale(LC_TIME, "C");
213 strcpy(date_fmt, "%a, %d %b %Y %H:%M:%S ");
214 i = 22;
215 goto format_utc;
216 } else /* default case */
217 date_fmt = (char*)"%a %b %e %H:%M:%S %Z %Y";
218 }
[821]219
[1770]220#define date_buf bb_common_bufsiz1
[821]221 if (*date_fmt == '\0') {
222 /* With no format string, just print a blank line */
[1770]223 date_buf[0] = '\0';
[821]224 } else {
225 /* Handle special conversions */
226
227 if (strncmp(date_fmt, "%f", 2) == 0) {
[1770]228 date_fmt = (char*)"%Y.%m.%d-%H:%M:%S";
[821]229 }
230
231 /* Generate output string */
[1770]232 strftime(date_buf, sizeof(date_buf), date_fmt, &tm_time);
[821]233 }
[1770]234 puts(date_buf);
[821]235
236 return EXIT_SUCCESS;
237}
Note: See TracBrowser for help on using the repository browser.