Changeset 1654 in MondoRescue

Timestamp:

Sep 24, 2007, 2:13:24 PM (17 years ago)

Author:

Bruno Cornec

Message:

mkdtemp checked in configure
Fix bugs insetup_tmpdir

Location:

branches/2.2.5/mondo

Files:

• configure.in (modified) (1 diff)
• src/common/libmondo-tools.c (modified) (2 diffs)

branches/2.2.5/mondo/configure.in

@@ -118 +118 @@
 AC_TYPE_SIGNAL
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([bzero getcwd memmove memset mkdir mkfifo setenv strcasecmp strchr strerror strrchr strstr])
+AC_CHECK_FUNCS([bzero getcwd memmove memset mkdir mkfifo setenv strcasecmp strchr strerror strrchr strstr mkdtemp])
 
 AC_OUTPUT([Makefile src/Makefile src/common/Makefile src/mondoarchive/Makefile src/mondorestore/Makefile src/restore-scripts/Makefile src/restore-scripts/mondo/Makefile src/restore-scripts/usr/Makefile src/restore-scripts/usr/bin/Makefile src/post-nuke.sample/Makefile src/post-nuke.sample/usr/Makefile src/post-nuke.sample/usr/bin/Makefile])

branches/2.2.5/mondo/src/common/libmondo-tools.c

@@ -966 +966 @@
     
     char *tmp = NULL;
+    char *p = NULL;
 
     if (getenv("TMPDIR")) {
@@ -974 +975 @@
         asprintf(&tmp, "/tmp/mondo.tmp.XXXXXX");
     }
-    if ((bkpinfo->tmpdir = mkdtemp(bkpinfo->tmpdir)) == NULL) {
-        log_it("Failed to create global tmp directory %s for Mondo.",bkpinfo->tmpdir);
+    p = mkdtemp(tmp);
+    if (p == NULL) {
+        log_it("Failed to create global tmp directory %s for Mondo.",tmp);
         finish(-1);
     }
+    strcpy(bkpinfo->tmpdir,p);
+    paranoid_free(tmp);
     //sprintf(bkpinfo->tmpdir, "%s/tmpfs/mondo.tmp.%d", "/tmp", (int) (random() % 32768));  // for mondorestore
 }