Changeset 972 in MondoRescue for trunk/mondo/src/mondorestore/mondo-rstr-tools.c

Timestamp:

Nov 23, 2006, 6:54:13 PM (17 years ago)

Author:

Bruno Cornec

Message:

fix a declaration issue

File:

• trunk/mondo/src/mondorestore/mondo-rstr-tools.c (modified) (2 diffs)

trunk/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -383 +383 @@
  **************************************************************************/
 
+/**
+ * Mount @p device at @p mpt as @p format.
+ * @param device The device (/dev entry) to mount.
+ * @param mpt The directory to mount it on.
+ * @param format The filesystem type of @p device.
+ * @param writeable If TRUE, mount read-write; if FALSE, mount read-only.
+ * @return 0 for success, nonzero for failure.
+ */
+int mount_device(char *device, char *mpt, char *format, bool writeable)
+{
+    int res = 0;
+
+    char *tmp = NULL;
+    char *command = NULL;
+    char *mountdir = NULL;
+    char *mountpoint = NULL;
+    char *additional_parameters = NULL;
+    char *p1 = NULL;
+    char *p2 = NULL;
+    char *p3 = NULL;
+
+    assert_string_is_neither_NULL_nor_zerolength(device);
+    assert_string_is_neither_NULL_nor_zerolength(mpt);
+    assert(format != NULL);
+
+    if (!strcmp(mpt, "/1")) {
+        mr_asprintf(&mountpoint, "/");
+        log_msg(3, "Mommm! SME is being a dildo!");
+    } else {
+        mr_asprintf(&mountpoint, mpt);
+    }
+
+    if (!strcmp(mountpoint, "lvm")) {
+        mr_free(mountpoint);
+        return (0);
+    }
+    if (!strcmp(mountpoint, "image")) {
+        mr_free(mountpoint);
+        return (0);
+    }
+    mr_asprintf(&tmp, "Mounting device %s   ", device);
+    log_msg(1, tmp);
+
+    if (writeable) {
+        mr_asprintf(&p1, "-o rw");
+    } else {
+        mr_asprintf(&p1, "-o ro");
+    }
+    tmp = find_home_of_exe("setfattr");
+    if (tmp) {
+        mr_asprintf(&p2, ",user_xattr");
+    } else {
+        mr_asprintf(&p2, "%s", "");
+    }
+    mr_free(tmp);
+
+    tmp = find_home_of_exe("setfacl");
+    if (tmp) {
+        mr_asprintf(&p3, ",acl");
+    } else {
+        mr_asprintf(&p3, "%s", "");
+    }
+    mr_free(tmp);
+
+    mr_asprintf(&additional_parameters, "%s%s%s", p1, p2, p3);
+    mr_free(p1);
+    mr_free(p2);
+    mr_free(p3);
+
+    if (!strcmp(mountpoint, "swap")) {
+        mr_asprintf(&command, "swapon %s", device);
+    } else {
+        if (!strcmp(mountpoint, "/")) {
+            mr_asprintf(&mountdir, MNT_RESTORING);
+        } else {
+            mr_asprintf(&mountdir, "%s%s", MNT_RESTORING, mountpoint);
+        }
+        mr_asprintf(&command, "mkdir -p %s", mountdir);
+        run_program_and_log_output(command, FALSE);
+        mr_free(command);
+
+        mr_asprintf(&command, "mount -t %s %s %s %s 2>> %s", format, device,
+                additional_parameters, mountdir, MONDO_LOGFILE);
+        log_msg(2, "command='%s'", command);
+    }
+    mr_free(additional_parameters);
+
+    res = run_program_and_log_output(command, TRUE);
+    if (res && (strstr(command, "xattr") || strstr(command, "acl"))) {
+        log_msg(1, "Re-trying without the fancy extra parameters");
+        mr_free(command);
+
+        mr_asprintf(&command, "mount -t %s %s %s 2>> %s", format, device,
+                mountdir, MONDO_LOGFILE);
+        res = run_program_and_log_output(command, TRUE);
+    }
+    if (res) {
+        log_msg(1, "Unable to mount device %s (type %s) at %s", device,
+                format, mountdir);
+        log_msg(1, "command was '%s'", command);
+        if (!strcmp(mountpoint, "swap")) {
+            log_to_screen(tmp);
+        } else {
+            log_msg(2, "Retrying w/o the '-t' switch");
+            mr_free(command);
+
+            mr_asprintf(&command, "mount %s %s 2>> %s", device, mountdir,
+                    MONDO_LOGFILE);
+            log_msg(2, "2nd command = '%s'", command);
+            res = run_program_and_log_output(command, TRUE);
+            if (res == 0) {
+                log_msg(1,
+                        "That's OK. I called mount w/o a filesystem type and it worked fine in the end.");
+            } else {
+                log_to_screen(tmp);
+            }
+        }
+    }
+    mr_free(tmp);
+    mr_free(command);
+    mr_free(mountdir);
+
+    if (res && !strcmp(mountpoint, "swap")) {
+        log_msg(2, "That's ok. It's just a swap partition.");
+        log_msg(2, "Non-fatal error. Returning 0.");
+        res = 0;
+    }
+    mr_free(mountpoint);
+
+    return (res);
+}
+/**************************************************************************
+ *END_MOUNT_DEVICE                                                        *
+ **************************************************************************/
+
+
 
 /**
@@ -615 +751 @@
 /**************************************************************************
  *END_MOUNT_CDROM                                                         *
- **************************************************************************/
-
-
-/**
- * Mount @p device at @p mpt as @p format.
- * @param device The device (/dev entry) to mount.
- * @param mpt The directory to mount it on.
- * @param format The filesystem type of @p device.
- * @param writeable If TRUE, mount read-write; if FALSE, mount read-only.
- * @return 0 for success, nonzero for failure.
- */
-int mount_device(char *device, char *mpt, char *format, bool writeable)
-{
-    int res = 0;
-
-    char *tmp = NULL;
-    char *command = NULL;
-    char *mountdir = NULL;
-    char *mountpoint = NULL;
-    char *additional_parameters = NULL;
-    char *p1 = NULL;
-    char *p2 = NULL;
-    char *p3 = NULL;
-
-    assert_string_is_neither_NULL_nor_zerolength(device);
-    assert_string_is_neither_NULL_nor_zerolength(mpt);
-    assert(format != NULL);
-
-    if (!strcmp(mpt, "/1")) {
-        mr_asprintf(&mountpoint, "/");
-        log_msg(3, "Mommm! SME is being a dildo!");
-    } else {
-        mr_asprintf(&mountpoint, mpt);
-    }
-
-    if (!strcmp(mountpoint, "lvm")) {
-        mr_free(mountpoint);
-        return (0);
-    }
-    if (!strcmp(mountpoint, "image")) {
-        mr_free(mountpoint);
-        return (0);
-    }
-    mr_asprintf(&tmp, "Mounting device %s   ", device);
-    log_msg(1, tmp);
-
-    if (writeable) {
-        mr_asprintf(&p1, "-o rw");
-    } else {
-        mr_asprintf(&p1, "-o ro");
-    }
-    tmp = find_home_of_exe("setfattr");
-    if (tmp) {
-        mr_asprintf(&p2, ",user_xattr");
-    } else {
-        mr_asprintf(&p2, "%s", "");
-    }
-    mr_free(tmp);
-
-    tmp = find_home_of_exe("setfacl");
-    if (tmp) {
-        mr_asprintf(&p3, ",acl");
-    } else {
-        mr_asprintf(&p3, "%s", "");
-    }
-    mr_free(tmp);
-
-    mr_asprintf(&additional_parameters, "%s%s%s", p1, p2, p3);
-    mr_free(p1);
-    mr_free(p2);
-    mr_free(p3);
-
-    if (!strcmp(mountpoint, "swap")) {
-        mr_asprintf(&command, "swapon %s", device);
-    } else {
-        if (!strcmp(mountpoint, "/")) {
-            mr_asprintf(&mountdir, MNT_RESTORING);
-        } else {
-            mr_asprintf(&mountdir, "%s%s", MNT_RESTORING, mountpoint);
-        }
-        mr_asprintf(&command, "mkdir -p %s", mountdir);
-        run_program_and_log_output(command, FALSE);
-        mr_free(command);
-
-        mr_asprintf(&command, "mount -t %s %s %s %s 2>> %s", format, device,
-                additional_parameters, mountdir, MONDO_LOGFILE);
-        log_msg(2, "command='%s'", command);
-    }
-    mr_free(additional_parameters);
-
-    res = run_program_and_log_output(command, TRUE);
-    if (res && (strstr(command, "xattr") || strstr(command, "acl"))) {
-        log_msg(1, "Re-trying without the fancy extra parameters");
-        mr_free(command);
-
-        mr_asprintf(&command, "mount -t %s %s %s 2>> %s", format, device,
-                mountdir, MONDO_LOGFILE);
-        res = run_program_and_log_output(command, TRUE);
-    }
-    if (res) {
-        log_msg(1, "Unable to mount device %s (type %s) at %s", device,
-                format, mountdir);
-        log_msg(1, "command was '%s'", command);
-        if (!strcmp(mountpoint, "swap")) {
-            log_to_screen(tmp);
-        } else {
-            log_msg(2, "Retrying w/o the '-t' switch");
-            mr_free(command);
-
-            mr_asprintf(&command, "mount %s %s 2>> %s", device, mountdir,
-                    MONDO_LOGFILE);
-            log_msg(2, "2nd command = '%s'", command);
-            res = run_program_and_log_output(command, TRUE);
-            if (res == 0) {
-                log_msg(1,
-                        "That's OK. I called mount w/o a filesystem type and it worked fine in the end.");
-            } else {
-                log_to_screen(tmp);
-            }
-        }
-    }
-    mr_free(tmp);
-    mr_free(command);
-    mr_free(mountdir);
-
-    if (res && !strcmp(mountpoint, "swap")) {
-        log_msg(2, "That's ok. It's just a swap partition.");
-        log_msg(2, "Non-fatal error. Returning 0.");
-        res = 0;
-    }
-    mr_free(mountpoint);
-
-    return (res);
-}
-/**************************************************************************
- *END_MOUNT_DEVICE                                                        *
  **************************************************************************/