Changeset 2506 in MondoRescue

Timestamp:

Jan 4, 2010, 11:31:53 AM (14 years ago)

Author:

Bruno Cornec

Message:

• Fix a bug when isodir is / only when splitting it in iso_path and iso_mnt

Location:

branches

Files:

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

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

@@ -586 +586 @@
             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_mnt);

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

@@ -610 +610 @@
             iso_path[0] = '\0';
         } else {
-            sprintf(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) {
+                sprintf(iso_path, "%s", iso_tmp);
+            // else it's a part of iso_tmp
+            } else {
+                sprintf(iso_path, "%s", iso_tmp + strlen(iso_mnt));
+            }
         }
         sprintf(tmp, "%s/ISODIR", bkpinfo->tmpdir);