[BusyBox-cvs] CVS update of busybox/libbb (interface.c)

[Erik Andersen]

    Date: Thursday, August 26, 2004 @ 15:45:22
  Author: andersen
    Path: /var/cvs/busybox/libbb

Modified: interface.c (1.24 -> 1.25)

Felipe Kellermann writes:

Unfortunatelly I've not followed the last two or three weeks commits (new
semester started and so now I rarely have time to fix my personal bridge)
but tonight I synched my tree and immediately noticed a rather nasty bug!

[Using libbb/interface.c:1.24]
# grep eth0 /proc/net/dev | xargs
eth0:311708397 237346 1670 0 1789 1670 0 0 22580308 120297 0 0 0 102 0 0

# ifconfig eth0
eth0      Link encap:Ethernet  HWaddr 00:20:AF:7C:EA:B7
          inet addr:10.0.0.1  Bcast:10.0.0.127  Mask:255.255.255.128
          UP BROADCAST RUNNING MULTICAST  MTU:1500  Metric:1
          RX packets:0 errors:0 dropped:0 overruns:0 frame:0
          TX packets:0 errors:0 dropped:0 overruns:0 carrier:0
          collisions:0 txqueuelen:1000
          RX bytes:0 (0.0 B)  TX bytes:0 (0.0 B)
          Interrupt:5 Base address:0x320


All values `ifconfig' is showing are `zeroed' -- I quickly looked at the
last commits I missed and noticed that there were a commit relating to
ifconfig, libbb/interface.c:1.23->1.24 (PatchSet 4338).

I've reversed the patch and now everything is working again.  I compared
the get_name's return values from the 1.23 and 1.24 and quickly noticed
that the new revision is leaving `p' right on the sep while the rev 1.23
was leaving it right on the starting of the values...

1-line, 1/3-minute patch attached  :-)


Index: busybox/libbb/interface.c
diff -u busybox/libbb/interface.c:1.24 busybox/libbb/interface.c:1.25
--- busybox/libbb/interface.c:1.24	Thu Aug 12 10:52:00 2004
+++ busybox/libbb/interface.c	Thu Aug 26 15:45:21 2004
@@ -1016,7 +1016,7 @@
 		/* first ':' not found - return empty */
 		name[0]='\0';
 	}
-	return p;
+	return p + 1;
 }
 
 /* If scanf supports size qualifiers for %n conversions, then we can