Ignore:
Timestamp:
Nov 6, 2007, 11:01:53 AM (16 years ago)
Author:
Bruno Cornec
Message:
  • 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:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/stable/mindi-busybox/coreutils/date.c

    r821 r1770  
    66 *
    77 * iso-format handling added by Robert Griebl <griebl@gmx.de>
     8 * bugfixes and cleanup by Bernhard Fischer
    89 *
    910 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
    1011*/
    1112
    12 #include <stdlib.h>
    13 #include <errno.h>
    14 #include <unistd.h>
    15 #include <time.h>
    16 #include <stdio.h>
    17 #include <string.h>
    18 #include "busybox.h"
     13#include "libbb.h"
    1914
    2015/* This 'date' command supports only 2 time setting formats,
    2116   all the GNU strftime stuff (its in libc, lets use it),
    22    setting time using UTC and displaying int, as well as
    23    an RFC 822 complient date output for shell scripting
     17   setting time using UTC and displaying it, as well as
     18   an RFC 2822 compliant date output for shell scripting
    2419   mail commands */
    2520
    … …  
    2924/* Default input handling to save surprising some people */
    3025
    31 static struct tm *date_conv_time(struct tm *tm_time, const char *t_string)
    32 {
    33     int nr;
    34     char *cp;
    35 
    36     nr = sscanf(t_string, "%2d%2d%2d%2d%d", &(tm_time->tm_mon),
    37                 &(tm_time->tm_mday), &(tm_time->tm_hour), &(tm_time->tm_min),
    38                 &(tm_time->tm_year));
    39 
    40     if (nr < 4 || nr > 5) {
    41         bb_error_msg_and_die(bb_msg_invalid_date, t_string);
    42     }
    43 
    44     cp = strchr(t_string, '.');
    45     if (cp) {
    46         nr = sscanf(cp + 1, "%2d", &(tm_time->tm_sec));
    47         if (nr != 1) {
    48             bb_error_msg_and_die(bb_msg_invalid_date, t_string);
    49         }
    50     }
    51 
    52     /* correct for century  - minor Y2K problem here? */
    53     if (tm_time->tm_year >= 1900) {
    54         tm_time->tm_year -= 1900;
    55     }
    56     /* adjust date */
    57     tm_time->tm_mon -= 1;
    58 
    59     return (tm_time);
    60 
    61 }
    62 
    63 
    64 /* The new stuff for LRP */
    65 
    66 static struct tm *date_conv_ftime(struct tm *tm_time, const char *t_string)
    67 {
    68     struct tm t;
    69 
    70     /* Parse input and assign appropriately to tm_time */
    71 
    72     if (t = *tm_time, sscanf(t_string, "%d:%d:%d", &t.tm_hour, &t.tm_min,
    73                          &t.tm_sec) == 3) {
    74         /* no adjustments needed */
    75     } else if (t = *tm_time, sscanf(t_string, "%d:%d", &t.tm_hour,
    76                                 &t.tm_min) == 2) {
    77         /* no adjustments needed */
    78     } else if (t = *tm_time, sscanf(t_string, "%d.%d-%d:%d:%d", &t.tm_mon,
    79                         &t.tm_mday, &t.tm_hour,
    80                         &t.tm_min, &t.tm_sec) == 5) {
    81         /* Adjust dates from 1-12 to 0-11 */
    82         t.tm_mon -= 1;
    83     } else if (t = *tm_time, sscanf(t_string, "%d.%d-%d:%d", &t.tm_mon,
    84                         &t.tm_mday,
    85                         &t.tm_hour, &t.tm_min) == 4) {
    86         /* Adjust dates from 1-12 to 0-11 */
    87         t.tm_mon -= 1;
    88     } else if (t = *tm_time, sscanf(t_string, "%d.%d.%d-%d:%d:%d", &t.tm_year,
    89                         &t.tm_mon, &t.tm_mday,
    90                         &t.tm_hour, &t.tm_min,
    91                             &t.tm_sec) == 6) {
    92         t.tm_year -= 1900;  /* Adjust years */
    93         t.tm_mon -= 1;  /* Adjust dates from 1-12 to 0-11 */
    94     } else if (t = *tm_time, sscanf(t_string, "%d.%d.%d-%d:%d", &t.tm_year,
    95                         &t.tm_mon, &t.tm_mday,
    96                         &t.tm_hour, &t.tm_min) == 5) {
    97         t.tm_year -= 1900;  /* Adjust years */
    98         t.tm_mon -= 1;  /* Adjust dates from 1-12 to 0-11 */
    99     } else {
    100         bb_error_msg_and_die(bb_msg_invalid_date, t_string);
    101     }
    102     *tm_time = t;
    103     return (tm_time);
    104 }
    10526
    10627#define DATE_OPT_RFC2822    0x01
    … …  
    11233#define DATE_OPT_HINT       0x40
    11334
     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);
    11442int date_main(int argc, char **argv)
    11543{
     44    time_t tm;
     45    struct tm tm_time;
     46    unsigned opt;
     47    int ifmt = -1;
    11648    char *date_str = NULL;
    11749    char *date_fmt = NULL;
    118     int set_time;
    119     int utc;
    120     time_t tm;
    121     unsigned long opt;
    122     struct tm tm_time;
    12350    char *filename = NULL;
    124 
    125     int ifmt = 0;
    12651    char *isofmt_arg;
    12752    char *hintfmt_arg;
    12853
    129     bb_opt_complementally = "?:d--s:s--d";
    130     opt = bb_getopt_ulflags(argc, argv, "Rs:ud:r:"
    131                     USE_FEATURE_DATE_ISOFMT("I::D:"),
    132                     &date_str, &date_str, &filename
    133                     USE_FEATURE_DATE_ISOFMT(, &isofmt_arg, &hintfmt_arg));
    134     set_time = opt & DATE_OPT_SET;
    135     utc = opt & DATE_OPT_UTC;
    136     if (utc && putenv("TZ=UTC0") != 0) {
    137         bb_error_msg_and_die(bb_msg_memory_exhausted);
    138     }
    139 
    140     if(ENABLE_FEATURE_DATE_ISOFMT && (opt & DATE_OPT_TIMESPEC)) {
     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);
     61
     62    if (ENABLE_FEATURE_DATE_ISOFMT && (opt & DATE_OPT_TIMESPEC)) {
    14163        if (!isofmt_arg) {
    142             ifmt = 1;
     64            ifmt = 0; /* default is date */
    14365        } else {
    144             char *isoformats[]={"date","hours","minutes","seconds"};
    145             for(ifmt = 4; ifmt;)
    146                 if(!strcmp(isofmt_arg,isoformats[--ifmt]))
    147                     break;
    148         }
    149         if (!ifmt) {
     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 */
    15074            bb_show_usage();
     75 found: ;
    15176        }
    15277    }
    … …  
    15681        date_fmt = &argv[optind][1];    /* Skip over the '+' */
    15782    } else if (date_str == NULL) {
    158         set_time = 1;
     83        opt |= DATE_OPT_SET;
    15984        date_str = argv[optind];
    16085    }
    … …  
    16388       which depends on whether the clock is being set or read */
    16489
    165     if(filename) {
     90    if (filename) {
    16691        struct stat statbuf;
    167         xstat(filename,&statbuf);
    168         tm=statbuf.st_mtime;
    169     } else time(&tm);
     92        xstat(filename, &statbuf);
     93        tm = statbuf.st_mtime;
     94    } else
     95        time(&tm);
    17096    memcpy(&tm_time, localtime(&tm), sizeof(tm_time));
    17197    /* Zero out fields - take her back to midnight! */
    … …  
    179105            strptime(date_str, hintfmt_arg, &tm_time);
    180106        } else if (strchr(date_str, ':') != NULL) {
    181             date_conv_ftime(&tm_time, date_str);
     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            }
    182139        } else {
    183             date_conv_time(&tm_time, date_str);
     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;
    184165        }
    185166
    … …  
    190171            bb_error_msg_and_die(bb_msg_invalid_date, date_str);
    191172        }
    192         if (utc && putenv("TZ=UTC0") != 0) {
    193             bb_error_msg_and_die(bb_msg_memory_exhausted);
    194         }
     173        maybe_set_utc(opt);
    195174
    196175        /* if setting time, set it */
    197         if (set_time && stime(&tm) < 0) {
     176        if ((opt & DATE_OPT_SET) && stime(&tm) < 0) {
    198177            bb_perror_msg("cannot set date");
    199178        }
    … …  
    203182
    204183    /* Deal with format string */
     184
    205185    if (date_fmt == NULL) {
    206         /* Start with the default case */
    207        
    208         date_fmt = (opt & DATE_OPT_RFC2822 ?
    209                     (utc ? "%a, %d %b %Y %H:%M:%S GMT" :
    210                     "%a, %d %b %Y %H:%M:%S %z") :
    211                     "%a %b %e %H:%M:%S %Z %Y");
    212 
    213         if (ENABLE_FEATURE_DATE_ISOFMT) {
    214             if (ifmt == 4)
    215                 date_fmt = utc ? "%Y-%m-%dT%H:%M:%SZ" : "%Y-%m-%dT%H:%M:%S%z";
    216             else if (ifmt == 3)
    217                 date_fmt = utc ? "%Y-%m-%dT%H:%MZ" : "%Y-%m-%dT%H:%M%z";
    218             else if (ifmt == 2)
    219                 date_fmt = utc ? "%Y-%m-%dT%HZ" : "%Y-%m-%dT%H%z";
    220             else if (ifmt == 1)
    221                 date_fmt = "%Y-%m-%d";
    222         }
    223     }
    224    
     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    }
     219
     220#define date_buf bb_common_bufsiz1
    225221    if (*date_fmt == '\0') {
    226 
    227222        /* With no format string, just print a blank line */
    228        
    229         *bb_common_bufsiz1=0;
     223        date_buf[0] = '\0';
    230224    } else {
    231 
    232225        /* Handle special conversions */
    233226
    234227        if (strncmp(date_fmt, "%f", 2) == 0) {
    235             date_fmt = "%Y.%m.%d-%H:%M:%S";
     228            date_fmt = (char*)"%Y.%m.%d-%H:%M:%S";
    236229        }
    237230
    238231        /* Generate output string */
    239         strftime(bb_common_bufsiz1, 200, date_fmt, &tm_time);
    240     }
    241     puts(bb_common_bufsiz1);
     232        strftime(date_buf, sizeof(date_buf), date_fmt, &tm_time);
     233    }
     234    puts(date_buf);
    242235
    243236    return EXIT_SUCCESS;
Note: See TracChangeset for help on using the changeset viewer.