source: MondoRescue/branches/stable/mindi-busybox/libbb/xatonum_template.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)

  • Property svn:eol-style set to native
File size: 4.6 KB
Line 
1/*
2You need to define the following (example):
3
4#define type long
5#define xstrtou(rest) xstrtoul##rest
6#define xstrto(rest) xstrtol##rest
7#define xatou(rest) xatoul##rest
8#define xato(rest) xatol##rest
9#define XSTR_UTYPE_MAX ULONG_MAX
10#define XSTR_TYPE_MAX LONG_MAX
11#define XSTR_TYPE_MIN LONG_MIN
12#define XSTR_STRTOU strtoul
13*/
14
15unsigned type xstrtou(_range_sfx)(const char *numstr, int base,
16 unsigned type lower,
17 unsigned type upper,
18 const struct suffix_mult *suffixes)
19{
20 unsigned type r;
21 int old_errno;
22 char *e;
23
24 /* Disallow '-' and any leading whitespace. Speed isn't critical here
25 * since we're parsing commandline args. So make sure we get the
26 * actual isspace function rather than a lnumstrer macro implementaion. */
27 if (*numstr == '-' || *numstr == '+' || (isspace)(*numstr))
28 goto inval;
29
30 /* Since this is a lib function, we're not allowed to reset errno to 0.
31 * Doing so could break an app that is deferring checking of errno.
32 * So, save the old value so that we can restore it if successful. */
33 old_errno = errno;
34 errno = 0;
35 r = XSTR_STRTOU(numstr, &e, base);
36 /* Do the initial validity check. Note: The standards do not
37 * guarantee that errno is set if no digits were found. So we
38 * must test for this explicitly. */
39 if (errno || numstr == e)
40 goto inval; /* error / no digits / illegal trailing chars */
41
42 errno = old_errno; /* Ok. So restore errno. */
43
44 /* Do optional suffix parsing. Allow 'empty' suffix tables.
45 * Note that we also allow nul suffixes with associated multipliers,
46 * to allow for scaling of the numstr by some default multiplier. */
47 if (suffixes) {
48 while (suffixes->mult) {
49 if (strcmp(suffixes->suffix, e) == 0) {
50 if (XSTR_UTYPE_MAX / suffixes->mult < r)
51 goto range; /* overflow! */
52 r *= suffixes->mult;
53 goto chk_range;
54 }
55 ++suffixes;
56 }
57 }
58
59 /* Note: trailing space is an error.
60 It would be easy enough to allow though if desired. */
61 if (*e)
62 goto inval;
63 chk_range:
64 /* Finally, check for range limits. */
65 if (r >= lower && r <= upper)
66 return r;
67 range:
68 bb_error_msg_and_die("number %s is not in %llu..%llu range",
69 numstr, (unsigned long long)lower,
70 (unsigned long long)upper);
71 inval:
72 bb_error_msg_and_die("invalid number '%s'", numstr);
73}
74
75unsigned type xstrtou(_range)(const char *numstr, int base,
76 unsigned type lower,
77 unsigned type upper)
78{
79 return xstrtou(_range_sfx)(numstr, base, lower, upper, NULL);
80}
81
82unsigned type xstrtou(_sfx)(const char *numstr, int base,
83 const struct suffix_mult *suffixes)
84{
85 return xstrtou(_range_sfx)(numstr, base, 0, XSTR_UTYPE_MAX, suffixes);
86}
87
88unsigned type xstrtou()(const char *numstr, int base)
89{
90 return xstrtou(_range_sfx)(numstr, base, 0, XSTR_UTYPE_MAX, NULL);
91}
92
93unsigned type xatou(_range_sfx)(const char *numstr,
94 unsigned type lower,
95 unsigned type upper,
96 const struct suffix_mult *suffixes)
97{
98 return xstrtou(_range_sfx)(numstr, 10, lower, upper, suffixes);
99}
100
101unsigned type xatou(_range)(const char *numstr,
102 unsigned type lower,
103 unsigned type upper)
104{
105 return xstrtou(_range_sfx)(numstr, 10, lower, upper, NULL);
106}
107
108unsigned type xatou(_sfx)(const char *numstr,
109 const struct suffix_mult *suffixes)
110{
111 return xstrtou(_range_sfx)(numstr, 10, 0, XSTR_UTYPE_MAX, suffixes);
112}
113
114unsigned type xatou()(const char *numstr)
115{
116 return xatou(_sfx)(numstr, NULL);
117}
118
119/* Signed ones */
120
121type xstrto(_range_sfx)(const char *numstr, int base,
122 type lower,
123 type upper,
124 const struct suffix_mult *suffixes)
125{
126 unsigned type u = XSTR_TYPE_MAX;
127 type r;
128 const char *p = numstr;
129
130 if (p[0] == '-') {
131 ++p;
132 ++u; /* two's complement */
133 }
134
135 r = xstrtou(_range_sfx)(p, base, 0, u, suffixes);
136
137 if (*numstr == '-') {
138 r = -r;
139 }
140
141 if (r < lower || r > upper) {
142 bb_error_msg_and_die("number %s is not in %lld..%lld range",
143 numstr, (long long)lower, (long long)upper);
144 }
145
146 return r;
147}
148
149type xstrto(_range)(const char *numstr, int base, type lower, type upper)
150{
151 return xstrto(_range_sfx)(numstr, base, lower, upper, NULL);
152}
153
154type xato(_range_sfx)(const char *numstr,
155 type lower,
156 type upper,
157 const struct suffix_mult *suffixes)
158{
159 return xstrto(_range_sfx)(numstr, 10, lower, upper, suffixes);
160}
161
162type xato(_range)(const char *numstr, type lower, type upper)
163{
164 return xstrto(_range_sfx)(numstr, 10, lower, upper, NULL);
165}
166
167type xato(_sfx)(const char *numstr, const struct suffix_mult *suffixes)
168{
169 return xstrto(_range_sfx)(numstr, 10, XSTR_TYPE_MIN, XSTR_TYPE_MAX, suffixes);
170}
171
172type xato()(const char *numstr)
173{
174 return xstrto(_range_sfx)(numstr, 10, XSTR_TYPE_MIN, XSTR_TYPE_MAX, NULL);
175}
176
177#undef type
178#undef xstrtou
179#undef xstrto
180#undef xatou
181#undef xato
182#undef XSTR_UTYPE_MAX
183#undef XSTR_TYPE_MAX
184#undef XSTR_TYPE_MIN
185#undef XSTR_STRTOU
Note: See TracBrowser for help on using the repository browser.