← Commit list

d409c3a2f

Bernhard Reutner-Fischer
Bernhard Reutner-Fischer
2006-03-29
SOURCE BUG Duration: 13s

Subject

- Rich Felker writes: fix invalid printf format strings http://busybox.net/lists/busybox/2006-March/019568.html

SOURCE BUG

This commit was genuinely broken at the time (not related to our build system): scripts/config/mkconfigs.c (2005-08-01 - 2006-10-05 arasi) uretilen bbconfigopts.h icine .config satirlarini kacissiz, ham newline'larla gömüyordu - gecerli C degildi, busybox'un kendi bb_mkdep araci bile parse edemiyordu (7d219aab7 ile duzeltildi, mkconfigs shell scripte cevrildi)

→ Bu hatanin tam hikayesini ve duzeltme diffini gor

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

coreutils/stat.c +1 -1e2fsprogs/blkid/blkid_getsize.c +1 -1libbb/human_readable.c +3 -3networking/interface.c +16 -16
coreutils/stat.c+1 -1
@@ -400,7 +400,7 @@ static int do_statfs(char const *filename, char const *format)
#else
format = (flags & OPT_TERSE
- ? "%s %Lx %lu "
+ ? "%s %llx %lu "
: " File: \"%s\"\n"
" ID: %-8Lx Namelen: %-7lu ");
printf(format,
e2fsprogs/blkid/blkid_getsize.c+1 -1
@@ -173,7 +173,7 @@ int main(int argc, char **argv)
perror(argv[0]);
bytes = blkid_get_dev_size(fd);
- printf("Device %s has %Ld 1k blocks.\n", argv[1], bytes >> 10);
+ printf("Device %s has %lld 1k blocks.\n", argv[1], bytes >> 10);
return 0;
}
libbb/human_readable.c+3 -3
@@ -33,8 +33,8 @@ const char *make_human_readable_str(unsigned long long size,
{
/* The code will adjust for additional (appended) units. */
static const char zero_and_units[] = { '0', 0, 'k', 'M', 'G', 'T' };
- static const char fmt[] = "%Lu";
- static const char fmt_tenths[] = "%Lu.%d%c";
+ static const char fmt[] = "%llu";
+ static const char fmt_tenths[] = "%llu.%d%c";
static char str[21]; /* Sufficient for 64 bit unsigned integers. */
@@ -74,7 +74,7 @@ const char *make_human_readable_str(unsigned long long size,
if ( frac >= 5 ) {
++val;
}
- f = "%Lu%*c" /* fmt_no_tenths */ ;
+ f = "%llu%*c" /* fmt_no_tenths */ ;
frac = 1;
}
#endif
networking/interface.c+16 -16
@@ -1038,23 +1038,23 @@ static char *get_name(char *name, char *p)
* args. */
/* static const char * const ss_fmt[] = { */
-/* "%Ln%Lu%lu%lu%lu%lu%ln%ln%Ln%Lu%lu%lu%lu%lu%lu", */
-/* "%Lu%Lu%lu%lu%lu%lu%ln%ln%Lu%Lu%lu%lu%lu%lu%lu", */
-/* "%Lu%Lu%lu%lu%lu%lu%lu%lu%Lu%Lu%lu%lu%lu%lu%lu%lu" */
+/* "%lln%llu%lu%lu%lu%lu%ln%ln%lln%llu%lu%lu%lu%lu%lu", */
+/* "%llu%llu%lu%lu%lu%lu%ln%ln%llu%llu%lu%lu%lu%lu%lu", */
+/* "%llu%llu%lu%lu%lu%lu%lu%lu%llu%llu%lu%lu%lu%lu%lu%lu" */
/* }; */
/* Lie about the size of the int pointed to for %n. */
#if INT_MAX == LONG_MAX
static const char * const ss_fmt[] = {
- "%n%Lu%u%u%u%u%n%n%n%Lu%u%u%u%u%u",
- "%Lu%Lu%u%u%u%u%n%n%Lu%Lu%u%u%u%u%u",
- "%Lu%Lu%u%u%u%u%u%u%Lu%Lu%u%u%u%u%u%u"
+ "%n%llu%u%u%u%u%n%n%n%llu%u%u%u%u%u",
+ "%llu%llu%u%u%u%u%n%n%llu%llu%u%u%u%u%u",
+ "%llu%llu%u%u%u%u%u%u%llu%llu%u%u%u%u%u%u"
};
#else
static const char * const ss_fmt[] = {
- "%n%Lu%lu%lu%lu%lu%n%n%n%Lu%lu%lu%lu%lu%lu",
- "%Lu%Lu%lu%lu%lu%lu%n%n%Lu%Lu%lu%lu%lu%lu%lu",
- "%Lu%Lu%lu%lu%lu%lu%lu%lu%Lu%Lu%lu%lu%lu%lu%lu%lu"
+ "%n%llu%lu%lu%lu%lu%n%n%n%llu%lu%lu%lu%lu%lu",
+ "%llu%llu%lu%lu%lu%lu%n%n%llu%llu%lu%lu%lu%lu%lu",
+ "%llu%llu%lu%lu%lu%lu%lu%lu%llu%llu%lu%lu%lu%lu%lu%lu"
};
#endif
@@ -1748,7 +1748,7 @@ static void print_bytes_scaled(unsigned long long ull, const char *end)
#endif
} while (i);
- printf("X bytes:%Lu (%Lu.%u %sB)%s", ull, int_part, frac_part, ext, end);
+ printf("X bytes:%llu (%llu.%u %sB)%s", ull, int_part, frac_part, ext, end);
}
static const char * const ife_print_flags_strs[] = {
@@ -1989,23 +1989,23 @@ static void ife_print(struct interface *ptr)
*/
printf(" ");
- printf(_("RX packets:%Lu errors:%lu dropped:%lu overruns:%lu frame:%lu\n"),
+ printf("RX packets:%llu errors:%lu dropped:%lu overruns:%lu frame:%lu\n",
ptr->stats.rx_packets, ptr->stats.rx_errors,
ptr->stats.rx_dropped, ptr->stats.rx_fifo_errors,
ptr->stats.rx_frame_errors);
if (can_compress)
- printf(_(" compressed:%lu\n"),
+ printf(" compressed:%lu\n",
ptr->stats.rx_compressed);
printf(" ");
- printf(_("TX packets:%Lu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n"),
+ printf("TX packets:%llu errors:%lu dropped:%lu overruns:%lu carrier:%lu\n",
ptr->stats.tx_packets, ptr->stats.tx_errors,
ptr->stats.tx_dropped, ptr->stats.tx_fifo_errors,
ptr->stats.tx_carrier_errors);
- printf(_(" collisions:%lu "), ptr->stats.collisions);
+ printf(" collisions:%lu "), ptr->stats.collisions;
if (can_compress)
- printf(_("compressed:%lu "), ptr->stats.tx_compressed);
+ printf("compressed:%lu ", ptr->stats.tx_compressed);
if (ptr->tx_queue_len != -1)
- printf(_("txqueuelen:%d "), ptr->tx_queue_len);
+ printf("txqueuelen:%d ", ptr->tx_queue_len);
printf("\n R");
print_bytes_scaled(ptr->stats.rx_bytes, " T");
print_bytes_scaled(ptr->stats.tx_bytes, "\n");