Changeset 2400 in MondoRescue

Timestamp:

Sep 15, 2009, 7:33:17 PM (15 years ago)

Author:

Bruno Cornec

Message:

• Use protocol name when displaying restore progress instead of netfs
• Ask for network protocol name at restore time

(Backport from 2.2.9)

Location:

branches/2.2.10/mondo/src

Files:

• common/libmondo-devices.c (modified) (1 diff)
• common/libmondo-string.c (modified) (2 diffs)
• mondorestore/mondo-rstr-newt.c (modified) (4 diffs)

branches/2.2.10/mondo/src/common/libmondo-devices.c

@@ -1719 +1719 @@
             mr_free(command);
 
+            p = popup_and_get_string("Network protocol", "Which Network protocol should I use?", bkpinfo->netfs_proto);
+            if (p == NULL) {
+                log_to_screen("User has chosen not to backup the PC");
+                finish(1);
+            }
+            mr_free(bkpinfo->netfs_proto);
+            bkpinfo->netfs_proto = p;
+
             p = popup_and_get_string("Network share", "Which remote Network share should I mount?", bkpinfo->netfs_mount);
             if (p == NULL) {

branches/2.2.10/mondo/src/common/libmondo-string.c

@@ -1075 +1075 @@
  * @note The returned string points to static storage that will be overwritten with each call.
  */
-/* BCO/BERLIOS change that function to allocate memory, return a pointer and modify caller to free the mem */
 char *media_descriptor_string(t_bkptype type_of_bkp) {
 
@@ -1103 +1102 @@
         break;
     case netfs:
-        mr_asprintf(type_of_backup, "netfs");
+        mr_asprintf(type_of_backup, "%s", bkpinfo->netfs_proto);
         break;
     case usb:

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-newt.c

@@ -1965 +1965 @@
     while (!finished) {
         flaws_str = evaluate_mountlist(mountlist);
-        if (strlen(flaws_str) > 0) {
+        /* flaws_str can be NULL */
+        if ((flaws_str == NULL) || (strlen(flaws_str) == 0)) {
+            mr_asprintf(flaws_str_A, "");
+        } else {
             mr_asprintf(flaws_str_A, "%s", flaws_str + 1);
-        } else {
-            mr_asprintf(flaws_str_A, "");
         }
         if (strlen(flaws_str_A) >= 74) {
@@ -1984 +1985 @@
             mr_asprintf(flaws_str_C, "");
         }
-        mr_free(flaws_str);
 
         newtLabelSetText(flawsLabelA, flaws_str_A);
@@ -1995 +1995 @@
 
         if (b_res == bOK) {
-            flaws_str = evaluate_mountlist(mountlist);
             if (flaws_str != NULL) {
-                mr_free(flaws_str);
                 finished =
                     ask_me_yes_or_no
@@ -2042 +2040 @@
             }
         }
+        mr_free(flaws_str);
     }
     newtFormDestroy(myForm);