[net-tools] Improved netstat-p-basename.patch

Jiří Popelka jpopelka at fedoraproject.org
Fri Jun 17 11:07:30 UTC 2011


commit d6dc1444ab4ff15022cda780b312d382b7bb009a
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Thu Jun 9 12:07:02 2011 +0200

    Improved netstat-p-basename.patch

 net-tools-1.60-netstat-p-basename.patch |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)
---
diff --git a/net-tools-1.60-netstat-p-basename.patch b/net-tools-1.60-netstat-p-basename.patch
index 6ead27c..c569079 100644
--- a/net-tools-1.60-netstat-p-basename.patch
+++ b/net-tools-1.60-netstat-p-basename.patch
@@ -1,7 +1,16 @@
 diff -up net-tools-1.60/netstat.c.p-basename net-tools-1.60/netstat.c
---- net-tools-1.60/netstat.c.p-basename	2011-04-21 13:52:51.000000000 +0200
-+++ net-tools-1.60/netstat.c	2011-04-21 13:54:03.000000000 +0200
-@@ -484,7 +484,7 @@ static void prg_cache_load(void)
+--- net-tools-1.60/netstat.c.p-basename	2011-06-09 12:01:59.907721330 +0200
++++ net-tools-1.60/netstat.c	2011-06-09 12:02:28.437352480 +0200
+@@ -413,7 +413,7 @@ static void prg_cache_load(void)
+ {
+     char line[LINE_MAX],eacces=0;
+     int procfdlen,fd,cmdllen,lnamelen;
+-    char lname[30],cmdlbuf[512],finbuf[PROGNAME_WIDTH];
++    char lname[30],cmdlbuf[512],finbuf[PROGNAME_WIDTH],*cmdlpend;
+     unsigned long inode;
+     const char *cs,*cmdlp;
+     DIR *dirproc=NULL,*dirfd=NULL;
+@@ -484,10 +484,12 @@ static void prg_cache_load(void)
  		    continue;
  		if (cmdllen < sizeof(cmdlbuf) - 1) 
  		    cmdlbuf[cmdllen]='\0';
@@ -10,3 +19,8 @@ diff -up net-tools-1.60/netstat.c.p-basename net-tools-1.60/netstat.c
  		    cmdlp++;
  		else 
  		    cmdlp = cmdlbuf;
++		if ((cmdlpend = strrchr(cmdlp, ':')) != NULL)
++		    *cmdlpend = '\0';
+ 	    }
+ 
+ 	    snprintf(finbuf, sizeof(finbuf), "%s/%s", direproc->d_name, cmdlp);


More information about the scm-commits mailing list