6b01b71e8
Denys Vlasenko
2010-01-24
Subject
randomconfig fixes
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
archival/Config.in +2 -1coreutils/ls.c +4 -9include/unarchive.h +2 -2shell/hush.c +1 -1util-linux/fbset.c +4 -4
archival/Config.in+2 -1
| @@ -281,7 +281,8 @@ config FEATURE_TAR_NOPRESERVE_TIME | |
| default n | |
| depends on TAR | |
| help | |
| - | With this option busybox supports GNU tar -m (do not preserve time) option. |
| + | With this option busybox supports GNU tar -m |
| + | (do not preserve time) option. |
| endif #tar | |
coreutils/ls.c+4 -9
| @@ -509,15 +509,10 @@ static int sortcmp(const void *a, const void *b) | |
| /* Make dif fit into an int */ | |
| if (sizeof(dif) > sizeof(int)) { | |
| - | if (sizeof(dif) == sizeof(int)*2) { |
| - | /* typical on many arches */ |
| - | if (dif != 0) { |
| - | dif = 1 | (int)((uoff_t)dif >> (sizeof(int)*8)); |
| - | } |
| - | } else { |
| - | while ((dif & ~(off_t)INT_MAX) != 0) { |
| - | dif >>= (sizeof(int)*8 / 2); |
| - | } |
| + | enum { BITS_TO_SHIFT = 8 * (sizeof(dif) - sizeof(int)) }; |
| + | /* shift leaving only "int" worth of bits */ |
| + | if (dif != 0) { |
| + | dif = 1 | (int)((uoff_t)dif >> BITS_TO_SHIFT); |
| } | |
| } | |
include/unarchive.h+2 -2
| @@ -53,14 +53,14 @@ typedef struct archive_handle_t { | |
| off_t offset; | |
| /* Archiver specific. Can make it a union if it ever gets big */ | |
| - | #if ENABLE_TAR |
| + | #if ENABLE_TAR || ENABLE_DPKG || ENABLE_DPKG_DEB |
| smallint tar__end; | |
| # if ENABLE_FEATURE_TAR_GNU_EXTENSIONS | |
| char* tar__longname; | |
| char* tar__linkname; | |
| # endif | |
| #endif | |
| - | #if ENABLE_CPIO |
| + | #if ENABLE_CPIO || ENABLE_RPM2CPIO || ENABLE_RPM |
| uoff_t cpio__blocks; | |
| struct hardlinks_t *cpio__hardlinks_to_create; | |
| struct hardlinks_t *cpio__created_hardlinks; | |
shell/hush.c+1 -1
| @@ -1516,13 +1516,13 @@ static char* FAST_FUNC endofname(const char *name) | |
| } | |
| return p; | |
| } | |
| + | #endif |
| static void FAST_FUNC set_local_var_from_halves(const char *name, const char *val) | |
| { | |
| char *var = xasprintf("%s=%s", name, val); | |
| set_local_var(var, /*flags:*/ 0, /*lvl:*/ 0, /*ro:*/ 0); | |
| } | |
| - | #endif |
| /* | |
util-linux/fbset.c+4 -4
| @@ -189,17 +189,17 @@ static const struct cmdoptions_t { | |
| #endif | |
| }; | |
| - | #if ENABLE_FEATURE_FBSET_READMODE |
| /* taken from linux/fb.h */ | |
| enum { | |
| - | FB_VMODE_INTERLACED = 1, /* interlaced */ |
| - | FB_VMODE_DOUBLE = 2, /* double scan */ |
| FB_SYNC_HOR_HIGH_ACT = 1, /* horizontal sync high active */ | |
| FB_SYNC_VERT_HIGH_ACT = 2, /* vertical sync high active */ | |
| + | #if ENABLE_FEATURE_FBSET_READMODE |
| + | FB_VMODE_INTERLACED = 1, /* interlaced */ |
| + | FB_VMODE_DOUBLE = 2, /* double scan */ |
| FB_SYNC_EXT = 4, /* external sync */ | |
| FB_SYNC_COMP_HIGH_ACT = 8, /* composite sync high active */ | |
| - | }; |
| #endif | |
| + | }; |
| #if ENABLE_FEATURE_FBSET_READMODE | |
| static void ss(uint32_t *x, uint32_t flag, char *buf, const char *what) | |