commit ab22b99de6df32cd0a51a5096483b1c363f936b5
author Dima Zavin <dima@android.com> Tue Jun 04 19:39:35 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 04 19:39:35 2013 +0000
tree 3d01b05f9ba1a1c2773986766c8a8b71f48cdc7a
parent 89c2be335dcae504c89b804c6781cdd2bdd3112c
parent abb7d58010da1fcd466e6e032c5f7bf8810ed4dd

Merge "HACK: cutils: restore record_stream temporarily"

toolbox/log.c

diff --git a/toolbox/log.c b/toolbox/log.c
index f30e6a7..0bee19e 100644
--- a/toolbox/log.c
+++ b/toolbox/log.c
@@ -130,8 +130,8 @@
     buffer[0] = '\0';
     
     for (i = optind ; i < argc ; i++) {
-        strncat(buffer, argv[i], sizeof(buffer)-1);
-        strncat(buffer, " ", sizeof(buffer)-1);
+        strlcat(buffer, argv[i], sizeof(buffer)-1);
+        strlcat(buffer, " ", sizeof(buffer)-1);
     }
 
     if(buffer[0] == 0) {

toolbox/netstat.c

diff --git a/toolbox/netstat.c b/toolbox/netstat.c
index 5768599..05dc640 100644
--- a/toolbox/netstat.c
+++ b/toolbox/netstat.c
@@ -108,7 +108,7 @@
             addr2str(AF_INET, &raddr, rport, rip);
 
             printf("%4s  %6d %6d %-22s %-22s %s\n",
-                   label, txq, rxq, lip, rip,
+                   label, rxq, txq, lip, rip,
                    state2str(state));
         }
     }
@@ -136,7 +136,7 @@
             addr2str(AF_INET6, &raddr6, rport, rip);
 
             printf("%4s  %6d %6d %-22s %-22s %s\n",
-                   label, txq, rxq, lip, rip,
+                   label, rxq, txq, lip, rip,
                    state2str(state));
         }
     }