Changeset 3147 in MondoRescue for branches/3.1/mondo/src/common/libmondo-tools.c

Timestamp:

Jun 19, 2013, 8:34:46 AM (11 years ago)

Author:

Bruno Cornec

Message:

• First pass on svn merge -r 2935:3146 ../3.0

File:

• branches/3.1/mondo/src/common/libmondo-tools.c (modified) (5 diffs)

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

@@ -304 +304 @@
 {
 #ifdef __FreeBSD__
-    system("kldstat | grep msdosfs || kldload msdosfs 2> /dev/null");
-    system("kldstat | grep ext2fs  || kldload ext2fs 2> /dev/null");
+    paranoid_system("kldstat | grep msdosfs || kldload msdosfs 2> /dev/null");
+    paranoid_system("kldstat | grep ext2fs  || kldload ext2fs 2> /dev/null");
 #else
-    system("modprobe -a msdos vfat loop &> /dev/null");
+    paranoid_system("modprobe -a msdos vfat loop &> /dev/null");
 #endif
 }
@@ -643 +643 @@
                 colon++;
                 hent = gethostbyname(colon);
-                mr_asprintf(bkpinfo->netfs_user,"%s", hostname);
+                mr_asprintf(&(bkpinfo->netfs_user),"%s", hostname);
             } else {
                 hent = gethostbyname(hostname);
@@ -713 +713 @@
 }
 
+/*  From busybox under GPLv2 */
+#ifndef HAVE_MKDTEMP
+/* This is now actually part of POSIX.1, but was only added in 2008 */
+char* mkdtemp(char *template)
+{
+    if (mktemp(template) == NULL || mkdir(template, 0700) != 0)
+        return NULL;
+    return template;
+}
+#endif
+
 void setup_tmpdir(char *path) {
 
@@ -721 +732 @@
         /* purging a potential old tmpdir */
         log_it("Purging old tmpdir %s", bkpinfo->tmpdir);
-        chdir("/tmp");
+        if (chdir("/tmp")) {
+            // FIXME
+        }
         mr_asprintf(tmp,"rm -Rf %s",bkpinfo->tmpdir);
         mr_free(bkpinfo->tmpdir);
-        (void)system(tmp);
+        paranoid_system(tmp);
         mr_free(tmp);
     }
@@ -1032 +1045 @@
     mr_free(tmp);
 
-    if (!run_program_and_log_output("parted2fdisk -l | grep -i raid", 1)
+    if (!run_program_and_log_output("parted2fdisk -l 2>/dev/null | grep -i raid", 1)
         && !does_file_exist("/etc/raidtab")) {
         log_to_screen
             ("You have RAID partitions but no /etc/raidtab - creating one from /proc/mdstat");
-        create_raidtab_from_mdstat("/etc/raidtab");
+        create_raidtab_from_mdstat(MDSTAT_FILE,"/etc/raidtab");
     }