Changeset 89 in MondoRescue for trunk/mondo/mondo/common/libmondo-devices.c

Timestamp:

Oct 27, 2005, 10:45:34 PM (19 years ago)

Author:

bcornec

Message:

merge r87:88 of the 2.04_berlios branch
indent some files

File:

• trunk/mondo/mondo/common/libmondo-devices.c (modified) (4 diffs)

trunk/mondo/mondo/common/libmondo-devices.c

@@ -2103 +2103 @@
             }
             // check whether already mounted - we better remove
-                        // surrounding spaces and trailing '/' for this
-            strip_spaces (bkpinfo->nfs_mount);
+            // surrounding spaces and trailing '/' for this
+            strip_spaces(bkpinfo->nfs_mount);
             if (bkpinfo->nfs_mount[strlen(bkpinfo->nfs_mount) - 1] == '/')
-              bkpinfo->nfs_mount[strlen(bkpinfo->nfs_mount) - 1] = '\0';
+                bkpinfo->nfs_mount[strlen(bkpinfo->nfs_mount) - 1] = '\0';
             sprintf(command, "mount | grep \"%s \" | cut -d' ' -f3",
-                   bkpinfo->nfs_mount);
+                    bkpinfo->nfs_mount);
             strcpy(bkpinfo->isodir,
                    call_program_and_get_last_line_of_output(command));
@@ -2122 +2122 @@
         }
         if (!is_this_device_mounted(bkpinfo->nfs_mount)) {
-          sprintf(bkpinfo->isodir, "/tmp/isodir.mondo.%d", (int)(random()%32768));
-          sprintf(command, "mkdir -p %s", bkpinfo->isodir);
-          run_program_and_log_output(command, 5);
-          sprintf(tmp, "mount %s -t nfs %s", bkpinfo->nfs_mount, bkpinfo->isodir);
-          run_program_and_log_output(tmp, 5);
-          malloc_string(g_selfmounted_isodir);
-          strcpy(g_selfmounted_isodir, bkpinfo->isodir);
+            sprintf(bkpinfo->isodir, "/tmp/isodir.mondo.%d",
+                    (int) (random() % 32768));
+            sprintf(command, "mkdir -p %s", bkpinfo->isodir);
+            run_program_and_log_output(command, 5);
+            sprintf(tmp, "mount %s -t nfs %s", bkpinfo->nfs_mount,
+                    bkpinfo->isodir);
+            run_program_and_log_output(tmp, 5);
+            malloc_string(g_selfmounted_isodir);
+            strcpy(g_selfmounted_isodir, bkpinfo->isodir);
         }
         if (!is_this_device_mounted(bkpinfo->nfs_mount)) {
@@ -2144 +2146 @@
         strcpy(bkpinfo->nfs_remote_dir, tmp);
         // check whether writable - we better remove surrounding spaces for this
-        strip_spaces (bkpinfo->nfs_remote_dir);
-        sprintf (command, "echo hi > %s/%s/.dummy.txt", bkpinfo->isodir,
-                      bkpinfo->nfs_remote_dir);
-        while (run_program_and_log_output (command, FALSE)) {
-          strcpy(tmp, bkpinfo->nfs_remote_dir);
-          asprintf (&prompt,
-                "Directory '%s' under mountpoint '%s' does not exist or is not writable. You can fix this or change the directory and retry or cancel the backup.",
-                bkpinfo->nfs_remote_dir, bkpinfo->isodir);
-          if(!popup_and_get_string ("Directory", prompt, tmp, MAX_STR_LEN)) {
-            log_to_screen("User has chosen not to backup the PC");
-            finish(1);
-          }
-          strcpy(bkpinfo->nfs_remote_dir, tmp);
-          // check whether writable - we better remove surrounding spaces for this */
-          strip_spaces (bkpinfo->nfs_remote_dir);
-          asprintf (&command, "echo hi > %s/%s/.dummy.txt", bkpinfo->isodir,
-                        bkpinfo->nfs_remote_dir);
+        strip_spaces(bkpinfo->nfs_remote_dir);
+        sprintf(command, "echo hi > %s/%s/.dummy.txt", bkpinfo->isodir,
+                bkpinfo->nfs_remote_dir);
+        while (run_program_and_log_output(command, FALSE)) {
+            strcpy(tmp, bkpinfo->nfs_remote_dir);
+            asprintf(&prompt,
+                     "Directory '%s' under mountpoint '%s' does not exist or is not writable. You can fix this or change the directory and retry or cancel the backup.",
+                     bkpinfo->nfs_remote_dir, bkpinfo->isodir);
+            if (!popup_and_get_string
+                ("Directory", prompt, tmp, MAX_STR_LEN)) {
+                log_to_screen("User has chosen not to backup the PC");
+                finish(1);
+            }
+            strcpy(bkpinfo->nfs_remote_dir, tmp);
+            // check whether writable - we better remove surrounding spaces for this */
+            strip_spaces(bkpinfo->nfs_remote_dir);
+            asprintf(&command, "echo hi > %s/%s/.dummy.txt",
+                     bkpinfo->isodir, bkpinfo->nfs_remote_dir);
         }
         for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
@@ -2908 +2911 @@
     }
 #endif
-    log_msg(1, "Using %s",fdisk);
+    log_msg(1, "Using %s", fdisk);
     sprintf(command, "%s -l %s | grep 'EFI GPT'", fdisk, drive);
     strcpy(tmp, call_program_and_get_last_line_of_output(command));