[gentoo-commits] gentoo-alt r1692 - in trunk/baselayout-prefix/src: . core

[Fabian Groffen (grobian)]

Author: grobian
Date: 2011-03-31 16:38:02 +0000 (Thu, 31 Mar 2011)
New Revision: 1692

Modified:
   trunk/baselayout-prefix/src/core/misc.c
   trunk/baselayout-prefix/src/core/misc.h
   trunk/baselayout-prefix/src/start-stop-daemon.c
Log:
applied updated baselayout-1.12.5-gnulib.patch

Modified: trunk/baselayout-prefix/src/core/misc.c
===================================================================
--- trunk/baselayout-prefix/src/core/misc.c	2011-03-31 14:12:56 UTC (rev 1691)
+++ trunk/baselayout-prefix/src/core/misc.c	2011-03-31 16:38:02 UTC (rev 1692)
@@ -85,31 +85,6 @@
 	return new_path;
 }
 
-char *strndup(const char *str, size_t size) {
-	char *new_str = NULL;
-	size_t len;
-
-	if (NULL == str) {
-		DBG_MSG("Invalid argument passed!\n");
-		errno = EINVAL;
-		return NULL;
-	}
-
-	/* Check lenght of str without breaching the size limit */
-	for (len = 0;(len < size) && ('\0' != str[len]);len++);
-
-	new_str = malloc(len + 1);
-	if (NULL == new_str) {
-		DBG_MSG("Failed to allocate buffer!\n");
-		return NULL;
-	}
-
-	/* Make sure our string is NULL terminated */
-	new_str[len] = '\0';
-	
-	return (char *)memcpy(new_str, str, len);
-}
-
 char *gbasename(const char *path) {
 	char *new_path = NULL;
 	

Modified: trunk/baselayout-prefix/src/core/misc.h
===================================================================
--- trunk/baselayout-prefix/src/core/misc.h	2011-03-31 14:12:56 UTC (rev 1691)
+++ trunk/baselayout-prefix/src/core/misc.h	2011-03-31 16:38:02 UTC (rev 1692)
@@ -246,8 +246,6 @@
  * with the malloc() call. */
 char *strcatpaths(const char *pathname1, const char *pathname2);
 
-/* Compat functions for GNU extensions */
-char *strndup(const char *str, size_t size);
 /* Same as basename(3), but do not modify path */
 char *gbasename(const char *path);
 

Modified: trunk/baselayout-prefix/src/start-stop-daemon.c
===================================================================
--- trunk/baselayout-prefix/src/start-stop-daemon.c	2011-03-31 14:12:56 UTC (rev 1691)
+++ trunk/baselayout-prefix/src/start-stop-daemon.c	2011-03-31 16:38:02 UTC (rev 1692)
@@ -30,6 +30,7 @@
  * 
  */
 
+#undef VERSION
 #define VERSION "1.13.11+gentoo"
 
 #define NONRETURNPRINTFFORMAT(x, y) \