svn commit: trunk/busybox: coreutils e2fsprogs/blkid libbb networki etc...
aldot at busybox.net
aldot at busybox.net
Wed Mar 29 22:34:48 UTC 2006
Author: aldot
Date: 2006-03-29 14:34:47 -0800 (Wed, 29 Mar 2006)
New Revision: 14697
Log:
- Rich Felker writes: fix invalid printf format strings
http://busybox.net/lists/busybox/2006-March/019568.html
text data bss dec hex filename
900619 10316 1038724 1949659 1dbfdb busybox.oorig
900603 10316 1038724 1949643 1dbfcb busybox
Modified:
trunk/busybox/coreutils/stat.c
trunk/busybox/e2fsprogs/blkid/blkid_getsize.c
trunk/busybox/libbb/human_readable.c
trunk/busybox/networking/interface.c
Changeset:
Modified: trunk/busybox/coreutils/stat.c
===================================================================
--- trunk/busybox/coreutils/stat.c 2006-03-29 22:28:27 UTC (rev 14696)
+++ trunk/busybox/coreutils/stat.c 2006-03-29 22:34:47 UTC (rev 14697)
@@ -400,7 +400,7 @@
#else
format = (flags & OPT_TERSE
- ? "%s %Lx %lu "
+ ? "%s %llx %lu "
: " File: \"%s\"\n"
" ID: %-8Lx Namelen: %-7lu ");
printf(format,
Modified: trunk/busybox/e2fsprogs/blkid/blkid_getsize.c
===================================================================
--- trunk/busybox/e2fsprogs/blkid/blkid_getsize.c 2006-03-29 22:28:27 UTC (rev 14696)
+++ trunk/busybox/e2fsprogs/blkid/blkid_getsize.c 2006-03-29 22:34:47 UTC (rev 14697)
@@ -173,7 +173,7 @@
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;
}
Modified: trunk/busybox/libbb/human_readable.c
===================================================================
--- trunk/busybox/libbb/human_readable.c 2006-03-29 22:28:27 UTC (rev 14696)
+++ trunk/busybox/libbb/human_readable.c 2006-03-29 22:34:47 UTC (rev 14697)
@@ -33,8 +33,8 @@
{
/* 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 @@
if ( frac >= 5 ) {
++val;
}
- f = "%Lu%*c" /* fmt_no_tenths */ ;
+ f = "%llu%*c" /* fmt_no_tenths */ ;
frac = 1;
}
#endif
Modified: trunk/busybox/networking/interface.c
===================================================================
--- trunk/busybox/networking/interface.c 2006-03-29 22:28:27 UTC (rev 14696)
+++ trunk/busybox/networking/interface.c 2006-03-29 22:34:47 UTC (rev 14697)
@@ -1038,23 +1038,23 @@
* 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 @@
#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 @@
*/
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");
More information about the busybox-cvs
mailing list