rpms/procps/F-7 procps-3.2.7-ps-eip64.patch, NONE, 1.1 procps.spec, 1.61, 1.62

[Tomas Smetana (tsmetana)]

Author: tsmetana

Update of /cvs/pkgs/rpms/procps/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25154

Modified Files:
	procps.spec 
Added Files:
	procps-3.2.7-ps-eip64.patch 
Log Message:
Resolves #244152: ps truncates eip/esp on 64-bit systems

procps-3.2.7-ps-eip64.patch:

--- NEW FILE procps-3.2.7-ps-eip64.patch ---
--- procps-3.2.7/ps/ps.1.eip64	2007-06-14 11:08:35.000000000 +0200
+++ procps-3.2.7/ps/ps.1	2007-06-14 11:03:28.000000000 +0200
@@ -1156,6 +1156,14 @@
 or\ a\ decimal representation otherwise.
 T}
 
+rip	RIP	T{
+64-bit instruction pointer.
+T}
+
+rsp	RSP	T{
+64-bit stack pointer.
+T}
+
 rss	RSS	T{
 resident set size, the non\-swapped physical memory that
 a task has used (in\ kiloBytes).
--- procps-3.2.7/ps/output.c.eip64	2007-06-14 11:08:24.000000000 +0200
+++ procps-3.2.7/ps/output.c	2007-06-14 10:58:21.000000000 +0200
@@ -764,10 +764,18 @@
     return snprintf(outbuf, COLWID, "%08x", (unsigned)(pp->kstk_esp));
 }
 
+static int pr_rsp(char *restrict const outbuf, const proc_t *restrict const pp){
+    return snprintf(outbuf, COLWID, "%016lx", (unsigned long)(pp->kstk_esp));
+}
+
 static int pr_eip(char *restrict const outbuf, const proc_t *restrict const pp){
     return snprintf(outbuf, COLWID, "%08x", (unsigned)(pp->kstk_eip));
 }
 
+static int pr_rip(char *restrict const outbuf, const proc_t *restrict const pp){
+    return snprintf(outbuf, COLWID, "%016lx", (unsigned long)(pp->kstk_eip));
+}
+
 /* This function helps print old-style time formats */
 static int old_time_helper(char *dst, unsigned long long t, unsigned long long rel) {
   if(!t)            return snprintf(dst, COLWID, "    -");
@@ -1403,7 +1411,9 @@
 {"resident",  "RES",     pr_nop,      sr_resident, 5,MEM,    LNX, PO|RIGHT},
 {"rgid",      "RGID",    pr_rgid,     sr_rgid,    5,   0,    XXX, ET|RIGHT},
 {"rgroup",    "RGROUP",  pr_rgroup,   sr_rgroup,  8, GRP,    U98, ET|USER}, /* was 8 wide */
+{"rip",       "RIP",     pr_rip,      sr_kstk_eip, 16, 0,    LNX, TO|RIGHT},
 {"rlink",     "RLINK",   pr_nop,      sr_nop,     8,   0,    BSD, AN|RIGHT},
+{"rsp",       "RSP",     pr_rsp,      sr_kstk_eip, 16, 0,    LNX, TO|RIGHT},
 {"rss",       "RSS",     pr_rss,      sr_rss,     5,   0,    XXX, PO|RIGHT}, /* was 5 wide */
 {"rssize",    "RSS",     pr_rss,      sr_vm_rss,  5,   0,    DEC, PO|RIGHT}, /*rsz*/
 {"rsz",       "RSZ",     pr_rss,      sr_vm_rss,  5,   0,    BSD, PO|RIGHT}, /*rssize*/


Index: procps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/procps/F-7/procps.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- procps.spec	23 May 2007 08:29:15 -0000	1.61
+++ procps.spec	18 Jun 2007 09:08:19 -0000	1.62
@@ -1,7 +1,7 @@
 Summary: System and process monitoring utilities
 Name: procps
 Version: 3.2.7
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://procps.sourceforge.net
@@ -56,6 +56,8 @@
 Patch26: procps-3.2.7-ps-stime.patch
 #208217 - command "ps jax --sort=uid,-ppid,+pid" fails
 Patch27: procps-3.2.7-ps-plussort.patch
+#244152 - ps truncates eip and esp to 32-bit values on 64-bit systems
+Patch28: procps-3.2.7-ps-eip64.patch
 
 BuildRequires: ncurses-devel
 
@@ -108,6 +110,7 @@
 %patch25 -p1
 %patch26 -p1
 %patch27 -p1
+%patch28 -p1
 
 cp %SOURCE1 .
 
@@ -145,6 +148,9 @@
 %attr(0644,root,root) %{_mandir}/man5/*
 
 %changelog
+* Mon Jun 18 2007 Tomas Smetana <tsmetana at redhat.com> 3.2.7-14
+- fix #244152 ps truncates eip and esp to 32-bit values on 64-bit systems
+
 * Tue May 22 2007 Tomas Smetana <tsmetana at redhat.com> 3.2.7-13
 - fix #208217 - ps does not accept '+' in sort specifier