rpms/frysk/devel frysk-sscanf.patch,NONE,1.1 frysk.spec,1.42,1.43

[fedora-cvs-commits at redhat.com]

Author: skasal

Update of /cvs/dist/rpms/frysk/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14035

Modified Files:
	frysk.spec 
Added Files:
	frysk-sscanf.patch 
Log Message:
Patch to avoid scanf("%a[..]").

frysk-sscanf.patch:
 line2addr.c |   23 +++++++++++------------
 1 files changed, 11 insertions(+), 12 deletions(-)

--- NEW FILE frysk-sscanf.patch ---
Index: ./frysk-imports/elfutils/tests/line2addr.c
===================================================================
RCS file: /cvs/frysk/frysk-imports/elfutils/tests/line2addr.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 line2addr.c
--- ./frysk-imports/elfutils/tests/line2addr.c	8 May 2006 20:48:53 -0000	1.1.1.1
+++ ./frysk-imports/elfutils/tests/line2addr.c	15 Jun 2006 18:19:57 -0000
@@ -131,19 +131,18 @@
   for (; cnt < argc; ++cnt)
     {
       struct args a = { .arg = argv[cnt] };
+      char *c = strchr (a.arg, ':');
 
-      switch (sscanf (a.arg, "%a[^:]:%d", &a.file, &a.line))
-	{
-	default:
-	case 0:
-	  printf ("ignored %s\n", argv[cnt]);
-	  continue;
-	case 1:
-	  a.line = 0;
-	  break;
-	case 2:
-	  break;
-	}
+      if (a.arg == NULL) {
+	printf ("ignored %s\n", a.arg);
+	continue;
+      } else if (c == NULL) {
+	a.file = strdup (a.arg);
+	a.line = 0;
+      } else {
+	a.file = strndup (a.arg, c - a.arg);
+	a.line = strtol (c + 1, NULL, 10);
+      }
 
       (void) dwfl_getdwarf (dwfl, &handle_module, &a, 0);
 


Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- frysk.spec	15 Jun 2006 16:39:18 -0000	1.42
+++ frysk.spec	15 Jun 2006 18:23:50 -0000	1.43
@@ -7,7 +7,8 @@
 URL:		http://sourceware.org/frysk
 Source:		%{name}-%{version}.tar.bz2
 
-Patch:		frysk_syscall.patch
+Patch0:		frysk_syscall.patch
+Patch1:		frysk-sscanf.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
@@ -44,7 +45,8 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch
+%patch0
+%patch1
 
 %build 
 
@@ -103,6 +105,7 @@
 %changelog
 * Thu Jun 15 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.14-1
 - Patch for new linux/unistd.h.
+- Patch to avoid scanf("%a[..]").
 
 * Thu Jun 15 2006 Stepan Kasal <skasal at redhat.com> - 0.0.1.2006.06.14-0
 - New upstream version.