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/printf.c

    r821 r1770  
    3131   %b = print an argument string, interpreting backslash escapes
    3232
    33    The `format' argument is re-used as many times as necessary
     33   The 'format' argument is re-used as many times as necessary
    3434   to convert all of the given arguments.
    3535
    … …  
    3939//   19990508 Busy Boxed! Dave Cinege
    4040
    41 #include <unistd.h>
    42 #include <stdio.h>
    43 #include <sys/types.h>
    44 #include <string.h>
    45 #include <errno.h>
    46 #include <stdlib.h>
    47 #include <fcntl.h>
    48 #include <ctype.h>
    49 #include <assert.h>
    50 #include "busybox.h"
    51 
    52 static int print_formatted (char *format, int argc, char **argv);
    53 static void print_direc (char *start, size_t length,
    54             int field_width, int precision, char *argument);
    55 
    56 typedef int (*converter)(char *arg, void *result);
    57 static void multiconvert(char *arg, void *result, converter convert)
    58 {
    59     char s[16];
     41#include "libbb.h"
     42
     43typedef void (*converter)(const char *arg, void *result);
     44
     45static void multiconvert(const char *arg, void *result, converter convert)
     46{
     47    char s[sizeof(int)*3 + 2];
     48
    6049    if (*arg == '"' || *arg == '\'') {
    61         sprintf(s,"%d",(unsigned)*(++arg));
    62         arg=s;
    63     }
    64     if(convert(arg,result)) fprintf(stderr, "%s", arg);
    65 }
    66 
    67 static unsigned long xstrtoul(char *arg)
     50        sprintf(s, "%d", (unsigned char)arg[1]);
     51        arg = s;
     52    }
     53    convert(arg, result);
     54    /* if there was conversion error, print unconverted string */
     55    if (errno)
     56        fputs(arg, stderr);
     57}
     58
     59static void conv_strtoul(const char *arg, void *result)
     60{
     61    *(unsigned long*)result = bb_strtoul(arg, NULL, 0);
     62}
     63static void conv_strtol(const char *arg, void *result)
     64{
     65    *(long*)result = bb_strtol(arg, NULL, 0);
     66}
     67static void conv_strtod(const char *arg, void *result)
     68{
     69    char *end;
     70    /* Well, this one allows leading whitespace... so what */
     71    /* What I like much less is that "-" is accepted too! :( */
     72    *(double*)result = strtod(arg, &end);
     73    if (end[0]) errno = ERANGE;
     74}
     75
     76static unsigned long my_xstrtoul(const char *arg)
    6877{
    6978    unsigned long result;
    70 
    71     multiconvert(arg,&result, (converter)safe_strtoul);
     79    multiconvert(arg, &result, conv_strtoul);
    7280    return result;
    7381}
    7482
    75 static long xstrtol(char *arg)
     83static long my_xstrtol(const char *arg)
    7684{
    7785    long result;
    78     multiconvert(arg, &result, (converter)safe_strtol);
     86    multiconvert(arg, &result, conv_strtol);
    7987    return result;
    8088}
    8189
    82 static double xstrtod(char *arg)
     90static double my_xstrtod(const char *arg)
    8391{
    8492    double result;
    85     multiconvert(arg, &result, (converter)safe_strtod);
     93    multiconvert(arg, &result, conv_strtod);
    8694    return result;
    8795}
    … …  
    100108}
    101109
    102 int printf_main(int argc, char **argv)
    103 {
    104     char *format;
    105     int args_used;
    106 
    107     if (argc <= 1 || **(argv + 1) == '-') {
    108         bb_show_usage();
    109     }
    110 
    111     format = argv[1];
    112     argc -= 2;
    113     argv += 2;
    114 
    115     do {
    116         args_used = print_formatted(format, argc, argv);
    117         argc -= args_used;
    118         argv += args_used;
    119     }
    120     while (args_used > 0 && argc > 0);
    121 
    122 /*
    123   if (argc > 0)
    124     fprintf(stderr, "excess args ignored");
    125 */
    126 
    127     return EXIT_SUCCESS;
     110static void print_direc(char *start, size_t length, int field_width, int precision,
     111        const char *argument)
     112{
     113    char *p;        /* Null-terminated copy of % directive. */
     114
     115    p = xmalloc((unsigned) (length + 1));
     116    strncpy(p, start, length);
     117    p[length] = 0;
     118
     119    switch (p[length - 1]) {
     120    case 'd':
     121    case 'i':
     122        if (field_width < 0) {
     123            if (precision < 0)
     124                printf(p, my_xstrtol(argument));
     125            else
     126                printf(p, precision, my_xstrtol(argument));
     127        } else {
     128            if (precision < 0)
     129                printf(p, field_width, my_xstrtol(argument));
     130            else
     131                printf(p, field_width, precision, my_xstrtol(argument));
     132        }
     133        break;
     134    case 'o':
     135    case 'u':
     136    case 'x':
     137    case 'X':
     138        if (field_width < 0) {
     139            if (precision < 0)
     140                printf(p, my_xstrtoul(argument));
     141            else
     142                printf(p, precision, my_xstrtoul(argument));
     143        } else {
     144            if (precision < 0)
     145                printf(p, field_width, my_xstrtoul(argument));
     146            else
     147                printf(p, field_width, precision, my_xstrtoul(argument));
     148        }
     149        break;
     150    case 'f':
     151    case 'e':
     152    case 'E':
     153    case 'g':
     154    case 'G':
     155        if (field_width < 0) {
     156            if (precision < 0)
     157                printf(p, my_xstrtod(argument));
     158            else
     159                printf(p, precision, my_xstrtod(argument));
     160        } else {
     161            if (precision < 0)
     162                printf(p, field_width, my_xstrtod(argument));
     163            else
     164                printf(p, field_width, precision, my_xstrtod(argument));
     165        }
     166        break;
     167    case 'c':
     168        printf(p, *argument);
     169        break;
     170    case 's':
     171        if (field_width < 0) {
     172            if (precision < 0)
     173                printf(p, argument);
     174            else
     175                printf(p, precision, argument);
     176        } else {
     177            if (precision < 0)
     178                printf(p, field_width, argument);
     179            else
     180                printf(p, field_width, precision, argument);
     181        }
     182        break;
     183    }
     184
     185    free(p);
    128186}
    129187
    130188/* Print the text in FORMAT, using ARGV (with ARGC elements) for
    131    arguments to any `%' directives.
     189   arguments to any '%' directives.
    132190   Return the number of elements of ARGV used.  */
    133191
    134192static int print_formatted(char *format, int argc, char **argv)
    135193{
    136     int save_argc = argc;       /* Preserve original value.  */
    137     char *f;                    /* Pointer into `format'.  */
    138     char *direc_start;          /* Start of % directive.  */
    139     size_t direc_length;        /* Length of % directive.  */
    140     int field_width;            /* Arg to first '*', or -1 if none.  */
    141     int precision;              /* Arg to second '*', or -1 if none.  */
     194    int save_argc = argc;   /* Preserve original value.  */
     195    char *f;                /* Pointer into 'format'.  */
     196    char *direc_start;      /* Start of % directive.  */
     197    size_t direc_length;    /* Length of % directive.  */
     198    int field_width;        /* Arg to first '*', or -1 if none.  */
     199    int precision;          /* Arg to second '*', or -1 if none.  */
    142200
    143201    for (f = format; *f; ++f) {
    … …  
    167225                ++direc_length;
    168226                if (argc > 0) {
    169                     field_width = xstrtoul(*argv);
     227                    field_width = my_xstrtoul(*argv);
    170228                    ++argv;
    171229                    --argc;
    172230                } else
    173231                    field_width = 0;
    174             } else
     232            } else {
    175233                while (isdigit(*f)) {
    176234                    ++f;
    177235                    ++direc_length;
    178236                }
     237            }
    179238            if (*f == '.') {
    180239                ++f;
    … …  
    184243                    ++direc_length;
    185244                    if (argc > 0) {
    186                         precision = xstrtoul(*argv);
     245                        precision = my_xstrtoul(*argv);
    187246                        ++argv;
    188247                        --argc;
    … …  
    200259            }
    201260            /*
    202                if (!strchr ("diouxXfeEgGcs", *f))
    203                fprintf(stderr, "%%%c: invalid directive", *f);
    204              */
     261            if (!strchr ("diouxXfeEgGcs", *f))
     262            fprintf(stderr, "%%%c: invalid directive", *f);
     263            */
    205264            ++direc_length;
    206265            if (argc > 0) {
    … …  
    213272                            precision, "");
    214273            break;
    215 
    216274        case '\\':
    217275            if (*++f == 'c')
    … …  
    220278            f--;
    221279            break;
    222 
    223280        default:
    224281            putchar(*f);
    … …  
    229286}
    230287
    231 static void
    232 print_direc(char *start, size_t length, int field_width, int precision,
    233             char *argument)
    234 {
    235     char *p;                    /* Null-terminated copy of % directive. */
    236 
    237     p = xmalloc((unsigned) (length + 1));
    238     strncpy(p, start, length);
    239     p[length] = 0;
    240 
    241     switch (p[length - 1]) {
    242     case 'd':
    243     case 'i':
    244         if (field_width < 0) {
    245             if (precision < 0)
    246                 printf(p, xstrtol(argument));
    247             else
    248                 printf(p, precision, xstrtol(argument));
    249         } else {
    250             if (precision < 0)
    251                 printf(p, field_width, xstrtol(argument));
    252             else
    253                 printf(p, field_width, precision, xstrtol(argument));
    254         }
    255         break;
    256 
    257     case 'o':
    258     case 'u':
    259     case 'x':
    260     case 'X':
    261         if (field_width < 0) {
    262             if (precision < 0)
    263                 printf(p, xstrtoul(argument));
    264             else
    265                 printf(p, precision, xstrtoul(argument));
    266         } else {
    267             if (precision < 0)
    268                 printf(p, field_width, xstrtoul(argument));
    269             else
    270                 printf(p, field_width, precision, xstrtoul(argument));
    271         }
    272         break;
    273 
    274     case 'f':
    275     case 'e':
    276     case 'E':
    277     case 'g':
    278     case 'G':
    279         if (field_width < 0) {
    280             if (precision < 0)
    281                 printf(p, xstrtod(argument));
    282             else
    283                 printf(p, precision, xstrtod(argument));
    284         } else {
    285             if (precision < 0)
    286                 printf(p, field_width, xstrtod(argument));
    287             else
    288                 printf(p, field_width, precision, xstrtod(argument));
    289         }
    290         break;
    291 
    292     case 'c':
    293         printf(p, *argument);
    294         break;
    295 
    296     case 's':
    297         if (field_width < 0) {
    298             if (precision < 0)
    299                 printf(p, argument);
    300             else
    301                 printf(p, precision, argument);
    302         } else {
    303             if (precision < 0)
    304                 printf(p, field_width, argument);
    305             else
    306                 printf(p, field_width, precision, argument);
    307         }
    308         break;
    309     }
    310 
    311     free(p);
    312 }
     288int printf_main(int argc, char **argv);
     289int printf_main(int argc, char **argv)
     290{
     291    char *format;
     292    int args_used;
     293
     294    if (argc <= 1 || argv[1][0] == '-') {
     295        bb_show_usage();
     296    }
     297
     298    format = argv[1];
     299    argc -= 2;
     300    argv += 2;
     301
     302    do {
     303        args_used = print_formatted(format, argc, argv);
     304        argc -= args_used;
     305        argv += args_used;
     306    } while (args_used > 0 && argc > 0);
     307
     308/*  if (argc > 0)
     309        fprintf(stderr, "excess args ignored");
     310*/
     311
     312    return EXIT_SUCCESS;
     313}
Note: See TracChangeset for help on using the changeset viewer.