rpms/procps/devel procps-pmap-smaps.patch,1.2,1.3

Daniel Novotny dnovotny at fedoraproject.org
Mon Feb 8 14:43:42 UTC 2010


Author: dnovotny

Update of /cvs/extras/rpms/procps/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30935

Modified Files:
	procps-pmap-smaps.patch 
Log Message:
fix the patch


procps-pmap-smaps.patch:
 pmap.c |   87 +++++++++++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 69 insertions(+), 18 deletions(-)

Index: procps-pmap-smaps.patch
===================================================================
RCS file: /cvs/extras/rpms/procps/devel/procps-pmap-smaps.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- procps-pmap-smaps.patch	8 Feb 2010 14:34:22 -0000	1.2
+++ procps-pmap-smaps.patch	8 Feb 2010 14:43:42 -0000	1.3
@@ -1,7 +1,7 @@
-diff -up procps-3.2.7/pmap.c.smap procps-3.2.7/pmap.c
---- procps-3.2.7/pmap.c.smap	2010-02-08 12:25:08.000000000 +0100
-+++ procps-3.2.7/pmap.c	2010-02-08 12:30:13.000000000 +0100
-@@ -123,24 +123,38 @@ static int one_proc(proc_t *p){
+diff -up procps-3.2.8/pmap.c.pmap procps-3.2.8/pmap.c
+--- procps-3.2.8/pmap.c.pmap	2008-10-19 21:34:34.000000000 +0200
++++ procps-3.2.8/pmap.c	2010-02-08 15:40:19.000000000 +0100
+@@ -126,24 +126,38 @@ static int one_proc(proc_t *p){
    char buf[32];
    char mapbuf[9600];
    char cmdbuf[512];
@@ -43,7 +43,7 @@ diff -up procps-3.2.7/pmap.c.smap procps
      }
      if(d_option){
        if(sizeof(KLONG)==4) printf("Address   Kbytes Mode  Offset           Device    Mapping\n");
-@@ -148,12 +162,54 @@ static int one_proc(proc_t *p){
+@@ -151,12 +165,54 @@ static int one_proc(proc_t *p){
      }
    }
  
@@ -98,9 +98,9 @@ diff -up procps-3.2.7/pmap.c.smap procps
 +      }
 +    }
      sscanf(mapbuf,"%"KLF"x-%"KLF"x %31s %Lx %x:%x %Lu", &start, &end, flags, &file_offset, &dev_major, &dev_minor, &inode);
-     tmp = strchr(mapbuf,'\n');
-     if(tmp) *tmp='\0';
-@@ -177,16 +233,9 @@ static int one_proc(proc_t *p){
+ 
+     if(start > range_high)
+@@ -186,16 +242,9 @@ static int one_proc(proc_t *p){
      flags[5] = '\0';
  
      if(x_option){
@@ -120,7 +120,7 @@ diff -up procps-3.2.7/pmap.c.smap procps
      }
      if(d_option){
        const char *cp = mapping_name(p, start, diff, mapbuf, 0, dev_major, dev_minor, inode);
-@@ -220,10 +269,12 @@ static int one_proc(proc_t *p){
+@@ -232,10 +281,12 @@ static int one_proc(proc_t *p){
    if(!q_option){
      if(x_option){
        if(sizeof(KLONG)==8){



More information about the scm-commits mailing list