Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/networking/netstat.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/networking/netstat.c (modified) (6 diffs)

branches/3.3/mindi-busybox/networking/netstat.c

@@ -120 +120 @@
 /* When there are IPv6 connections the IPv6 addresses will be
  * truncated to none-recognition. The '-W' option makes the
- * address columns wide enough to accomodate for longest possible
+ * address columns wide enough to accommodate for longest possible
  * IPv6 addresses, i.e. addresses of the form
  * xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:ddd.ddd.ddd.ddd
@@ -126 +126 @@
 #define ADDR_WIDE                51  /* INET6_ADDRSTRLEN + 5 for the port number */
 #if ENABLE_FEATURE_NETSTAT_WIDE
-# define FMT_NET_CONN_DATA       "%s   %6ld %6ld %-*s %-*s %-12s"
+# define FMT_NET_CONN_DATA       "%s   %6lu %6lu %-*s %-*s %-12s"
 # define FMT_NET_CONN_HEADER     "\nProto Recv-Q Send-Q %-*s %-*s State       %s\n"
 #else
-# define FMT_NET_CONN_DATA       "%s   %6ld %6ld %-23s %-23s %-12s"
+# define FMT_NET_CONN_DATA       "%s   %6lu %6lu %-23s %-23s %-12s"
 # define FMT_NET_CONN_HEADER     "\nProto Recv-Q Send-Q %-23s %-23s State       %s\n"
 #endif
@@ -229 +229 @@
     long inode = -1;
 
-    if (strncmp(lname, "socket:[", sizeof("socket:[")-1) == 0) {
+    if (is_prefixed_with(lname, "socket:[")) {
         /* "socket:[12345]", extract the "12345" as inode */
         inode = bb_strtoul(lname + sizeof("socket:[")-1, (char**)&lname, 0);
         if (*lname != ']')
             inode = -1;
-    } else if (strncmp(lname, "[0000]:", sizeof("[0000]:")-1) == 0) {
+    } else if (is_prefixed_with(lname, "[0000]:")) {
         /* "[0000]:12345", extract the "12345" as inode */
         inode = bb_strtoul(lname + sizeof("[0000]:")-1, NULL, 0);
@@ -404 +404 @@
             "%32[0-9A-Fa-f]:%X %X "
             "%lX:%lX %*X:%*X "
-            "%*X %d %*d %ld ",
+            "%*X %d %*d %lu ",
             local_addr, &param->local_port,
             rem_addr, &param->rem_port, &param->state,
@@ -612 +612 @@
     strcat(ss_flags, "]");
 
-    printf("%-5s %-6ld %-11s %-10s %-13s %6lu ",
+    printf("%-5s %-6lu %-11s %-10s %-13s %6lu ",
         ss_proto, refcnt, ss_flags, ss_type, ss_state, inode
         );
@@ -623 +623 @@
     /* TODO: currently we stop at first NUL byte. Is it a problem? */
     line += path_ofs;
-    *strchrnul(line, '\n') = '\0';
+    chomp(line);
     while (*line)
         fputc_printable(*line++, stdout);