mkdir: make safe for libraries

xstrdup is too dangerous to use in a syscall replacement.

* modules/mkdir (Depends-on): Drop xalloc.
* lib/mkdir.c (rpl_mkdir): Fail with ENOMEM rather than calling
exit.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index bda6fbbf3c5376f39313b48cef194cc15f525e1f..27528cb958d97bb922ac1cff4349847c04417ef7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-10-29  Eric Blake  <ebb9@byu.net>
 
+       mkdir: make safe for libraries
+       * modules/mkdir (Depends-on): Drop xalloc.
+       * lib/mkdir.c (rpl_mkdir): Fail with ENOMEM rather than calling
+       exit.
+
        tests: avoid some compiler warnings
        * tests/test-getaddrinfo.c (simple): Mark static, and allow string
        literals.

diff --git a/lib/mkdir.c b/lib/mkdir.c
index 3d9f04380213e7aa4eda8b9569f197ac49c862aa..e6dbc78e0988fbe517cf4001eafb29e37af67420 100644 (file)
--- a/lib/mkdir.c
+++ b/lib/mkdir.c
@@ -56,7 +56,13 @@ rpl_mkdir (char const *dir, mode_t mode maybe_unused)
 
   if (len && dir[len - 1] == '/')
     {
-      tmp_dir = xstrdup (dir);
+      tmp_dir = strdup (dir);
+      if (!tmp_dir)
+        {
+          /* Rather than rely on strdup-posix, we set errno ourselves.  */
+          errno = ENOMEM;
+          return -1;
+        }
       strip_trailing_slashes (tmp_dir);
     }
   else

diff --git a/modules/mkdir b/modules/mkdir
index 59d60fb4aed43efaf52458300e1356769ceadedc..fa0931d27501c8eb4f0bccdc106a51fa1e4de4a6 100644 (file)
--- a/modules/mkdir
+++ b/modules/mkdir
@@ -7,7 +7,6 @@ m4/mkdir.m4
 
 Depends-on:
 sys_stat
-xalloc
 dirname
 
 configure.ac: