Apply vodz' last_patch52

[oweals/busybox.git] / libbb / xfuncs.c

diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index 291bfafd6276acf798010a5e64a9af8fea97c1f5..869c04a4c18119f60bc7a91b2756b2adf831ae1f 100644 (file)
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -30,26 +30,15 @@
 extern void *xmalloc(size_t size)
 {
        void *ptr = malloc(size);
-
-       if (!ptr)
+       if (ptr == NULL && size != 0)
                error_msg_and_die(memory_exhausted);
        return ptr;
 }
 
-extern void *xrealloc(void *old, size_t size)
+extern void *xrealloc(void *ptr, size_t size)
 {
-       void *ptr;
-
-       /* SuS2 says "If size is 0 and ptr is not a null pointer, the
-        * object pointed to is freed."  Do that here, in case realloc
-        * returns a NULL, since we don't want to choke in that case. */
-       if (size==0 && old) {
-               free(old);
-               return NULL;
-       }
-
-       ptr = realloc(old, size);
-       if (!ptr)
+       ptr = realloc(ptr, size);
+       if (ptr == NULL && size != 0)
                error_msg_and_die(memory_exhausted);
        return ptr;
 }
@@ -57,7 +46,7 @@ extern void *xrealloc(void *old, size_t size)
 extern void *xcalloc(size_t nmemb, size_t size)
 {
        void *ptr = calloc(nmemb, size);
-       if (!ptr)
+       if (ptr == NULL && nmemb != 0 && size != 0)
                error_msg_and_die(memory_exhausted);
        return ptr;
 }
@@ -96,6 +85,13 @@ FILE *xfopen(const char *path, const char *mode)
        return fp;
 }
 
+/* Stupid gcc always includes its own builtin strlen()... */
+#undef strlen
+size_t xstrlen(const char *string)
+{
+           return(strlen(string));
+}
+
 /* END CODE */
 /*
 Local Variables: