ifdata: Don't assume that all interface names are 6 characters or less, for instance...

diff --git a/debian/changelog b/debian/changelog
index d9d20e7d3efdfb37e803f3d2e8d4ddbbe15f4b2b..aac1f3f4088ff9e131c090be10f1efc5db019d51 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+moreutils (0.35) UNRELEASED; urgency=low
+
+  * ifdata: Don't assume that all interface names are 6 characters or less,
+    for instance "wmaster0" is longer. Increase the limit to 20 characters.
+    Closes: #526654 (Thanks, Alan Pope)
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 02 May 2009 20:40:23 -0400
+
 moreutils (0.34) unstable; urgency=low
 
   * vipe: Avoid dying on empty input. Thanks, Anders Kaseorg

diff --git a/ifdata.c b/ifdata.c
index f8fa0240cfe7d245c22dbd09d77be08e479ada1d..ba68edced696c617214a22b0a677e165d9c1dd8d 100644 (file)
--- a/ifdata.c
+++ b/ifdata.c
@@ -246,7 +246,7 @@ struct if_stat *get_stats(const char *iface) {
 
        do {
                int items = fscanf(fd,
-                       " %6[^:]:%llu %llu %llu %llu %llu %llu %llu %llu "
+                       " %20[^:]:%llu %llu %llu %llu %llu %llu %llu %llu "
                        "%llu %llu %llu %llu %llu %llu %llu %llu",
                        name,
                        &ifstat->in_bytes,    &ifstat->in_packets,