From 01f32662b6eca36ea177085a8e01f8142eb20255 Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Mon, 6 May 2013 17:30:58 +0200 Subject: [PATCH] [testsuite] [RHEL-5] Fix gdb-orphanripper.c runtime error. --- gdb-orphanripper.c | 6 +++--- gdb.spec | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gdb-orphanripper.c b/gdb-orphanripper.c index d79d93c..2653dd2 100644 --- a/gdb-orphanripper.c +++ b/gdb-orphanripper.c @@ -108,7 +108,7 @@ static int child_exited (void) char buf[200]; int fd, i, retval; ssize_t got; - char *state; + char state[3]; snprintf (buf, sizeof (buf), "/proc/%ld/stat", (long) child); fd = open (buf, O_RDONLY); @@ -128,14 +128,14 @@ static int child_exited (void) perror ("close (/proc/CHILD/stat)"); exit (EXIT_FAILURE); } - i = sscanf (buf, "%*d%*s%ms", &state); + /* RHEL-5 does not support %ms. */ + i = sscanf (buf, "%*d%*s%2s", state); if (i != 1) { perror ("sscanf (/proc/CHILD/stat)"); exit (EXIT_FAILURE); } retval = strcmp (state, "Z") == 0; - free (state); return retval; } diff --git a/gdb.spec b/gdb.spec index f99843c..5a57ff6 100644 --- a/gdb.spec +++ b/gdb.spec @@ -36,7 +36,7 @@ Version: 7.6 # The release always contains a leading reserved number, start it at 1. # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing. -Release: 26%{?dist} +Release: 27%{?dist} License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and BSD and Public Domain Group: Development/Debuggers @@ -1394,6 +1394,9 @@ fi %endif # 0%{!?el5:1} || "%{_target_cpu}" == "noarch" %changelog +* Mon May 6 2013 Jan Kratochvil - 7.6-27.fc19 +- [testsuite] [RHEL-5] Fix gdb-orphanripper.c runtime error. + * Fri May 3 2013 Jan Kratochvil - 7.6-26.fc19 - Fix gcore for vDSO (on ppc64).