Changeset 2522 in MondoRescue

Timestamp:

Jan 4, 2010, 8:22:26 PM (14 years ago)

Author:

Bruno Cornec

Message:

Re-apply the fix of [2506] broken by older patches applied after :-(

File:

• branches/2.2.9/mondo/src/common/libmondo-tools.c (modified) (1 diff)

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

@@ -590 +590 @@
             mr_asprintf(&iso_path, "%s", "");
         } else {
-            mr_asprintf(&iso_path, "%s", iso_tmp + strlen(iso_mnt));
+            // If iso_mnt is only / then iso_path is the full dir
+            // (the formula bellow doesn't work in this case)
+            if (strcmp(iso_mnt, "/") == 0) {
+                mr_asprintf(&iso_path, "%s", iso_tmp);
+            // else it's a part of iso_tmp
+            } else {
+                mr_asprintf(&iso_path, "%s", iso_tmp + strlen(iso_mnt));
+            }
         }
         mr_free(iso_tmp);
+        mr_free(iso_mnt);
 
         mr_asprintf(&tmp, "%s/ISODIR", bkpinfo->tmpdir);