Changeset 3147 in MondoRescue for branches/3.1/mondo/src/common/libmondo-cli.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-cli.c (modified) (11 diffs)

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

@@ -20 +20 @@
 extern int g_loglevel;
 extern bool g_text_mode;
+extern bool g_fail_immediately;
 extern char g_startdir[MAX_STR_LEN];    ///< ????? @bug ?????
 extern char *MONDO_OPTIONS;
@@ -53 +54 @@
 
 extern void free_MR_global_filenames(void);
+
+long g_max_biggie_size = BIGGIEMAXSIZE;
 
 /**
@@ -101 +104 @@
     mr_free(tmp);
 
+    /*  Before erasing dirs go into a safe place */
+    if (chdir("/tmp")) {
+        // FIXME
+    }
+    mr_asprintf(tmp, "rm -Rf %s/tmp.mondo.*", bkpinfo->tmpdir);
+    paranoid_system(tmp);
+    mr_free(tmp);
+
     mr_asprintf(tmp, "mkdir -p %s", bkpinfo->scratchdir);
     paranoid_system(tmp);
@@ -162 +173 @@
     int i = 0;
     int retval = 0;
-    int percent = 0;
-    int lastpos = 0;
 
     /*@ buffers ** */
@@ -355 +364 @@
         mr_free(p);
         log_to_screen("You didn't specify a tape streamer device. I'm assuming %s", flag_val['d']);
-        percent = 0;
     }
 
@@ -498 +506 @@
                 if (strstr(bkpinfo->netfs_proto, "sshfs")) {
                     mr_asprintf(tmp1, "sshfs %s@%s", bkpinfo->netfs_user, bkpinfo->netfs_mount);
+                } else if (strstr(bkpinfo->netfs_proto, "smbfs")) {
+                    sprintf(tmp, "mount -t cifs %s -o user=%s", bkpinfo->netfs_mount, bkpinfo->netfs_user);
                 } else if (strstr(bkpinfo->netfs_proto, "nfs")) {
                     mr_asprintf(tmp1, "mount %s@%s", bkpinfo->netfs_user, bkpinfo->netfs_mount);
@@ -507 +517 @@
                 if (strstr(bkpinfo->netfs_proto, "sshfs")) {
                     mr_asprintf(tmp1, "sshfs %s", bkpinfo->netfs_mount);
+                } else if (strstr(bkpinfo->netfs_proto, "smbfs")) {
+                    sprintf(tmp, "mount -t cifs %s", bkpinfo->netfs_mount);
                 } else if (strstr(bkpinfo->netfs_proto, "nfs")) {
                     mr_asprintf(tmp1, "mount %s", bkpinfo->netfs_mount);
@@ -629 +641 @@
         }
         mr_free(tmp1);
-        lastpos = 0;
 
         mr_make_devlist_from_pathlist(flag_val['E'], 'E');
@@ -637 +648 @@
     if (flag_set['e']) {
         bkpinfo->please_dont_eject = TRUE;
+    }
+
+    if (flag_set['M']) {
+        g_max_biggie_size = atol(flag_val['M']);
+        log_msg(1, "Max size for biggie file is now %ld KB", g_max_biggie_size);
     }
 
@@ -778 +794 @@
         /* Before changing remove old ones if any */
         if (bkpinfo->scratchdir) {
-            chdir("/tmp");
+            if (chdir("/tmp")) {
+                // FIXME
+            }
             mr_asprintf(tmp1, "rm -Rf %s", bkpinfo->scratchdir);
             paranoid_system(tmp1);
@@ -859 +877 @@
             log_to_screen("Please install LZOP. You can't use '-L' until you do.\n");
         }
+    }
+
+    if (flag_set['F']) {
+        log_msg(3, "-F means we will fail immediately at the first interaction request");
+        g_fail_immediately = TRUE;
     }