[gentoo-commits] gentoo-projects commit in pax-utils: scanelf.c xfuncs.c xfuncs.h

[Fabian Groffen (grobian)]

grobian     09/01/31 17:58:37

  Modified:             scanelf.c xfuncs.c xfuncs.h
  Log:
  For bug #249731, add an xstrndup wrapper, and implement strndup on hosts that don't have it, based on the strndup implementation of sandbox, with a little change to make it C90 compliant.

Revision  Changes    Path
1.208                pax-utils/scanelf.c

file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/scanelf.c?rev=1.208&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/scanelf.c?rev=1.208&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/scanelf.c?r1=1.207&r2=1.208

Index: scanelf.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/pax-utils/scanelf.c,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- scanelf.c	30 Dec 2008 13:38:35 -0000	1.207
+++ scanelf.c	31 Jan 2009 17:58:37 -0000	1.208
@@ -1,13 +1,13 @@
 /*
  * Copyright 2003-2007 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/pax-utils/scanelf.c,v 1.207 2008/12/30 13:38:35 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/pax-utils/scanelf.c,v 1.208 2009/01/31 17:58:37 grobian Exp $
  *
  * Copyright 2003-2007 Ned Ludd        - <solar@g.o>
  * Copyright 2004-2007 Mike Frysinger  - <vapier@g.o>
  */
 
-static const char *rcsid = "$Id: scanelf.c,v 1.207 2008/12/30 13:38:35 vapier Exp $";
+static const char *rcsid = "$Id: scanelf.c,v 1.208 2009/01/31 17:58:37 grobian Exp $";
 const char * const argv0 = "scanelf";
 
 #include "paxinc.h"
@@ -1038,7 +1038,7 @@
 							++this_sym; \
 						} \
 						if (next_sym) /* Copy it so that we don't have to worry about the final , */ \
-							this_sym = strndup(this_sym, next_sym-this_sym); \
+							this_sym = xstrndup(this_sym, next_sym-this_sym); \
 						/* ok, lets compare the name now */ \
 						if (scanelf_match_symname(this_sym, symname)) { \
 							if (be_semi_verbose) { \



1.4                  pax-utils/xfuncs.c

file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/xfuncs.c?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/xfuncs.c?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/xfuncs.c?r1=1.3&r2=1.4

Index: xfuncs.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/pax-utils/xfuncs.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfuncs.c	30 Dec 2008 13:00:29 -0000	1.3
+++ xfuncs.c	31 Jan 2009 17:58:37 -0000	1.4
@@ -1,7 +1,7 @@
 /*
  * Copyright 2003-2007 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/pax-utils/xfuncs.c,v 1.3 2008/12/30 13:00:29 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/pax-utils/xfuncs.c,v 1.4 2009/01/31 17:58:37 grobian Exp $
  *
  * Copyright 2003-2007 Ned Ludd        - <solar@g.o>
  * Copyright 2004-2007 Mike Frysinger  - <vapier@g.o>
@@ -16,6 +16,32 @@
 	return ret;
 }
 
+#ifndef strndup
+static inline char *my_strndup(const char *str, size_t n)
+{
+	size_t r;
+	char *ret;
+	for (r = 0; r < n; ++r)
+		if (!str[r])
+			break;
+
+	ret = xmalloc(r + 1);
+	memcpy(ret, str, r);
+	ret[r] = '\0';
+	return ret;
+}
+/* do this to avoid warning: declaration of 'strndup' shadows a built-in
+ * function */
+#define strndup(S, N) my_strndup(S, N)
+#endif
+
+char *xstrndup(const char *s, const size_t n)
+{
+	char *ret = strndup(s, n);
+	if (!ret) err("Could not strdup(): %s", strerror(errno));
+	return ret;
+}
+
 void *xmalloc(size_t size)
 {
 	void *ret = malloc(size);



1.3                  pax-utils/xfuncs.h

file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/xfuncs.h?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/xfuncs.h?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/xfuncs.h?r1=1.2&r2=1.3

Index: xfuncs.h
===================================================================
RCS file: /var/cvsroot/gentoo-projects/pax-utils/xfuncs.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfuncs.h	30 Dec 2008 12:58:08 -0000	1.2
+++ xfuncs.h	31 Jan 2009 17:58:37 -0000	1.3
@@ -1,7 +1,7 @@
 /*
  * Copyright 2003-2007 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/pax-utils/xfuncs.h,v 1.2 2008/12/30 12:58:08 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/pax-utils/xfuncs.h,v 1.3 2009/01/31 17:58:37 grobian Exp $
  *
  * Copyright 2003-2007 Ned Ludd        - <solar@g.o>
  * Copyright 2004-2007 Mike Frysinger  - <vapier@g.o>
@@ -11,6 +11,7 @@
 #define __XFUNCS_H__
 
 char *xstrdup(const char *s);
+char *xstrndup(const char *s, const size_t n);
 void *xmalloc(size_t size);
 void *xzalloc(size_t size);
 void *xrealloc(void *ptr, size_t size);