[procps-ng/f20] - Skipping trailing zeros in read_unvectored (#1057600)
Jaromír Cápík
jcapik at fedoraproject.org
Fri Jan 24 17:45:13 UTC 2014
commit 7ec9500d0ec38e1c961be027ed9fdec418391bfd
Author: Jaromir Capik <jcapik at redhat.com>
Date: Fri Jan 24 18:45:09 2014 +0100
- Skipping trailing zeros in read_unvectored (#1057600)
ksh-skip-trailing-zeros.patch | 11 +++++++++++
procps-ng.spec | 7 ++++++-
2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/ksh-skip-trailing-zeros.patch b/ksh-skip-trailing-zeros.patch
new file mode 100644
index 0000000..16dd067
--- /dev/null
+++ b/ksh-skip-trailing-zeros.patch
@@ -0,0 +1,11 @@
+diff -Naur procps-ng-3.3.9.orig/proc/readproc.c procps-ng-3.3.9/proc/readproc.c
+--- procps-ng-3.3.9.orig/proc/readproc.c 2013-11-25 10:57:32.000000000 +0100
++++ procps-ng-3.3.9/proc/readproc.c 2014-01-24 16:20:02.222000000 +0100
+@@ -686,6 +686,7 @@
+ close(fd);
+ if(n){
+ int i=n;
++ while(i && dst[i-1]=='\0') --i; // skip trailing zeros
+ while(i--)
+ if(dst[i]=='\n' || dst[i]=='\0') dst[i]=sep;
+ if(dst[n-1]==' ') dst[n-1]='\0';
diff --git a/procps-ng.spec b/procps-ng.spec
index a00a6f1..3f6084b 100644
--- a/procps-ng.spec
+++ b/procps-ng.spec
@@ -4,7 +4,7 @@
Summary: System and process monitoring utilities
Name: procps-ng
Version: 3.3.8
-Release: 14%{?dist}
+Release: 15%{?dist}
License: GPL+ and GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+
Group: Applications/System
URL: https://sourceforge.net/projects/procps-ng/
@@ -20,6 +20,7 @@ Patch5: procps-ng-3.3.8-RH-man-page-check.patch
Patch6: procps-ng-3.3.8-libselinux.patch
Patch7: procps-ng-3.3.8-free-shmem.patch
Patch8: 0002-top-restore-the-lost-final-newline-when-in-Batch-mod.patch
+Patch9: ksh-skip-trailing-zeros.patch
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
@@ -87,6 +88,7 @@ System and process monitoring utilities development headers
%patch6 -p1
%patch7 -p1
%patch8 -p1
+%patch9 -p1
%build
# The following stuff is needed for git archives only
@@ -153,6 +155,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/sysctl.d
%{_includedir}/proc
%changelog
+* Fri Jan 24 2014 Jaromir Capik <jcapik at redhat.com> - 3.3.8-15
+- Skipping trailing zeros in read_unvectored (#1057600)
+
* Tue Sep 17 2013 Jaromir Capik <jcapik at redhat.com> - 3.3.8-14
- top: Fixing missing newline when running in the batch mode (#1008674)
More information about the scm-commits
mailing list