Changeset 128 in MondoRescue for branches/2.05/mondo/mondo/mondorestore

Timestamp:

Nov 19, 2005, 2:27:41 AM (18 years ago)

Author:

bcornec

Message:

indent on all the C code

Location:

branches/2.05/mondo/mondo/mondorestore

Files:

• mondo-prep.c (modified) (114 diffs)
• mondo-restore-EXT.h (modified) (2 diffs)
• mondo-restore.c (modified) (42 diffs)
• mondo-restore.h (modified) (2 diffs)
• mondo-rstr-compare-EXT.h (modified) (1 diff)
• mondo-rstr-compare.c (modified) (13 diffs)
• mondo-rstr-compare.h (modified) (1 diff)
• mondo-rstr-newt.c (modified) (53 diffs)
• mondo-rstr-newt.h (modified) (3 diffs)
• mondo-rstr-tools-EXT.h (modified) (2 diffs)
• mondo-rstr-tools.c (modified) (40 diffs)
• mondo-rstr-tools.h (modified) (1 diff)
• mondoprep.h (modified) (2 diffs)
• mr-externs.h (modified) (6 diffs)

branches/2.05/mondo/mondo/mondorestore/mondo-prep.c

@@ -188 +188 @@
 extern bool g_text_mode;
 
-extern void pause_for_N_seconds(int, char*);
-
-
-FILE *g_fprep=NULL;
-
-
-
-int g_partition_table_locked_up=0;
+extern void pause_for_N_seconds(int, char *);
+
+
+FILE *g_fprep = NULL;
+
+
+
+int g_partition_table_locked_up = 0;
 
 
@@ -208 +208 @@
 void wipe_MBRs_and_reboot_if_necessary(struct mountlist_itself *mountlist)
 {
-    char *command;
-    char *tmp;
-    int lino;
-    int i;
-    FILE*fout;
-    char *buf;
-    const int blocksize=512;        
-        struct list_of_disks *drivelist=NULL;
+    char *command;
+    char *tmp;
+    int lino;
+    int i;
+    FILE *fout;
+    char *buf;
+    const int blocksize = 512;
+    struct list_of_disks *drivelist = NULL;
 // If LVMs are present and a zero-and-reboot wasn't recently undertaken
 // then zero & insist on reboot.
-    malloc_string(command);
-    malloc_string(tmp);
-    buf = malloc(blocksize);
-        if (does_file_exist("/tmp/i-want-my-lvm")) // FIXME - cheating :)
-      {
-        drivelist = malloc(sizeof(struct list_of_disks));
-        make_list_of_drives_in_mountlist(mountlist, drivelist);
-        for (lino = 0; lino < drivelist->entries; lino++)
-          {
-            sprintf(command, "dd if=%s bs=512 count=1 2> /dev/null | grep \"%s\"", drivelist->el[lino].device, MONDO_WAS_HERE);
-            if (!run_program_and_log_output(command, 1))
-          {
-            log_msg(1, "Found MONDO_WAS_HERE marker on drive#%d (%s)", lino, drivelist->el[lino].device);
-            break;
-          }
-              }
-        
-        if (lino==drivelist->entries)
-          {
+    malloc_string(command);
+    malloc_string(tmp);
+    buf = malloc(blocksize);
+    if (does_file_exist("/tmp/i-want-my-lvm"))  // FIXME - cheating :)
+    {
+        drivelist = malloc(sizeof(struct list_of_disks));
+        make_list_of_drives_in_mountlist(mountlist, drivelist);
+        for (lino = 0; lino < drivelist->entries; lino++) {
+            sprintf(command,
+                    "dd if=%s bs=512 count=1 2> /dev/null | grep \"%s\"",
+                    drivelist->el[lino].device, MONDO_WAS_HERE);
+            if (!run_program_and_log_output(command, 1)) {
+                log_msg(1, "Found MONDO_WAS_HERE marker on drive#%d (%s)",
+                        lino, drivelist->el[lino].device);
+                break;
+            }
+        }
+
+        if (lino == drivelist->entries) {
 // zero & reboot
-            log_to_screen("I am sorry for the inconvenience but I must ask you to reboot.");
-        log_to_screen("I need to reset the Master Boot Record; in order to be");
-        log_to_screen("sure the kernel notices, I must reboot after doing it.");
-        log_to_screen("Please hit 'Enter' to reboot.");
-            for (lino = 0; lino < drivelist->entries; lino++)
-              {
-            for(i=0;i<blocksize; i++)
-              { buf[i] = 0; }
-            sprintf(buf, "%s\n", MONDO_WAS_HERE);
-            fout = fopen(drivelist->el[lino].device, "w+");
-            if (!fout)
-              {
-                log_msg(1, "Unable to open+wipe %s", drivelist->el[lino].device);
-              }
-            else
-              {
-                if (1!=fwrite(buf, blocksize, 1, fout))
-              {
-                log_msg(1, "Failed to wipe %s", drivelist->el[lino].device);
-              }
-            else
-              {
-                log_msg(1, "Successfully wiped %s", drivelist->el[lino].device);
-              }
-                fclose(fout);
-                  }
-          }
-                system("sync"); system("sync"); system("sync");
-        popup_and_OK("I must now reboot. Please leave the boot media in the drive and repeat your actions - e.g. type 'nuke' - and it should work fine.");
-                system("reboot"); 
-          }
-          }
-      
+            log_to_screen
+                ("I am sorry for the inconvenience but I must ask you to reboot.");
+            log_to_screen
+                ("I need to reset the Master Boot Record; in order to be");
+            log_to_screen
+                ("sure the kernel notices, I must reboot after doing it.");
+            log_to_screen("Please hit 'Enter' to reboot.");
+            for (lino = 0; lino < drivelist->entries; lino++) {
+                for (i = 0; i < blocksize; i++) {
+                    buf[i] = 0;
+                }
+                sprintf(buf, "%s\n", MONDO_WAS_HERE);
+                fout = fopen(drivelist->el[lino].device, "w+");
+                if (!fout) {
+                    log_msg(1, "Unable to open+wipe %s",
+                            drivelist->el[lino].device);
+                } else {
+                    if (1 != fwrite(buf, blocksize, 1, fout)) {
+                        log_msg(1, "Failed to wipe %s",
+                                drivelist->el[lino].device);
+                    } else {
+                        log_msg(1, "Successfully wiped %s",
+                                drivelist->el[lino].device);
+                    }
+                    fclose(fout);
+                }
+            }
+            system("sync");
+            system("sync");
+            system("sync");
+            popup_and_OK
+                ("I must now reboot. Please leave the boot media in the drive and repeat your actions - e.g. type 'nuke' - and it should work fine.");
+            system("reboot");
+        }
+    }
 // Still here? Cool!
-  paranoid_free(command);
-  paranoid_free(tmp);
-  log_msg(1, "Cool. I didn't have to wipe anything.");
+    paranoid_free(command);
+    paranoid_free(tmp);
+    log_msg(1, "Cool. I didn't have to wipe anything.");
 }
 
@@ -282 +284 @@
 
 
-int fput_string_one_char_at_a_time(FILE*fout, char*str)
+int fput_string_one_char_at_a_time(FILE * fout, char *str)
 {
-  int i, j;
-  FILE*fq;
-
-  if (ferror(fout))
-    {
-    return(-1);
-    }
-  log_msg(5, "Writing string '%s', one char at a time", str);
-  j = strlen(str);
-  for(i=0; i<j; i++)
-    {
-      log_msg(6, "Writing %d ('%c')", str[i], str[i]);
-      if ((fq = fopen(FDISK_LOG, "a+"))) { fputc(str[i], fq);fclose(fq); }
-      fputc(str[i], fout);
-      fflush(fout);
-      usleep(1000L*100L);
-      if (str[i]<32) { usleep(1000L*10L); }
-    }
-  log_msg(5, "Returning");
-   
-   return(i);
+    int i, j;
+    FILE *fq;
+
+    if (ferror(fout)) {
+        return (-1);
+    }
+    log_msg(5, "Writing string '%s', one char at a time", str);
+    j = strlen(str);
+    for (i = 0; i < j; i++) {
+        log_msg(6, "Writing %d ('%c')", str[i], str[i]);
+        if ((fq = fopen(FDISK_LOG, "a+"))) {
+            fputc(str[i], fq);
+            fclose(fq);
+        }
+        fputc(str[i], fout);
+        fflush(fout);
+        usleep(1000L * 100L);
+        if (str[i] < 32) {
+            usleep(1000L * 10L);
+        }
+    }
+    log_msg(5, "Returning");
+
+    return (i);
 }
 
@@ -325 +330 @@
  * @return The number of errors encountered (0 for success).
  */
- 
-
-int do_my_funky_lvm_stuff(bool just_erase_existing_volumes, bool vacuum_pack)
+
+
+int do_my_funky_lvm_stuff(bool just_erase_existing_volumes,
+                          bool vacuum_pack)
 {
     /**  buffers **********************************************/
@@ -340 +346 @@
     char *vgchange_sz;
     char *vgremove_sz;
-//  char *do_this_last;
+//  char *do_this_last;
 
     /** char **************************************************/
@@ -353 +359 @@
     long extents;
     fpos_t orig_pos;
-    
+
     /** pointers **********************************************/
     FILE *fin;
@@ -377 +383 @@
     malloc_string(vgchange_sz);
     malloc_string(vgremove_sz);
-//  malloc_string(do_this_last); // postpone lvcreate call if necessary
+//  malloc_string(do_this_last); // postpone lvcreate call if necessary
     command = malloc(512);
 
-//  do_this_last[0] = '\0';
-iamhere("STARTING");
+//  do_this_last[0] = '\0';
+    iamhere("STARTING");
     log_msg(1, "OK, opened i-want-my-lvm. Shutting down LVM volumes...");
-    if (find_home_of_exe("lvm")) // found it :) cool
-      {
-        strcpy(lvscan_sz,   "lvm lvscan");
-        strcpy(lvremove_sz, "lvm lvremove");
-        strcpy(vgscan_sz,   "lvm vgscan");
-        strcpy(pvscan_sz,   "lvm pvscan");
-        strcpy(vgcreate_sz, "lvm vgcreate");
-        strcpy(vgchange_sz, "lvm vgchange");
-        strcpy(vgremove_sz, "lvm vgremove");
-      }
-    else
-      {
-        strcpy(lvscan_sz,   "lvscan");
-        strcpy(lvremove_sz, "lvremove");
-        strcpy(vgscan_sz,   "vgscan");
-        strcpy(pvscan_sz,   "pvscan");
-        strcpy(vgcreate_sz, "vgcreate");
-        strcpy(vgchange_sz, "vgchange");
-        strcpy(vgremove_sz, "vgremove");
-      }
-    sprintf(command, "for i in `%s | cut -d\"'\" -f2 | sort -r` ; do echo \"Shutting down lv $i\" >> " MONDO_LOGFILE "; %s -f $i; done",
-                    lvscan_sz, lvremove_sz);
+    if (find_home_of_exe("lvm"))    // found it :) cool
+    {
+        strcpy(lvscan_sz, "lvm lvscan");
+        strcpy(lvremove_sz, "lvm lvremove");
+        strcpy(vgscan_sz, "lvm vgscan");
+        strcpy(pvscan_sz, "lvm pvscan");
+        strcpy(vgcreate_sz, "lvm vgcreate");
+        strcpy(vgchange_sz, "lvm vgchange");
+        strcpy(vgremove_sz, "lvm vgremove");
+    } else {
+        strcpy(lvscan_sz, "lvscan");
+        strcpy(lvremove_sz, "lvremove");
+        strcpy(vgscan_sz, "vgscan");
+        strcpy(pvscan_sz, "pvscan");
+        strcpy(vgcreate_sz, "vgcreate");
+        strcpy(vgchange_sz, "vgchange");
+        strcpy(vgremove_sz, "vgremove");
+    }
+    sprintf(command,
+            "for i in `%s | cut -d\"'\" -f2 | sort -r` ; do echo \"Shutting down lv $i\" >> "
+            MONDO_LOGFILE "; %s -f $i; done", lvscan_sz, lvremove_sz);
     run_program_and_log_output(command, 5);
     sleep(1);
-    sprintf(command, "for i in `%s | grep -i lvm | cut -d'\"' -f2` ; do %s -a n $i ; %s $i; echo \"Shutting down vg $i\" >> " MONDO_LOGFILE "; done; %s -a n", vgscan_sz, vgchange_sz, vgremove_sz, vgremove_sz);
+    sprintf(command,
+            "for i in `%s | grep -i lvm | cut -d'\"' -f2` ; do %s -a n $i ; %s $i; echo \"Shutting down vg $i\" >> "
+            MONDO_LOGFILE "; done; %s -a n", vgscan_sz, vgchange_sz,
+            vgremove_sz, vgremove_sz);
     run_program_and_log_output(command, 5);
     if (just_erase_existing_volumes) {
         paranoid_fclose(fin);
         log_msg(1, "Closed i-want-my-lvm. Finished erasing LVMs.");
-        retval=0;
+        retval = 0;
         goto end_of_i_want_my_lvm;
     }
@@ -423 +431 @@
             continue;
         }
-        if (res && strstr(command, "create") && vacuum_pack)
-          {
-            sleep(2);
-            system("sync"); system("sync"); system("sync");
-          }
-        if ((p=strstr(incoming, "vgcreate")))
-          {
+        if (res && strstr(command, "create") && vacuum_pack) {
+            sleep(2);
+            system("sync");
+            system("sync");
+            system("sync");
+        }
+        if ((p = strstr(incoming, "vgcreate"))) {
 // include next line(s) if they end in /dev (cos we've got a broken i-want-my-lvm)
-            for (fgets(tmp, 512, fin); !feof(fin); fgets(tmp, 512, fin)) {
-            if (tmp[0] == '#') {
-                fsetpos(fin, &orig_pos);
-                break;
-            } else {
-                fgetpos(fin, &orig_pos);
-                strcat(incoming, tmp);
-            }
-            }
-            for(q=incoming; *q!='\0'; q++)
-              {
-                if (*q<32) { *q=' '; }
-              }
-            strcpy(tmp, p+strlen("vgcreate")+1);
-            for(q=tmp; *q>32; q++);
-            *q = '\0';
-               log_msg(1, "Deleting old entries at /dev/%s", tmp);
-//             sprintf(command, "%s -f %s", vgremove_sz, tmp);
-//             run_program_and_log_output(command, 1);
-               sprintf(command, "rm -Rf /dev/%s", tmp);
-               run_program_and_log_output(command, 1);
-            run_program_and_log_output(vgscan_sz, 1);
-            run_program_and_log_output(pvscan_sz, 1);
-            log_msg(3, "After working around potentially broken i-want-my-lvm, incoming[] is now '%s'", incoming);
-          }
+            for (fgets(tmp, 512, fin); !feof(fin); fgets(tmp, 512, fin)) {
+                if (tmp[0] == '#') {
+                    fsetpos(fin, &orig_pos);
+                    break;
+                } else {
+                    fgetpos(fin, &orig_pos);
+                    strcat(incoming, tmp);
+                }
+            }
+            for (q = incoming; *q != '\0'; q++) {
+                if (*q < 32) {
+                    *q = ' ';
+                }
+            }
+            strcpy(tmp, p + strlen("vgcreate") + 1);
+            for (q = tmp; *q > 32; q++);
+            *q = '\0';
+            log_msg(1, "Deleting old entries at /dev/%s", tmp);
+//             sprintf(command, "%s -f %s", vgremove_sz, tmp);
+//             run_program_and_log_output(command, 1);
+            sprintf(command, "rm -Rf /dev/%s", tmp);
+            run_program_and_log_output(command, 1);
+            run_program_and_log_output(vgscan_sz, 1);
+            run_program_and_log_output(pvscan_sz, 1);
+            log_msg(3,
+                    "After working around potentially broken i-want-my-lvm, incoming[] is now '%s'",
+                    incoming);
+        }
         for (p = incoming + 1; *p == ' '; p++);
         strcpy(command, p);
@@ -462 +473 @@
         *p = '\0';
         res = run_program_and_log_output(command, 5);
-        if (res>0 && (p=strstr(command, "lvm ")))
-          {
-            *p = *(p+1) = *(p+2) = ' ';
-            res = run_program_and_log_output(command, 5);
-          }
+        if (res > 0 && (p = strstr(command, "lvm "))) {
+            *p = *(p + 1) = *(p + 2) = ' ';
+            res = run_program_and_log_output(command, 5);
+        }
         log_msg(0, "%s --> %d", command, res);
-                if (res>0) {res=1;}
-        if (res && strstr(command, "lvcreate") && vacuum_pack)
-          {
-            res=0;
-            if (strstr(command, "lvm lvcreate"))
-            lvmversion = 2;
-            log_it("%s... so I'll get creative.", tmp);
-            if (lvmversion == 2)
-              {
-                strcpy(tmp, call_program_and_get_last_line_of_output
-                    ("tail -n5 /var/log/mondo-archive.log | grep Insufficient | tail -n1"));
-              }
-            else
-              {
-                strcpy(tmp, call_program_and_get_last_line_of_output
-                    ("tail -n5 /var/log/mondo-archive.log | grep lvcreate | tail -n1"));
-              }
-            for(p=tmp; *p!='\0' && !isdigit(*p); p++);
-            extents = atol(p);
-            log_msg(5, "p='%s' --> extents=%ld", p, extents);
-            p = strstr(command, "-L");
-            if (!p)
-              {
-                log_msg(0, "Fiddlesticks. '%s' returned %d", command, res);
-              }
-            else
-              {
-            if (lvmversion == 2)
-              {
-                *p++ = '-'; *p++ = 'l'; *p++ = ' ';
-                for(q=p; *q!=' '; q++) { *q = ' '; }
-                sprintf(p, "%ld", extents);
-                i = strlen(p);
-                *(p+i) = ' ';
-              }
-            else
-              {
-                p++; p++; p++;
-                for(q=p; *q!=' '; q++) { *(q-1) = ' '; }
-                sprintf(p, "%ld%c", extents, 'm');
-                i = strlen(p);
-                *(p+i) = ' ';
-              }
-                log_msg(5, "Retrying with '%s'", command);
-                res = run_program_and_log_output(command, 5);
-            if (res>0) { res=1; }
-            if (g_fprep) { fprintf(g_fprep, "%s\n", command); }
-                log_msg(0, "%s --> %d", command, res);
-            if (!res)
-              {
-                log_msg(5, "YAY! This time, it succeeded.");
-              }
-              }
-          }
-        if (strstr(command, "vgcreate"))
-          {
-            log_msg(0, "In case you're interested...");
-            run_program_and_log_output(vgscan_sz, 1);
-            run_program_and_log_output(pvscan_sz, 1);
-          }
-                if (res!=0 && !strstr(command, "insmod")) {
-            retval ++;
+        if (res > 0) {
+            res = 1;
+        }
+        if (res && strstr(command, "lvcreate") && vacuum_pack) {
+            res = 0;
+            if (strstr(command, "lvm lvcreate"))
+                lvmversion = 2;
+            log_it("%s... so I'll get creative.", tmp);
+            if (lvmversion == 2) {
+                strcpy(tmp, call_program_and_get_last_line_of_output
+                       ("tail -n5 /var/log/mondo-archive.log | grep Insufficient | tail -n1"));
+            } else {
+                strcpy(tmp, call_program_and_get_last_line_of_output
+                       ("tail -n5 /var/log/mondo-archive.log | grep lvcreate | tail -n1"));
+            }
+            for (p = tmp; *p != '\0' && !isdigit(*p); p++);
+            extents = atol(p);
+            log_msg(5, "p='%s' --> extents=%ld", p, extents);
+            p = strstr(command, "-L");
+            if (!p) {
+                log_msg(0, "Fiddlesticks. '%s' returned %d", command, res);
+            } else {
+                if (lvmversion == 2) {
+                    *p++ = '-';
+                    *p++ = 'l';
+                    *p++ = ' ';
+                    for (q = p; *q != ' '; q++) {
+                        *q = ' ';
+                    }
+                    sprintf(p, "%ld", extents);
+                    i = strlen(p);
+                    *(p + i) = ' ';
+                } else {
+                    p++;
+                    p++;
+                    p++;
+                    for (q = p; *q != ' '; q++) {
+                        *(q - 1) = ' ';
+                    }
+                    sprintf(p, "%ld%c", extents, 'm');
+                    i = strlen(p);
+                    *(p + i) = ' ';
+                }
+                log_msg(5, "Retrying with '%s'", command);
+                res = run_program_and_log_output(command, 5);
+                if (res > 0) {
+                    res = 1;
+                }
+                if (g_fprep) {
+                    fprintf(g_fprep, "%s\n", command);
+                }
+                log_msg(0, "%s --> %d", command, res);
+                if (!res) {
+                    log_msg(5, "YAY! This time, it succeeded.");
+                }
+            }
+        }
+        if (strstr(command, "vgcreate")) {
+            log_msg(0, "In case you're interested...");
+            run_program_and_log_output(vgscan_sz, 1);
+            run_program_and_log_output(pvscan_sz, 1);
+        }
+        if (res != 0 && !strstr(command, "insmod")) {
+            retval++;
         }
         sprintf(tmp, "echo \"%s\" >> /tmp/out.sh", command);
@@ -537 +549 @@
     paranoid_fclose(fin);
     log_msg(1, "Closed i-want-my-lvm. Finished doing funky stuff.");
-end_of_i_want_my_lvm:
+  end_of_i_want_my_lvm:
     paranoid_free(tmp);
     paranoid_free(incoming);
@@ -548 +560 @@
     paranoid_free(vgchange_sz);
     paranoid_free(vgremove_sz);
-//  paranoid_free(do_this_last);
-    system("sync"); system("sync"); system("sync"); 
+//  paranoid_free(do_this_last);
+    system("sync");
+    system("sync");
+    system("sync");
     sleep(1);
-iamhere("ENDING");
-    if (retval>2)
-      {
-        log_msg(1, "%d errors. I'm reporting this.", retval);
-        return(retval);
-      }
-    else
-      {
-        log_msg(1, "Not many errors. Returning 0.");
-        return(0);
-      }
+    iamhere("ENDING");
+    if (retval > 2) {
+        log_msg(1, "%d errors. I'm reporting this.", retval);
+        return (retval);
+    } else {
+        log_msg(1, "Not many errors. Returning 0.");
+        return (0);
+    }
 }
 
@@ -574 +585 @@
  * @return 0 for success, nonzero for failure.
  */
-    int extrapolate_mountlist_to_include_raid_partitions(struct mountlist_itself
-                             *new_mountlist, struct mountlist_itself
-                             *old_mountlist)
+int extrapolate_mountlist_to_include_raid_partitions(struct mountlist_itself
+                                                     *new_mountlist, struct mountlist_itself
+                                                     *old_mountlist)
 {
     /** pointers *********************************************************/
@@ -603 +614 @@
 
 #ifdef __FreeBSD__
-    log_to_screen ("I don't know how to extrapolate the mountlist on FreeBSD. Sorry.");
-    return(1);
+    log_to_screen
+        ("I don't know how to extrapolate the mountlist on FreeBSD. Sorry.");
+    return (1);
 #endif
 
@@ -611 +623 @@
         {
             if (!does_file_exist("/etc/raidtab")) {
-                log_to_screen("Cannot find /etc/raidtab - cannot extrapolate the fdisk entries");
+                log_to_screen
+                    ("Cannot find /etc/raidtab - cannot extrapolate the fdisk entries");
                 finish(1);
             }
@@ -619 +632 @@
             }
             for (fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin)
-                 && !strstr(incoming, old_mountlist->el[lino].device); fgets(incoming, MAX_STR_LEN - 1, fin));
+                 && !strstr(incoming, old_mountlist->el[lino].device);
+                 fgets(incoming, MAX_STR_LEN - 1, fin));
             if (!feof(fin)) {
-                sprintf(tmp, "Investigating %s", old_mountlist->el[lino].device);
+                sprintf(tmp, "Investigating %s",
+                        old_mountlist->el[lino].device);
                 log_it(tmp);
                 for (fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin)
-                     && !strstr(incoming, "raiddev"); fgets(incoming, MAX_STR_LEN - 1, fin)) {
+                     && !strstr(incoming, "raiddev");
+                     fgets(incoming, MAX_STR_LEN - 1, fin)) {
                     if (strstr(incoming, OSSWAP("device", "drive"))
-                        && !strchr(incoming, '#')) {
-                        for (p = incoming + strlen(incoming); *(p - 1) <= 32; p--);
+                        && !strchr(incoming, '#')) {
+                        for (p = incoming + strlen(incoming);
+                             *(p - 1) <= 32; p--);
                         *p = '\0';
                         for (p--; p > incoming && *(p - 1) > 32; p--);
                         sprintf(tmp, "Extrapolating %s", p);
                         log_it(tmp);
-                        for (j = 0; j < new_mountlist->entries && strcmp(new_mountlist->el[j].device, p);
-                             j++);
+                        for (j = 0;
+                             j < new_mountlist->entries
+                             && strcmp(new_mountlist->el[j].device, p);
+                             j++);
                         if (j >= new_mountlist->entries) {
-                            strcpy(new_mountlist->el[new_mountlist->entries].device, p);
-                            strcpy(new_mountlist->el[new_mountlist->entries].mountpoint, "raid");
-                            strcpy(new_mountlist->el[new_mountlist->entries].format, "raid");
-                            new_mountlist->el[new_mountlist->entries].size =
-                                old_mountlist->el[lino].size;
+                            strcpy(new_mountlist->
+                                   el[new_mountlist->entries].device, p);
+                            strcpy(new_mountlist->
+                                   el[new_mountlist->entries].mountpoint,
+                                   "raid");
+                            strcpy(new_mountlist->
+                                   el[new_mountlist->entries].format,
+                                   "raid");
+                            new_mountlist->el[new_mountlist->entries].
+                                size = old_mountlist->el[lino].size;
                             new_mountlist->entries++;
                         } else {
-                            sprintf(tmp, "Not adding %s to mountlist: it's already there", p);
+                            sprintf(tmp,
+                                    "Not adding %s to mountlist: it's already there",
+                                    p);
                             log_it(tmp);
                         }
@@ -650 +676 @@
             paranoid_fclose(fin);
         } else {
-            strcpy(new_mountlist->el[new_mountlist->entries].device, old_mountlist->el[lino].device);
-            strcpy(new_mountlist->el[new_mountlist->entries].mountpoint, old_mountlist->el[lino].mountpoint);
-            strcpy(new_mountlist->el[new_mountlist->entries].format, old_mountlist->el[lino].format);
-            new_mountlist->el[new_mountlist->entries].size = old_mountlist->el[lino].size;
+            strcpy(new_mountlist->el[new_mountlist->entries].device,
+                   old_mountlist->el[lino].device);
+            strcpy(new_mountlist->el[new_mountlist->entries].mountpoint,
+                   old_mountlist->el[lino].mountpoint);
+            strcpy(new_mountlist->el[new_mountlist->entries].format,
+                   old_mountlist->el[lino].format);
+            new_mountlist->el[new_mountlist->entries].size =
+                old_mountlist->el[lino].size;
             new_mountlist->entries++;
         }
@@ -697 +727 @@
         sprintf(tmp, "Not formatting %s (it is a RAID disk)", device);
         log_it(tmp);
-        paranoid_free(program); paranoid_free(tmp);
+        paranoid_free(program);
+        paranoid_free(tmp);
         return (0);
     }
@@ -703 +734 @@
     if (strcmp(format, "swap") == 0) {
         log_it("Not formatting %s - it's swap", device);
-        paranoid_free(program); paranoid_free(tmp);
+        paranoid_free(program);
+        paranoid_free(tmp);
         return (0);
     }
@@ -709 +741 @@
     if (strlen(format) <= 2) {
         sprintf(tmp,
-            "%s has a really small format type ('%s') - this is probably a hexadecimal string, which would suggest the partition is an image --- I shouldn't format it",
-            device, format);
+                "%s has a really small format type ('%s') - this is probably a hexadecimal string, which would suggest the partition is an image --- I shouldn't format it",
+                device, format);
         log_it(tmp);
-        paranoid_free(program); paranoid_free(tmp);
+        paranoid_free(program);
+        paranoid_free(tmp);
         return (0);
     }
@@ -718 +751 @@
         sprintf(tmp, "%s is mounted - cannot format it       ", device);
         log_to_screen(tmp);
-        paranoid_free(program); paranoid_free(tmp);
+        paranoid_free(program);
+        paranoid_free(tmp);
         return (1);
     }
@@ -726 +760 @@
         if (!vinum_started_yet) {
             if (!does_file_exist("/tmp/raidconf.txt")) {
-                log_to_screen("/tmp/raidconf.txt does not exist. I therefore cannot start Vinum.");
+                log_to_screen
+                    ("/tmp/raidconf.txt does not exist. I therefore cannot start Vinum.");
             } else {
                 int res;
-                res = run_program_and_log_output("vinum create /tmp/raidconf.txt", TRUE);
+                res =
+                    run_program_and_log_output
+                    ("vinum create /tmp/raidconf.txt", TRUE);
                 if (res) {
                     log_to_screen
-                        ("`vinum create /tmp/raidconf.txt' returned errors. Please fix them and re-run mondorestore.");
+                        ("`vinum create /tmp/raidconf.txt' returned errors. Please fix them and re-run mondorestore.");
                     finish(1);
                 }
@@ -742 +779 @@
             FILE *fin;
             char line[MAX_STR_LEN];
-            sprintf(tmp, "Initializing Vinum device %s (this may take a *long* time)", device);
+            sprintf(tmp,
+                    "Initializing Vinum device %s (this may take a *long* time)",
+                    device);
             log_to_screen(tmp);
             /* format raid partition */
             //      sprintf (program, "mkraid --really-force %s", device); --- disabled -- BB, 02/12/2003
             sprintf(program,
-                "for plex in `vinum lv -r %s | grep '^P' | tr '\t' ' ' | tr -s ' ' | cut -d' ' -f2`; do echo $plex; done > /tmp/plexes",
-                basename(device));
+                    "for plex in `vinum lv -r %s | grep '^P' | tr '\t' ' ' | tr -s ' ' | cut -d' ' -f2`; do echo $plex; done > /tmp/plexes",
+                    basename(device));
             system(program);
-            if (g_fprep) { fprintf(g_fprep, "%s\n", program); }
+            if (g_fprep) {
+                fprintf(g_fprep, "%s\n", program);
+            }
             fin = fopen("/tmp/plexes", "r");
             while (fgets(line, MAX_STR_LEN - 1, fin)) {
@@ -762 +803 @@
                 while (1) {
                     sprintf(tmp,
-                        "vinum lp -r %s | grep '^S' | head -1 | tr -s ' ' | cut -d: -f2 | cut -f1 | sed 's/^ //' | sed 's/I //' | sed 's/%%//'",
-                        line);
+                            "vinum lp -r %s | grep '^S' | head -1 | tr -s ' ' | cut -d: -f2 | cut -f1 | sed 's/^ //' | sed 's/I //' | sed 's/%%//'",
+                            line);
                     FILE *pin = popen(tmp, "r");
                     char status[MAX_STR_LEN / 4];
@@ -788 +829 @@
         log_to_screen("Stopping %s", device);
         stop_raid_device(device);
-        system("sync"); sleep(1);
-        if (g_fprep) { fprintf(g_fprep, "%s\n", program); }
+        system("sync");
+        sleep(1);
+        if (g_fprep) {
+            fprintf(g_fprep, "%s\n", program);
+        }
 
         log_msg(1, "Making %s", device);
@@ -795 +839 @@
         res = run_program_and_log_output(program, 1);
         log_msg(1, "%s returned %d", program, res);
-        system("sync"); sleep(3);
+        system("sync");
+        sleep(3);
         start_raid_device(device);
-        if (g_fprep) { fprintf(g_fprep, "%s\n", program); }
-        system("sync"); sleep(2);
-        
-//      log_to_screen("Starting %s", device);
-//      sprintf(program, "raidstart %s", device);
-//      res = run_program_and_log_output(program, 1);
-//      log_msg(1, "%s returned %d", program, res);
-//      system("sync"); sleep(1);
-        if (g_fprep) { fprintf(g_fprep, "%s\n", program); }
-
-#endif
-        system("sync"); sleep(1);
+        if (g_fprep) {
+            fprintf(g_fprep, "%s\n", program);
+        }
+        system("sync");
+        sleep(2);
+
+//      log_to_screen("Starting %s", device);
+//      sprintf(program, "raidstart %s", device);
+//      res = run_program_and_log_output(program, 1);
+//      log_msg(1, "%s returned %d", program, res);
+//      system("sync"); sleep(1);
+        if (g_fprep) {
+            fprintf(g_fprep, "%s\n", program);
+        }
+#endif
+        system("sync");
+        sleep(1);
         newtResume();
     }
@@ -814 +864 @@
 //#endif
 
-    if (!strcmp(format, "lvm"))
-      {
-        log_msg(1, "Don't format %s - it's part of an lvm volume", device);
-        paranoid_free(program); paranoid_free(tmp);
-        return(0);
-      }
+    if (!strcmp(format, "lvm")) {
+        log_msg(1, "Don't format %s - it's part of an lvm volume", device);
+        paranoid_free(program);
+        paranoid_free(tmp);
+        return (0);
+    }
     res = which_format_command_do_i_need(format, program);
     sprintf(tmp, "%s %s", program, device);
@@ -830 +880 @@
     res = run_program_and_log_output(program, FALSE);
     if (res && strstr(program, "kludge")) {
-        sprintf(tmp, "Kludge failed; using regular mkfs.%s to format %s", format, device);
+        sprintf(tmp, "Kludge failed; using regular mkfs.%s to format %s",
+                format, device);
 #ifdef __FreeBSD__
         sprintf(program, "newfs_msdos -F 32 %s", device);
@@ -843 +894 @@
 #endif
         res = run_program_and_log_output(program, FALSE);
-        if (g_fprep) { fprintf(g_fprep, "%s\n", program); }
+        if (g_fprep) {
+            fprintf(g_fprep, "%s\n", program);
+        }
     }
     retval += res;
@@ -853 +906 @@
 
     log_to_screen(tmp);
-    paranoid_free(program); paranoid_free(tmp);
-    system("sync"); sleep(1);
+    paranoid_free(program);
+    paranoid_free(tmp);
+    system("sync");
+    sleep(1);
     return (retval);
 }
@@ -868 +923 @@
  * @return The number of errors encountered (0 for success).
  */
-int format_everything(struct mountlist_itself *mountlist, bool interactively)
+int format_everything(struct mountlist_itself *mountlist,
+                      bool interactively)
 {
     /** int **************************************************************/
@@ -874 +930 @@
     int lino;
     int res;
-//  int i;
-//  struct list_of_disks *drivelist;
+//  int i;
+//  struct list_of_disks *drivelist;
 
     /** long *************************************************************/
@@ -890 +946 @@
     /** end **************************************************************/
 
-    assert(mountlist!=NULL);
+    assert(mountlist != NULL);
     malloc_string(tmp);
-    sprintf(tmp, "format_everything (mountlist, interactively = %s", (interactively) ? "true" : "false");
+    sprintf(tmp, "format_everything (mountlist, interactively = %s",
+            (interactively) ? "true" : "false");
     log_it(tmp);
     mvaddstr_and_log_it(g_currentY, 0, "Formatting partitions     ");
-    open_progress_form("Formatting partitions", "I am now formatting your hard disk partitions.",
-               "This may take up to five minutes.", "", mountlist->entries + 1);
-
-    progress_step = (mountlist->entries > 0) ? g_maximum_progress / mountlist->entries : 1;
+    open_progress_form("Formatting partitions",
+                       "I am now formatting your hard disk partitions.",
+                       "This may take up to five minutes.", "",
+                       mountlist->entries + 1);
+
+    progress_step =
+        (mountlist->entries >
+         0) ? g_maximum_progress / mountlist->entries : 1;
 // start soft-raids now (because LVM might depend on them)
 // ...and for simplicity's sake, let's format them at the same time :)
     log_msg(1, "Stopping all RAID devices");
     stop_all_raid_devices(mountlist);
-    system("sync"); system("sync"); system("sync"); 
+    system("sync");
+    system("sync");
+    system("sync");
     sleep(2);
-    log_msg(1, "Prepare soft-RAIDs"); // prep and format too
+    log_msg(1, "Prepare soft-RAIDs");   // prep and format too
     for (lino = 0; lino < mountlist->entries; lino++) {
         me = &mountlist->el[lino];  // the current mountlist entry
@@ -912 +975 @@
             if (interactively) {
                 // ask user if we should format the current device
-                sprintf(tmp, "Shall I format %s (%s) ?", me->device, me->mountpoint);
+                sprintf(tmp, "Shall I format %s (%s) ?", me->device,
+                        me->mountpoint);
                 do_it = ask_me_yes_or_no(tmp);
             } else {
@@ -918 +982 @@
             }
             if (do_it) {
-            // NB: format_device() also stops/starts RAID device if necessary
+                // NB: format_device() also stops/starts RAID device if necessary
                 retval += format_device(me->device, me->format);
             }
@@ -924 +988 @@
         }
     }
-    system("sync"); system("sync"); system("sync"); 
+    system("sync");
+    system("sync");
+    system("sync");
     sleep(2);
 // This last step is probably necessary
-//  log_to_screen("Re-starting software RAIDs...");
-//  start_all_raid_devices(mountlist);
-//  system("sync"); system("sync"); system("sync"); 
-//  sleep(5);
+//  log_to_screen("Re-starting software RAIDs...");
+//  start_all_raid_devices(mountlist);
+//  system("sync"); system("sync"); system("sync"); 
+//  sleep(5);
 // do LVMs now
     log_msg(1, "Creating LVMs");
@@ -936 +1002 @@
         wait_until_software_raids_are_prepped("/proc/mdstat", 10);
         log_to_screen("Configuring LVM");
-                if (!g_text_mode) { newtSuspend(); }
+        if (!g_text_mode) {
+            newtSuspend();
+        }
 /*
         for(i=0; i<3; i++)
@@ -949 +1017 @@
             log_msg(1, "Vacuum-packing...");
 */
-            res = do_my_funky_lvm_stuff(FALSE, TRUE);
+        res = do_my_funky_lvm_stuff(FALSE, TRUE);
 /*
         }
 */
-                if (!g_text_mode) { newtResume(); }
-        if (!res) { log_to_screen("LVM initialized OK"); }
-        else { log_to_screen("Failed to initialize LVM"); }
+        if (!g_text_mode) {
+            newtResume();
+        }
+        if (!res) {
+            log_to_screen("LVM initialized OK");
+        } else {
+            log_to_screen("Failed to initialize LVM");
+        }
         // retval += res;
         if (res) {
-            retval ++;
-        }
-        sleep(3);
-    }
-
+            retval++;
+        }
+        sleep(3);
+    }
 // do regulars at last
-    sleep(2); // woo!
-        log_msg(1, "Formatting regulars");
+    sleep(2);                   // woo!
+    log_msg(1, "Formatting regulars");
     for (lino = 0; lino < mountlist->entries; lino++) {
         me = &mountlist->el[lino];  // the current mountlist entry
@@ -972 +1044 @@
             log_it(tmp);
         } else if (!strcmp(me->format, "raid")) {
-            sprintf(tmp, "Not formatting %s - it's a raid-let", me->device);
+            sprintf(tmp, "Not formatting %s - it's a raid-let",
+                    me->device);
             log_it(tmp);
             continue;
@@ -980 +1053 @@
             continue;
         } else if (!strncmp(me->device, "/dev/md", 7)) {
-            sprintf(tmp, "Already formatted %s - it's a soft-RAID dev", me->device);
+            sprintf(tmp, "Already formatted %s - it's a soft-RAID dev",
+                    me->device);
             log_it(tmp);
             continue;
         } else if (!does_file_exist(me->device)
-                    && strncmp(me->device, "/dev/hd", 7)
-                    && strncmp(me->device, "/dev/sd", 7)) {
-            sprintf(tmp, "Not formatting %s yet - doesn't exist - probably an LVM", me->device);
+                   && strncmp(me->device, "/dev/hd", 7)
+                   && strncmp(me->device, "/dev/sd", 7)) {
+            sprintf(tmp,
+                    "Not formatting %s yet - doesn't exist - probably an LVM",
+                    me->device);
             log_it(tmp);
             continue;
@@ -992 +1068 @@
             if (interactively) {
                 // ask user if we should format the current device
-                sprintf(tmp, "Shall I format %s (%s) ?", me->device, me->mountpoint);
+                sprintf(tmp, "Shall I format %s (%s) ?", me->device,
+                        me->mountpoint);
                 do_it = ask_me_yes_or_no(tmp);
             } else {
@@ -1016 +1093 @@
     if (retval) {
         mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
-        log_to_screen("Errors occurred during the formatting of your hard drives.");
+        log_to_screen
+            ("Errors occurred during the formatting of your hard drives.");
     } else {
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
 
-    sprintf(tmp, "format_everything () - %s", (retval) ? "failed!" : "finished successfully");
+    sprintf(tmp, "format_everything () - %s",
+            (retval) ? "failed!" : "finished successfully");
     log_it(tmp);
 
-    if (g_partition_table_locked_up > 0)
-      {
-        if (retval > 0 && !interactively)
-              {
+    if (g_partition_table_locked_up > 0) {
+        if (retval > 0 && !interactively) {
 //123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 
-                log_to_screen(
-  "Partition table locked up %d times. At least one 'mkfs' (format) command", g_partition_table_locked_up);
-                log_to_screen(
-  "failed. I think these two events are related. Sometimes, fdisk's ioctl() call");
-                log_to_screen(
-  "to refresh its copy of the partition table causes the kernel to lock the ");
-                log_to_screen(
-  "partition table. I believe this has just happened.");
-                if (ask_me_yes_or_no("Please choose 'yes' to reboot and try again; or 'no' to ignore this warning and continue."))
-                  {
-            system("sync");
-            system("sync");
-            system("sync");
-            system("reboot"); 
-          }
-          }
-        else
-          {
-            log_to_screen(
-"Partition table locked up %d time%c. However, disk formatting succeeded.", g_partition_table_locked_up, (g_partition_table_locked_up==1)?'.':'s');
-          }
-      }
-        newtSuspend();
+            log_to_screen
+                ("Partition table locked up %d times. At least one 'mkfs' (format) command",
+                 g_partition_table_locked_up);
+            log_to_screen
+                ("failed. I think these two events are related. Sometimes, fdisk's ioctl() call");
+            log_to_screen
+                ("to refresh its copy of the partition table causes the kernel to lock the ");
+            log_to_screen
+                ("partition table. I believe this has just happened.");
+            if (ask_me_yes_or_no
+                ("Please choose 'yes' to reboot and try again; or 'no' to ignore this warning and continue."))
+            {
+                system("sync");
+                system("sync");
+                system("sync");
+                system("reboot");
+            }
+        } else {
+            log_to_screen
+                ("Partition table locked up %d time%c. However, disk formatting succeeded.",
+                 g_partition_table_locked_up,
+                 (g_partition_table_locked_up == 1) ? '.' : 's');
+        }
+    }
+    newtSuspend();
     system("clear");
     newtResume();
@@ -1067 +1146 @@
  * @return The number of errors encountered (0 for success).
  */
-int make_dummy_partitions(FILE*pout_to_fdisk, char *drivename, int devno_we_must_allow_for)
+int make_dummy_partitions(FILE * pout_to_fdisk, char *drivename,
+                          int devno_we_must_allow_for)
 {
     /** int **************************************************************/
@@ -1087 +1167 @@
         log_it(tmp);
         g_maximum_progress++;
-        res = partition_device(pout_to_fdisk,drivename, 1, 0, "ext2", 32000);
+        res =
+            partition_device(pout_to_fdisk, drivename, 1, 0, "ext2",
+                             32000);
         retval += res;
         previous_devno = 1;
@@ -1096 +1178 @@
     }
     for (; current_devno < devno_we_must_allow_for; current_devno++) {
-        sprintf(tmp, "Creating dummy partition %s%d", drivename, current_devno);
+        sprintf(tmp, "Creating dummy partition %s%d", drivename,
+                current_devno);
         log_it(tmp);
         g_maximum_progress++;
-        res = partition_device(pout_to_fdisk,drivename, current_devno, previous_devno, OSSWAP("ext2", "ufs"), 32000);
+        res =
+            partition_device(pout_to_fdisk, drivename, current_devno,
+                             previous_devno, OSSWAP("ext2", "ufs"), 32000);
         retval += res;
         previous_devno = current_devno;
@@ -1147 +1232 @@
     else
         fprintf(f, "type: %u\n", lp->d_type);
-    fprintf(f, "disk: %.*s\n", (int) sizeof(lp->d_typename), lp->d_typename);
-    fprintf(f, "label: %.*s\n", (int) sizeof(lp->d_packname), lp->d_packname);
+    fprintf(f, "disk: %.*s\n", (int) sizeof(lp->d_typename),
+            lp->d_typename);
+    fprintf(f, "label: %.*s\n", (int) sizeof(lp->d_packname),
+            lp->d_packname);
     fprintf(f, "flags:");
     if (lp->d_flags & D_REMOVABLE)
@@ -1167 +1254 @@
     fprintf(f, "trackskew: %u\n", lp->d_trackskew);
     fprintf(f, "cylinderskew: %u\n", lp->d_cylskew);
-    fprintf(f, "headswitch: %lu\t\t# milliseconds\n", (u_long) lp->d_headswitch);
-    fprintf(f, "track-to-track seek: %ld\t# milliseconds\n", (u_long) lp->d_trkseek);
+    fprintf(f, "headswitch: %lu\t\t# milliseconds\n",
+            (u_long) lp->d_headswitch);
+    fprintf(f, "track-to-track seek: %ld\t# milliseconds\n",
+            (u_long) lp->d_trkseek);
     fprintf(f, "drivedata: ");
     for (i = NDDATA - 1; i >= 0; i--)
@@ -1178 +1267 @@
         fprintf(f, "%lu ", (u_long) lp->d_drivedata[j]);
     fprintf(f, "\n\n%u partitions:\n", lp->d_npartitions);
-    fprintf(f, "#        size   offset    fstype   [fsize bsize bps/cpg]\n");
+    fprintf(f,
+            "#        size   offset    fstype   [fsize bsize bps/cpg]\n");
     pp = lp->d_partitions;
     for (i = 0; i < lp->d_npartitions; i++, pp++) {
         if (pp->p_size) {
-            fprintf(f, "  %c: %8lu %8lu  ", 'a' + i, (u_long) pp->p_size, (u_long) pp->p_offset);
+            fprintf(f, "  %c: %8lu %8lu  ", 'a' + i, (u_long) pp->p_size,
+                    (u_long) pp->p_offset);
             if (pp->p_fstype < FSMAXTYPES)
                 fprintf(f, "%8.8s", fstypenames[pp->p_fstype]);
@@ -1190 +1281 @@
 
             case FS_UNUSED: /* XXX */
-                fprintf(f, "    %5lu %5lu %5.5s ", (u_long) pp->p_fsize, (u_long) (pp->p_fsize * pp->p_frag), "");
+                fprintf(f, "    %5lu %5lu %5.5s ", (u_long) pp->p_fsize,
+                        (u_long) (pp->p_fsize * pp->p_frag), "");
                 break;
 
             case FS_BSDFFS:
-                fprintf(f, "    %5lu %5lu %5u ", (u_long) pp->p_fsize, (u_long) (pp->p_fsize * pp->p_frag),
-                    pp->p_cpg);
+                fprintf(f, "    %5lu %5lu %5u ", (u_long) pp->p_fsize,
+                        (u_long) (pp->p_fsize * pp->p_frag), pp->p_cpg);
                 break;
 
             case FS_BSDLFS:
-                fprintf(f, "    %5lu %5lu %5d", (u_long) pp->p_fsize, (u_long) (pp->p_fsize * pp->p_frag),
-                    pp->p_cpg);
+                fprintf(f, "    %5lu %5lu %5d", (u_long) pp->p_fsize,
+                        (u_long) (pp->p_fsize * pp->p_frag), pp->p_cpg);
                 break;
 
@@ -1207 +1299 @@
                 break;
             }
-            fprintf(f, "\t# (Cyl. %4lu", (u_long) (pp->p_offset / lp->d_secpercyl));
+            fprintf(f, "\t# (Cyl. %4lu",
+                    (u_long) (pp->p_offset / lp->d_secpercyl));
             if (pp->p_offset % lp->d_secpercyl)
                 putc('*', f);
             else
                 putc(' ', f);
-            fprintf(f, "- %lu", (u_long) ((pp->p_offset + pp->p_size + lp->d_secpercyl - 1) / lp->d_secpercyl - 1));
+            fprintf(f, "- %lu",
+                    (u_long) ((pp->p_offset + pp->p_size +
+                               lp->d_secpercyl - 1) / lp->d_secpercyl -
+                              1));
             if (pp->p_size % lp->d_secpercyl)
                 putc('*', f);
@@ -1238 +1334 @@
     /* New world order */
     if ((ioctl(f, DIOCGMEDIASIZE, &mediasize) != 0)
-        || (ioctl(f, DIOCGSECTORSIZE, &secsize) != 0)) {
+        || (ioctl(f, DIOCGSECTORSIZE, &secsize) != 0)) {
         close(f);
         return (NULL);
@@ -1282 +1378 @@
     return (&loclab);
 }
+
 /* End stolen from /usr/src/sbin/disklabel/disklabel.c. */
 
@@ -1301 +1398 @@
  * @return The number of errors encountered (0 for success).
  */
-int label_drive_or_slice(struct mountlist_itself *mountlist, char *drivename, struct disklabel *ret)
+int label_drive_or_slice(struct mountlist_itself *mountlist,
+                         char *drivename, struct disklabel *ret)
 {
     char subdev_str[MAX_STR_LEN];
@@ -1325 +1423 @@
             lp->d_partitions[c - 'a'].p_cpg = 0;
             if (!strcmp(mountlist->el[idx].format, "ufs")
-                || !strcmp(mountlist->el[idx].format, "ffs")
-                || !strcmp(mountlist->el[idx].format, "4.2BSD")) {
+                || !strcmp(mountlist->el[idx].format, "ffs")
+                || !strcmp(mountlist->el[idx].format, "4.2BSD")) {
                 lp->d_partitions[c - 'a'].p_fstype = FS_BSDFFS;
                 lp->d_partitions[c - 'a'].p_fsize = 2048;
@@ -1332 +1430 @@
                 lp->d_partitions[c - 'a'].p_cpg = 64;
             } else if (!strcasecmp(mountlist->el[idx].format, "raid")
-                   || !strcasecmp(mountlist->el[idx].format, "vinum")) {
+                       || !strcasecmp(mountlist->el[idx].format, "vinum")) {
                 lp->d_partitions[c - 'a'].p_fstype = FS_VINUM;
             } else if (!strcmp(mountlist->el[idx].format, "swap")) {
@@ -1353 +1451 @@
         for (lastone = i - 1; lastone >= 0; lastone--) {
             if ((lp->d_partitions[lastone].p_size)
-                && (lastone != RAW_PART))
+                && (lastone != RAW_PART))
                 break;
         }
-        lp->d_partitions[i].p_offset = lp->d_partitions[lastone].p_offset + lp->d_partitions[lastone].p_size;
-    }
-    if (lp->d_partitions[lo].p_offset + lp->d_partitions[lo].p_size > lp->d_secperunit) {
-        lp->d_partitions[lo].p_size = lp->d_secperunit - lp->d_partitions[lo].p_offset;
+        lp->d_partitions[i].p_offset =
+            lp->d_partitions[lastone].p_offset +
+            lp->d_partitions[lastone].p_size;
+    }
+    if (lp->d_partitions[lo].p_offset + lp->d_partitions[lo].p_size >
+        lp->d_secperunit) {
+        lp->d_partitions[lo].p_size =
+            lp->d_secperunit - lp->d_partitions[lo].p_offset;
     }
 
@@ -1367 +1469 @@
     sprintf(command, "disklabel -wr %s auto", canonical_name(drivename));
     retval += run_program_and_log_output(command, TRUE);
-    sprintf(command, "disklabel -R %s /tmp/disklabel", canonical_name(drivename));
+    sprintf(command, "disklabel -R %s /tmp/disklabel",
+            canonical_name(drivename));
     retval += run_program_and_log_output(command, TRUE);
     if (ret)
@@ -1390 +1493 @@
     int retval = 0;
     int i;
-    FILE*pout_to_fdisk=NULL;
-    
+    FILE *pout_to_fdisk = NULL;
+
 #ifdef __FreeBSD__
     bool fbsd_part = FALSE;
@@ -1413 +1516 @@
     malloc_string(format);
     malloc_string(tmp);
-    
+
     sprintf(tmp, "Partitioning drive %s", drivename);
     log_it(tmp);
 
-#if __FreeBSD__ 
-        log_it("(Not opening fdisk now; that's the Linux guy's job)");
+#if __FreeBSD__
+    log_it("(Not opening fdisk now; that's the Linux guy's job)");
     pout_to_fdisk = NULL;
 #else
     make_hole_for_file(FDISK_LOG);
 #ifdef __IA64__
-    sprintf(tmp, "parted2fdisk %s >> %s 2>> %s", drivename, FDISK_LOG, FDISK_LOG);
+    sprintf(tmp, "parted2fdisk %s >> %s 2>> %s", drivename, FDISK_LOG,
+            FDISK_LOG);
 #else
     sprintf(tmp, "fdisk %s >> %s 2>> %s", drivename, FDISK_LOG, FDISK_LOG);
 #endif
     pout_to_fdisk = popen(tmp, "w");
-    if (!pout_to_fdisk) { 
-        log_to_screen("Cannot call fdisk to configure %s", drivename); 
+    if (!pout_to_fdisk) {
+        log_to_screen("Cannot call fdisk to configure %s", drivename);
         paranoid_free(device_str);
         paranoid_free(format);
         paranoid_free(tmp);
-        return(1); 
+        return (1);
     }
 #endif
@@ -1451 +1555 @@
                 for (c = 'a'; c <= 'z'; c++) {
                     sprintf(subdev_str, "%s%c", drivename, c);
-                    if (find_device_in_mountlist(mountlist, subdev_str) > 0) {
+                    if (find_device_in_mountlist(mountlist, subdev_str) >
+                        0) {
                         fbsd_part = TRUE;
                     }
@@ -1457 +1562 @@
                 if (fbsd_part) {
                     int r = label_drive_or_slice(mountlist,
-                                     drivename,
-                                     0);
+                                                 drivename,
+                                                 0);
                     char command[MAX_STR_LEN];
-                    sprintf(command, "disklabel -B %s", basename(drivename));
+                    sprintf(command, "disklabel -B %s",
+                            basename(drivename));
                     if (system(command)) {
-                        log_to_screen("Warning! Unable to make the drive bootable.");
+                        log_to_screen
+                            ("Warning! Unable to make the drive bootable.");
                     }
                     paranoid_free(device_str);
@@ -1507 +1614 @@
 #if __FreeBSD__
             // FreeBSD doesn't let you write to blk devices in <512byte chunks.
-//          sprintf(tmp, "dd if=/dev/zero of=%s count=1 bs=512", drivename);
-//          if (run_program_and_log_output(tmp, TRUE)) {
+//          sprintf(tmp, "dd if=/dev/zero of=%s count=1 bs=512", drivename);
+//          if (run_program_and_log_output(tmp, TRUE)) {
             file = open(drivename, O_WRONLY);
             if (!file) {
-                sprintf(tmp, "Warning - unable to open %s for wiping it's partition table", drivename);
+                sprintf(tmp,
+                        "Warning - unable to open %s for wiping it's partition table",
+                        drivename);
                 log_to_screen(tmp);
             }
 
-            for (i=0; i<512; i++) {
-                if ( !write(file, "\0", 1) ) {
-                    sprintf(tmp, "Warning - unable to write to %s", drivename);
+            for (i = 0; i < 512; i++) {
+                if (!write(file, "\0", 1)) {
+                    sprintf(tmp, "Warning - unable to write to %s",
+                            drivename);
                     log_to_screen(tmp);
                 }
@@ -1524 +1634 @@
 #else
             iamhere("New, kernel-friendly partition remover");
-            for(i=20;i>0;i--)
-              {
-                fprintf(pout_to_fdisk, "d\n%d\n", i);
-                fflush(pout_to_fdisk);
-              }
-//          sprintf(tmp, "dd if=/dev/zero of=%s count=1 bs=512", drivename);
-//          run_program_and_log_output(tmp, 1);
-#endif  
+            for (i = 20; i > 0; i--) {
+                fprintf(pout_to_fdisk, "d\n%d\n", i);
+                fflush(pout_to_fdisk);
+            }
+//          sprintf(tmp, "dd if=/dev/zero of=%s count=1 bs=512", drivename);
+//          run_program_and_log_output(tmp, 1);
+#endif
             if (current_devno > 1) {
-                previous_devno = make_dummy_partitions(pout_to_fdisk,drivename, current_devno);
+                previous_devno =
+                    make_dummy_partitions(pout_to_fdisk, drivename,
+                                          current_devno);
             }
         }
@@ -1540 +1651 @@
 #endif
 
-        strcpy(format, mountlist->el[lino].format);
-        partsize = mountlist->el[lino].size;
+            strcpy(format, mountlist->el[lino].format);
+            partsize = mountlist->el[lino].size;
 
 #ifdef __FreeBSD__
@@ -1549 +1660 @@
 #ifndef __IA64__
         if (current_devno == 5 && previous_devno == 4) {
-            log_to_screen("You must leave at least one partition spare as the Extended partition.");
+            log_to_screen
+                ("You must leave at least one partition spare as the Extended partition.");
             paranoid_free(device_str);
             paranoid_free(format);
@@ -1557 +1669 @@
 #endif
 
-        retval += partition_device(pout_to_fdisk, drivename, current_devno, previous_devno, format, partsize);
+        retval +=
+            partition_device(pout_to_fdisk, drivename, current_devno,
+                             previous_devno, format, partsize);
 
 #ifdef __FreeBSD__
@@ -1564 +1678 @@
             retval += label_drive_or_slice(mountlist, device_str, 0);
             if (system(tmp)) {
-                log_to_screen("Warning! Unable to make the slice bootable.");
+                log_to_screen
+                    ("Warning! Unable to make the slice bootable.");
             }
         }
@@ -1572 +1687 @@
     }
 
-    if (pout_to_fdisk)
-    {
+    if (pout_to_fdisk) {
 // mark relevant partition as bootable
-        sprintf(tmp, "a\n%s\n", call_program_and_get_last_line_of_output("make-me-bootable /tmp/mountlist.txt dummy"));
+        sprintf(tmp, "a\n%s\n",
+                call_program_and_get_last_line_of_output
+                ("make-me-bootable /tmp/mountlist.txt dummy"));
         fput_string_one_char_at_a_time(pout_to_fdisk, tmp);
 // close fdisk
         fput_string_one_char_at_a_time(pout_to_fdisk, "w\n");
         system("sync");
-        paranoid_pclose(pout_to_fdisk); 
-        log_msg(0, "------------------- fdisk.log looks like this ------------------");
+        paranoid_pclose(pout_to_fdisk);
+        log_msg(0,
+                "------------------- fdisk.log looks like this ------------------");
         sprintf(tmp, "cat %s >> %s", FDISK_LOG, MONDO_LOGFILE);
         system(tmp);
-        log_msg(0, "------------------- end of fdisk.log... word! ------------------");
+        log_msg(0,
+                "------------------- end of fdisk.log... word! ------------------");
         sprintf(tmp, "tail -n6 %s | fgrep \"16: \"", FDISK_LOG);
-        if (!run_program_and_log_output(tmp, 5))
-          {
-            g_partition_table_locked_up++;
-            log_to_screen("A flaw in the Linux kernel has locked the partition table.");
-          }
+        if (!run_program_and_log_output(tmp, 5)) {
+            g_partition_table_locked_up++;
+            log_to_screen
+                ("A flaw in the Linux kernel has locked the partition table.");
+        }
     }
     paranoid_free(device_str);
@@ -1607 +1725 @@
  * @return 0 for success, nonzero for failure.
  */
-int partition_device(FILE*pout_to_fdisk, const char *drive, int partno, int prev_partno, const char *format, long long partsize)
+int partition_device(FILE * pout_to_fdisk, const char *drive, int partno,
+                     int prev_partno, const char *format,
+                     long long partsize)
 {
     /** int **************************************************************/
@@ -1632 +1752 @@
     malloc_string(logfile);
     malloc_string(output);
-    
+
     assert_string_is_neither_NULL_nor_zerolength(drive);
     assert(format != NULL);
 
-    log_it("partition_device('%s', %d, %d, '%s', %lld) --- starting", drive, partno, prev_partno, format, partsize);
+    log_it("partition_device('%s', %d, %d, '%s', %lld) --- starting",
+           drive, partno, prev_partno, format, partsize);
 
     if (!strncmp(drive, RAID_DEVICE_STUB, strlen(RAID_DEVICE_STUB))) {
@@ -1652 +1773 @@
         sprintf(tmp, "Partitioning device %s (max size)", partition_name);
     } else {
-        sprintf(tmp, "Partitioning device %s (%lld MB)", partition_name, (long long) partsize / 1024);
+        sprintf(tmp, "Partitioning device %s (%lld MB)", partition_name,
+                (long long) partsize / 1024);
     }
     update_progress_form(tmp);
@@ -1658 +1780 @@
 
     if (is_this_device_mounted(partition_name)) {
-        sprintf(tmp, "%s is mounted, and should not be partitioned", partition_name);
+        sprintf(tmp, "%s is mounted, and should not be partitioned",
+                partition_name);
         log_to_screen(tmp);
         paranoid_free(program);
@@ -1679 +1802 @@
     p = (char *) strrchr(partition_name, '/');
     sprintf(logfile, "/tmp/fdisk.log.%s", ++p);
-    sprintf(program, "parted2fdisk %s >> %s 2>> %s", drive, MONDO_LOGFILE, MONDO_LOGFILE);
+    sprintf(program, "parted2fdisk %s >> %s 2>> %s", drive, MONDO_LOGFILE,
+            MONDO_LOGFILE);
 
     /* BERLIOS: shoould not be called each time */
@@ -1689 +1813 @@
     } else {
         /* MBR needs an extended partition if more than 4 partitions */
-        if (strcmp(part_table_fmt,"MBR") == 0) {
+        if (strcmp(part_table_fmt, "MBR") == 0) {
             if (partno == 5) {
                 if (prev_partno >= 4) {
-                    log_to_screen("You need to leave at least one partition free, for 'extended/logical'");
+                    log_to_screen
+                        ("You need to leave at least one partition free, for 'extended/logical'");
                     paranoid_free(program);
                     paranoid_free(partition_name);
@@ -1700 +1825 @@
                     return (1);
                 } else {
-                    sprintf(output + strlen(output), "n\ne\n%d\n\n\n", prev_partno + 1);
+                    sprintf(output + strlen(output), "n\ne\n%d\n\n\n",
+                            prev_partno + 1);
                 }
             }
@@ -1711 +1837 @@
     strcat(output + strlen(output), "\n");  /*start block (ENTER for next free blk */
     if (partsize > 0) {
-                if (!strcmp(format, "7")) { log_msg(1, "Adding 512K, just in case"); partsize+=512; }
+        if (!strcmp(format, "7")) {
+            log_msg(1, "Adding 512K, just in case");
+            partsize += 512;
+        }
         sprintf(output + strlen(output), "+%lldK", (long long) (partsize));
     }
@@ -1728 +1857 @@
 
 
-    if (pout_to_fdisk)
-    {
+    if (pout_to_fdisk) {
         log_msg(1, "Doing the new all-in-one fdisk thing");
         log_msg(1, "output = '%s'", output);
@@ -1735 +1863 @@
         fput_string_one_char_at_a_time(pout_to_fdisk, "\n\np\n");
         strcpy(tmp, last_line_of_file(FDISK_LOG));
-        if (strstr(tmp, " (m "))
-        {
+        if (strstr(tmp, " (m ")) {
             log_msg(1, "Successfully created %s%d", drive, partno);
-        }
-        else
-        {
+        } else {
             log_msg(1, "last line = %s", tmp);
-            log_msg(1, "Failed to create %s%d; sending 'Enter'...", drive, partno);
-        }
-        if (!retval)
-        {
-            log_msg(1, "Trying to set %s%d's partition type now", drive, partno);
-            retval = set_partition_type(pout_to_fdisk, drive, partno, format, partsize);
-            if (retval)
-            {
+            log_msg(1, "Failed to create %s%d; sending 'Enter'...", drive,
+                    partno);
+        }
+        if (!retval) {
+            log_msg(1, "Trying to set %s%d's partition type now", drive,
+                    partno);
+            retval =
+                set_partition_type(pout_to_fdisk, drive, partno, format,
+                                   partsize);
+            if (retval) {
                 log_msg(1, "Failed. Trying again...");
-                    retval = set_partition_type(pout_to_fdisk, drive, partno, format, partsize);
-            }
-          }
-        if (retval) { log_msg(1, "...but failed to set type"); }
-    }
-    else
-    {
+                retval =
+                    set_partition_type(pout_to_fdisk, drive, partno,
+                                       format, partsize);
+            }
+        }
+        if (retval) {
+            log_msg(1, "...but failed to set type");
+        }
+    } else {
         strcat(output, "w\n\n");
-            if (g_fprep) { fprintf(g_fprep, "echo \"%s\" | %s\n", output, program); }
+        if (g_fprep) {
+            fprintf(g_fprep, "echo \"%s\" | %s\n", output, program);
+        }
         /* write to disk; close fdisk's stream */
         if (!(fout = popen(program, "w"))) {
@@ -1770 +1901 @@
             log_it("Vaccum-packing");
             g_current_progress--;
-            res = partition_device(pout_to_fdisk, drive, partno, prev_partno, format, -1);
+            res =
+                partition_device(pout_to_fdisk, drive, partno, prev_partno,
+                                 format, -1);
             if (res) {
                 sprintf(tmp, "Failed to vacuum-pack %s", partition_name);
@@ -1780 +1913 @@
         }
         if (does_partition_exist(drive, partno)) {
-            retval = set_partition_type(pout_to_fdisk, drive, partno, format, partsize);
+            retval =
+                set_partition_type(pout_to_fdisk, drive, partno, format,
+                                   partsize);
             if (retval) {
-                sprintf(tmp, "Partitioned %s but failed to set its type", partition_name);
+                sprintf(tmp, "Partitioned %s but failed to set its type",
+                        partition_name);
                 log_it(tmp);
             } else {
                 if (partsize > 0) {
-                    sprintf(tmp, "Partition %s created+configured OK", partition_name);
+                    sprintf(tmp, "Partition %s created+configured OK",
+                            partition_name);
                     log_to_screen(tmp);
                 } else {
@@ -1792 +1929 @@
                 }
             }
-            } else {
+        } else {
             sprintf(tmp, "Failed to partition %s", partition_name);
             if (partsize > 0) {
@@ -1844 +1981 @@
         /*      mountlist=&new_mtlist; */
         /*      extrapolate_mountlist_to_include_raid_partitions(mountlist,orig_mtlist); */
-        log_msg(0,"Mountlist, including the partitions incorporated in RAID devices:-");
+        log_msg(0,
+                "Mountlist, including the partitions incorporated in RAID devices:-");
         for (i = 0; i < mountlist->entries; i++) {
             log_it(mountlist->el[i].device);
@@ -1851 +1989 @@
     }
     log_msg(0, "Stopping all LVMs, just in case");
-        if (!g_text_mode) { newtSuspend(); }
-    do_my_funky_lvm_stuff(TRUE, FALSE); // just remove old partitions
-        if (!g_text_mode) { newtResume(); }
+    if (!g_text_mode) {
+        newtSuspend();
+    }
+    do_my_funky_lvm_stuff(TRUE, FALSE); // just remove old partitions
+    if (!g_text_mode) {
+        newtResume();
+    }
     log_msg(0, "Stopping all software RAID devices, just in case");
     stop_all_raid_devices(mountlist);
     log_msg(0, "Done.");
-    
+
 /*  
     if (does_file_exist("/tmp/i-want-my-lvm"))
@@ -1865 +2007 @@
 */
 
-    open_progress_form("Partitioning devices", "I am now going to partition all your drives.",
-               "This should not take more than five minutes.", "", mountlist->entries);
+    open_progress_form("Partitioning devices",
+                       "I am now going to partition all your drives.",
+                       "This should not take more than five minutes.", "",
+                       mountlist->entries);
 
     make_list_of_drives_in_mountlist(mountlist, drivelist);
@@ -1878 +2022 @@
     if (retval) {
         mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
-        log_to_screen("Errors occurred during the partitioning of your hard drives.");
+        log_to_screen
+            ("Errors occurred during the partitioning of your hard drives.");
     } else {
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
@@ -1904 +2049 @@
  * @return 0 for success, nonzero for failure.
  */
-int set_partition_type(FILE *pout_to_fdisk, const char *drive, int partno, const char *format, long long partsize)
+int set_partition_type(FILE * pout_to_fdisk, const char *drive, int partno,
+                       const char *format, long long partsize)
 {
     /** buffers *********************************************************/
-  char *partition;
-  char *command;
-  char *output;
-  char *tmp;
-  char *partcode;
-  char *logfile;
+    char *partition;
+    char *command;
+    char *output;
+    char *tmp;
+    char *partcode;
+    char *logfile;
 
     /** pointers *********************************************************/
@@ -1926 +2072 @@
     assert(format != NULL);
 
-  malloc_string(partition);
-  malloc_string(command);
-  malloc_string(output);
-  malloc_string(tmp);
-  malloc_string(partcode);
-  malloc_string(logfile);
+    malloc_string(partition);
+    malloc_string(command);
+    malloc_string(output);
+    malloc_string(tmp);
+    malloc_string(partcode);
+    malloc_string(logfile);
 
     build_partition_name(partition, drive, partno);
@@ -1944 +2090 @@
             strcpy(partcode, "b");
         }
-    } else if (strcmp(format, "ext2") == 0 || strcmp(format, "reiserfs") == 0 || strcmp(format, "ext3") == 0
-           || strcmp(format, "xfs") == 0 || strcmp(format, "jfs") == 0) {
+    } else if (strcmp(format, "ext2") == 0
+               || strcmp(format, "reiserfs") == 0
+               || strcmp(format, "ext3") == 0 || strcmp(format, "xfs") == 0
+               || strcmp(format, "jfs") == 0) {
         strcpy(partcode, "83");
     } else if (strcmp(format, "minix") == 0) {
@@ -1952 +2100 @@
         strcpy(partcode, "fd");
     } else if ((strcmp(format, "ufs") == 0)
-           || (strcmp(format, "ffs") == 0)) {   /* raid autodetect */
+               || (strcmp(format, "ffs") == 0)) {   /* raid autodetect */
         strcpy(partcode, "a5");
     } else if (strcmp(format, "lvm") == 0) {
@@ -1962 +2110 @@
     } else {
         /* probably an image */
-        sprintf(tmp, "Unknown format ('%s') - using supplied string anyway", format);
+        sprintf(tmp,
+                "Unknown format ('%s') - using supplied string anyway",
+                format);
         mvaddstr_and_log_it(g_currentY++, 0, tmp);
 #ifdef __FreeBSD__
-        strcpy(partcode, format); // was a5
+        strcpy(partcode, format);   // was a5
 #else
-        strcpy(partcode, format); // was 83
-#endif
-    }
-    sprintf(tmp, "Setting %s's type to %s (%s)", partition, format, partcode);
+        strcpy(partcode, format);   // was 83
+#endif
+    }
+    sprintf(tmp, "Setting %s's type to %s (%s)", partition, format,
+            partcode);
     log_msg(1, tmp);
     if (partcode[0] != '\0' && strcmp(partcode, "83")) {    /* no need to set type if 83: 83 is default */
-        
-        if (pout_to_fdisk)
-        {
+
+        if (pout_to_fdisk) {
             res = 0;
             fput_string_one_char_at_a_time(pout_to_fdisk, "t\n");
-            if (partno > 1 || strstr(last_line_of_file(FDISK_LOG), " (1-4)"))
-            {
+            if (partno > 1
+                || strstr(last_line_of_file(FDISK_LOG), " (1-4)")) {
                 log_msg(5, "Specifying partno (%d) - yay", partno);
                 sprintf(tmp, "%d\n", partno);
                 fput_string_one_char_at_a_time(pout_to_fdisk, tmp);
-                log_msg(5, "A - last line = '%s'", last_line_of_file(FDISK_LOG));
-            }
-            
+                log_msg(5, "A - last line = '%s'",
+                        last_line_of_file(FDISK_LOG));
+            }
+
             sprintf(tmp, "%s\n", partcode);
             fput_string_one_char_at_a_time(pout_to_fdisk, tmp);
-            log_msg(5, "B - last line = '%s'", last_line_of_file(FDISK_LOG));
+            log_msg(5, "B - last line = '%s'",
+                    last_line_of_file(FDISK_LOG));
             fput_string_one_char_at_a_time(pout_to_fdisk, "\n");
-            log_msg(5, "C - last line = '%s'", last_line_of_file(FDISK_LOG));
-            
+            log_msg(5, "C - last line = '%s'",
+                    last_line_of_file(FDISK_LOG));
+
             strcpy(tmp, last_line_of_file(FDISK_LOG));
-            if (!strstr(tmp, " (m "))
-              { 
-                log_msg(1, "last line = '%s'; part type set failed", tmp);
-                res++; 
-                fput_string_one_char_at_a_time(pout_to_fdisk,"\n");
-              }
-            fput_string_one_char_at_a_time(pout_to_fdisk,"p\n");
-        }
-        else
-        {
+            if (!strstr(tmp, " (m ")) {
+                log_msg(1, "last line = '%s'; part type set failed", tmp);
+                res++;
+                fput_string_one_char_at_a_time(pout_to_fdisk, "\n");
+            }
+            fput_string_one_char_at_a_time(pout_to_fdisk, "p\n");
+        } else {
             sprintf(output, "t\n%d\n%s\n", partno, partcode);
             strcat(output, "w\n");
-            sprintf(command, "parted2fdisk %s >> %s 2>> %s", drive, MONDO_LOGFILE, MONDO_LOGFILE);
+            sprintf(command, "parted2fdisk %s >> %s 2>> %s", drive,
+                    MONDO_LOGFILE, MONDO_LOGFILE);
             log_msg(5, "output = '%s'", output);
             log_msg(5, "partno=%d; partcode=%s", partno, partcode);
@@ -2019 +2170 @@
             }
         }
-    if (res)
-      {
-        log_OS_error(command);
-      } 
-    }
-
-  paranoid_free(partition);
-  paranoid_free(command);
-  paranoid_free(output);
-  paranoid_free(tmp);
-  paranoid_free(partcode);
-  paranoid_free(logfile);
-
-  return (res);
+        if (res) {
+            log_OS_error(command);
+        }
+    }
+
+    paranoid_free(partition);
+    paranoid_free(command);
+    paranoid_free(output);
+    paranoid_free(tmp);
+    paranoid_free(partcode);
+    paranoid_free(logfile);
+
+    return (res);
 }
 
@@ -2049 +2199 @@
     assert_string_is_neither_NULL_nor_zerolength(raid_device);
     malloc_string(program);
-    
+
 #ifdef __FreeBSD__
     if (is_this_device_mounted(raid_device)) {
@@ -2062 +2212 @@
     log_msg(1, "program = %s", program);
     res = run_program_and_log_output(program, 1);
-    if (g_fprep) { fprintf(g_fprep, "%s\n", program); }
-    if (res) { log_msg(1, "Warning - failed to start RAID device %s", raid_device); }
+    if (g_fprep) {
+        fprintf(g_fprep, "%s\n", program);
+    }
+    if (res) {
+        log_msg(1, "Warning - failed to start RAID device %s",
+                raid_device);
+    }
     retval += res;
     sleep(1);
@@ -2089 +2244 @@
     assert_string_is_neither_NULL_nor_zerolength(raid_device);
     malloc_string(program);
-    
+
 #ifdef __FreeBSD__
     if (is_this_device_mounted(raid_device)) {
@@ -2102 +2257 @@
     log_msg(1, "program = %s", program);
     res = run_program_and_log_output(program, 1);
-    if (g_fprep) { fprintf(g_fprep, "%s\n", program); }
-    if (res) { log_msg(1, "Warning - failed to stop RAID device %s", raid_device); }
+    if (g_fprep) {
+        fprintf(g_fprep, "%s\n", program);
+    }
+    if (res) {
+        log_msg(1, "Warning - failed to stop RAID device %s", raid_device);
+    }
     retval += res;
     return (retval);
@@ -2112 +2271 @@
 {
     int i;
-    int retval=0;
+    int retval = 0;
     int res;
-    
-    for(i=0; i<mountlist->entries; i++)
-      {
-        if (!strncmp(mountlist->el[i].device, RAID_DEVICE_STUB, strlen(RAID_DEVICE_STUB)))
-          {
-            log_msg(1, "Starting %s", mountlist->el[i].device);
-        res = start_raid_device(mountlist->el[i].device);
-        retval += res;
-          }
-      }
-    if (retval) { log_msg(1, "Started all s/w raid devices OK"); }
-    else { log_msg(1, "Failed to start some/all s/w raid devices"); }
-    return(retval);
+
+    for (i = 0; i < mountlist->entries; i++) {
+        if (!strncmp
+            (mountlist->el[i].device, RAID_DEVICE_STUB,
+             strlen(RAID_DEVICE_STUB))) {
+            log_msg(1, "Starting %s", mountlist->el[i].device);
+            res = start_raid_device(mountlist->el[i].device);
+            retval += res;
+        }
+    }
+    if (retval) {
+        log_msg(1, "Started all s/w raid devices OK");
+    } else {
+        log_msg(1, "Failed to start some/all s/w raid devices");
+    }
+    return (retval);
 }
 
@@ -2163 +2325 @@
     for (i = 0; i < 3; i++) {
 #ifdef __FreeBSD__
-        fin = popen("vinum list | grep '^[PVS]' | sed 's/S/1/;s/P/2/;s/V/3/' | sort | cut -d' ' -f2", "r");
+        fin =
+            popen
+            ("vinum list | grep '^[PVS]' | sed 's/S/1/;s/P/2/;s/V/3/' | sort | cut -d' ' -f2",
+             "r");
         if (!fin) {
             paranoid_free(dev);
@@ -2169 +2334 @@
             return (1);
         }
-        for (fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin); fgets(incoming, MAX_STR_LEN - 1, fin)) {
+        for (fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin);
+             fgets(incoming, MAX_STR_LEN - 1, fin)) {
             retval += stop_raid_device(incoming);
         }
@@ -2180 +2346 @@
             return (1);
         }
-        for (fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin); fgets(incoming, MAX_STR_LEN - 1, fin)) {
-            for (p = incoming; *p != '\0' && (*p != 'm' || *(p + 1) != 'd' || !isdigit(*(p + 2))); p++);
+        for (fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin);
+             fgets(incoming, MAX_STR_LEN - 1, fin)) {
+            for (p = incoming;
+                 *p != '\0' && (*p != 'm' || *(p + 1) != 'd'
+                                || !isdigit(*(p + 2))); p++);
             if (*p != '\0') {
                 sprintf(dev, "/dev/%s", p);
@@ -2192 +2361 @@
     }
     paranoid_fclose(fin);
-    if (retval) { log_msg(1, "Warning - unable to stop some RAID devices"); }
+    if (retval) {
+        log_msg(1, "Warning - unable to stop some RAID devices");
+    }
     paranoid_free(dev);
     paranoid_free(incoming);
-    system("sync"); system("sync"); system("sync"); 
+    system("sync");
+    system("sync");
+    system("sync");
     sleep(1);
     return (retval);
@@ -2250 +2423 @@
         sprintf(program, "mkfs -t %s -c", format);  // -c checks for bad blocks
 #endif
-        sprintf(tmp, "Unknown format (%s) - assuming '%s' will do", format, program);
+        sprintf(tmp, "Unknown format (%s) - assuming '%s' will do", format,
+                program);
         log_it(tmp);
         res = 0;
@@ -2267 +2441 @@
  */
 long calc_orig_size_of_drive_from_mountlist(struct mountlist_itself
-                        *mountlist, char *drive_name)
+                                            *mountlist, char *drive_name)
 {
     /** long ************************************************************/
@@ -2284 +2458 @@
     assert_string_is_neither_NULL_nor_zerolength(drive_name);
 
-    for (original_size_of_drive = 0, partno = 0; partno < mountlist->entries; partno++) {
-        if (strncmp(mountlist->el[partno].device, drive_name, strlen(drive_name)) == 0) {
+    for (original_size_of_drive = 0, partno = 0;
+         partno < mountlist->entries; partno++) {
+        if (strncmp
+            (mountlist->el[partno].device, drive_name,
+             strlen(drive_name)) == 0) {
             original_size_of_drive += mountlist->el[partno].size;
         } else {
@@ -2310 +2487 @@
  */
 void resize_drive_proportionately_to_suit_new_drives(struct mountlist_itself
-                             *mountlist, char *drive_name)
+                                                     *mountlist,
+                                                     char *drive_name)
 {
     /**buffers **********************************************************/
@@ -2317 +2495 @@
     /** int *************************************************************/
     int partno, lastpart;
-               /** remove driveno, noof_drives stan benoit apr 2002**/
+               /** remove driveno, noof_drives stan benoit apr 2002**/
 
     /** float ***********************************************************/
     float factor;
     float new_size;
-//  float newcylinderno;
+//  float newcylinderno;
 
     /** long *************************************************************/
@@ -2328 +2506 @@
     long current_size_of_drive = 0;
     long original_size_of_drive = 0;
-    long final_size;    /* all in Megabytes */
+    long final_size;            /* all in Megabytes */
     struct mountlist_reference *drivemntlist;
 
@@ -2340 +2518 @@
 
     if (strlen(drive_name) >= strlen(RAID_DEVICE_STUB)) {
-        if (strncmp(drive_name, RAID_DEVICE_STUB, strlen(RAID_DEVICE_STUB)) == 0) {
+        if (strncmp(drive_name, RAID_DEVICE_STUB, strlen(RAID_DEVICE_STUB))
+            == 0) {
             paranoid_free(tmp);
             return;
@@ -2352 +2531 @@
 
     current_size_of_drive = get_phys_size_of_drive(drive_name);
-    
+
     if (current_size_of_drive <= 0) {
         log_it("Not resizing to match %s - can't find drive", drive_name);
@@ -2358 +2537 @@
         return;
     }
-    sprintf(tmp, "Expanding entries to suit drive %s (%ld MB)", drive_name, current_size_of_drive);
+    sprintf(tmp, "Expanding entries to suit drive %s (%ld MB)", drive_name,
+            current_size_of_drive);
     log_to_screen(tmp);
 
-    drivemntlist = malloc(sizeof (struct mountlist_reference));
-    drivemntlist->el = malloc(sizeof(struct mountlist_line *) * MAX_TAPECATALOG_ENTRIES);
+    drivemntlist = malloc(sizeof(struct mountlist_reference));
+    drivemntlist->el =
+        malloc(sizeof(struct mountlist_line *) * MAX_TAPECATALOG_ENTRIES);
 
     if (!drivemntlist) {
@@ -2375 +2556 @@
 
     if (original_size_of_drive <= 0) {
-        sprintf(tmp, "Cannot resize %s's entries. Drive not found.", drive_name);
+        sprintf(tmp, "Cannot resize %s's entries. Drive not found.",
+                drive_name);
         log_to_screen(tmp);
         paranoid_free(tmp);
         return;
     }
-    factor = (float) (current_size_of_drive) / (float) (original_size_of_drive);
-    sprintf(tmp, "Disk %s was %ld MB; is now %ld MB; factor = %f", drive_name, original_size_of_drive, current_size_of_drive,
-        factor);
+    factor =
+        (float) (current_size_of_drive) / (float) (original_size_of_drive);
+    sprintf(tmp, "Disk %s was %ld MB; is now %ld MB; factor = %f",
+            drive_name, original_size_of_drive, current_size_of_drive,
+            factor);
     log_to_screen(tmp);
 
-    lastpart = drivemntlist->entries-1;
+    lastpart = drivemntlist->entries - 1;
     for (partno = 0; partno < drivemntlist->entries; partno++) {
         /* the 'atoi' thing is to make sure we don't try to resize _images_, whose formats will be numeric */
-        if ( !atoi(drivemntlist->el[partno]->format) ) {
+        if (!atoi(drivemntlist->el[partno]->format)) {
             new_size = (float) (drivemntlist->el[partno]->size) * factor;
         } else {
             new_size = drivemntlist->el[partno]->size;
         }
-        
+
         if (!strcmp(drivemntlist->el[partno]->mountpoint, "image")) {
             log_msg(1, "Skipping %s (%s) because it's an image",
-                            drivemntlist->el[partno]->device,
-                            drivemntlist->el[partno]->mountpoint);
-            newsizL = (long) new_size; // It looks wrong but it's not
+                    drivemntlist->el[partno]->device,
+                    drivemntlist->el[partno]->mountpoint);
+            newsizL = (long) new_size;  // It looks wrong but it's not
         } else {
             newsizL = (long) new_size;
         }
-        sprintf(tmp, "Changing %s from %lld KB to %ld KB", drivemntlist->el[partno]->device, drivemntlist->el[partno]->size,newsizL);
+        sprintf(tmp, "Changing %s from %lld KB to %ld KB",
+                drivemntlist->el[partno]->device,
+                drivemntlist->el[partno]->size, newsizL);
         log_to_screen(tmp);
         drivemntlist->el[partno]->size = newsizL;
@@ -2420 +2606 @@
  */
 void resize_mountlist_proportionately_to_suit_new_drives(struct mountlist_itself
-                             *mountlist)
+                                                         *mountlist)
 {
     /** buffers *********************************************************/
@@ -2434 +2620 @@
 
     if (g_mountlist_fname[0] == '\0') {
-        log_it ("resize_mountlist_prop...() - warning - mountlist fname is blank");
-        log_it ("That does NOT affect the functioning of this subroutine.");
-        log_it ("--- Hugo, 2002/11/20");
+        log_it
+            ("resize_mountlist_prop...() - warning - mountlist fname is blank");
+        log_it("That does NOT affect the functioning of this subroutine.");
+        log_it("--- Hugo, 2002/11/20");
     }
     iamhere("Resizing mountlist");
@@ -2442 +2629 @@
     iamhere("Back from MLoDiM");
     for (driveno = 0; driveno < drivelist->entries; driveno++) {
-        resize_drive_proportionately_to_suit_new_drives(mountlist, drivelist->el[driveno].device);
+        resize_drive_proportionately_to_suit_new_drives(mountlist,
+                                                        drivelist->
+                                                        el[driveno].
+                                                        device);
     }
     log_to_screen("Mountlist adjusted to suit current hard drive(s)");
@@ -2456 +2646 @@
  * @author Ralph Grewe
  */
-void create_mountlist_for_drive(struct mountlist_itself *mountlist, char *drive_name, struct mountlist_reference *drivemntlist) {
+void create_mountlist_for_drive(struct mountlist_itself *mountlist,
+                                char *drive_name,
+                                struct mountlist_reference *drivemntlist)
+{
     int partno;
     char *tmp_drive_name, *c;
@@ -2464 +2657 @@
     assert(drivemntlist != NULL);
 
-    log_msg (1, "Creating list of partitions for drive %s",drive_name);
-
-    tmp_drive_name = strdup (drive_name);
-    if (!tmp_drive_name) fatal_error ("Out of memory");
-    
+    log_msg(1, "Creating list of partitions for drive %s", drive_name);
+
+    tmp_drive_name = strdup(drive_name);
+    if (!tmp_drive_name)
+        fatal_error("Out of memory");
+
     /* devfs devices? */
-    c = strrchr (tmp_drive_name, '/');
-    if (c && strncmp (c, "/disc", 5) == 0) {
-        /* yup its devfs, change the "disc" to "part" so the existing code works */
-        strcpy (c + 1, "part");
-    }
-    drivemntlist->entries=0;
+    c = strrchr(tmp_drive_name, '/');
+    if (c && strncmp(c, "/disc", 5) == 0) {
+        /* yup its devfs, change the "disc" to "part" so the existing code works */
+        strcpy(c + 1, "part");
+    }
+    drivemntlist->entries = 0;
     for (partno = 0; partno < mountlist->entries; partno++) {
-        if (strncmp (mountlist->el[partno].device, tmp_drive_name, strlen(tmp_drive_name)) == 0) {
-            drivemntlist->el[drivemntlist->entries] = &mountlist->el[partno];
+        if (strncmp
+            (mountlist->el[partno].device, tmp_drive_name,
+             strlen(tmp_drive_name)) == 0) {
+            drivemntlist->el[drivemntlist->entries] =
+                &mountlist->el[partno];
             drivemntlist->entries++;
         }
     }
     if (tmp_drive_name)
-        free (tmp_drive_name);
+        free(tmp_drive_name);
 }
 

branches/2.05/mondo/mondo/mondorestore/mondo-restore-EXT.h

@@ -6 +6 @@
 
 extern bool g_sigpipe_caught;
-extern bool g_ISO_restore_mode; /* are we in Iso Mode? */
+extern bool g_ISO_restore_mode; /* are we in Iso Mode? */
 extern bool g_I_have_just_nuked;
 extern char *g_tmpfs_mountpt;
@@ -13 +13 @@
 
 extern struct s_bkpinfo *g_bkpinfo_DONTUSETHIS;
-extern char  *g_biggielist_txt;
-extern char  *g_filelist_full;
-extern char  *g_biggielist_pot;
-extern char  *g_filelist_potential;
-extern char  *g_filelist_imagedevs; 
-extern char  *g_filelist_restthese; 
-extern char  *g_biggielist_restthese;
-extern char  *g_imagedevs_restthese; 
-extern char  *g_mondo_cfg_file;
-extern char  *g_mountlist_fname;
-extern char  *g_mondo_home;
+extern char *g_biggielist_txt;
+extern char *g_filelist_full;
+extern char *g_biggielist_pot;
+extern char *g_filelist_potential;
+extern char *g_filelist_imagedevs;
+extern char *g_filelist_restthese;
+extern char *g_biggielist_restthese;
+extern char *g_imagedevs_restthese;
+extern char *g_mondo_cfg_file;
+extern char *g_mountlist_fname;
+extern char *g_mondo_home;
 
 
-extern void ask_about_these_imagedevs(char*,char*);
-extern int catchall_mode(struct s_bkpinfo *, struct mountlist_itself *, struct raidlist_itself*);
-extern void sort_mountlist_by_device(struct mountlist_itself*);
-extern void find_pathname_of_executable_preferably_in_RESTORING(char *, char*, char*);
-extern int interactive_mode(struct s_bkpinfo *, struct mountlist_itself *, struct raidlist_itself *);
-extern int nuke_mode(struct s_bkpinfo *, struct mountlist_itself *, struct raidlist_itself *);
-extern int compare_mode(struct s_bkpinfo *, struct mountlist_itself *, struct raidlist_itself *);
+extern void ask_about_these_imagedevs(char *, char *);
+extern int catchall_mode(struct s_bkpinfo *, struct mountlist_itself *,
+                         struct raidlist_itself *);
+extern void sort_mountlist_by_device(struct mountlist_itself *);
+extern void find_pathname_of_executable_preferably_in_RESTORING(char *,
+                                                                char *,
+                                                                char *);
+extern int interactive_mode(struct s_bkpinfo *, struct mountlist_itself *,
+                            struct raidlist_itself *);
+extern int nuke_mode(struct s_bkpinfo *, struct mountlist_itself *,
+                     struct raidlist_itself *);
+extern int compare_mode(struct s_bkpinfo *, struct mountlist_itself *,
+                        struct raidlist_itself *);
 extern int iso_mode(struct s_bkpinfo *bkpinfo,
-     struct mountlist_itself *mountlist,
-     struct raidlist_itself *raidlist,
-     bool nuke_me_please);
-extern int load_mountlist(struct mountlist_itself*,char*);
-extern int load_raidtab_into_raidlist(struct raidlist_itself*,char*);
-extern int restore_mode(struct s_bkpinfo *, struct mountlist_itself *, struct raidlist_itself *);
-extern int save_raidlist_to_raidtab(struct raidlist_itself*,char*);
-extern void process_raidtab_line(FILE*, struct raid_device_record *, char*, char*);
-extern int restore_a_biggiefile_from_CD(struct s_bkpinfo *, long, struct s_node*);
-extern int restore_a_biggiefile_from_stream(struct s_bkpinfo*, char*, long , char*, long long, struct s_node*);
-extern int restore_a_tarball_from_CD(char *, int, struct s_node*);
-extern int restore_a_tarball_from_stream(struct s_bkpinfo*, char *, int, struct s_node*, long long);
-extern int restore_all_biggiefiles_from_CD(struct s_bkpinfo*, struct s_node*);
-extern int restore_all_biggiefiles_from_stream(struct s_bkpinfo*, struct s_node*);
-extern int restore_all_tarballs_from_CD(struct s_bkpinfo*, struct s_node*);
-extern int restore_all_tarballs_from_stream(struct s_bkpinfo*, struct s_node*);
-extern int restore_everything(struct s_bkpinfo*, struct s_node*);
-extern int restore_live_from_monitas_server(struct s_bkpinfo *, char*, char*, char*);
-extern int restore_to_live_filesystem(struct s_bkpinfo*);
-extern void swap_mountlist_entries(struct mountlist_itself*,int,int);
-extern void sort_mountlist_by_mountpoint(struct mountlist_itself*,bool);
-extern void sort_mountlist_by_device(struct mountlist_itself*);
+                    struct mountlist_itself *mountlist,
+                    struct raidlist_itself *raidlist, bool nuke_me_please);
+extern int load_mountlist(struct mountlist_itself *, char *);
+extern int load_raidtab_into_raidlist(struct raidlist_itself *, char *);
+extern int restore_mode(struct s_bkpinfo *, struct mountlist_itself *,
+                        struct raidlist_itself *);
+extern int save_raidlist_to_raidtab(struct raidlist_itself *, char *);
+extern void process_raidtab_line(FILE *, struct raid_device_record *,
+                                 char *, char *);
+extern int restore_a_biggiefile_from_CD(struct s_bkpinfo *, long,
+                                        struct s_node *);
+extern int restore_a_biggiefile_from_stream(struct s_bkpinfo *, char *,
+                                            long, char *, long long,
+                                            struct s_node *);
+extern int restore_a_tarball_from_CD(char *, int, struct s_node *);
+extern int restore_a_tarball_from_stream(struct s_bkpinfo *, char *, int,
+                                         struct s_node *, long long);
+extern int restore_all_biggiefiles_from_CD(struct s_bkpinfo *,
+                                           struct s_node *);
+extern int restore_all_biggiefiles_from_stream(struct s_bkpinfo *,
+                                               struct s_node *);
+extern int restore_all_tarballs_from_CD(struct s_bkpinfo *,
+                                        struct s_node *);
+extern int restore_all_tarballs_from_stream(struct s_bkpinfo *,
+                                            struct s_node *);
+extern int restore_everything(struct s_bkpinfo *, struct s_node *);
+extern int restore_live_from_monitas_server(struct s_bkpinfo *, char *,
+                                            char *, char *);
+extern int restore_to_live_filesystem(struct s_bkpinfo *);
+extern void swap_mountlist_entries(struct mountlist_itself *, int, int);
+extern void sort_mountlist_by_mountpoint(struct mountlist_itself *, bool);
+extern void sort_mountlist_by_device(struct mountlist_itself *);
 extern void success_message(void);
 extern void twenty_seconds_til_yikes(void);
-extern int run_raw_mbr(bool offer_to_hack_scripts, char*bd);
-extern int save_mountlist_to_disk(struct mountlist_itself*, char*);
-extern void save_raidrec_to_file(struct raid_device_record *raidrec, FILE*fout);
-extern int save_raidlist_to_raidtab(struct raidlist_itself *raidlist, char*fname);
-extern int what_number_cd_is_this(struct s_bkpinfo*);
+extern int run_raw_mbr(bool offer_to_hack_scripts, char *bd);
+extern int save_mountlist_to_disk(struct mountlist_itself *, char *);
+extern void save_raidrec_to_file(struct raid_device_record *raidrec,
+                                 FILE * fout);
+extern int save_raidlist_to_raidtab(struct raidlist_itself *raidlist,
+                                    char *fname);
+extern int what_number_cd_is_this(struct s_bkpinfo *);
 
 #ifdef __FreeBSD__

branches/2.05/mondo/mondo/mondorestore/mondo-restore.c

@@ -5 +5 @@
     copyright            : (C) 2000 by Hugo Rabson
     email                : Hugo Rabson <hugorabson@msn.com>
-    cvsid                : $Id: mondo-restore.c,v 1.42 2004/06/21 20:20:37 hugo Exp $
+    cvsid                : $Id$
 ***************************************************************************/
 
@@ -407 +407 @@
 
 
-//static char cvsid[] = "$Id: mondo-restore.c,v 1.42 2004/06/21 20:20:37 hugo Exp $";
+//static char cvsid[] = "$Id$";
 
 /**************************************************************************
  * Globals                                                                *
  **************************************************************************/
-extern char *g_tmpfs_mountpt; // declared in libmondo-tools.c
-extern struct s_bkpinfo *g_bkpinfo_DONTUSETHIS; // used by finish() to free
-                                                // up global bkpinfo struct
+extern char *g_tmpfs_mountpt;   // declared in libmondo-tools.c
+extern struct s_bkpinfo *g_bkpinfo_DONTUSETHIS; // used by finish() to free
+                                                // up global bkpinfo struct
 extern bool g_text_mode;
 extern FILE *g_fprep;
@@ -433 +433 @@
  * Set by the signal handler; cleared after it's handled.
  */
-bool    g_sigpipe_caught=FALSE;
+bool g_sigpipe_caught = FALSE;
 
 /**
@@ -439 +439 @@
  * If FALSE, then we're restoring from some kind of real media (tape, CD, etc.)
  */
-bool    g_ISO_restore_mode = FALSE; /* are we in Iso Mode? */
+bool g_ISO_restore_mode = FALSE;    /* are we in Iso Mode? */
 
 /**
  * If TRUE, then we have had a successful "nuke" restore.
  */
-bool    g_I_have_just_nuked = FALSE;
+bool g_I_have_just_nuked = FALSE;
 
 /**
  * The device to mount to get at the ISO images. Ignored unless @p g_ISO_restore_mode.
  */
-char    *g_isodir_device;
+char *g_isodir_device;
 
 /**
  * The format of @p g_isodir_device. Ignored unless @p g_ISO_restore_mode.
  */
-char    *g_isodir_format;
+char *g_isodir_format;
 
 /**
  * The location of 'biggielist.txt', containing the biggiefiles on the current archive set.
  */
-char    *g_biggielist_txt;
+char *g_biggielist_txt;
 
 /**
@@ -465 +465 @@
  * the current archive set.
  */
-char    *g_filelist_full;
+char *g_filelist_full;
 
 /**
@@ -471 +471 @@
  * as images, not as individual files.
  */
-char  *g_filelist_imagedevs;
+char *g_filelist_imagedevs;
 
 /**
@@ -477 +477 @@
  * @see g_filelist_imagedevs
  */
-char  *g_imagedevs_restthese;
+char *g_imagedevs_restthese;
 
 /**
@@ -483 +483 @@
  * information for this backup.
  */
-char  *g_mondo_cfg_file;
+char *g_mondo_cfg_file;
 
 /**
@@ -489 +489 @@
  * user's partitions and hard drives.
  */
-char  *g_mountlist_fname;
+char *g_mountlist_fname;
 
 /**
@@ -495 +495 @@
  * to avoid link errors.
  */
-char  *g_mondo_home;
+char *g_mondo_home;
 
 /* @} - end of "Restore-Time Globals" in globalGroup */
@@ -501 +501 @@
 
 
-extern int copy_from_src_to_dest(FILE*f_orig, FILE*f_archived, char direction);
+extern int copy_from_src_to_dest(FILE * f_orig, FILE * f_archived,
+                                 char direction);
 
 
@@ -525 +526 @@
  * @ingroup restoreGuiGroup
  */
-int let_user_edit_the_mountlist(struct s_bkpinfo *bkpinfo, struct mountlist_itself *mountlist, struct raidlist_itself *raidlist)
+int let_user_edit_the_mountlist(struct s_bkpinfo *bkpinfo,
+                                struct mountlist_itself *mountlist,
+                                struct raidlist_itself *raidlist)
 {
-  int retval=0, res=0;
-
-  log_msg(2, "let_user_edit_the_mountlist() --- starting");
-
-  assert(bkpinfo!=NULL);
-  assert(mountlist!=NULL);
-  assert(raidlist!=NULL);
-      if ( !bkpinfo->disaster_recovery )
-        {
-          strcpy( g_mountlist_fname, "/tmp/mountlist.txt" );
-          log_msg(2,  "I guess you're testing edit_mountlist()" );
-        }
-      if (!does_file_exist(g_mountlist_fname))
-        {
-          log_to_screen(g_mountlist_fname);
-          log_to_screen("does not exist");
-          return(1);
-        }
-     
-      retval = load_mountlist( mountlist, g_mountlist_fname );
-      load_raidtab_into_raidlist( raidlist, RAIDTAB_FNAME );
-      if ( retval ) { log_to_screen( "Warning - load_raidtab_into_raidlist returned an error" ); }
-      res = edit_mountlist( g_mountlist_fname, mountlist, raidlist );
-      if ( res ) 
-    { 
-      return( 1 ); 
-    }
-
-      save_mountlist_to_disk( mountlist, g_mountlist_fname );
-      save_raidlist_to_raidtab( raidlist, RAIDTAB_FNAME );
-      
-      log_to_screen("I have finished editing the mountlist for you.");
-      
-      return( retval );
-    }
+    int retval = 0, res = 0;
+
+    log_msg(2, "let_user_edit_the_mountlist() --- starting");
+
+    assert(bkpinfo != NULL);
+    assert(mountlist != NULL);
+    assert(raidlist != NULL);
+    if (!bkpinfo->disaster_recovery) {
+        strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
+        log_msg(2, "I guess you're testing edit_mountlist()");
+    }
+    if (!does_file_exist(g_mountlist_fname)) {
+        log_to_screen(g_mountlist_fname);
+        log_to_screen("does not exist");
+        return (1);
+    }
+
+    retval = load_mountlist(mountlist, g_mountlist_fname);
+    load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
+    if (retval) {
+        log_to_screen
+            ("Warning - load_raidtab_into_raidlist returned an error");
+    }
+    res = edit_mountlist(g_mountlist_fname, mountlist, raidlist);
+    if (res) {
+        return (1);
+    }
+
+    save_mountlist_to_disk(mountlist, g_mountlist_fname);
+    save_raidlist_to_raidtab(raidlist, RAIDTAB_FNAME);
+
+    log_to_screen("I have finished editing the mountlist for you.");
+
+    return (retval);
+}
 
 
@@ -573 +576 @@
  * @ingroup restoreUtilityGroup
  */
-bool 
-partition_table_contains_Compaq_diagnostic_partition(struct mountlist_itself *mountlist)
+bool
+partition_table_contains_Compaq_diagnostic_partition(struct
+                                                     mountlist_itself *
+                                                     mountlist)
 {
-  int i;
-
-  assert(mountlist!=NULL);
-
-  for( i = 0; i < mountlist->entries; i++ )
-    {
-      if ( strstr( mountlist->el[i].format, "ompaq" ) )
-    {
-      log_msg(2, "mountlist[%d] (%s) is %s (Compaq alert!)",
-          i, 
-          mountlist->el[i].device, 
-          mountlist->el[i].format );
-      
-      return( TRUE );
-    }
-    }
-  return( FALSE );
+    int i;
+
+    assert(mountlist != NULL);
+
+    for (i = 0; i < mountlist->entries; i++) {
+        if (strstr(mountlist->el[i].format, "ompaq")) {
+            log_msg(2, "mountlist[%d] (%s) is %s (Compaq alert!)",
+                    i, mountlist->el[i].device, mountlist->el[i].format);
+
+            return (TRUE);
+        }
+    }
+    return (FALSE);
 }
+
 /**************************************************************************
  *END_PARTITION_TABLE_CONTAINS_COMPAQ_DIAGNOSTIC_PARTITION                *
@@ -604 +606 @@
  * @ingroup restoreUtilityGroup
  */
-void 
-offer_to_abort_because_Compaq_Proliants_suck(void)
+void offer_to_abort_because_Compaq_Proliants_suck(void)
 {
-  popup_and_OK( COMPAQ_PROLIANTS_SUCK );
-  if ( ask_me_yes_or_no("Would you like to reboot and use your Compaq CD to prep your hard drive?") )
-    { 
-      fatal_error( "Aborting. Please reboot and prep your hard drive with your Compaq CD." ); 
-    }
+    popup_and_OK(COMPAQ_PROLIANTS_SUCK);
+    if (ask_me_yes_or_no
+        ("Would you like to reboot and use your Compaq CD to prep your hard drive?"))
+    {
+        fatal_error
+            ("Aborting. Please reboot and prep your hard drive with your Compaq CD.");
+    }
 }
+
 /**************************************************************************
  *END_OFFER_TO_ABORT_BECAUSE_COMPAQ_PROLIANTS_SUCK                        *
@@ -627 +631 @@
  * @ingroup restoreGroup
  */
-int 
-catchall_mode( struct s_bkpinfo *bkpinfo, 
-           struct mountlist_itself *mountlist, 
-           struct raidlist_itself*raidlist)
+int
+catchall_mode(struct s_bkpinfo *bkpinfo,
+              struct mountlist_itself *mountlist,
+              struct raidlist_itself *raidlist)
 {
-  char c, *tmp;
-  int retval = 0;
-
-  iamhere("inside catchall");
-  assert(bkpinfo!=NULL);
-  assert(mountlist!=NULL);
-  assert(raidlist!=NULL);
-  malloc_string(tmp);
-  iamhere("pre wrm");
-  c = which_restore_mode();
-  iamhere("post wrm");
-  if ( c == 'I' || c == 'N' || c == 'C')
-    { 
-      interactively_obtain_media_parameters_from_user( bkpinfo, FALSE); 
-    }
-  else
-    {
-      popup_and_OK( "No restoring or comparing will take place today." );
-      if ( is_this_device_mounted( "/mnt/cdrom" ) ) 
-    { 
-      run_program_and_log_output( "umount /mnt/cdrom", FALSE); 
-    }
-      if ( g_ISO_restore_mode ) 
-    {
-          sprintf(tmp, "umount %s", bkpinfo->isodir);
-      run_program_and_log_output( tmp, FALSE); 
-    }
-      paranoid_MR_finish( 0 );
-    }
-
-  iamhere("post int");
-
-  if (bkpinfo->backup_media_type == iso)
-    {
-      if (iso_fiddly_bits(bkpinfo, (c=='N')?TRUE:FALSE))
-        { log_msg(2, "catchall_mode --- iso_fiddly_bits returned w/ error"); return(1); }
-      else
-        { log_msg(2, "catchall_mode --- iso_fiddly_bits ok"); }
-    }
-
-  if (c == 'I' ) 
-    { 
-      log_msg(2, "IM selected" ); 
-      retval += interactive_mode( bkpinfo,mountlist,raidlist ); 
-    }
-  else if 
-    ( c == 'N' ) 
-    { 
-      log_msg(2, "NM selected"); 
-      retval += nuke_mode( bkpinfo, mountlist, raidlist ); }
-  else if 
-    ( c == 'C' ) 
-    { 
-      log_msg(2, "CM selected" ); 
-      retval += compare_mode( bkpinfo, mountlist, raidlist); 
-    }
-  paranoid_free(tmp);
-  return( retval );
+    char c, *tmp;
+    int retval = 0;
+
+    iamhere("inside catchall");
+    assert(bkpinfo != NULL);
+    assert(mountlist != NULL);
+    assert(raidlist != NULL);
+    malloc_string(tmp);
+    iamhere("pre wrm");
+    c = which_restore_mode();
+    iamhere("post wrm");
+    if (c == 'I' || c == 'N' || c == 'C') {
+        interactively_obtain_media_parameters_from_user(bkpinfo, FALSE);
+    } else {
+        popup_and_OK("No restoring or comparing will take place today.");
+        if (is_this_device_mounted("/mnt/cdrom")) {
+            run_program_and_log_output("umount /mnt/cdrom", FALSE);
+        }
+        if (g_ISO_restore_mode) {
+            sprintf(tmp, "umount %s", bkpinfo->isodir);
+            run_program_and_log_output(tmp, FALSE);
+        }
+        paranoid_MR_finish(0);
+    }
+
+    iamhere("post int");
+
+    if (bkpinfo->backup_media_type == iso) {
+        if (iso_fiddly_bits(bkpinfo, (c == 'N') ? TRUE : FALSE)) {
+            log_msg(2,
+                    "catchall_mode --- iso_fiddly_bits returned w/ error");
+            return (1);
+        } else {
+            log_msg(2, "catchall_mode --- iso_fiddly_bits ok");
+        }
+    }
+
+    if (c == 'I') {
+        log_msg(2, "IM selected");
+        retval += interactive_mode(bkpinfo, mountlist, raidlist);
+    } else if (c == 'N') {
+        log_msg(2, "NM selected");
+        retval += nuke_mode(bkpinfo, mountlist, raidlist);
+    } else if (c == 'C') {
+        log_msg(2, "CM selected");
+        retval += compare_mode(bkpinfo, mountlist, raidlist);
+    }
+    paranoid_free(tmp);
+    return (retval);
 }
+
 /**************************************************************************
  *END_CATCHALL_MODE                                                      *
@@ -709 +705 @@
  */
 void
-find_pathname_of_executable_preferably_in_RESTORING( char *out_path, char *fname, char*restg )
+find_pathname_of_executable_preferably_in_RESTORING(char *out_path,
+                                                    char *fname,
+                                                    char *restg)
 {
-  assert(out_path!=NULL);
-  assert_string_is_neither_NULL_nor_zerolength(fname);
-
-  sprintf( out_path, "%s/sbin/%s", restg, fname );
-  if ( does_file_exist(out_path) )
-    {
-      sprintf( out_path, "%s/usr/sbin/%s", restg, fname );
-      if ( does_file_exist( out_path ) )
-        {
-          sprintf( out_path, "%s/bin/%s", restg, fname );
-          if ( does_file_exist( out_path ) )
-            {
-              sprintf( out_path, "%s/usr/bin/%s", restg, fname );
-              if ( does_file_exist( out_path ) )
-                {
-                  strcpy( out_path, fname );
-                }
-            }
-        }
-    }
+    assert(out_path != NULL);
+    assert_string_is_neither_NULL_nor_zerolength(fname);
+
+    sprintf(out_path, "%s/sbin/%s", restg, fname);
+    if (does_file_exist(out_path)) {
+        sprintf(out_path, "%s/usr/sbin/%s", restg, fname);
+        if (does_file_exist(out_path)) {
+            sprintf(out_path, "%s/bin/%s", restg, fname);
+            if (does_file_exist(out_path)) {
+                sprintf(out_path, "%s/usr/bin/%s", restg, fname);
+                if (does_file_exist(out_path)) {
+                    strcpy(out_path, fname);
+                }
+            }
+        }
+    }
 }
 
@@ -753 +747 @@
  * @return 0 for success, or the number of errors encountered.
  */
-int 
-interactive_mode( struct s_bkpinfo *bkpinfo, 
-          struct mountlist_itself *mountlist, 
-          struct raidlist_itself *raidlist)
+int
+interactive_mode(struct s_bkpinfo *bkpinfo,
+                 struct mountlist_itself *mountlist,
+                 struct raidlist_itself *raidlist)
 {
-  int retval = 0;
-  int res;
-  int ptn_errs = 0;
-  int fmt_errs = 0;
-
-  bool done;
-  bool restore_all;
+    int retval = 0;
+    int res;
+    int ptn_errs = 0;
+    int fmt_errs = 0;
+
+    bool done;
+    bool restore_all;
 
   /** needs malloc **********/
-  char *tmp;
-  char *fstab_fname;
-  char *old_restpath;
-  
-  struct s_node *filelist;
-
-  /* try to partition and format */
-
-  log_msg(2,"interactive_mode --- starting (great, assertions OK)");
-
-  malloc_string(tmp);
-  malloc_string(fstab_fname);
-  malloc_string(old_restpath);
-  assert(bkpinfo!=NULL);
-  assert(mountlist!=NULL);
-  assert(raidlist!=NULL); 
-
-  log_msg(2,"interactive_mode --- assertions OK");
-
-  if (g_text_mode)
-    {
-      if (!ask_me_yes_or_no("Interactive Mode + textonly = experimental! Proceed anyway?"))
-        { fatal_error("Wise move."); }
-    }
-
-  iamhere("About to load config file");
-  get_cfg_file_from_archive_or_bust(bkpinfo);
-  read_cfg_file_into_bkpinfo( g_mondo_cfg_file, bkpinfo );
-  iamhere("Done loading config file; resizing ML");
+    char *tmp;
+    char *fstab_fname;
+    char *old_restpath;
+
+    struct s_node *filelist;
+
+    /* try to partition and format */
+
+    log_msg(2, "interactive_mode --- starting (great, assertions OK)");
+
+    malloc_string(tmp);
+    malloc_string(fstab_fname);
+    malloc_string(old_restpath);
+    assert(bkpinfo != NULL);
+    assert(mountlist != NULL);
+    assert(raidlist != NULL);
+
+    log_msg(2, "interactive_mode --- assertions OK");
+
+    if (g_text_mode) {
+        if (!ask_me_yes_or_no
+            ("Interactive Mode + textonly = experimental! Proceed anyway?"))
+        {
+            fatal_error("Wise move.");
+        }
+    }
+
+    iamhere("About to load config file");
+    get_cfg_file_from_archive_or_bust(bkpinfo);
+    read_cfg_file_into_bkpinfo(g_mondo_cfg_file, bkpinfo);
+    iamhere("Done loading config file; resizing ML");
 #ifdef __FreeBSD__
-  if (strstr(call_program_and_get_last_line_of_output("cat /tmp/cmdline"), "noresize"))
+    if (strstr
+        (call_program_and_get_last_line_of_output("cat /tmp/cmdline"),
+         "noresize"))
 #else
-  if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "noresize"))
+    if (strstr
+        (call_program_and_get_last_line_of_output("cat /proc/cmdline"),
+         "noresize"))
 #endif
-    { log_msg(1,"Not resizing mountlist."); }
-  else
-    { resize_mountlist_proportionately_to_suit_new_drives(mountlist); }
-  for( done = FALSE; !done; )
-    {
-      iamhere("About to edit mountlist");
-      if (g_text_mode)
-        {
-          save_mountlist_to_disk (mountlist, g_mountlist_fname);
-      sprintf(tmp, "%s %s", find_my_editor(), g_mountlist_fname);
-          res = system(tmp);
-          load_mountlist (mountlist, g_mountlist_fname);
-        }
-      else
-        {
-          res = edit_mountlist( g_mountlist_fname, mountlist, raidlist );
-        }
-      iamhere("Finished editing mountlist");
-      if ( res ) 
-    { 
-      paranoid_MR_finish( 1 ); 
-    }
-      log_msg(2, "Proceeding..." );
-      save_mountlist_to_disk( mountlist, g_mountlist_fname );
-      save_raidlist_to_raidtab( raidlist, RAIDTAB_FNAME );
-      mvaddstr_and_log_it( 1, 30, "Restoring Interactively" );
-      if ( bkpinfo->differential )
-        {
-          log_to_screen( "Because this is a differential backup, disk" );
-      log_to_screen(" partitioning and formatting will not take place." );
-          done=TRUE;
-        }
-      else
-        {
-          if ( ask_me_yes_or_no( "Do you want to erase and partition your hard drives?" ) )
-            {
-          if ( partition_table_contains_Compaq_diagnostic_partition( mountlist ) )
-        { offer_to_abort_because_Compaq_Proliants_suck(); done=TRUE; }
-          else
-        {
-          twenty_seconds_til_yikes();
-          g_fprep = fopen("/tmp/prep.sh", "w");
-          ptn_errs = partition_everything( mountlist );
-          if (ptn_errs)
-            {
-              log_to_screen("Warning. Errors occurred during disk partitioning.");
-            }
-          
-          fmt_errs = format_everything( mountlist, FALSE );
-          if (!fmt_errs)
-            {
-              log_to_screen("Errors during disk partitioning were handled OK.");
-              log_to_screen("Partitions were formatted OK despite those errors.");
-              ptn_errs = 0;
-            }
-          if ( !ptn_errs && !fmt_errs)
-            {
-              done = TRUE;
-            }
-        }
-              paranoid_fclose(g_fprep);
-        }
-          else
-            {
-              mvaddstr_and_log_it( g_currentY++, 0, "User opted not to partition the devices" );
-              if ( ask_me_yes_or_no( "Do you want to format your hard drives?" ) )
-                {
-                  fmt_errs = format_everything( mountlist, TRUE );
-                  if (!fmt_errs) 
-            { 
-              done = TRUE; 
-            }
-            }
-              else
-                {
-                  ptn_errs = fmt_errs = 0;
-                  done = TRUE;
-                }
-            }
-          if (fmt_errs)
-            {
-              mvaddstr_and_log_it( g_currentY++,
-                   0,
-                   "Errors occurred. Please repartition and format drives manually.");
-              done = FALSE;
-            }
-          if ( ptn_errs & !fmt_errs )
-            {
-              mvaddstr_and_log_it( g_currentY++,
-                   0,
-                   "Errors occurred during partitioning. Formatting, however, went OK.");
-              done = TRUE;
-            }
-          if ( !done )
-            {
-              if ( !ask_me_yes_or_no( "Re-edit the mountlist?" ) ) 
-        {
-          retval++;
-          goto end_of_func;
-        }
-            }
-        }
-    }
-
-  /* mount */
-  if ( mount_all_devices( mountlist, TRUE ) )
-    { 
-      unmount_all_devices( mountlist ); 
-      retval++;
-      goto end_of_func;
-    }
-  /* restore */
-  if ( ( restore_all = ask_me_yes_or_no( "Do you want me to restore all of your data?" ) ) )
-    {
-      log_msg(1, "Restoring all data");
-      retval += restore_everything( bkpinfo, NULL );
-    }
-  else if ( ( restore_all = ask_me_yes_or_no( "Do you want me to restore _some_ of your data?") ) )
-    {
-      strcpy( old_restpath, bkpinfo->restore_path );
-      for( done = FALSE; !done; )
-        {
-      unlink("/tmp/filelist.full");
-          filelist = process_filelist_and_biggielist( bkpinfo );
-      /* Now you have /tmp/tmpfs/filelist.restore-these and /tmp/tmpfs/biggielist.restore-these;
-         the former is a list of regular files; the latter, biggiefiles and imagedevs.
-      */        
-      if ( filelist )
-            {
-gotos_suck:
-              strcpy( tmp, old_restpath );
+    {
+        log_msg(1, "Not resizing mountlist.");
+    } else {
+        resize_mountlist_proportionately_to_suit_new_drives(mountlist);
+    }
+    for (done = FALSE; !done;) {
+        iamhere("About to edit mountlist");
+        if (g_text_mode) {
+            save_mountlist_to_disk(mountlist, g_mountlist_fname);
+            sprintf(tmp, "%s %s", find_my_editor(), g_mountlist_fname);
+            res = system(tmp);
+            load_mountlist(mountlist, g_mountlist_fname);
+        } else {
+            res = edit_mountlist(g_mountlist_fname, mountlist, raidlist);
+        }
+        iamhere("Finished editing mountlist");
+        if (res) {
+            paranoid_MR_finish(1);
+        }
+        log_msg(2, "Proceeding...");
+        save_mountlist_to_disk(mountlist, g_mountlist_fname);
+        save_raidlist_to_raidtab(raidlist, RAIDTAB_FNAME);
+        mvaddstr_and_log_it(1, 30, "Restoring Interactively");
+        if (bkpinfo->differential) {
+            log_to_screen("Because this is a differential backup, disk");
+            log_to_screen
+                (" partitioning and formatting will not take place.");
+            done = TRUE;
+        } else {
+            if (ask_me_yes_or_no
+                ("Do you want to erase and partition your hard drives?")) {
+                if (partition_table_contains_Compaq_diagnostic_partition
+                    (mountlist)) {
+                    offer_to_abort_because_Compaq_Proliants_suck();
+                    done = TRUE;
+                } else {
+                    twenty_seconds_til_yikes();
+                    g_fprep = fopen("/tmp/prep.sh", "w");
+                    ptn_errs = partition_everything(mountlist);
+                    if (ptn_errs) {
+                        log_to_screen
+                            ("Warning. Errors occurred during disk partitioning.");
+                    }
+
+                    fmt_errs = format_everything(mountlist, FALSE);
+                    if (!fmt_errs) {
+                        log_to_screen
+                            ("Errors during disk partitioning were handled OK.");
+                        log_to_screen
+                            ("Partitions were formatted OK despite those errors.");
+                        ptn_errs = 0;
+                    }
+                    if (!ptn_errs && !fmt_errs) {
+                        done = TRUE;
+                    }
+                }
+                paranoid_fclose(g_fprep);
+            } else {
+                mvaddstr_and_log_it(g_currentY++, 0,
+                                    "User opted not to partition the devices");
+                if (ask_me_yes_or_no
+                    ("Do you want to format your hard drives?")) {
+                    fmt_errs = format_everything(mountlist, TRUE);
+                    if (!fmt_errs) {
+                        done = TRUE;
+                    }
+                } else {
+                    ptn_errs = fmt_errs = 0;
+                    done = TRUE;
+                }
+            }
+            if (fmt_errs) {
+                mvaddstr_and_log_it(g_currentY++,
+                                    0,
+                                    "Errors occurred. Please repartition and format drives manually.");
+                done = FALSE;
+            }
+            if (ptn_errs & !fmt_errs) {
+                mvaddstr_and_log_it(g_currentY++,
+                                    0,
+                                    "Errors occurred during partitioning. Formatting, however, went OK.");
+                done = TRUE;
+            }
+            if (!done) {
+                if (!ask_me_yes_or_no("Re-edit the mountlist?")) {
+                    retval++;
+                    goto end_of_func;
+                }
+            }
+        }
+    }
+
+    /* mount */
+    if (mount_all_devices(mountlist, TRUE)) {
+        unmount_all_devices(mountlist);
+        retval++;
+        goto end_of_func;
+    }
+    /* restore */
+    if ((restore_all =
+         ask_me_yes_or_no("Do you want me to restore all of your data?")))
+    {
+        log_msg(1, "Restoring all data");
+        retval += restore_everything(bkpinfo, NULL);
+    } else
+        if ((restore_all =
+             ask_me_yes_or_no
+             ("Do you want me to restore _some_ of your data?"))) {
+        strcpy(old_restpath, bkpinfo->restore_path);
+        for (done = FALSE; !done;) {
+            unlink("/tmp/filelist.full");
+            filelist = process_filelist_and_biggielist(bkpinfo);
+            /* Now you have /tmp/tmpfs/filelist.restore-these and /tmp/tmpfs/biggielist.restore-these;
+               the former is a list of regular files; the latter, biggiefiles and imagedevs.
+             */
+            if (filelist) {
+              gotos_suck:
+                strcpy(tmp, old_restpath);
 // (NB: %s is where your filesystem is mounted now, by default)", MNT_RESTORING);
-              if ( popup_and_get_string( "Restore path", "Restore files to where?", tmp, MAX_STR_LEN/4 ) )
-                {
-          if ( !strcmp( tmp, "/" ) )
-            { 
-              if ( !ask_me_yes_or_no( "Are you sure?" ) ) 
-            { 
-              goto gotos_suck;
-            } 
-              tmp[0] = '\0'; // so we restore to [blank]/file/name :)
-            }
-                  strcpy( bkpinfo->restore_path, tmp );
-          log_msg(1, "Restoring subset");
-                  retval += restore_everything( bkpinfo, filelist );
-                  free_filelist( filelist );
-                }
-              else
-                {
-                  strcpy( bkpinfo->restore_path, old_restpath );
-                  free_filelist( filelist );
-                }
-              if ( !ask_me_yes_or_no( "Restore another subset of your backup?" ) )
-        { 
-          done = TRUE; 
-        }
-            }
-          else
-            {
-              done = TRUE;
-            }
-    }
-      strcpy( old_restpath, bkpinfo->restore_path );
-    }
-  else
-    {
-      mvaddstr_and_log_it( g_currentY++,
-               0,
-               "User opted not to restore any data.                                  ");
-    }
-  if ( retval )
-    {
-      mvaddstr_and_log_it( g_currentY++,
-               0,
-               "Errors occurred during the restore phase.            ");
-    }
-  
-  if (ask_me_yes_or_no( "Initialize the boot loader?" ) )
-    {
-      run_boot_loader( TRUE );
-    }
-  else
-    {
-      mvaddstr_and_log_it( g_currentY++,
-               0,
-               "User opted not to initialize the boot loader.");
-    }
+                if (popup_and_get_string
+                    ("Restore path", "Restore files to where?", tmp,
+                     MAX_STR_LEN / 4)) {
+                    if (!strcmp(tmp, "/")) {
+                        if (!ask_me_yes_or_no("Are you sure?")) {
+                            goto gotos_suck;
+                        }
+                        tmp[0] = '\0';  // so we restore to [blank]/file/name :)
+                    }
+                    strcpy(bkpinfo->restore_path, tmp);
+                    log_msg(1, "Restoring subset");
+                    retval += restore_everything(bkpinfo, filelist);
+                    free_filelist(filelist);
+                } else {
+                    strcpy(bkpinfo->restore_path, old_restpath);
+                    free_filelist(filelist);
+                }
+                if (!ask_me_yes_or_no
+                    ("Restore another subset of your backup?")) {
+                    done = TRUE;
+                }
+            } else {
+                done = TRUE;
+            }
+        }
+        strcpy(old_restpath, bkpinfo->restore_path);
+    } else {
+        mvaddstr_and_log_it(g_currentY++,
+                            0,
+                            "User opted not to restore any data.                                  ");
+    }
+    if (retval) {
+        mvaddstr_and_log_it(g_currentY++,
+                            0,
+                            "Errors occurred during the restore phase.            ");
+    }
+
+    if (ask_me_yes_or_no("Initialize the boot loader?")) {
+        run_boot_loader(TRUE);
+    } else {
+        mvaddstr_and_log_it(g_currentY++,
+                            0,
+                            "User opted not to initialize the boot loader.");
+    }
 
 //  run_program_and_log_output("cp -af /etc/lvm " MNT_RESTORING "/etc/", 1);
-  protect_against_braindead_sysadmins();
-  //  modify_rclocal_one_time( MNT_RESTORING "/etc" );
-  retval += unmount_all_devices( mountlist );
-  /*  if (restore_some || restore_all || */
-  if ( ask_me_yes_or_no( "Label your ext2 and ext3 partitions if necessary?" ) )
-    {
-      mvaddstr_and_log_it( g_currentY,
-               0,
-               "Using e2label to label your ext2,3 partitions" );
-      if ( does_file_exist( "/tmp/fstab.new" ) )
-        { 
-      strcpy( fstab_fname, "/tmp/fstab.new"); 
-    }
-      else
-        { 
-      strcpy( fstab_fname, "/tmp/fstab"); 
-    }
-      sprintf( tmp,
-           "label-partitions-as-necessary %s < %s >> %s 2>> %s", g_mountlist_fname, 
-           fstab_fname, MONDO_LOGFILE, MONDO_LOGFILE);
-      res=system( tmp );
-      if ( res )
-    {
-      log_to_screen("label-partitions-as-necessary returned an error");
-      mvaddstr_and_log_it( g_currentY++, 74, "Failed.");
-    }
-      else
-    {
-      mvaddstr_and_log_it(g_currentY++, 74, "Done.");
-    }
-      retval += res;
-    }
-
-  iamhere("About to leave interactive_mode()");
-  if ( retval )
-    {
-      mvaddstr_and_log_it(g_currentY++,
-              0,
-              "Warning - errors occurred during the restore phase.");
-    }
-end_of_func:
-  paranoid_free(tmp);
-  paranoid_free(fstab_fname);
-  paranoid_free(old_restpath);
-  iamhere("Leaving interactive_mode()");
-  return( retval );
+    protect_against_braindead_sysadmins();
+    //  modify_rclocal_one_time( MNT_RESTORING "/etc" );
+    retval += unmount_all_devices(mountlist);
+    /*  if (restore_some || restore_all || */
+    if (ask_me_yes_or_no
+        ("Label your ext2 and ext3 partitions if necessary?")) {
+        mvaddstr_and_log_it(g_currentY, 0,
+                            "Using e2label to label your ext2,3 partitions");
+        if (does_file_exist("/tmp/fstab.new")) {
+            strcpy(fstab_fname, "/tmp/fstab.new");
+        } else {
+            strcpy(fstab_fname, "/tmp/fstab");
+        }
+        sprintf(tmp,
+                "label-partitions-as-necessary %s < %s >> %s 2>> %s",
+                g_mountlist_fname, fstab_fname, MONDO_LOGFILE,
+                MONDO_LOGFILE);
+        res = system(tmp);
+        if (res) {
+            log_to_screen
+                ("label-partitions-as-necessary returned an error");
+            mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
+        } else {
+            mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+        }
+        retval += res;
+    }
+
+    iamhere("About to leave interactive_mode()");
+    if (retval) {
+        mvaddstr_and_log_it(g_currentY++,
+                            0,
+                            "Warning - errors occurred during the restore phase.");
+    }
+  end_of_func:
+    paranoid_free(tmp);
+    paranoid_free(fstab_fname);
+    paranoid_free(old_restpath);
+    iamhere("Leaving interactive_mode()");
+    return (retval);
 }
+
 /**************************************************************************
  *END_INTERACTIVE_MODE                                                    *
@@ -1052 +1023 @@
  * @return 0 for success, or the number of errors encountered.
  */
-int 
-iso_mode(struct s_bkpinfo *bkpinfo, 
-     struct mountlist_itself *mountlist, 
-     struct raidlist_itself *raidlist, 
-     bool nuke_me_please)
+int
+iso_mode(struct s_bkpinfo *bkpinfo,
+         struct mountlist_itself *mountlist,
+         struct raidlist_itself *raidlist, bool nuke_me_please)
 {
-  char c;
-  int retval=0;
-
-  assert(bkpinfo!=NULL);
-  assert(mountlist!=NULL);
-  assert(raidlist!=NULL);
-  if (iso_fiddly_bits(bkpinfo, nuke_me_please))
-    { log_msg(1,"iso_mode --- returning w/ error"); return(1); }
-  else
-    {
-      c=which_restore_mode();
-      if (c=='I' || c=='N' || c=='C')
-    { interactively_obtain_media_parameters_from_user(bkpinfo, FALSE); }
-      if (c=='I') { retval+=interactive_mode(bkpinfo,mountlist,raidlist); }
-      else if (c=='N') { retval+=nuke_mode(bkpinfo,mountlist,raidlist); }
-      else if (c=='C') { retval+=compare_mode(bkpinfo,mountlist,raidlist); }
-      else
-    { log_to_screen("OK, I shan't restore/compare any files."); }
-    }
-  if (is_this_device_mounted(MNT_CDROM)) { paranoid_system("umount "MNT_CDROM); }
+    char c;
+    int retval = 0;
+
+    assert(bkpinfo != NULL);
+    assert(mountlist != NULL);
+    assert(raidlist != NULL);
+    if (iso_fiddly_bits(bkpinfo, nuke_me_please)) {
+        log_msg(1, "iso_mode --- returning w/ error");
+        return (1);
+    } else {
+        c = which_restore_mode();
+        if (c == 'I' || c == 'N' || c == 'C') {
+            interactively_obtain_media_parameters_from_user(bkpinfo,
+                                                            FALSE);
+        }
+        if (c == 'I') {
+            retval += interactive_mode(bkpinfo, mountlist, raidlist);
+        } else if (c == 'N') {
+            retval += nuke_mode(bkpinfo, mountlist, raidlist);
+        } else if (c == 'C') {
+            retval += compare_mode(bkpinfo, mountlist, raidlist);
+        } else {
+            log_to_screen("OK, I shan't restore/compare any files.");
+        }
+    }
+    if (is_this_device_mounted(MNT_CDROM)) {
+        paranoid_system("umount " MNT_CDROM);
+    }
 //  if (! already_mounted)
 //    {
-      if (system("umount /tmp/isodir 2> /dev/null")) { log_to_screen("WARNING - unable to unmount device where the ISO files are stored."); }
+    if (system("umount /tmp/isodir 2> /dev/null")) {
+        log_to_screen
+            ("WARNING - unable to unmount device where the ISO files are stored.");
+    }
 //    }
-  return( retval );
+    return (retval);
 }
+
 /**************************************************************************
  *END_ISO_MODE                                                            *
@@ -1103 +1085 @@
  * @warning <b><i>THIS WILL ERASE ALL EXISTING DATA!</i></b>
  */
-int 
-nuke_mode( struct s_bkpinfo *bkpinfo, 
-       struct mountlist_itself *mountlist,
-       struct raidlist_itself *raidlist )
+int
+nuke_mode(struct s_bkpinfo *bkpinfo,
+          struct mountlist_itself *mountlist,
+          struct raidlist_itself *raidlist)
 {
-  int retval = 0;
-  int res = 0;
-  bool boot_loader_installed = FALSE;
+    int retval = 0;
+    int res = 0;
+    bool boot_loader_installed = FALSE;
   /** malloc **/
-  char tmp[MAX_STR_LEN], tmpA[MAX_STR_LEN], tmpB[MAX_STR_LEN], tmpC[MAX_STR_LEN];
-
-  assert(bkpinfo!=NULL);
-  assert(mountlist!=NULL);
-  assert(raidlist!=NULL);
-
-  log_msg(2, "nuke_mode --- starting");
-
-  get_cfg_file_from_archive_or_bust(bkpinfo);
-  load_mountlist( mountlist, g_mountlist_fname); // in case read_cfg_file_into_bkpinfo updated the mountlist
+    char tmp[MAX_STR_LEN], tmpA[MAX_STR_LEN], tmpB[MAX_STR_LEN],
+        tmpC[MAX_STR_LEN];
+
+    assert(bkpinfo != NULL);
+    assert(mountlist != NULL);
+    assert(raidlist != NULL);
+
+    log_msg(2, "nuke_mode --- starting");
+
+    get_cfg_file_from_archive_or_bust(bkpinfo);
+    load_mountlist(mountlist, g_mountlist_fname);   // in case read_cfg_file_into_bkpinfo updated the mountlist
 #ifdef __FreeBSD__
-  if (strstr(call_program_and_get_last_line_of_output("cat /tmp/cmdline"), "noresize"))
+    if (strstr
+        (call_program_and_get_last_line_of_output("cat /tmp/cmdline"),
+         "noresize"))
 #else
-  if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "noresize"))
+    if (strstr
+        (call_program_and_get_last_line_of_output("cat /proc/cmdline"),
+         "noresize"))
 #endif
-    { log_msg(2, "Not resizing mountlist."); }
-  else
-    { resize_mountlist_proportionately_to_suit_new_drives(mountlist); }
-  if (!evaluate_mountlist( mountlist, tmpA, tmpB, tmpC ))
-    {
-      sprintf(tmp, "Mountlist analyzed. Result: \"%s %s %s\" Switch to Interactive Mode?", tmpA, tmpB, tmpC);
-      if (ask_me_yes_or_no(tmp) )
     {
-      retval = interactive_mode( bkpinfo, mountlist, raidlist );
-      finish(retval);
-    }
-      else
+        log_msg(2, "Not resizing mountlist.");
+    } else {
+        resize_mountlist_proportionately_to_suit_new_drives(mountlist);
+    }
+    if (!evaluate_mountlist(mountlist, tmpA, tmpB, tmpC)) {
+        sprintf(tmp,
+                "Mountlist analyzed. Result: \"%s %s %s\" Switch to Interactive Mode?",
+                tmpA, tmpB, tmpC);
+        if (ask_me_yes_or_no(tmp)) {
+            retval = interactive_mode(bkpinfo, mountlist, raidlist);
+            finish(retval);
+        } else {
+            fatal_error("Nuke Mode aborted. ");
+        }
+    }
+    save_mountlist_to_disk(mountlist, g_mountlist_fname);
+    mvaddstr_and_log_it(1, 30, "Restoring Automatically");
+    if (bkpinfo->differential) {
+        log_to_screen("Because this is a differential backup, disk");
+        log_to_screen("partitioning and formatting will not take place.");
+        res = 0;
+    } else {
+        if (partition_table_contains_Compaq_diagnostic_partition
+            (mountlist)) {
+            offer_to_abort_because_Compaq_Proliants_suck();
+        } else {
+            twenty_seconds_til_yikes();
+            g_fprep = fopen("/tmp/prep.sh", "w");
+#ifdef __FreeBSD__
+            if (strstr
+                (call_program_and_get_last_line_of_output
+                 ("cat /tmp/cmdline"), "nopart"))
+#else
+            if (strstr
+                (call_program_and_get_last_line_of_output
+                 ("cat /proc/cmdline"), "nopart"))
+#endif
+            {
+                log_msg(2,
+                        "Not partitioning drives due to 'nopart' option.");
+                res = 0;
+            } else {
+                res = partition_everything(mountlist);
+                if (res) {
+                    log_to_screen
+                        ("Warning. Errors occurred during partitioning.");
+                    res = 0;
+                }
+            }
+            retval += res;
+            if (!res) {
+                log_to_screen("Preparing to format your disk(s)");
+                sleep(1);
+                system("sync");
+                log_to_screen("Please wait. This may take a few minutes.");
+                res += format_everything(mountlist, FALSE);
+            }
+            paranoid_fclose(g_fprep);
+        }
+    }
+    retval += res;
+    if (res) {
+        mvaddstr_and_log_it(g_currentY++,
+                            0,
+                            "Failed to partition and/or format your hard drives.");
+
+        if (ask_me_yes_or_no("Try in interactive mode instead?")) {
+            retval = interactive_mode(bkpinfo, mountlist, raidlist);
+            goto after_the_nuke;
+        } else
+            if (!ask_me_yes_or_no
+                ("Would you like to try to proceed anyway?")) {
+            return (retval);
+        }
+    }
+    retval = mount_all_devices(mountlist, TRUE);
+    if (retval) {
+        unmount_all_devices(mountlist);
+        log_to_screen
+            ("Unable to mount all partitions. Sorry, I cannot proceed.");
+        return (retval);
+    }
+    iamhere("Restoring everything");
+    retval += restore_everything(bkpinfo, NULL);
+    if (!run_boot_loader(FALSE)) {
+        log_msg(1,
+                "Great! Boot loader was installed. No need for msg at end.");
+        boot_loader_installed = TRUE;
+    }
+    protect_against_braindead_sysadmins();
+//  run_program_and_log_output("cp -af /etc/lvm " MNT_RESTORING "/etc/", 1);
+    //  modify_rclocal_one_time( MNT_RESTORING "/etc" );
+    retval += unmount_all_devices(mountlist);
+    mvaddstr_and_log_it(g_currentY,
+                        0,
+                        "Using e2label to label your ext2,3 partitions");
+
+    sprintf(tmp, "label-partitions-as-necessary %s < /tmp/fstab",
+            g_mountlist_fname);
+    res = run_program_and_log_output(tmp, TRUE);
+    if (res) {
+        log_to_screen("label-partitions-as-necessary returned an error");
+        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+    }
+    retval += res;
+
+  after_the_nuke:
+    if (retval) {
+        log_to_screen("Errors occurred during the nuke phase.");
+    } else if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "RESTORE"))    // Bruno's thing
     {
-      fatal_error( "Nuke Mode aborted. ");
-    }
-    }
-  save_mountlist_to_disk( mountlist, g_mountlist_fname );
-  mvaddstr_and_log_it( 1, 30, "Restoring Automatically" );
-  if ( bkpinfo->differential )
-    {
-      log_to_screen( "Because this is a differential backup, disk" );
-      log_to_screen( "partitioning and formatting will not take place." );
-      res = 0;
-    }
-  else
-    {     
-      if ( partition_table_contains_Compaq_diagnostic_partition( mountlist ) )
-    { 
-      offer_to_abort_because_Compaq_Proliants_suck(); 
-    }
-      else
-    {
-      twenty_seconds_til_yikes();
-      g_fprep = fopen("/tmp/prep.sh", "w");
-#ifdef __FreeBSD__
-      if (strstr (call_program_and_get_last_line_of_output ("cat /tmp/cmdline"), "nopart"))
+        log_to_screen
+            ("PC was restored successfully. Thank you for using Mondo Rescue.");
+        log_to_screen
+            ("Please visit http://www.mondorescue.org and thank the dev team.");
+    } else {
+#ifdef FREELOADER
+        success_message();
 #else
-      if (strstr (call_program_and_get_last_line_of_output ("cat /proc/cmdline"), "nopart"))
+        log_to_screen("PC was restored successfully!");
 #endif
-          {
-          log_msg (2, "Not partitioning drives due to 'nopart' option.");
-          res = 0;
-          }
-      else
-          {
-          res = partition_everything( mountlist );
-          if (res)
-            {
-              log_to_screen("Warning. Errors occurred during partitioning.");
-              res = 0;
-            }
-          }
-      retval += res;
-      if ( !res )
-        {
-          log_to_screen("Preparing to format your disk(s)");
-          sleep(1);
-          system("sync");
-          log_to_screen("Please wait. This may take a few minutes.");
-          res += format_everything( mountlist, FALSE );
-        }
-      paranoid_fclose(g_fprep);
-    }
-    }
-  retval += res;
-  if ( res )
-    {
-      mvaddstr_and_log_it( g_currentY++,
-               0,
-               "Failed to partition and/or format your hard drives.");
-      
-      if ( ask_me_yes_or_no( "Try in interactive mode instead?" ) )
-    { 
-      retval = interactive_mode( bkpinfo, mountlist, raidlist ); 
-      goto after_the_nuke;
-    }
-      else if ( !ask_me_yes_or_no( "Would you like to try to proceed anyway?" ) )
-        {
-          return( retval );
-    }
-    }
-  retval = mount_all_devices( mountlist, TRUE );
-  if ( retval ) 
-    {
-      unmount_all_devices( mountlist ); 
-      log_to_screen("Unable to mount all partitions. Sorry, I cannot proceed.");
-      return( retval );
-    }
-  iamhere("Restoring everything");
-  retval += restore_everything( bkpinfo, NULL );
-  if (!run_boot_loader( FALSE ))
-    {
-      log_msg(1, "Great! Boot loader was installed. No need for msg at end.");
-      boot_loader_installed = TRUE;
-    }
-  protect_against_braindead_sysadmins();
-//  run_program_and_log_output("cp -af /etc/lvm " MNT_RESTORING "/etc/", 1);
-  //  modify_rclocal_one_time( MNT_RESTORING "/etc" );
-  retval += unmount_all_devices( mountlist );
-  mvaddstr_and_log_it( g_currentY,
-               0,
-               "Using e2label to label your ext2,3 partitions");
-
-  sprintf( tmp, "label-partitions-as-necessary %s < /tmp/fstab", g_mountlist_fname );
-  res = run_program_and_log_output( tmp, TRUE );
-  if ( res )
-    {
-      log_to_screen( "label-partitions-as-necessary returned an error" );
-      mvaddstr_and_log_it( g_currentY++, 74, "Failed." );
-    }
-  else
-    {
-      mvaddstr_and_log_it( g_currentY++, 74, "Done." );
-    }
-  retval += res;
-
-after_the_nuke:
-  if (retval)
-    {
-      log_to_screen("Errors occurred during the nuke phase.");
-    }
-  else if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "RESTORE")) // Bruno's thing
-    {
-      log_to_screen("PC was restored successfully. Thank you for using Mondo Rescue.");
-      log_to_screen("Please visit http://www.mondorescue.org and thank the dev team.");
-    }
-  else
-    {
-#ifdef FREELOADER
-      success_message();
-#else
-      log_to_screen("PC was restored successfully!");
-#endif
-    }
-  g_I_have_just_nuked = TRUE;
+    }
+    g_I_have_just_nuked = TRUE;
 /*
   if (!boot_loader_installed && !does_file_exist(DO_MBR_PLEASE))
@@ -1269 +1247 @@
     }
 */
-  return( retval );
+    return (retval);
 }
 
@@ -1284 +1262 @@
  * @return 0 for success, or the number of errors encountered.
  */
-int
-restore_to_live_filesystem( struct s_bkpinfo *bkpinfo )
+int restore_to_live_filesystem(struct s_bkpinfo *bkpinfo)
 {
-  int retval = 0;
+    int retval = 0;
 
   /** malloc **/
-  char *old_restpath;
-
-  struct mountlist_itself *mountlist;
+    char *old_restpath;
+
+    struct mountlist_itself *mountlist;
 //  static
-  struct raidlist_itself *raidlist;
-  struct s_node *filelist;
-
-  log_msg(1, "restore_to_live_filesystem() - starting");
-  assert(bkpinfo!=NULL);
-  malloc_string(old_restpath);
-  mountlist = malloc(sizeof(struct mountlist_itself));
-  raidlist = malloc(sizeof(struct raidlist_itself));
-  if (!mountlist || !raidlist) { fatal_error("Cannot malloc() mountlist and/or raidlist"); }
-
-  strcpy(bkpinfo->restore_path, "/");
-  if ( !g_restoring_live_from_cd)
-    {
-      popup_and_OK("Please insert tape/CD/boot floppy, then hit 'OK' to continue.");
-      sleep( 1 );
-    }
-  interactively_obtain_media_parameters_from_user(bkpinfo, FALSE);
-  log_msg(2,  "bkpinfo->media_device = %s", bkpinfo->media_device );
-  if ( !bkpinfo->media_device[0] )
-    {
-      log_msg(2, "Warning - failed to find media dev");
-    }
-
-
-  log_msg(2, "bkpinfo->isodir = %s", bkpinfo->isodir);
-
-  open_evalcall_form("Thinking...");
-
-  get_cfg_file_from_archive_or_bust ( bkpinfo );
-  read_cfg_file_into_bkpinfo(g_mondo_cfg_file, bkpinfo);
-  load_mountlist( mountlist, g_mountlist_fname); // in case read_cfg_file_into_bkpinfo 
-  
-  close_evalcall_form();
-  retval = load_mountlist(mountlist, g_mountlist_fname );
-  load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME );
-  filelist = process_filelist_and_biggielist( bkpinfo );
-  if ( filelist )
-    {
-      save_filelist(filelist, "/tmp/selected-files.txt");
-      strcpy( old_restpath, bkpinfo->restore_path );
-      if ( popup_and_get_string( "Restore path",
-                 "Restore files to where? )",
-                 bkpinfo->restore_path, MAX_STR_LEN/4 ) )
-        {
-      iamhere("Restoring everything");
-          retval += restore_everything( bkpinfo, filelist );
-          free_filelist( filelist );
-          strcpy(bkpinfo->restore_path, old_restpath);
-        }
-      else
-        {
-          free_filelist(filelist);
-        }
-      strcpy(bkpinfo->restore_path, old_restpath);
-    }
-  if ( IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type ) )
-    {
-      log_msg(2, "I probably don't need to unmount or eject the CD-ROM but I'm doing it anyway.");
-    }
-  run_program_and_log_output( "umount "MNT_CDROM, FALSE );
-  if (!bkpinfo->please_dont_eject) { eject_device( bkpinfo->media_device ); }
-  paranoid_free(old_restpath);
-  free(mountlist);
-  free(raidlist);
-  return( retval );
+    struct raidlist_itself *raidlist;
+    struct s_node *filelist;
+
+    log_msg(1, "restore_to_live_filesystem() - starting");
+    assert(bkpinfo != NULL);
+    malloc_string(old_restpath);
+    mountlist = malloc(sizeof(struct mountlist_itself));
+    raidlist = malloc(sizeof(struct raidlist_itself));
+    if (!mountlist || !raidlist) {
+        fatal_error("Cannot malloc() mountlist and/or raidlist");
+    }
+
+    strcpy(bkpinfo->restore_path, "/");
+    if (!g_restoring_live_from_cd) {
+        popup_and_OK
+            ("Please insert tape/CD/boot floppy, then hit 'OK' to continue.");
+        sleep(1);
+    }
+    interactively_obtain_media_parameters_from_user(bkpinfo, FALSE);
+    log_msg(2, "bkpinfo->media_device = %s", bkpinfo->media_device);
+    if (!bkpinfo->media_device[0]) {
+        log_msg(2, "Warning - failed to find media dev");
+    }
+
+
+    log_msg(2, "bkpinfo->isodir = %s", bkpinfo->isodir);
+
+    open_evalcall_form("Thinking...");
+
+    get_cfg_file_from_archive_or_bust(bkpinfo);
+    read_cfg_file_into_bkpinfo(g_mondo_cfg_file, bkpinfo);
+    load_mountlist(mountlist, g_mountlist_fname);   // in case read_cfg_file_into_bkpinfo 
+
+    close_evalcall_form();
+    retval = load_mountlist(mountlist, g_mountlist_fname);
+    load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
+    filelist = process_filelist_and_biggielist(bkpinfo);
+    if (filelist) {
+        save_filelist(filelist, "/tmp/selected-files.txt");
+        strcpy(old_restpath, bkpinfo->restore_path);
+        if (popup_and_get_string("Restore path",
+                                 "Restore files to where? )",
+                                 bkpinfo->restore_path, MAX_STR_LEN / 4)) {
+            iamhere("Restoring everything");
+            retval += restore_everything(bkpinfo, filelist);
+            free_filelist(filelist);
+            strcpy(bkpinfo->restore_path, old_restpath);
+        } else {
+            free_filelist(filelist);
+        }
+        strcpy(bkpinfo->restore_path, old_restpath);
+    }
+    if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
+        log_msg(2,
+                "I probably don't need to unmount or eject the CD-ROM but I'm doing it anyway.");
+    }
+    run_program_and_log_output("umount " MNT_CDROM, FALSE);
+    if (!bkpinfo->please_dont_eject) {
+        eject_device(bkpinfo->media_device);
+    }
+    paranoid_free(old_restpath);
+    free(mountlist);
+    free(raidlist);
+    return (retval);
 }
 
@@ -1386 +1362 @@
 int
 restore_a_biggiefile_from_CD(struct s_bkpinfo *bkpinfo,
-                 long bigfileno,
-                 struct s_node*filelist, char*pathname_of_last_file_restored)
+                             long bigfileno,
+                             struct s_node *filelist,
+                             char *pathname_of_last_file_restored)
 {
-  FILE *fin;
-  FILE *fout;
-  FILE *fbzip2;
-  
+    FILE *fin;
+    FILE *fout;
+    FILE *fbzip2;
+
   /** malloc ***/
-  char *checksum, *outfile_fname, *tmp, *bzip2_command, *partimagehack_command, *suffix, *sz_devfile;
-  char *bigblk;
-  char *p;
-  int retval = 0;
-  int finished = FALSE;
-  long sliceno;
-  long siz;
-  char partimagehack_fifo[MAX_STR_LEN];
-  char *file_to_openout = NULL;
-  struct s_filename_and_lstat_info biggiestruct;
-  struct utimbuf the_utime_buf, *ubuf;
-  bool use_partimage_hack=FALSE;
-  pid_t pid;
-  int res=0;
-  int old_loglevel;
-  char sz_msg[MAX_STR_LEN];
-  struct s_node *node;
-
-  old_loglevel = g_loglevel;
-  ubuf = &the_utime_buf;
-  assert(bkpinfo!=NULL);
-
-  malloc_string(checksum);
-  malloc_string(outfile_fname);
-  malloc_string(tmp);
-  malloc_string(bzip2_command);
-  malloc_string(partimagehack_command);
-  malloc_string(suffix);
-  malloc_string(sz_devfile);
-
-  pathname_of_last_file_restored[0] = '\0';
-  if( !(bigblk = malloc( TAPE_BLOCK_SIZE ) ) )
-    {
-      fatal_error("Cannot malloc bigblk");
-    }
-
-  if ( !(fin = fopen( slice_fname( bigfileno, 0, ARCHIVES_PATH, ""), "r" ) ) )
-    {
-      log_to_screen( "Cannot even open bigfile's info file" );
-      return( 1 );
-    }
-
-  memset((void*)&biggiestruct, 0, sizeof(biggiestruct));
-  if ( fread((void*)&biggiestruct, 1, sizeof(biggiestruct), fin) < sizeof(biggiestruct))
-    {
-      log_msg(2, "Warning - unable to get biggiestruct of bigfile #%d", bigfileno+1);
-    }
-  paranoid_fclose(fin);
-
-  strcpy(checksum, biggiestruct.checksum);
-
-  if ( !checksum[0])
-    {
-      sprintf(tmp,"Warning - bigfile %ld does not have a checksum",bigfileno+1);
-      log_msg(3, tmp);
-      p = checksum;
-    }
-
-  if (!strncmp ( biggiestruct.filename, "/dev/", 5)) // Whether NTFS or not :)
-    { strcpy( outfile_fname, biggiestruct.filename); }
-  else
-    { sprintf( outfile_fname, "%s/%s", bkpinfo->restore_path, biggiestruct.filename ); }
-
-  /* skip file if we have a selective restore subset & it doesn't match */
-  if (filelist != NULL)
-    {
-      node = find_string_at_node(filelist, biggiestruct.filename);
-      if (!node)
-        {
-          log_msg(0, "Skipping %s (name isn't in filelist)", biggiestruct.filename);
-          pathname_of_last_file_restored[0] = '\0';
-      return (0);
-        }
-      else if (!(node->selected))
-        {
-      log_msg(1, "Skipping %s (name isn't in biggielist subset)", biggiestruct.filename);
-          pathname_of_last_file_restored[0] = '\0';
-          return( 0 );
-        }
-    }
-  /* otherwise, continue */
- 
-  log_msg(1, "DEFINITELY restoring %s", biggiestruct.filename); 
-  if (biggiestruct.use_partimagehack)
-    {
-      if (strncmp ( biggiestruct.filename, "/dev/", 5))
-        {
-      log_msg(1, "I was in error when I set biggiestruct.use_partimagehack to TRUE.");
-      log_msg(1, "%s isn't even in /dev", biggiestruct.filename);
-      biggiestruct.use_partimagehack = FALSE;
-    }
-    }
-
-  if (biggiestruct.use_partimagehack) // if it's an NTFS device
+    char *checksum, *outfile_fname, *tmp, *bzip2_command,
+        *partimagehack_command, *suffix, *sz_devfile;
+    char *bigblk;
+    char *p;
+    int retval = 0;
+    int finished = FALSE;
+    long sliceno;
+    long siz;
+    char partimagehack_fifo[MAX_STR_LEN];
+    char *file_to_openout = NULL;
+    struct s_filename_and_lstat_info biggiestruct;
+    struct utimbuf the_utime_buf, *ubuf;
+    bool use_partimage_hack = FALSE;
+    pid_t pid;
+    int res = 0;
+    int old_loglevel;
+    char sz_msg[MAX_STR_LEN];
+    struct s_node *node;
+
+    old_loglevel = g_loglevel;
+    ubuf = &the_utime_buf;
+    assert(bkpinfo != NULL);
+
+    malloc_string(checksum);
+    malloc_string(outfile_fname);
+    malloc_string(tmp);
+    malloc_string(bzip2_command);
+    malloc_string(partimagehack_command);
+    malloc_string(suffix);
+    malloc_string(sz_devfile);
+
+    pathname_of_last_file_restored[0] = '\0';
+    if (!(bigblk = malloc(TAPE_BLOCK_SIZE))) {
+        fatal_error("Cannot malloc bigblk");
+    }
+
+    if (!(fin = fopen(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""), "r"))) {
+        log_to_screen("Cannot even open bigfile's info file");
+        return (1);
+    }
+
+    memset((void *) &biggiestruct, 0, sizeof(biggiestruct));
+    if (fread((void *) &biggiestruct, 1, sizeof(biggiestruct), fin) <
+        sizeof(biggiestruct)) {
+        log_msg(2, "Warning - unable to get biggiestruct of bigfile #%d",
+                bigfileno + 1);
+    }
+    paranoid_fclose(fin);
+
+    strcpy(checksum, biggiestruct.checksum);
+
+    if (!checksum[0]) {
+        sprintf(tmp, "Warning - bigfile %ld does not have a checksum",
+                bigfileno + 1);
+        log_msg(3, tmp);
+        p = checksum;
+    }
+
+    if (!strncmp(biggiestruct.filename, "/dev/", 5))    // Whether NTFS or not :)
+    {
+        strcpy(outfile_fname, biggiestruct.filename);
+    } else {
+        sprintf(outfile_fname, "%s/%s", bkpinfo->restore_path,
+                biggiestruct.filename);
+    }
+
+    /* skip file if we have a selective restore subset & it doesn't match */
+    if (filelist != NULL) {
+        node = find_string_at_node(filelist, biggiestruct.filename);
+        if (!node) {
+            log_msg(0, "Skipping %s (name isn't in filelist)",
+                    biggiestruct.filename);
+            pathname_of_last_file_restored[0] = '\0';
+            return (0);
+        } else if (!(node->selected)) {
+            log_msg(1, "Skipping %s (name isn't in biggielist subset)",
+                    biggiestruct.filename);
+            pathname_of_last_file_restored[0] = '\0';
+            return (0);
+        }
+    }
+    /* otherwise, continue */
+
+    log_msg(1, "DEFINITELY restoring %s", biggiestruct.filename);
+    if (biggiestruct.use_partimagehack) {
+        if (strncmp(biggiestruct.filename, "/dev/", 5)) {
+            log_msg(1,
+                    "I was in error when I set biggiestruct.use_partimagehack to TRUE.");
+            log_msg(1, "%s isn't even in /dev", biggiestruct.filename);
+            biggiestruct.use_partimagehack = FALSE;
+        }
+    }
+
+    if (biggiestruct.use_partimagehack) // if it's an NTFS device
 //  if (!strncmp ( biggiestruct.filename, "/dev/", 5))
-    {
-      g_loglevel = 4;
-      use_partimage_hack = TRUE;
-      log_msg(2, "Calling partimagehack in background because %s is an NTFS /dev entry", outfile_fname);
-      sprintf(sz_devfile, "/tmp/%d.%d.000", (int)(random()%32768), (int)(random()%32768));
-      mkfifo(sz_devfile, 0x770);
-      strcpy(partimagehack_fifo, sz_devfile);
-      file_to_openout = partimagehack_fifo;
-      switch(pid=fork())
-                {
-                  case -1: fatal_error("Fork failure");
-              case 0:
-            log_msg(3, "CHILD - fip - calling feed_outfrom_partimage(%s, %s)", biggiestruct.filename, partimagehack_fifo);
-            res=feed_outfrom_partimage(biggiestruct.filename, partimagehack_fifo);
-//          log_msg(3, "CHILD - fip - exiting");
-            exit(res);
-            break;
-                  default:
-            log_msg(3, "feed_into_partimage() called in background --- pid=%ld", (long int)(pid));
-                }
-    }
-  else
-    {
-      use_partimage_hack = FALSE;
-      partimagehack_fifo[0] = '\0';
-      file_to_openout = outfile_fname;
-      if ( !does_file_exist( outfile_fname ) ) // yes, it looks weird with the '!' but it's correct that way
-       { make_hole_for_file( outfile_fname ); }
-    }
-
-  sprintf( tmp, "Reassembling big file %ld (%s)", bigfileno+1, outfile_fname );
-  log_msg(2, tmp );
-
-  /*
-    last slice is zero-length and uncompressed; when we find it, we stop.
-    We DON'T wait until there are no more slices; if we did that,
-    We might stop at end of CD, not at last slice (which is 0-len and uncompd)
-  */
-
-  strncpy(pathname_of_last_file_restored, biggiestruct.filename, MAX_STR_LEN-1);
-  pathname_of_last_file_restored[MAX_STR_LEN-1] = '\0';
-
-  log_msg(3, "file_to_openout = %s", file_to_openout);
-  if ( !(fout = fopen( file_to_openout, "w" ) ) )
-    {
-      log_to_screen( "Cannot openout outfile_fname - hard disk full?");
-      return(1);
-    }
-  log_msg(3, "Opened out to %s", outfile_fname); // CD/DVD --> mondorestore --> partimagehack --> hard disk itself
-
-  for( sliceno = 1, finished = FALSE; !finished; )
-    {
-      if ( !does_file_exist(slice_fname(bigfileno,sliceno,ARCHIVES_PATH,"")) && !does_file_exist(slice_fname(bigfileno,sliceno,ARCHIVES_PATH,"lzo")) && !does_file_exist(slice_fname(bigfileno,sliceno,ARCHIVES_PATH,"bz2")))
     {
-      log_msg(3, "Cannot find a data slice or terminator slice on CD %d", g_current_media_number);
-      g_current_media_number++;
-      sprintf( tmp, "Asking for %s #%d so that I may read slice #%ld\n",media_descriptor_string(bkpinfo->backup_media_type), g_current_media_number,sliceno);
-      log_msg(2,  tmp );
-      sprintf( tmp, "Restoring from %s #%d", media_descriptor_string(bkpinfo->backup_media_type), g_current_media_number );
-      log_to_screen( tmp );
-      insist_on_this_cd_number( bkpinfo, g_current_media_number );
-      log_to_screen( "Continuing to restore.");
-    }
-      else
-    {
-      strcpy(tmp, slice_fname(bigfileno,sliceno,ARCHIVES_PATH,""));
-      if (does_file_exist(tmp) && length_of_file(tmp) == 0)
-        {
-          log_msg(2, "End of bigfile # %ld (slice %ld is the terminator)", bigfileno + 1, sliceno );
-          finished = TRUE;
-              continue;
-        }
-      else
-        {
-          if ( does_file_exist(slice_fname(bigfileno, sliceno,ARCHIVES_PATH, "lzo" ) ) )
+        g_loglevel = 4;
+        use_partimage_hack = TRUE;
+        log_msg(2,
+                "Calling partimagehack in background because %s is an NTFS /dev entry",
+                outfile_fname);
+        sprintf(sz_devfile, "/tmp/%d.%d.000", (int) (random() % 32768),
+                (int) (random() % 32768));
+        mkfifo(sz_devfile, 0x770);
+        strcpy(partimagehack_fifo, sz_devfile);
+        file_to_openout = partimagehack_fifo;
+        switch (pid = fork()) {
+        case -1:
+            fatal_error("Fork failure");
+        case 0:
+            log_msg(3,
+                    "CHILD - fip - calling feed_outfrom_partimage(%s, %s)",
+                    biggiestruct.filename, partimagehack_fifo);
+            res =
+                feed_outfrom_partimage(biggiestruct.filename,
+                                       partimagehack_fifo);
+//          log_msg(3, "CHILD - fip - exiting");
+            exit(res);
+            break;
+        default:
+            log_msg(3,
+                    "feed_into_partimage() called in background --- pid=%ld",
+                    (long int) (pid));
+        }
+    } else {
+        use_partimage_hack = FALSE;
+        partimagehack_fifo[0] = '\0';
+        file_to_openout = outfile_fname;
+        if (!does_file_exist(outfile_fname))    // yes, it looks weird with the '!' but it's correct that way
         {
-          strcpy( bzip2_command, "lzop" );
-          strcpy( suffix, "lzo");
-        }
-          else if ( does_file_exist( slice_fname( bigfileno, sliceno, ARCHIVES_PATH, "bz2" ) ) )
-        {
-          strcpy( bzip2_command, "bzip2" );
-          strcpy( suffix, "bz2");
-        }
-          else if ( does_file_exist( slice_fname( bigfileno, sliceno, ARCHIVES_PATH, "" ) ) )
-        {
-          strcpy( bzip2_command, "" );
-          strcpy( suffix, "");
-        }
-          else
-        {
-          log_to_screen( "OK, that's pretty fsck0red...");
-          return( 1 );
-        }
-        }
-          if ( bzip2_command[0] != '\0' )
-            {
-          sprintf( bzip2_command + strlen( bzip2_command ),
-               " -dc %s 2>> %s",
-               slice_fname( bigfileno, sliceno, ARCHIVES_PATH, suffix),
-               MONDO_LOGFILE);
-        }
-          else
-            {
-          sprintf( bzip2_command, "cat %s 2>> %s",
-               slice_fname(bigfileno, sliceno, ARCHIVES_PATH, suffix ),
-               MONDO_LOGFILE );
-        }
-      sprintf(tmp, "Working on %s #%d, file #%ld, slice #%ld    ", media_descriptor_string(bkpinfo->backup_media_type), g_current_media_number, bigfileno + 1, sliceno );
-          log_msg(2, tmp );
-
-          if (!g_text_mode)
-            {
-              newtDrawRootText( 0, g_noof_rows - 2, tmp );
-              newtRefresh();
-              strip_spaces( tmp );
-              update_progress_form( tmp );
-            }
-      if ( !(fbzip2 = popen( bzip2_command, "r" ) ) )
-        {
-          fatal_error( "Can't run popen command");
-        }
-      while( !feof( fbzip2 ) )
-        {
-          siz = fread( bigblk, 1, TAPE_BLOCK_SIZE, fbzip2 );
-          if (siz > 0)
-        {
-                  sprintf(sz_msg, "Read %ld from fbzip2", siz);
-          siz = fwrite( bigblk, 1, siz, fout);
-                  sprintf(sz_msg + strlen(sz_msg), "; written %ld to fout", siz);
-//        log_msg(2. sz_msg);
-        }
-        }
-      paranoid_pclose(fbzip2);
-
-
-          sliceno++;
-          g_current_progress++;
-        }
-    }
+            make_hole_for_file(outfile_fname);
+        }
+    }
+
+    sprintf(tmp, "Reassembling big file %ld (%s)", bigfileno + 1,
+            outfile_fname);
+    log_msg(2, tmp);
+
+    /*
+       last slice is zero-length and uncompressed; when we find it, we stop.
+       We DON'T wait until there are no more slices; if we did that,
+       We might stop at end of CD, not at last slice (which is 0-len and uncompd)
+     */
+
+    strncpy(pathname_of_last_file_restored, biggiestruct.filename,
+            MAX_STR_LEN - 1);
+    pathname_of_last_file_restored[MAX_STR_LEN - 1] = '\0';
+
+    log_msg(3, "file_to_openout = %s", file_to_openout);
+    if (!(fout = fopen(file_to_openout, "w"))) {
+        log_to_screen("Cannot openout outfile_fname - hard disk full?");
+        return (1);
+    }
+    log_msg(3, "Opened out to %s", outfile_fname);  // CD/DVD --> mondorestore --> partimagehack --> hard disk itself
+
+    for (sliceno = 1, finished = FALSE; !finished;) {
+        if (!does_file_exist
+            (slice_fname(bigfileno, sliceno, ARCHIVES_PATH, ""))
+            &&
+            !does_file_exist(slice_fname
+                             (bigfileno, sliceno, ARCHIVES_PATH, "lzo"))
+            &&
+            !does_file_exist(slice_fname
+                             (bigfileno, sliceno, ARCHIVES_PATH, "bz2"))) {
+            log_msg(3,
+                    "Cannot find a data slice or terminator slice on CD %d",
+                    g_current_media_number);
+            g_current_media_number++;
+            sprintf(tmp,
+                    "Asking for %s #%d so that I may read slice #%ld\n",
+                    media_descriptor_string(bkpinfo->backup_media_type),
+                    g_current_media_number, sliceno);
+            log_msg(2, tmp);
+            sprintf(tmp, "Restoring from %s #%d",
+                    media_descriptor_string(bkpinfo->backup_media_type),
+                    g_current_media_number);
+            log_to_screen(tmp);
+            insist_on_this_cd_number(bkpinfo, g_current_media_number);
+            log_to_screen("Continuing to restore.");
+        } else {
+            strcpy(tmp,
+                   slice_fname(bigfileno, sliceno, ARCHIVES_PATH, ""));
+            if (does_file_exist(tmp) && length_of_file(tmp) == 0) {
+                log_msg(2,
+                        "End of bigfile # %ld (slice %ld is the terminator)",
+                        bigfileno + 1, sliceno);
+                finished = TRUE;
+                continue;
+            } else {
+                if (does_file_exist
+                    (slice_fname
+                     (bigfileno, sliceno, ARCHIVES_PATH, "lzo"))) {
+                    strcpy(bzip2_command, "lzop");
+                    strcpy(suffix, "lzo");
+                } else
+                    if (does_file_exist
+                        (slice_fname
+                         (bigfileno, sliceno, ARCHIVES_PATH, "bz2"))) {
+                    strcpy(bzip2_command, "bzip2");
+                    strcpy(suffix, "bz2");
+                } else
+                    if (does_file_exist
+                        (slice_fname
+                         (bigfileno, sliceno, ARCHIVES_PATH, ""))) {
+                    strcpy(bzip2_command, "");
+                    strcpy(suffix, "");
+                } else {
+                    log_to_screen("OK, that's pretty fsck0red...");
+                    return (1);
+                }
+            }
+            if (bzip2_command[0] != '\0') {
+                sprintf(bzip2_command + strlen(bzip2_command),
+                        " -dc %s 2>> %s",
+                        slice_fname(bigfileno, sliceno, ARCHIVES_PATH,
+                                    suffix), MONDO_LOGFILE);
+            } else {
+                sprintf(bzip2_command, "cat %s 2>> %s",
+                        slice_fname(bigfileno, sliceno, ARCHIVES_PATH,
+                                    suffix), MONDO_LOGFILE);
+            }
+            sprintf(tmp, "Working on %s #%d, file #%ld, slice #%ld    ",
+                    media_descriptor_string(bkpinfo->backup_media_type),
+                    g_current_media_number, bigfileno + 1, sliceno);
+            log_msg(2, tmp);
+
+            if (!g_text_mode) {
+                newtDrawRootText(0, g_noof_rows - 2, tmp);
+                newtRefresh();
+                strip_spaces(tmp);
+                update_progress_form(tmp);
+            }
+            if (!(fbzip2 = popen(bzip2_command, "r"))) {
+                fatal_error("Can't run popen command");
+            }
+            while (!feof(fbzip2)) {
+                siz = fread(bigblk, 1, TAPE_BLOCK_SIZE, fbzip2);
+                if (siz > 0) {
+                    sprintf(sz_msg, "Read %ld from fbzip2", siz);
+                    siz = fwrite(bigblk, 1, siz, fout);
+                    sprintf(sz_msg + strlen(sz_msg),
+                            "; written %ld to fout", siz);
+//        log_msg(2. sz_msg);
+                }
+            }
+            paranoid_pclose(fbzip2);
+
+
+            sliceno++;
+            g_current_progress++;
+        }
+    }
 /*
   memset(bigblk, TAPE_BLOCK_SIZE, 1); // This all looks very fishy...
@@ -1636 +1630 @@
   fwrite( bigblk, 1, TAPE_BLOCK_SIZE, fout);
 */
-  paranoid_fclose( fout );
-  g_loglevel = old_loglevel;
-
-  if (use_partimage_hack)
-    {
-      log_msg(3, "Waiting for partimage to finish");
-      sprintf(tmp, " ps ax | grep \" partimagehack \" | grep -v grep > /dev/null 2> /dev/null");
-      while(system(tmp) == 0)
-        { sleep(1); }
-      log_it("OK, partimage has really finished");
-    }
-
-  if (strcmp(outfile_fname, "/dev/null"))
-    {
-      chown( outfile_fname, biggiestruct.properties.st_uid, biggiestruct.properties.st_gid );
-      chmod( outfile_fname, biggiestruct.properties.st_mode );
-      ubuf->actime = biggiestruct.properties.st_atime;
-      ubuf->modtime= biggiestruct.properties.st_mtime;
-      utime( outfile_fname, ubuf );
-    }
-  paranoid_free( bigblk );
-  paranoid_free(checksum);
-  paranoid_free(outfile_fname);
-  paranoid_free(tmp);
-  paranoid_free(bzip2_command);
-  paranoid_free(partimagehack_command);
-  paranoid_free(suffix);
-  paranoid_free(sz_devfile);
-
-  return( retval );
+    paranoid_fclose(fout);
+    g_loglevel = old_loglevel;
+
+    if (use_partimage_hack) {
+        log_msg(3, "Waiting for partimage to finish");
+        sprintf(tmp,
+                " ps ax | grep \" partimagehack \" | grep -v grep > /dev/null 2> /dev/null");
+        while (system(tmp) == 0) {
+            sleep(1);
+        }
+        log_it("OK, partimage has really finished");
+    }
+
+    if (strcmp(outfile_fname, "/dev/null")) {
+        chown(outfile_fname, biggiestruct.properties.st_uid,
+              biggiestruct.properties.st_gid);
+        chmod(outfile_fname, biggiestruct.properties.st_mode);
+        ubuf->actime = biggiestruct.properties.st_atime;
+        ubuf->modtime = biggiestruct.properties.st_mtime;
+        utime(outfile_fname, ubuf);
+    }
+    paranoid_free(bigblk);
+    paranoid_free(checksum);
+    paranoid_free(outfile_fname);
+    paranoid_free(tmp);
+    paranoid_free(bzip2_command);
+    paranoid_free(partimagehack_command);
+    paranoid_free(suffix);
+    paranoid_free(sz_devfile);
+
+    return (retval);
 }
 
@@ -1688 +1683 @@
  * @bug orig_checksum and biggiefile_size are unused (except to check that they are non-NULL).
  */
-int
-restore_a_biggiefile_from_stream(struct s_bkpinfo *bkpinfo,
-                 char *orig_bf_fname,
-                 long biggiefile_number,
-                 char *orig_checksum, //UNUSED
-                 long long biggiefile_size, //UNUSED
-                 struct s_node *filelist, int use_partimagehack,
-                 char*pathname_of_last_file_restored)
+int restore_a_biggiefile_from_stream(struct s_bkpinfo *bkpinfo, char *orig_bf_fname, long biggiefile_number, char *orig_checksum,   //UNUSED
+                                     long long biggiefile_size, //UNUSED
+                                     struct s_node *filelist,
+                                     int use_partimagehack,
+                                     char *pathname_of_last_file_restored)
 {
-  FILE *pout;
-  FILE *fin;
+    FILE *pout;
+    FILE *fin;
 
   /** mallocs ********/
-  char *tmp;
-  char *command;
-  char *outfile_fname;
-  char *partimagehack_command;
-  char *sz_devfile;
-  char *partimagehack_fifo;
-  char *file_to_openout = NULL;
-
-  struct s_node *node;
-
-  int old_loglevel;
-  long current_slice_number = 0;
-  int retval = 0;
-  int res = 0;
-  int ctrl_chr = '\0';
-  long long slice_siz;
-  bool dummy_restore = FALSE;
-  bool use_partimage_hack=FALSE;
-  pid_t pid;
-  struct s_filename_and_lstat_info biggiestruct;
-  struct utimbuf the_utime_buf, *ubuf;
-  ubuf = &the_utime_buf;
-
-  malloc_string(tmp);
-  malloc_string(partimagehack_fifo);
-  malloc_string(outfile_fname);
-  malloc_string(command);
-  malloc_string(sz_devfile);
-  malloc_string(partimagehack_command);
-  old_loglevel = g_loglevel;
-  assert(bkpinfo!=NULL);
-  assert(orig_bf_fname!=NULL);
-  assert(orig_checksum!=NULL);
-
-  pathname_of_last_file_restored[0] = '\0';
-  if (use_partimagehack == BLK_START_A_PIHBIGGIE)
-    {
-      use_partimagehack = 1;
-      log_msg(1, "%s --- pih=YES", orig_bf_fname);
-    }
-  else if (use_partimagehack == BLK_START_A_NORMBIGGIE)
-    {
-      use_partimagehack = 0;
-      log_msg(1, "%s --- pih=NO", orig_bf_fname);
-    }
-  else
-    {
-      use_partimagehack = 0;
-      log_msg(1, "%s --- pih=NO (weird marker though)", orig_bf_fname);
-    }
-  
-  strncpy(pathname_of_last_file_restored, orig_bf_fname, MAX_STR_LEN-1);
-  pathname_of_last_file_restored[MAX_STR_LEN-1] = '\0';
-  
-  /* open out to biggiefile to be restored (or /dev/null if biggiefile is not to be restored) */
-
-  if (filelist != NULL)
-    {
-      node = find_string_at_node(filelist, orig_bf_fname);
-      if (!node)
-        {
-          dummy_restore = TRUE;
-          log_msg(1, "Skipping big file %ld (%s) - not in biggielist subset", biggiefile_number+1, orig_bf_fname);
-          pathname_of_last_file_restored[0] = '\0';
-        }
-      else if (!(node->selected))
-        {
-          dummy_restore = TRUE;
-      log_msg(1, "Skipping %s (name isn't in biggielist subset)", orig_bf_fname);
-          pathname_of_last_file_restored[0] = '\0';
-        }
-    }
-
-  if (use_partimagehack)
-    {
-      if (strncmp ( orig_bf_fname, "/dev/", 5))
-        {
-      log_msg(1, "I was in error when I set use_partimagehack to TRUE.");
-      log_msg(1, "%s isn't even in /dev", orig_bf_fname);
-      use_partimagehack = FALSE;
-    }
-    }
-
-  if (use_partimagehack)
-    {
-      g_loglevel = 4;
-      strcpy(outfile_fname, orig_bf_fname);
-      use_partimage_hack = TRUE;
-      log_msg(2, "Calling partimagehack in background because %s is a /dev entry", outfile_fname);
-      sprintf(sz_devfile, "/tmp/%d.%d.000", (int)(random()%32768), (int)(random()%32768));
-      mkfifo(sz_devfile, 0x770);
-      strcpy(partimagehack_fifo, sz_devfile);
-      file_to_openout = partimagehack_fifo;
-      switch(pid=fork())
-                {
-                  case -1: fatal_error("Fork failure");
-              case 0:
-            log_msg(3, "CHILD - fip - calling feed_outfrom_partimage(%s, %s)", outfile_fname, partimagehack_fifo);
-            res=feed_outfrom_partimage(outfile_fname, partimagehack_fifo);
-//          log_msg(3, "CHILD - fip - exiting");
-            exit(res);
-            break;
-                  default:
-            log_msg(3, "feed_into_partimage() called in background --- pid=%ld", (long int)(pid));
-                }
-    }
-  else
-    {
-      if (!strncmp ( orig_bf_fname, "/dev/", 5)) // non-NTFS partition
-        { strcpy(outfile_fname, orig_bf_fname); }
-      else // biggiefile
-        { sprintf( outfile_fname, "%s/%s", bkpinfo->restore_path, orig_bf_fname ); }
-      use_partimage_hack = FALSE;
-      partimagehack_fifo[0] = '\0';
-      file_to_openout = outfile_fname;
-      if ( !does_file_exist( outfile_fname ) ) // yes, it looks weird with the '!' but it's correct that way
-       { make_hole_for_file( outfile_fname ); }
-      sprintf(tmp, "Reassembling big file %ld (%s)", biggiefile_number + 1, orig_bf_fname );
-      log_msg(2, tmp );
-    }
-  
-  if (dummy_restore)
-    { sprintf( outfile_fname, "/dev/null" ); }
-    
-  if ( !bkpinfo->zip_exe[0] )
-    {
-      sprintf(command, "cat > \"%s\"", file_to_openout);
-    }
-  else
-    {
-      sprintf(command,"%s -dc > \"%s\" 2>> %s",bkpinfo->zip_exe, file_to_openout, MONDO_LOGFILE);
-    }
-  sprintf(tmp,"Pipe command = '%s'",command);
-  log_msg(3, tmp);
-
-  /* restore biggiefile, one slice at a time */
-  if ( !( pout = popen(command, "w" ) ) )
-    {
-      fatal_error( "Cannot pipe out" );
-    }
-  for( res = read_header_block_from_stream( &slice_siz, tmp, &ctrl_chr); ctrl_chr!=BLK_STOP_A_BIGGIE; res=read_header_block_from_stream(&slice_siz, tmp, &ctrl_chr ) )
-    {
-      if ( ctrl_chr != BLK_START_AN_AFIO_OR_SLICE )
-    {
-      wrong_marker( BLK_START_AN_AFIO_OR_SLICE,ctrl_chr );
-    }
-      sprintf( tmp,"Working on file #%ld, slice #%ld    ",
-           biggiefile_number + 1,
-           current_slice_number);
-      log_msg(2, tmp);
-      if (!g_text_mode)
-        {
-          newtDrawRootText( 0, g_noof_rows - 2, tmp);
-          newtRefresh();
-        }
-      strip_spaces( tmp );
-      update_progress_form( tmp );
-      if ( current_slice_number == 0 )
-        {
-          res = read_file_from_stream_to_file( bkpinfo,"/tmp/biggie-blah.txt",slice_siz);
-          if (!(fin = fopen("/tmp/biggie-blah.txt", "r")))
-            { log_OS_error("blah blah"); }
-          else
-            {
-              if ( fread( (void*)&biggiestruct, 1, sizeof(biggiestruct), fin) < sizeof(biggiestruct))
-                {
-                  log_msg(2, "Warning - unable to get biggiestruct of bigfile #%d", biggiefile_number + 1);
-                }
-              paranoid_fclose(fin);
-            }
-    }
-      else
-        {
-          res = read_file_from_stream_to_stream( bkpinfo, pout, slice_siz );
-        }
-      retval += res;
-      res = read_header_block_from_stream( &slice_siz, tmp, &ctrl_chr );
-      if (ctrl_chr != BLK_STOP_AN_AFIO_OR_SLICE)
-    {
-      wrong_marker(BLK_STOP_AN_AFIO_OR_SLICE, ctrl_chr);
-    }
-      current_slice_number++;
-      g_current_progress++;
-    }
-  paranoid_pclose(pout);
-  
-  log_msg(1, "pathname_of_last_file_restored is now %s", pathname_of_last_file_restored);
-
-  if (use_partimage_hack)
-    {
-      log_msg(3, "Waiting for partimage to finish");
-      sprintf(tmp, " ps ax | grep \" partimagehack \" | grep -v grep > /dev/null 2> /dev/null");
-      while(system(tmp) == 0)
-        { sleep(1); }
-      log_msg(3, "OK, partimage has really finished");
-    }
-
-  log_msg(3, "biggiestruct.filename = %s", biggiestruct.filename);
-  log_msg(3, "biggiestruct.checksum = %s", biggiestruct.checksum);
-  if (strcmp(outfile_fname, "/dev/null"))
-    {
-      chmod(outfile_fname, biggiestruct.properties.st_mode);
-      chown(outfile_fname, biggiestruct.properties.st_uid, biggiestruct.properties.st_gid);
-      ubuf->actime = biggiestruct.properties.st_atime;
-      ubuf->modtime= biggiestruct.properties.st_mtime;
-      utime( outfile_fname, ubuf );
-    }
-
-  paranoid_free(tmp);
-  paranoid_free(outfile_fname);
-  paranoid_free(command);
-  paranoid_free(partimagehack_command);
-  paranoid_free(sz_devfile);
-  paranoid_free(partimagehack_fifo);
-  g_loglevel = old_loglevel;
-  return(retval);
+    char *tmp;
+    char *command;
+    char *outfile_fname;
+    char *partimagehack_command;
+    char *sz_devfile;
+    char *partimagehack_fifo;
+    char *file_to_openout = NULL;
+
+    struct s_node *node;
+
+    int old_loglevel;
+    long current_slice_number = 0;
+    int retval = 0;
+    int res = 0;
+    int ctrl_chr = '\0';
+    long long slice_siz;
+    bool dummy_restore = FALSE;
+    bool use_partimage_hack = FALSE;
+    pid_t pid;
+    struct s_filename_and_lstat_info biggiestruct;
+    struct utimbuf the_utime_buf, *ubuf;
+    ubuf = &the_utime_buf;
+
+    malloc_string(tmp);
+    malloc_string(partimagehack_fifo);
+    malloc_string(outfile_fname);
+    malloc_string(command);
+    malloc_string(sz_devfile);
+    malloc_string(partimagehack_command);
+    old_loglevel = g_loglevel;
+    assert(bkpinfo != NULL);
+    assert(orig_bf_fname != NULL);
+    assert(orig_checksum != NULL);
+
+    pathname_of_last_file_restored[0] = '\0';
+    if (use_partimagehack == BLK_START_A_PIHBIGGIE) {
+        use_partimagehack = 1;
+        log_msg(1, "%s --- pih=YES", orig_bf_fname);
+    } else if (use_partimagehack == BLK_START_A_NORMBIGGIE) {
+        use_partimagehack = 0;
+        log_msg(1, "%s --- pih=NO", orig_bf_fname);
+    } else {
+        use_partimagehack = 0;
+        log_msg(1, "%s --- pih=NO (weird marker though)", orig_bf_fname);
+    }
+
+    strncpy(pathname_of_last_file_restored, orig_bf_fname,
+            MAX_STR_LEN - 1);
+    pathname_of_last_file_restored[MAX_STR_LEN - 1] = '\0';
+
+    /* open out to biggiefile to be restored (or /dev/null if biggiefile is not to be restored) */
+
+    if (filelist != NULL) {
+        node = find_string_at_node(filelist, orig_bf_fname);
+        if (!node) {
+            dummy_restore = TRUE;
+            log_msg(1,
+                    "Skipping big file %ld (%s) - not in biggielist subset",
+                    biggiefile_number + 1, orig_bf_fname);
+            pathname_of_last_file_restored[0] = '\0';
+        } else if (!(node->selected)) {
+            dummy_restore = TRUE;
+            log_msg(1, "Skipping %s (name isn't in biggielist subset)",
+                    orig_bf_fname);
+            pathname_of_last_file_restored[0] = '\0';
+        }
+    }
+
+    if (use_partimagehack) {
+        if (strncmp(orig_bf_fname, "/dev/", 5)) {
+            log_msg(1,
+                    "I was in error when I set use_partimagehack to TRUE.");
+            log_msg(1, "%s isn't even in /dev", orig_bf_fname);
+            use_partimagehack = FALSE;
+        }
+    }
+
+    if (use_partimagehack) {
+        g_loglevel = 4;
+        strcpy(outfile_fname, orig_bf_fname);
+        use_partimage_hack = TRUE;
+        log_msg(2,
+                "Calling partimagehack in background because %s is a /dev entry",
+                outfile_fname);
+        sprintf(sz_devfile, "/tmp/%d.%d.000", (int) (random() % 32768),
+                (int) (random() % 32768));
+        mkfifo(sz_devfile, 0x770);
+        strcpy(partimagehack_fifo, sz_devfile);
+        file_to_openout = partimagehack_fifo;
+        switch (pid = fork()) {
+        case -1:
+            fatal_error("Fork failure");
+        case 0:
+            log_msg(3,
+                    "CHILD - fip - calling feed_outfrom_partimage(%s, %s)",
+                    outfile_fname, partimagehack_fifo);
+            res =
+                feed_outfrom_partimage(outfile_fname, partimagehack_fifo);
+//          log_msg(3, "CHILD - fip - exiting");
+            exit(res);
+            break;
+        default:
+            log_msg(3,
+                    "feed_into_partimage() called in background --- pid=%ld",
+                    (long int) (pid));
+        }
+    } else {
+        if (!strncmp(orig_bf_fname, "/dev/", 5))    // non-NTFS partition
+        {
+            strcpy(outfile_fname, orig_bf_fname);
+        } else                  // biggiefile
+        {
+            sprintf(outfile_fname, "%s/%s", bkpinfo->restore_path,
+                    orig_bf_fname);
+        }
+        use_partimage_hack = FALSE;
+        partimagehack_fifo[0] = '\0';
+        file_to_openout = outfile_fname;
+        if (!does_file_exist(outfile_fname))    // yes, it looks weird with the '!' but it's correct that way
+        {
+            make_hole_for_file(outfile_fname);
+        }
+        sprintf(tmp, "Reassembling big file %ld (%s)",
+                biggiefile_number + 1, orig_bf_fname);
+        log_msg(2, tmp);
+    }
+
+    if (dummy_restore) {
+        sprintf(outfile_fname, "/dev/null");
+    }
+
+    if (!bkpinfo->zip_exe[0]) {
+        sprintf(command, "cat > \"%s\"", file_to_openout);
+    } else {
+        sprintf(command, "%s -dc > \"%s\" 2>> %s", bkpinfo->zip_exe,
+                file_to_openout, MONDO_LOGFILE);
+    }
+    sprintf(tmp, "Pipe command = '%s'", command);
+    log_msg(3, tmp);
+
+    /* restore biggiefile, one slice at a time */
+    if (!(pout = popen(command, "w"))) {
+        fatal_error("Cannot pipe out");
+    }
+    for (res = read_header_block_from_stream(&slice_siz, tmp, &ctrl_chr);
+         ctrl_chr != BLK_STOP_A_BIGGIE;
+         res = read_header_block_from_stream(&slice_siz, tmp, &ctrl_chr)) {
+        if (ctrl_chr != BLK_START_AN_AFIO_OR_SLICE) {
+            wrong_marker(BLK_START_AN_AFIO_OR_SLICE, ctrl_chr);
+        }
+        sprintf(tmp, "Working on file #%ld, slice #%ld    ",
+                biggiefile_number + 1, current_slice_number);
+        log_msg(2, tmp);
+        if (!g_text_mode) {
+            newtDrawRootText(0, g_noof_rows - 2, tmp);
+            newtRefresh();
+        }
+        strip_spaces(tmp);
+        update_progress_form(tmp);
+        if (current_slice_number == 0) {
+            res =
+                read_file_from_stream_to_file(bkpinfo,
+                                              "/tmp/biggie-blah.txt",
+                                              slice_siz);
+            if (!(fin = fopen("/tmp/biggie-blah.txt", "r"))) {
+                log_OS_error("blah blah");
+            } else {
+                if (fread
+                    ((void *) &biggiestruct, 1, sizeof(biggiestruct),
+                     fin) < sizeof(biggiestruct)) {
+                    log_msg(2,
+                            "Warning - unable to get biggiestruct of bigfile #%d",
+                            biggiefile_number + 1);
+                }
+                paranoid_fclose(fin);
+            }
+        } else {
+            res =
+                read_file_from_stream_to_stream(bkpinfo, pout, slice_siz);
+        }
+        retval += res;
+        res = read_header_block_from_stream(&slice_siz, tmp, &ctrl_chr);
+        if (ctrl_chr != BLK_STOP_AN_AFIO_OR_SLICE) {
+            wrong_marker(BLK_STOP_AN_AFIO_OR_SLICE, ctrl_chr);
+        }
+        current_slice_number++;
+        g_current_progress++;
+    }
+    paranoid_pclose(pout);
+
+    log_msg(1, "pathname_of_last_file_restored is now %s",
+            pathname_of_last_file_restored);
+
+    if (use_partimage_hack) {
+        log_msg(3, "Waiting for partimage to finish");
+        sprintf(tmp,
+                " ps ax | grep \" partimagehack \" | grep -v grep > /dev/null 2> /dev/null");
+        while (system(tmp) == 0) {
+            sleep(1);
+        }
+        log_msg(3, "OK, partimage has really finished");
+    }
+
+    log_msg(3, "biggiestruct.filename = %s", biggiestruct.filename);
+    log_msg(3, "biggiestruct.checksum = %s", biggiestruct.checksum);
+    if (strcmp(outfile_fname, "/dev/null")) {
+        chmod(outfile_fname, biggiestruct.properties.st_mode);
+        chown(outfile_fname, biggiestruct.properties.st_uid,
+              biggiestruct.properties.st_gid);
+        ubuf->actime = biggiestruct.properties.st_atime;
+        ubuf->modtime = biggiestruct.properties.st_mtime;
+        utime(outfile_fname, ubuf);
+    }
+
+    paranoid_free(tmp);
+    paranoid_free(outfile_fname);
+    paranoid_free(command);
+    paranoid_free(partimagehack_command);
+    paranoid_free(sz_devfile);
+    paranoid_free(partimagehack_fifo);
+    g_loglevel = old_loglevel;
+    return (retval);
 }
 
@@ -1938 +1936 @@
 int
 restore_a_tarball_from_CD(char *tarball_fname,
-              long current_tarball_number,
-              struct s_node*filelist)
+                          long current_tarball_number,
+                          struct s_node *filelist)
 {
-  int retval = 0;
-  int res;
-  char *p;
+    int retval = 0;
+    int res;
+    char *p;
 
   /** malloc **/
-  char *command;
-  char *tmp;
-  char *filelist_name;
-  char *filelist_subset_fname;
-  char *executable;
-  char *temp_log;
-  char screen_message[100];
-  long matches=0;
-  bool use_star;
-  char *xattr_fname;
-  char *acl_fname;
+    char *command;
+    char *tmp;
+    char *filelist_name;
+    char *filelist_subset_fname;
+    char *executable;
+    char *temp_log;
+    char screen_message[100];
+    long matches = 0;
+    bool use_star;
+    char *xattr_fname;
+    char *acl_fname;
 //  char files_to_restore_this_time_fname[MAX_STR_LEN];
 
-  assert_string_is_neither_NULL_nor_zerolength(tarball_fname);
-  malloc_string(command);
-  malloc_string(tmp);
-  malloc_string(filelist_name);
-  malloc_string(filelist_subset_fname);
-  malloc_string(executable);
-  malloc_string(temp_log);
-  malloc_string(xattr_fname);
-  malloc_string(acl_fname);
-  
-  log_msg(5, "Entering");
-  filelist_subset_fname[0] = '\0';
-  use_star = (strstr(tarball_fname, ".star"))?TRUE:FALSE;
+    assert_string_is_neither_NULL_nor_zerolength(tarball_fname);
+    malloc_string(command);
+    malloc_string(tmp);
+    malloc_string(filelist_name);
+    malloc_string(filelist_subset_fname);
+    malloc_string(executable);
+    malloc_string(temp_log);
+    malloc_string(xattr_fname);
+    malloc_string(acl_fname);
+
+    log_msg(5, "Entering");
+    filelist_subset_fname[0] = '\0';
+    use_star = (strstr(tarball_fname, ".star")) ? TRUE : FALSE;
 //  sprintf(files_to_restore_this_time_fname, "/tmp/ftrttf.%d.%d", (int)getpid(), (int)random());
-  sprintf(command, "mkdir -p %s/tmp", MNT_RESTORING);
-  run_program_and_log_output(command, 9);
-  sprintf(temp_log, "/tmp/%d.%d", (int)(random()%32768), (int)(random()%32768));
-  
-  sprintf(filelist_name, MNT_CDROM"/archives/filelist.%ld",current_tarball_number);
-  if ( length_of_file( filelist_name ) <= 2 )
-    {
-      log_msg(2, "There are _zero_ files in filelist '%s'", filelist_name);
-      log_msg(2, "This is a bit silly (ask Hugo to fix mondo-makefilelist, please)");
-      log_msg(2, "but it's non-critical. It's cosmetic. Don't worry about it.");
-      retval=0;
-      goto leave_sub;
-    }
-  if ( count_lines_in_file(filelist_name) <= 0 || length_of_file( tarball_fname ) <= 0 )
-    {
-      log_msg(3, "length_of_file(%s) = %ld", tarball_fname, length_of_file(tarball_fname));
-      sprintf(tmp,"Unable to restore fileset #%ld (CD I/O error)",current_tarball_number);
-      log_to_screen(tmp);
-      retval=1;
-      goto leave_sub;
-    }
-
-  if (filelist)
-    {
-      sprintf(filelist_subset_fname, "/tmp/filelist-subset-%ld.tmp", current_tarball_number);
-      if ((matches=save_filelist_entries_in_common
-                (filelist_name, filelist, filelist_subset_fname, use_star))
-                <= 0)
-    {
-      sprintf(tmp, "Skipping fileset %ld", current_tarball_number);
-      log_msg(1, tmp);
-    }
-      else
-        {
-      log_msg(3, "Saved fileset %ld's subset to %s", current_tarball_number, filelist_subset_fname);
-    }
-      sprintf(screen_message, "Tarball #%ld --- %ld matches", current_tarball_number, matches);
-      log_to_screen(screen_message);
-    }
-  else
-    {
-      filelist_subset_fname[0] = '\0';
-    }
-
-  if (filelist == NULL || matches>0)
-    {
-      sprintf(xattr_fname, XATTR_LIST_FNAME_RAW_SZ, MNT_CDROM"/archives", current_tarball_number);
-      sprintf(acl_fname, ACL_LIST_FNAME_RAW_SZ, MNT_CDROM"/archives", current_tarball_number);
-      if ( strstr( tarball_fname, ".bz2" ) )
-        {
-          strcpy(executable,"bzip2");
-        }
-      else if ( strstr( tarball_fname, ".lzo") )
-        {
-          strcpy( executable,"lzop");
-        }
-      else
-        {
-          executable[0] = '\0';
-        }
-      if (executable[0])
-        {
-          sprintf( tmp, "which %s > /dev/null 2> /dev/null", executable );
-          if ( run_program_and_log_output( tmp, FALSE ) )
-            {
-             log_to_screen("(compare_a_tarball) Compression program not found - oh no!");
-             paranoid_MR_finish(1);
-            }
-          strcpy(tmp, executable);
-          sprintf(executable, "-P %s -Z", tmp);
-        }
+    sprintf(command, "mkdir -p %s/tmp", MNT_RESTORING);
+    run_program_and_log_output(command, 9);
+    sprintf(temp_log, "/tmp/%d.%d", (int) (random() % 32768),
+            (int) (random() % 32768));
+
+    sprintf(filelist_name, MNT_CDROM "/archives/filelist.%ld",
+            current_tarball_number);
+    if (length_of_file(filelist_name) <= 2) {
+        log_msg(2, "There are _zero_ files in filelist '%s'",
+                filelist_name);
+        log_msg(2,
+                "This is a bit silly (ask Hugo to fix mondo-makefilelist, please)");
+        log_msg(2,
+                "but it's non-critical. It's cosmetic. Don't worry about it.");
+        retval = 0;
+        goto leave_sub;
+    }
+    if (count_lines_in_file(filelist_name) <= 0
+        || length_of_file(tarball_fname) <= 0) {
+        log_msg(3, "length_of_file(%s) = %ld", tarball_fname,
+                length_of_file(tarball_fname));
+        sprintf(tmp, "Unable to restore fileset #%ld (CD I/O error)",
+                current_tarball_number);
+        log_to_screen(tmp);
+        retval = 1;
+        goto leave_sub;
+    }
+
+    if (filelist) {
+        sprintf(filelist_subset_fname, "/tmp/filelist-subset-%ld.tmp",
+                current_tarball_number);
+        if ((matches =
+             save_filelist_entries_in_common(filelist_name, filelist,
+                                             filelist_subset_fname,
+                                             use_star))
+            <= 0) {
+            sprintf(tmp, "Skipping fileset %ld", current_tarball_number);
+            log_msg(1, tmp);
+        } else {
+            log_msg(3, "Saved fileset %ld's subset to %s",
+                    current_tarball_number, filelist_subset_fname);
+        }
+        sprintf(screen_message, "Tarball #%ld --- %ld matches",
+                current_tarball_number, matches);
+        log_to_screen(screen_message);
+    } else {
+        filelist_subset_fname[0] = '\0';
+    }
+
+    if (filelist == NULL || matches > 0) {
+        sprintf(xattr_fname, XATTR_LIST_FNAME_RAW_SZ,
+                MNT_CDROM "/archives", current_tarball_number);
+        sprintf(acl_fname, ACL_LIST_FNAME_RAW_SZ, MNT_CDROM "/archives",
+                current_tarball_number);
+        if (strstr(tarball_fname, ".bz2")) {
+            strcpy(executable, "bzip2");
+        } else if (strstr(tarball_fname, ".lzo")) {
+            strcpy(executable, "lzop");
+        } else {
+            executable[0] = '\0';
+        }
+        if (executable[0]) {
+            sprintf(tmp, "which %s > /dev/null 2> /dev/null", executable);
+            if (run_program_and_log_output(tmp, FALSE)) {
+                log_to_screen
+                    ("(compare_a_tarball) Compression program not found - oh no!");
+                paranoid_MR_finish(1);
+            }
+            strcpy(tmp, executable);
+            sprintf(executable, "-P %s -Z", tmp);
+        }
 #ifdef __FreeBSD__
 #define BUFSIZE 512
@@ -2051 +2049 @@
 
 //      if (strstr(tarball_fname, ".star."))
-      if (use_star)
-        {
-      sprintf( command, "star -x -force-remove -U " STAR_ACL_SZ " errctl= file=%s", tarball_fname);
-      if (strstr (tarball_fname, ".bz2"))
-        { strcat( command, " -bz"); }
-    }
-      else
-        {
-      if ( filelist_subset_fname[0] != '\0' )
-            {
-              sprintf( command,
-           "afio -i -M 8m -b %ld -c %ld %s -w %s %s",
-           TAPE_BLOCK_SIZE,
-           BUFSIZE,
-           executable,
-           filelist_subset_fname,
-//             files_to_restore_this_time_fname,
-           tarball_fname);
-        }
-          else
-            {
-              sprintf( command,
-           "afio -i -b %ld -c %ld -M 8m %s %s",
-           TAPE_BLOCK_SIZE,
-           BUFSIZE,
-           executable,
-           tarball_fname);
-            }
-    }
+        if (use_star) {
+            sprintf(command,
+                    "star -x -force-remove -U " STAR_ACL_SZ
+                    " errctl= file=%s", tarball_fname);
+            if (strstr(tarball_fname, ".bz2")) {
+                strcat(command, " -bz");
+            }
+        } else {
+            if (filelist_subset_fname[0] != '\0') {
+                sprintf(command,
+                        "afio -i -M 8m -b %ld -c %ld %s -w %s %s",
+                        TAPE_BLOCK_SIZE,
+                        BUFSIZE, executable, filelist_subset_fname,
+//             files_to_restore_this_time_fname,
+                        tarball_fname);
+            } else {
+                sprintf(command,
+                        "afio -i -b %ld -c %ld -M 8m %s %s",
+                        TAPE_BLOCK_SIZE,
+                        BUFSIZE, executable, tarball_fname);
+            }
+        }
 #undef BUFSIZE
-      sprintf(command+strlen(command), " 2>> %s >> %s", temp_log, temp_log);
-      log_msg(1,"command = '%s'", command);
-      unlink(temp_log);
-      res = system(command);
-      if (res)
-        {
-      p = strstr(command, "-acl ");
-      if (p)
-        {
-          p[0]=p[1]=p[2]=p[3]=' ';
-              log_msg(1,"new command = '%s'", command);
-              res = system(command);
-        }
-        }
-      if (res && length_of_file(temp_log)<5) { res=0; }
-      
-      log_msg(1, "Setting fattr list %s", xattr_fname);
-      if (length_of_file(xattr_fname)>0)
-        {
-          res=set_fattr_list(filelist_subset_fname, xattr_fname);
-          if (res) { log_to_screen("Errors occurred while setting extended attributes"); }
-          else { log_msg(1, "I set xattr OK"); }
-          retval += res;
-        }
-      if (length_of_file(acl_fname)>0)
-        {
-          log_msg(1, "Setting acl list %s", acl_fname);
-          res=set_acl_list(filelist_subset_fname, acl_fname);
-          if (res) { log_to_screen("Errors occurred while setting access control lists"); }
-          else { log_msg(1, "I set ACL OK"); }
-          retval += res;
-        }
-      if ( retval )
-        {
-          sprintf(command, "cat %s >> %s", temp_log, MONDO_LOGFILE);
-          system(command);
-          log_msg(2, "Errors occurred while processing fileset #%d",current_tarball_number);
-        }
-      else
-        {
-          log_msg(2, "Fileset #%d processed OK", current_tarball_number);
-        }
-    }
-  if (does_file_exist("/PAUSE"))
-    { popup_and_OK("Press ENTER to go on. Delete /PAUSE to stop these pauses."); }
-  unlink(filelist_subset_fname);
-  unlink(xattr_fname);
-  unlink(acl_fname);
-  unlink(temp_log);
-  
-leave_sub:
-  paranoid_free(command); paranoid_free(tmp);
-  paranoid_free(filelist_name); paranoid_free(filelist_subset_fname);
-  paranoid_free(executable); paranoid_free(temp_log);
-  paranoid_free(xattr_fname); paranoid_free(acl_fname);
-  log_msg(5, "Leaving");
-  return(retval);
+        sprintf(command + strlen(command), " 2>> %s >> %s", temp_log,
+                temp_log);
+        log_msg(1, "command = '%s'", command);
+        unlink(temp_log);
+        res = system(command);
+        if (res) {
+            p = strstr(command, "-acl ");
+            if (p) {
+                p[0] = p[1] = p[2] = p[3] = ' ';
+                log_msg(1, "new command = '%s'", command);
+                res = system(command);
+            }
+        }
+        if (res && length_of_file(temp_log) < 5) {
+            res = 0;
+        }
+
+        log_msg(1, "Setting fattr list %s", xattr_fname);
+        if (length_of_file(xattr_fname) > 0) {
+            res = set_fattr_list(filelist_subset_fname, xattr_fname);
+            if (res) {
+                log_to_screen
+                    ("Errors occurred while setting extended attributes");
+            } else {
+                log_msg(1, "I set xattr OK");
+            }
+            retval += res;
+        }
+        if (length_of_file(acl_fname) > 0) {
+            log_msg(1, "Setting acl list %s", acl_fname);
+            res = set_acl_list(filelist_subset_fname, acl_fname);
+            if (res) {
+                log_to_screen
+                    ("Errors occurred while setting access control lists");
+            } else {
+                log_msg(1, "I set ACL OK");
+            }
+            retval += res;
+        }
+        if (retval) {
+            sprintf(command, "cat %s >> %s", temp_log, MONDO_LOGFILE);
+            system(command);
+            log_msg(2, "Errors occurred while processing fileset #%d",
+                    current_tarball_number);
+        } else {
+            log_msg(2, "Fileset #%d processed OK", current_tarball_number);
+        }
+    }
+    if (does_file_exist("/PAUSE")) {
+        popup_and_OK
+            ("Press ENTER to go on. Delete /PAUSE to stop these pauses.");
+    }
+    unlink(filelist_subset_fname);
+    unlink(xattr_fname);
+    unlink(acl_fname);
+    unlink(temp_log);
+
+  leave_sub:
+    paranoid_free(command);
+    paranoid_free(tmp);
+    paranoid_free(filelist_name);
+    paranoid_free(filelist_subset_fname);
+    paranoid_free(executable);
+    paranoid_free(temp_log);
+    paranoid_free(xattr_fname);
+    paranoid_free(acl_fname);
+    log_msg(5, "Leaving");
+    return (retval);
 }
 
@@ -2162 +2164 @@
 int
 restore_a_tarball_from_stream(struct s_bkpinfo *bkpinfo,
-                  char *tarball_fname,
-                  long current_tarball_number,
-                  struct s_node*filelist,
-                  long long size, char*xattr_fname, char*acl_fname)
+                              char *tarball_fname,
+                              long current_tarball_number,
+                              struct s_node *filelist,
+                              long long size, char *xattr_fname,
+                              char *acl_fname)
 {
-  int retval = 0;
-  int res = 0;
+    int retval = 0;
+    int res = 0;
 
   /** malloc add ***/
-  char *tmp;
-  char *command;
-  char *afio_fname;
-  char *filelist_fname;
-  char *filelist_subset_fname;
-  char *executable;
-  long matches=0;
-  bool restore_this_fileset = FALSE;
-  bool use_star;
-  
-  assert(bkpinfo!=NULL);
-  assert_string_is_neither_NULL_nor_zerolength(tarball_fname);
-  malloc_string(filelist_subset_fname);
-  malloc_string(filelist_fname);
-  malloc_string(afio_fname);
-  malloc_string(executable);
-  malloc_string(command);
-  malloc_string(tmp);
-  filelist_subset_fname[0] = '\0';
-  /* to do it with a file... */
-  use_star = (strstr(tarball_fname, ".star"))?TRUE:FALSE;
-  sprintf( tmp,
-       "Restoring from fileset #%ld (%ld KB) on %s #%d",current_tarball_number,
-       (long) size>>10,
-       media_descriptor_string(bkpinfo->backup_media_type),
-       g_current_media_number );
-  log_msg(2, tmp );
-  run_program_and_log_output( "mkdir -p " MNT_RESTORING "/tmp", FALSE );
+    char *tmp;
+    char *command;
+    char *afio_fname;
+    char *filelist_fname;
+    char *filelist_subset_fname;
+    char *executable;
+    long matches = 0;
+    bool restore_this_fileset = FALSE;
+    bool use_star;
+
+    assert(bkpinfo != NULL);
+    assert_string_is_neither_NULL_nor_zerolength(tarball_fname);
+    malloc_string(filelist_subset_fname);
+    malloc_string(filelist_fname);
+    malloc_string(afio_fname);
+    malloc_string(executable);
+    malloc_string(command);
+    malloc_string(tmp);
+    filelist_subset_fname[0] = '\0';
+    /* to do it with a file... */
+    use_star = (strstr(tarball_fname, ".star")) ? TRUE : FALSE;
+    sprintf(tmp,
+            "Restoring from fileset #%ld (%ld KB) on %s #%d",
+            current_tarball_number, (long) size >> 10,
+            media_descriptor_string(bkpinfo->backup_media_type),
+            g_current_media_number);
+    log_msg(2, tmp);
+    run_program_and_log_output("mkdir -p " MNT_RESTORING "/tmp", FALSE);
 
   /****************************************************************************
@@ -2205 +2208 @@
    * in afio or someting; oh darn.. OK, use tmpfs :-)                         *
    ****************************************************************************/
-  filelist_fname[0] = filelist_subset_fname[0] = '\0';
-  sprintf(afio_fname, "/tmp/tmpfs/archive.tmp.%ld", current_tarball_number);
-  sprintf(filelist_fname, "%s/filelist.%ld", bkpinfo->tmpdir, current_tarball_number);
-  sprintf(filelist_subset_fname, "%s/filelist-subset-%ld.tmp", bkpinfo->tmpdir, current_tarball_number);
+    filelist_fname[0] = filelist_subset_fname[0] = '\0';
+    sprintf(afio_fname, "/tmp/tmpfs/archive.tmp.%ld",
+            current_tarball_number);
+    sprintf(filelist_fname, "%s/filelist.%ld", bkpinfo->tmpdir,
+            current_tarball_number);
+    sprintf(filelist_subset_fname, "%s/filelist-subset-%ld.tmp",
+            bkpinfo->tmpdir, current_tarball_number);
 //  sprintf(filelist_fname, "/tmp/tmpfs/temp-filelist.%ld", current_tarball_number);
-  res = read_file_from_stream_to_file( bkpinfo, afio_fname,size );
-  if (strstr(tarball_fname, ".star")) { bkpinfo->use_star = TRUE; }
-  if (res) { log_msg(1, "Warning - error reading afioball from tape"); }
-  if (bkpinfo->compression_level == 0)
-    {
-      executable[0] = '\0';
-    }
-  else
-    {
-      if (bkpinfo->use_star)
-        { strcpy(executable, " -bz"); }
-      else
-        { sprintf(executable, "-P %s -Z", bkpinfo->zip_exe); }
-    }
-
-  if (!filelist) // if unconditional restore then restore entire fileset
-    {
-      restore_this_fileset = TRUE;
-    }
-  else          // If restoring selectively then get TOC from tarball
-    {
-      if (strstr(tarball_fname, ".star."))
-        {
-      use_star = TRUE;
-      sprintf( command, "star -t file=%s %s", afio_fname, executable);
-    }
-      else
-        {
-      use_star = FALSE;
-          sprintf( command, "afio -t -M 8m -b %ld %s %s", TAPE_BLOCK_SIZE,
-                        executable, afio_fname);
-    }
-      sprintf(command+strlen(command), " > %s 2>> %s", filelist_fname, MONDO_LOGFILE);
-      log_msg(1, "command = %s", command);
-      if (system(command)) { log_msg(4, "Warning - error occurred while retrieving TOC"); }
-      if ((matches=save_filelist_entries_in_common(filelist_fname, filelist, filelist_subset_fname, use_star))
-                     <= 0
-                    || length_of_file(filelist_subset_fname)<2)
-        {
-      if (length_of_file(filelist_subset_fname)<2)
-        { log_msg(1, "No matches found in fileset %ld", current_tarball_number); }
-      sprintf(tmp, "Skipping fileset %ld", current_tarball_number);
-      log_msg(2, tmp);
-          restore_this_fileset = FALSE;
-        }
-      else
-        {
-      log_msg(5, "%ld matches. Saved fileset %ld's subset to %s", matches, current_tarball_number, filelist_subset_fname);
-      restore_this_fileset = TRUE;
-    }
-    }
+    res = read_file_from_stream_to_file(bkpinfo, afio_fname, size);
+    if (strstr(tarball_fname, ".star")) {
+        bkpinfo->use_star = TRUE;
+    }
+    if (res) {
+        log_msg(1, "Warning - error reading afioball from tape");
+    }
+    if (bkpinfo->compression_level == 0) {
+        executable[0] = '\0';
+    } else {
+        if (bkpinfo->use_star) {
+            strcpy(executable, " -bz");
+        } else {
+            sprintf(executable, "-P %s -Z", bkpinfo->zip_exe);
+        }
+    }
+
+    if (!filelist)              // if unconditional restore then restore entire fileset
+    {
+        restore_this_fileset = TRUE;
+    } else                      // If restoring selectively then get TOC from tarball
+    {
+        if (strstr(tarball_fname, ".star.")) {
+            use_star = TRUE;
+            sprintf(command, "star -t file=%s %s", afio_fname, executable);
+        } else {
+            use_star = FALSE;
+            sprintf(command, "afio -t -M 8m -b %ld %s %s", TAPE_BLOCK_SIZE,
+                    executable, afio_fname);
+        }
+        sprintf(command + strlen(command), " > %s 2>> %s", filelist_fname,
+                MONDO_LOGFILE);
+        log_msg(1, "command = %s", command);
+        if (system(command)) {
+            log_msg(4, "Warning - error occurred while retrieving TOC");
+        }
+        if ((matches =
+             save_filelist_entries_in_common(filelist_fname, filelist,
+                                             filelist_subset_fname,
+                                             use_star))
+            <= 0 || length_of_file(filelist_subset_fname) < 2) {
+            if (length_of_file(filelist_subset_fname) < 2) {
+                log_msg(1, "No matches found in fileset %ld",
+                        current_tarball_number);
+            }
+            sprintf(tmp, "Skipping fileset %ld", current_tarball_number);
+            log_msg(2, tmp);
+            restore_this_fileset = FALSE;
+        } else {
+            log_msg(5, "%ld matches. Saved fileset %ld's subset to %s",
+                    matches, current_tarball_number,
+                    filelist_subset_fname);
+            restore_this_fileset = TRUE;
+        }
+    }
 
 // Concoct the call to star/afio to restore files
-  if (strstr(tarball_fname, ".star.")) // star
-    {
-      sprintf( command, "star -x file=%s %s", afio_fname, executable);
-      if (filelist)
-        { sprintf(command+strlen(command), " list=%s", filelist_subset_fname); }
-    }
-  else                                 // afio
-    {
-      sprintf( command, "afio -i -M 8m -b %ld %s", TAPE_BLOCK_SIZE, executable);
-      if (filelist)
-        { sprintf(command+strlen(command), " -w %s", filelist_subset_fname); }
-      sprintf(command+strlen(command), " %s", afio_fname);
-    }
-  sprintf( command+strlen(command), " 2>> %s", MONDO_LOGFILE);
+    if (strstr(tarball_fname, ".star."))    // star
+    {
+        sprintf(command, "star -x file=%s %s", afio_fname, executable);
+        if (filelist) {
+            sprintf(command + strlen(command), " list=%s",
+                    filelist_subset_fname);
+        }
+    } else                      // afio
+    {
+        sprintf(command, "afio -i -M 8m -b %ld %s", TAPE_BLOCK_SIZE,
+                executable);
+        if (filelist) {
+            sprintf(command + strlen(command), " -w %s",
+                    filelist_subset_fname);
+        }
+        sprintf(command + strlen(command), " %s", afio_fname);
+    }
+    sprintf(command + strlen(command), " 2>> %s", MONDO_LOGFILE);
 
 // Call if IF there are files to restore (selectively/unconditionally)
-  if (restore_this_fileset)
-    {
-      log_msg(1, "Calling command='%s'", command);
-      paranoid_system(command);
-
-      iamhere("Restoring xattr, acl stuff");
-      res=set_fattr_list(filelist_subset_fname, xattr_fname);
-      if (res) { log_msg(1, "Errors occurred while setting xattr"); }
-      else { log_msg(1, "I set xattr OK"); }
-      retval += res;
-      
-      res=set_acl_list(filelist_subset_fname, acl_fname);
-      if (res) { log_msg(1, "Errors occurred while setting ACL"); }
-      else { log_msg(1, "I set ACL OK"); }
-      retval += res;
-      
-    }
-  else
-    {
-      log_msg(1, "NOT CALLING '%s'", command);
-    }
-    
-  if (does_file_exist("/PAUSE") && current_tarball_number >= 50)
-    {
-      log_to_screen("Paused after set %ld", current_tarball_number); 
-      popup_and_OK("Pausing. Press ENTER to continue.");
-    }
-    
-  unlink(filelist_subset_fname);
-  unlink(filelist_fname);
-  unlink(afio_fname);
-
-  paranoid_free(filelist_subset_fname);
-  paranoid_free(filelist_fname);
-  paranoid_free(afio_fname);
-  paranoid_free(command);
-  paranoid_free(tmp);
-  return(retval);
+    if (restore_this_fileset) {
+        log_msg(1, "Calling command='%s'", command);
+        paranoid_system(command);
+
+        iamhere("Restoring xattr, acl stuff");
+        res = set_fattr_list(filelist_subset_fname, xattr_fname);
+        if (res) {
+            log_msg(1, "Errors occurred while setting xattr");
+        } else {
+            log_msg(1, "I set xattr OK");
+        }
+        retval += res;
+
+        res = set_acl_list(filelist_subset_fname, acl_fname);
+        if (res) {
+            log_msg(1, "Errors occurred while setting ACL");
+        } else {
+            log_msg(1, "I set ACL OK");
+        }
+        retval += res;
+
+    } else {
+        log_msg(1, "NOT CALLING '%s'", command);
+    }
+
+    if (does_file_exist("/PAUSE") && current_tarball_number >= 50) {
+        log_to_screen("Paused after set %ld", current_tarball_number);
+        popup_and_OK("Pausing. Press ENTER to continue.");
+    }
+
+    unlink(filelist_subset_fname);
+    unlink(filelist_fname);
+    unlink(afio_fname);
+
+    paranoid_free(filelist_subset_fname);
+    paranoid_free(filelist_fname);
+    paranoid_free(afio_fname);
+    paranoid_free(command);
+    paranoid_free(tmp);
+    return (retval);
 }
+
 /**************************************************************************
  *END_RESTORE_A_TARBALL_FROM_STREAM                                       *
@@ -2335 +2352 @@
  */
 int
-restore_all_biggiefiles_from_CD(struct s_bkpinfo *bkpinfo, struct s_node* filelist)
+restore_all_biggiefiles_from_CD(struct s_bkpinfo *bkpinfo,
+                                struct s_node *filelist)
 {
-  int retval = 0;
-  int res;
-  long noof_biggiefiles, bigfileno = 0, total_slices;
+    int retval = 0;
+    int res;
+    long noof_biggiefiles, bigfileno = 0, total_slices;
   /** malloc **/
-  char *tmp;
-  bool just_changed_cds = FALSE, finished;
-  char *xattr_fname;
-  char *acl_fname;
-  char *biggies_whose_EXATs_we_should_set; // EXtended ATtributes
-  char *pathname_of_last_biggie_restored;
-  FILE *fbw = NULL;
-    
-  malloc_string(xattr_fname);
-  malloc_string(acl_fname);
-  malloc_string(tmp);
-  malloc_string(biggies_whose_EXATs_we_should_set);
-  malloc_string(pathname_of_last_biggie_restored);
-  assert(bkpinfo!=NULL);
-
-  sprintf(biggies_whose_EXATs_we_should_set, "%s/biggies-whose-EXATs-we-should-set", bkpinfo->tmpdir);
-  if (!(fbw = fopen(biggies_whose_EXATs_we_should_set, "w")))
-   { log_msg(1, "Warning - cannot openout %s", biggies_whose_EXATs_we_should_set); }
-  
-  read_cfg_var( g_mondo_cfg_file, "total-slices", tmp);
-  total_slices = atol( tmp );
-  sprintf(tmp,"Reassembling large files      ");
-  mvaddstr_and_log_it( g_currentY, 0, tmp );
-  if (length_of_file(BIGGIELIST) < 6)
-    {
-      log_msg(1, "OK, no biggielist; not restoring biggiefiles");
-      return(0);
-    }
-  noof_biggiefiles = count_lines_in_file(BIGGIELIST);
-  if ( noof_biggiefiles <= 0 )
-    {
-      log_msg(2, "OK, no biggiefiles in biggielist; not restoring biggiefiles");
-      return(0);
-    }
-  sprintf( tmp,"OK, there are %ld biggiefiles in the archives",noof_biggiefiles);
-  log_msg(2, tmp );
-  
-  open_progress_form( "Reassembling large files",
-              "I am now reassembling all the large files." ,
-              "Please wait. This may take some time.",
-              "",
-              total_slices);
-  for( bigfileno = 0, finished = FALSE; !finished;)
-    {
-      log_msg( 2, "Thinking about restoring bigfile %ld", bigfileno + 1 );
-      if ( !does_file_exist(slice_fname(bigfileno, 0, ARCHIVES_PATH, "" ) ) )
-    {
-      log_msg(3, "...but its first slice isn't on this CD. Perhaps this was a selective restore?");
-          log_msg(3, "Cannot find bigfile #%ld 's first slice on %s #%d", bigfileno+1, media_descriptor_string(bkpinfo->backup_media_type), g_current_media_number);
-          log_msg(3, "Slicename would have been %s", slice_fname(bigfileno+1,0,ARCHIVES_PATH,""));
-      // I'm not positive 'just_changed_cds' is even necessary...
-      if (just_changed_cds)
-            {
-              just_changed_cds = FALSE;
-              log_msg(3, "I'll continue to scan this CD for bigfiles to be restored.");
-            }
-      else if (does_file_exist( MNT_CDROM"/archives/NOT-THE-LAST"))
-        {
-              insist_on_this_cd_number(bkpinfo, ++g_current_media_number);
-          sprintf(tmp,"Restoring from %s #%d", media_descriptor_string(bkpinfo->backup_media_type), g_current_media_number);
-          log_to_screen(tmp);
-              just_changed_cds = TRUE;
-        }
-          else
-        {
-          log_msg(2, "There was no bigfile #%ld. That's OK." ,bigfileno+1);
-          log_msg(2, "I'm going to stop restoring bigfiles now.");
-          finished = TRUE;
-        }
-    }
-      else
-    {
-          just_changed_cds = FALSE;
-      sprintf(tmp,"Restoring big file %ld",bigfileno + 1);
-      update_progress_form(tmp);
-      res = restore_a_biggiefile_from_CD(bkpinfo, bigfileno, filelist, pathname_of_last_biggie_restored);
-      iamhere(pathname_of_last_biggie_restored);
-      if (fbw && pathname_of_last_biggie_restored[0])
-        { fprintf(fbw, "%s\n", pathname_of_last_biggie_restored); }
-      retval += res;
-      bigfileno++;
-
-    }
-    }
-
-  if (fbw)
-    {
-      fclose(fbw);
-      sprintf(acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, ARCHIVES_PATH);
-      sprintf(xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, ARCHIVES_PATH);
-      if (length_of_file(acl_fname)  >0 && find_home_of_exe("setfacl"))
-        {
-      set_acl_list  (biggies_whose_EXATs_we_should_set, acl_fname);
-    }
-      if (length_of_file(xattr_fname)>0 && find_home_of_exe("setfattr"))
-        {
-      set_fattr_list(biggies_whose_EXATs_we_should_set, xattr_fname);
-    }
-    }
-  if (does_file_exist("/PAUSE"))
-    { popup_and_OK("Press ENTER to go on. Delete /PAUSE to stop these pauses."); }
-  close_progress_form();
-  if (retval)
-    {
-      mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
-    }
-  else
-    {
-      mvaddstr_and_log_it(g_currentY++, 74, "Done.");
-    }
-  paranoid_free(xattr_fname);
-  paranoid_free(acl_fname);
-  paranoid_free(tmp);
-  paranoid_free(biggies_whose_EXATs_we_should_set);
-  paranoid_free(pathname_of_last_biggie_restored);
-  return( retval );
+    char *tmp;
+    bool just_changed_cds = FALSE, finished;
+    char *xattr_fname;
+    char *acl_fname;
+    char *biggies_whose_EXATs_we_should_set;    // EXtended ATtributes
+    char *pathname_of_last_biggie_restored;
+    FILE *fbw = NULL;
+
+    malloc_string(xattr_fname);
+    malloc_string(acl_fname);
+    malloc_string(tmp);
+    malloc_string(biggies_whose_EXATs_we_should_set);
+    malloc_string(pathname_of_last_biggie_restored);
+    assert(bkpinfo != NULL);
+
+    sprintf(biggies_whose_EXATs_we_should_set,
+            "%s/biggies-whose-EXATs-we-should-set", bkpinfo->tmpdir);
+    if (!(fbw = fopen(biggies_whose_EXATs_we_should_set, "w"))) {
+        log_msg(1, "Warning - cannot openout %s",
+                biggies_whose_EXATs_we_should_set);
+    }
+
+    read_cfg_var(g_mondo_cfg_file, "total-slices", tmp);
+    total_slices = atol(tmp);
+    sprintf(tmp, "Reassembling large files      ");
+    mvaddstr_and_log_it(g_currentY, 0, tmp);
+    if (length_of_file(BIGGIELIST) < 6) {
+        log_msg(1, "OK, no biggielist; not restoring biggiefiles");
+        return (0);
+    }
+    noof_biggiefiles = count_lines_in_file(BIGGIELIST);
+    if (noof_biggiefiles <= 0) {
+        log_msg(2,
+                "OK, no biggiefiles in biggielist; not restoring biggiefiles");
+        return (0);
+    }
+    sprintf(tmp, "OK, there are %ld biggiefiles in the archives",
+            noof_biggiefiles);
+    log_msg(2, tmp);
+
+    open_progress_form("Reassembling large files",
+                       "I am now reassembling all the large files.",
+                       "Please wait. This may take some time.",
+                       "", total_slices);
+    for (bigfileno = 0, finished = FALSE; !finished;) {
+        log_msg(2, "Thinking about restoring bigfile %ld", bigfileno + 1);
+        if (!does_file_exist(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""))) {
+            log_msg(3,
+                    "...but its first slice isn't on this CD. Perhaps this was a selective restore?");
+            log_msg(3, "Cannot find bigfile #%ld 's first slice on %s #%d",
+                    bigfileno + 1,
+                    media_descriptor_string(bkpinfo->backup_media_type),
+                    g_current_media_number);
+            log_msg(3, "Slicename would have been %s",
+                    slice_fname(bigfileno + 1, 0, ARCHIVES_PATH, ""));
+            // I'm not positive 'just_changed_cds' is even necessary...
+            if (just_changed_cds) {
+                just_changed_cds = FALSE;
+                log_msg(3,
+                        "I'll continue to scan this CD for bigfiles to be restored.");
+            } else if (does_file_exist(MNT_CDROM "/archives/NOT-THE-LAST")) {
+                insist_on_this_cd_number(bkpinfo,
+                                         ++g_current_media_number);
+                sprintf(tmp, "Restoring from %s #%d",
+                        media_descriptor_string(bkpinfo->
+                                                backup_media_type),
+                        g_current_media_number);
+                log_to_screen(tmp);
+                just_changed_cds = TRUE;
+            } else {
+                log_msg(2, "There was no bigfile #%ld. That's OK.",
+                        bigfileno + 1);
+                log_msg(2, "I'm going to stop restoring bigfiles now.");
+                finished = TRUE;
+            }
+        } else {
+            just_changed_cds = FALSE;
+            sprintf(tmp, "Restoring big file %ld", bigfileno + 1);
+            update_progress_form(tmp);
+            res =
+                restore_a_biggiefile_from_CD(bkpinfo, bigfileno, filelist,
+                                             pathname_of_last_biggie_restored);
+            iamhere(pathname_of_last_biggie_restored);
+            if (fbw && pathname_of_last_biggie_restored[0]) {
+                fprintf(fbw, "%s\n", pathname_of_last_biggie_restored);
+            }
+            retval += res;
+            bigfileno++;
+
+        }
+    }
+
+    if (fbw) {
+        fclose(fbw);
+        sprintf(acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, ARCHIVES_PATH);
+        sprintf(xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, ARCHIVES_PATH);
+        if (length_of_file(acl_fname) > 0 && find_home_of_exe("setfacl")) {
+            set_acl_list(biggies_whose_EXATs_we_should_set, acl_fname);
+        }
+        if (length_of_file(xattr_fname) > 0
+            && find_home_of_exe("setfattr")) {
+            set_fattr_list(biggies_whose_EXATs_we_should_set, xattr_fname);
+        }
+    }
+    if (does_file_exist("/PAUSE")) {
+        popup_and_OK
+            ("Press ENTER to go on. Delete /PAUSE to stop these pauses.");
+    }
+    close_progress_form();
+    if (retval) {
+        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+    }
+    paranoid_free(xattr_fname);
+    paranoid_free(acl_fname);
+    paranoid_free(tmp);
+    paranoid_free(biggies_whose_EXATs_we_should_set);
+    paranoid_free(pathname_of_last_biggie_restored);
+    return (retval);
 }
+
 /**************************************************************************
  *END_RESTORE_ALL_BIGGIFILES_FROM_CD                                      *
@@ -2475 +2498 @@
  */
 int
-restore_all_tarballs_from_CD(struct s_bkpinfo *bkpinfo, struct s_node* filelist)
+restore_all_tarballs_from_CD(struct s_bkpinfo *bkpinfo,
+                             struct s_node *filelist)
 {
-  int retval = 0;
-  int res;
-  int attempts;
-  long current_tarball_number = 0;
-  long max_val;
+    int retval = 0;
+    int res;
+    int attempts;
+    long current_tarball_number = 0;
+    long max_val;
   /**malloc ***/
-  char *tmp;
-  char *tarball_fname;
-  char *progress_str;
-  char *comment;
-
-  malloc_string(tmp);
-  malloc_string(tarball_fname);
-  malloc_string(progress_str);
-  malloc_string(comment);
-  
-  assert(bkpinfo!=NULL);
-
-  mvaddstr_and_log_it(g_currentY, 0, "Restoring from archives");
-  log_msg(2, "Insisting on 1st CD, so that I can have a look at LAST-FILELIST-NUMBER");
-  if ( g_current_media_number != 1) 
-    { 
-      log_msg(3, "OK, that's jacked up.");
-      g_current_media_number = 1;
-    }
-  insist_on_this_cd_number( bkpinfo, g_current_media_number);
-  read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp);
-  max_val = atol(tmp) + 1;
-  sprintf(progress_str,"Restoring from %s #%d", media_descriptor_string(bkpinfo->backup_media_type), g_current_media_number);
-  log_to_screen(progress_str);
-  open_progress_form("Restoring from archives", 
-             "Restoring data from the archives." , 
-             "Please wait. This may take some time.",
-             progress_str,max_val);
-  for(;;)
-    {
-      insist_on_this_cd_number(bkpinfo, g_current_media_number);
-      update_progress_form(progress_str);
-      sprintf(tarball_fname, MNT_CDROM"/archives/%ld.afio.bz2",current_tarball_number);
-      if (!does_file_exist(tarball_fname)) 
-    {
-      sprintf(tarball_fname, MNT_CDROM"/archives/%ld.afio.lzo",current_tarball_number);
-    }
-      if (!does_file_exist(tarball_fname)) 
-    {
-      sprintf(tarball_fname, MNT_CDROM"/archives/%ld.afio.",current_tarball_number);
-    }
-      if (!does_file_exist(tarball_fname))
-    {
-      sprintf(tarball_fname, MNT_CDROM"/archives/%ld.star.bz2", current_tarball_number);
-    }
-      if (!does_file_exist(tarball_fname))
-    {
-      sprintf(tarball_fname, MNT_CDROM"/archives/%ld.star.", current_tarball_number);
-    }
-      if (!does_file_exist(tarball_fname))
-    {
-      if (current_tarball_number == 0)
-        {
-          log_to_screen("No tarballs. Strange. Maybe you only backed up freakin' big files?");
-          return(0);
-        }
-      if (!does_file_exist( MNT_CDROM"/archives/NOT-THE-LAST") || system("find "MNT_CDROM"/archives/slice* > /dev/null 2> /dev/null") == 0 )
-        {
-          break;
-        }
-      g_current_media_number++;
-      sprintf(progress_str,"Restoring from %s #%d",media_descriptor_string(bkpinfo->backup_media_type), g_current_media_number);
-      log_to_screen(progress_str);
-    }
-      else
-        {
-          sprintf(progress_str,"Restoring from fileset #%ld on %s #%d", 
-                current_tarball_number,
-                media_descriptor_string(bkpinfo->backup_media_type),
-                g_current_media_number);
-//    log_msg(3, "progress_str = %s", progress_str);
-          for(res = 999, attempts = 0; attempts < 3 && res != 0; attempts++)
-            {
-          res = restore_a_tarball_from_CD(tarball_fname,current_tarball_number, filelist);
-        }
-          sprintf(tmp,"%s #%d, fileset #%ld - restore ",
-        media_descriptor_string(bkpinfo->backup_media_type),
-          g_current_media_number,
-          current_tarball_number);
-          if (res) 
-        { 
-          strcat(tmp,"reported errors");
-        } 
-      else if (attempts > 1) 
-        {
-          strcat(tmp,"succeeded"); 
-        } 
-      else 
-        { 
-          strcat(tmp,"succeeded"); 
-        }
-          if (attempts > 1) 
-        { 
-          sprintf( tmp + strlen(tmp)," (%d attempts) - review logs",attempts); 
-        }
-          strcpy(comment, tmp);
-          if (attempts > 1) 
-        {
-          log_to_screen(comment); 
-        }
-         
-          retval += res;
-          current_tarball_number++;
-          g_current_progress++;
-        }
-    }
-  close_progress_form();
-  if (retval)
-    { 
-      mvaddstr_and_log_it(g_currentY++,74,"Errors."); 
-    }
-  else
-    { 
-      mvaddstr_and_log_it(g_currentY++,74,"Done."); 
-    }
-  paranoid_free(tmp);
-  paranoid_free(tarball_fname);
-  paranoid_free(progress_str);
-  paranoid_free(comment);
-  
-  return(retval);
+    char *tmp;
+    char *tarball_fname;
+    char *progress_str;
+    char *comment;
+
+    malloc_string(tmp);
+    malloc_string(tarball_fname);
+    malloc_string(progress_str);
+    malloc_string(comment);
+
+    assert(bkpinfo != NULL);
+
+    mvaddstr_and_log_it(g_currentY, 0, "Restoring from archives");
+    log_msg(2,
+            "Insisting on 1st CD, so that I can have a look at LAST-FILELIST-NUMBER");
+    if (g_current_media_number != 1) {
+        log_msg(3, "OK, that's jacked up.");
+        g_current_media_number = 1;
+    }
+    insist_on_this_cd_number(bkpinfo, g_current_media_number);
+    read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp);
+    max_val = atol(tmp) + 1;
+    sprintf(progress_str, "Restoring from %s #%d",
+            media_descriptor_string(bkpinfo->backup_media_type),
+            g_current_media_number);
+    log_to_screen(progress_str);
+    open_progress_form("Restoring from archives",
+                       "Restoring data from the archives.",
+                       "Please wait. This may take some time.",
+                       progress_str, max_val);
+    for (;;) {
+        insist_on_this_cd_number(bkpinfo, g_current_media_number);
+        update_progress_form(progress_str);
+        sprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.bz2",
+                current_tarball_number);
+        if (!does_file_exist(tarball_fname)) {
+            sprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.lzo",
+                    current_tarball_number);
+        }
+        if (!does_file_exist(tarball_fname)) {
+            sprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.",
+                    current_tarball_number);
+        }
+        if (!does_file_exist(tarball_fname)) {
+            sprintf(tarball_fname, MNT_CDROM "/archives/%ld.star.bz2",
+                    current_tarball_number);
+        }
+        if (!does_file_exist(tarball_fname)) {
+            sprintf(tarball_fname, MNT_CDROM "/archives/%ld.star.",
+                    current_tarball_number);
+        }
+        if (!does_file_exist(tarball_fname)) {
+            if (current_tarball_number == 0) {
+                log_to_screen
+                    ("No tarballs. Strange. Maybe you only backed up freakin' big files?");
+                return (0);
+            }
+            if (!does_file_exist(MNT_CDROM "/archives/NOT-THE-LAST")
+                || system("find " MNT_CDROM
+                          "/archives/slice* > /dev/null 2> /dev/null") ==
+                0) {
+                break;
+            }
+            g_current_media_number++;
+            sprintf(progress_str, "Restoring from %s #%d",
+                    media_descriptor_string(bkpinfo->backup_media_type),
+                    g_current_media_number);
+            log_to_screen(progress_str);
+        } else {
+            sprintf(progress_str, "Restoring from fileset #%ld on %s #%d",
+                    current_tarball_number,
+                    media_descriptor_string(bkpinfo->backup_media_type),
+                    g_current_media_number);
+//    log_msg(3, "progress_str = %s", progress_str);
+            for (res = 999, attempts = 0; attempts < 3 && res != 0;
+                 attempts++) {
+                res =
+                    restore_a_tarball_from_CD(tarball_fname,
+                                              current_tarball_number,
+                                              filelist);
+            }
+            sprintf(tmp, "%s #%d, fileset #%ld - restore ",
+                    media_descriptor_string(bkpinfo->backup_media_type),
+                    g_current_media_number, current_tarball_number);
+            if (res) {
+                strcat(tmp, "reported errors");
+            } else if (attempts > 1) {
+                strcat(tmp, "succeeded");
+            } else {
+                strcat(tmp, "succeeded");
+            }
+            if (attempts > 1) {
+                sprintf(tmp + strlen(tmp), " (%d attempts) - review logs",
+                        attempts);
+            }
+            strcpy(comment, tmp);
+            if (attempts > 1) {
+                log_to_screen(comment);
+            }
+
+            retval += res;
+            current_tarball_number++;
+            g_current_progress++;
+        }
+    }
+    close_progress_form();
+    if (retval) {
+        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+    }
+    paranoid_free(tmp);
+    paranoid_free(tarball_fname);
+    paranoid_free(progress_str);
+    paranoid_free(comment);
+
+    return (retval);
 }
 
@@ -2620 +2640 @@
  */
 int
-restore_all_biggiefiles_from_stream(struct s_bkpinfo *bkpinfo, struct s_node*filelist)
+restore_all_biggiefiles_from_stream(struct s_bkpinfo *bkpinfo,
+                                    struct s_node *filelist)
 {
-  long noof_biggiefiles;
-  long current_bigfile_number = 0;
-  long total_slices;
-
-  int retval = 0;
-  int res = 0;
-  int ctrl_chr;
+    long noof_biggiefiles;
+    long current_bigfile_number = 0;
+    long total_slices;
+
+    int retval = 0;
+    int res = 0;
+    int ctrl_chr;
 
   /** malloc add ****/
-  char *tmp;
-  char *biggie_fname;
-  char *biggie_cksum;
-  char *xattr_fname;
-  char *acl_fname;
-  char *p;
-  char *pathname_of_last_biggie_restored;  
-  char *biggies_whose_EXATs_we_should_set; // EXtended ATtributes
-  long long biggie_size;
-  FILE *fbw = NULL;
-
-  malloc_string(tmp);
-  malloc_string(biggie_fname);
-  malloc_string(biggie_cksum);
-  malloc_string(xattr_fname);
-  malloc_string(acl_fname);
-  malloc_string(biggies_whose_EXATs_we_should_set);
-  malloc_string(pathname_of_last_biggie_restored);
-  assert(bkpinfo!=NULL);
-
-  read_cfg_var(g_mondo_cfg_file, "total-slices", tmp);
-
-  total_slices = atol(tmp);
-  sprintf(tmp, "Reassembling large files      ");
-  sprintf(xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
-  sprintf(acl_fname,   ACL_BIGGLST_FNAME_RAW_SZ,   bkpinfo->tmpdir);
-  mvaddstr_and_log_it( g_currentY, 0, tmp );
-  sprintf(biggies_whose_EXATs_we_should_set, "%s/biggies-whose-EXATs-we-should-set", bkpinfo->tmpdir);
-  if (!(fbw = fopen(biggies_whose_EXATs_we_should_set, "w")))
-   { log_msg(1, "Warning - cannot openout %s", biggies_whose_EXATs_we_should_set); }
-  
+    char *tmp;
+    char *biggie_fname;
+    char *biggie_cksum;
+    char *xattr_fname;
+    char *acl_fname;
+    char *p;
+    char *pathname_of_last_biggie_restored;
+    char *biggies_whose_EXATs_we_should_set;    // EXtended ATtributes
+    long long biggie_size;
+    FILE *fbw = NULL;
+
+    malloc_string(tmp);
+    malloc_string(biggie_fname);
+    malloc_string(biggie_cksum);
+    malloc_string(xattr_fname);
+    malloc_string(acl_fname);
+    malloc_string(biggies_whose_EXATs_we_should_set);
+    malloc_string(pathname_of_last_biggie_restored);
+    assert(bkpinfo != NULL);
+
+    read_cfg_var(g_mondo_cfg_file, "total-slices", tmp);
+
+    total_slices = atol(tmp);
+    sprintf(tmp, "Reassembling large files      ");
+    sprintf(xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
+    sprintf(acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
+    mvaddstr_and_log_it(g_currentY, 0, tmp);
+    sprintf(biggies_whose_EXATs_we_should_set,
+            "%s/biggies-whose-EXATs-we-should-set", bkpinfo->tmpdir);
+    if (!(fbw = fopen(biggies_whose_EXATs_we_should_set, "w"))) {
+        log_msg(1, "Warning - cannot openout %s",
+                biggies_whose_EXATs_we_should_set);
+    }
 // get xattr and acl files if they're there
-  res = read_header_block_from_stream( &biggie_size, biggie_fname, &ctrl_chr);
-  if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES)
-    {
-      res = read_EXAT_files_from_tape(bkpinfo, &biggie_size, biggie_fname, &ctrl_chr, xattr_fname, acl_fname); 
-    }
-
-  noof_biggiefiles = atol( biggie_fname );
-  sprintf( tmp, "OK, there are %ld biggiefiles in the archives", noof_biggiefiles );
-  log_msg(2, tmp );
-  open_progress_form( "Reassembling large files", 
-              "I am now reassembling all the large files." , 
-              "Please wait. This may take some time.", 
-              "", 
-              total_slices);
-
-  for( res = read_header_block_from_stream( &biggie_size, biggie_fname, &ctrl_chr); ctrl_chr!=BLK_STOP_BIGGIEFILES; res=read_header_block_from_stream(&biggie_size, biggie_fname, &ctrl_chr))
-    {
-      if (ctrl_chr != BLK_START_A_NORMBIGGIE && ctrl_chr != BLK_START_A_PIHBIGGIE) 
-    {
-      wrong_marker(BLK_START_A_NORMBIGGIE,ctrl_chr);
-    }
-      p = strrchr(biggie_fname,'/');
-      if (!p)
-    {
-      p = biggie_fname;
-    }
-      else
-    {
-      p++;
-    }
-      sprintf(tmp,"Restoring big file %ld (%lld K)",current_bigfile_number+1, biggie_size/1024);
-      update_progress_form(tmp);
-      res = restore_a_biggiefile_from_stream(bkpinfo,biggie_fname,
-                         current_bigfile_number,
-                         biggie_cksum,
-                         biggie_size,
-                         filelist, ctrl_chr,
-                         pathname_of_last_biggie_restored);
-      log_msg(1, "I believe I have restored %s", pathname_of_last_biggie_restored);
-      if (fbw && pathname_of_last_biggie_restored[0])
-        { fprintf(fbw, "%s\n", pathname_of_last_biggie_restored); }
-      retval += res;
-      current_bigfile_number++;
-
-    }
-  if (current_bigfile_number != noof_biggiefiles && noof_biggiefiles != 0 )
-    {
-      sprintf( tmp,
-           "Warning - bigfileno=%ld but noof_biggiefiles=%ld\n",current_bigfile_number,
-           noof_biggiefiles);
-    }
-  else
-    {
-      sprintf( tmp,"%ld biggiefiles in biggielist.txt; %ld biggiefiles processed today.",
-           noof_biggiefiles,
-           current_bigfile_number);
-    }
-  log_msg(1, tmp);
-
-  if (fbw)
-    {
-      fclose(fbw);
-      if (length_of_file(biggies_whose_EXATs_we_should_set) >2)
-        {
-      iamhere("Setting biggie-EXATs");
-          if (length_of_file(acl_fname)  >0)
-            {
-          log_msg(1, "set_acl_list(%s,%s)", biggies_whose_EXATs_we_should_set, acl_fname);
-          set_acl_list  (biggies_whose_EXATs_we_should_set, acl_fname);
-        }
-          if (length_of_file(xattr_fname)>0)
-            {
-          log_msg(1, "set_fattr_List(%s,%s)", biggies_whose_EXATs_we_should_set, xattr_fname);
-          set_fattr_list(biggies_whose_EXATs_we_should_set, xattr_fname); 
-        }
-    }
-      else
-        {
-      iamhere("No biggiefiles selected. So, no biggie-EXATs to set.");
-    }
-    }
-  if (does_file_exist("/PAUSE"))
-    { popup_and_OK("Press ENTER to go on. Delete /PAUSE to stop these pauses."); }
-
-  close_progress_form();
-  if (retval)
-    {
-      mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
-    }
-  else
-    {
-      mvaddstr_and_log_it(g_currentY++, 74, "Done.");
-    }
-  paranoid_free(biggies_whose_EXATs_we_should_set);
-  paranoid_free(pathname_of_last_biggie_restored);
-  paranoid_free(biggie_fname);
-  paranoid_free(biggie_cksum);
-  paranoid_free(xattr_fname);
-  paranoid_free(acl_fname);
-  paranoid_free(tmp);
-  return(retval);
+    res =
+        read_header_block_from_stream(&biggie_size, biggie_fname,
+                                      &ctrl_chr);
+    if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
+        res =
+            read_EXAT_files_from_tape(bkpinfo, &biggie_size, biggie_fname,
+                                      &ctrl_chr, xattr_fname, acl_fname);
+    }
+
+    noof_biggiefiles = atol(biggie_fname);
+    sprintf(tmp, "OK, there are %ld biggiefiles in the archives",
+            noof_biggiefiles);
+    log_msg(2, tmp);
+    open_progress_form("Reassembling large files",
+                       "I am now reassembling all the large files.",
+                       "Please wait. This may take some time.",
+                       "", total_slices);
+
+    for (res =
+         read_header_block_from_stream(&biggie_size, biggie_fname,
+                                       &ctrl_chr);
+         ctrl_chr != BLK_STOP_BIGGIEFILES;
+         res =
+         read_header_block_from_stream(&biggie_size, biggie_fname,
+                                       &ctrl_chr)) {
+        if (ctrl_chr != BLK_START_A_NORMBIGGIE
+            && ctrl_chr != BLK_START_A_PIHBIGGIE) {
+            wrong_marker(BLK_START_A_NORMBIGGIE, ctrl_chr);
+        }
+        p = strrchr(biggie_fname, '/');
+        if (!p) {
+            p = biggie_fname;
+        } else {
+            p++;
+        }
+        sprintf(tmp, "Restoring big file %ld (%lld K)",
+                current_bigfile_number + 1, biggie_size / 1024);
+        update_progress_form(tmp);
+        res = restore_a_biggiefile_from_stream(bkpinfo, biggie_fname,
+                                               current_bigfile_number,
+                                               biggie_cksum,
+                                               biggie_size,
+                                               filelist, ctrl_chr,
+                                               pathname_of_last_biggie_restored);
+        log_msg(1, "I believe I have restored %s",
+                pathname_of_last_biggie_restored);
+        if (fbw && pathname_of_last_biggie_restored[0]) {
+            fprintf(fbw, "%s\n", pathname_of_last_biggie_restored);
+        }
+        retval += res;
+        current_bigfile_number++;
+
+    }
+    if (current_bigfile_number != noof_biggiefiles
+        && noof_biggiefiles != 0) {
+        sprintf(tmp, "Warning - bigfileno=%ld but noof_biggiefiles=%ld\n",
+                current_bigfile_number, noof_biggiefiles);
+    } else {
+        sprintf(tmp,
+                "%ld biggiefiles in biggielist.txt; %ld biggiefiles processed today.",
+                noof_biggiefiles, current_bigfile_number);
+    }
+    log_msg(1, tmp);
+
+    if (fbw) {
+        fclose(fbw);
+        if (length_of_file(biggies_whose_EXATs_we_should_set) > 2) {
+            iamhere("Setting biggie-EXATs");
+            if (length_of_file(acl_fname) > 0) {
+                log_msg(1, "set_acl_list(%s,%s)",
+                        biggies_whose_EXATs_we_should_set, acl_fname);
+                set_acl_list(biggies_whose_EXATs_we_should_set, acl_fname);
+            }
+            if (length_of_file(xattr_fname) > 0) {
+                log_msg(1, "set_fattr_List(%s,%s)",
+                        biggies_whose_EXATs_we_should_set, xattr_fname);
+                set_fattr_list(biggies_whose_EXATs_we_should_set,
+                               xattr_fname);
+            }
+        } else {
+            iamhere
+                ("No biggiefiles selected. So, no biggie-EXATs to set.");
+        }
+    }
+    if (does_file_exist("/PAUSE")) {
+        popup_and_OK
+            ("Press ENTER to go on. Delete /PAUSE to stop these pauses.");
+    }
+
+    close_progress_form();
+    if (retval) {
+        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+    }
+    paranoid_free(biggies_whose_EXATs_we_should_set);
+    paranoid_free(pathname_of_last_biggie_restored);
+    paranoid_free(biggie_fname);
+    paranoid_free(biggie_cksum);
+    paranoid_free(xattr_fname);
+    paranoid_free(acl_fname);
+    paranoid_free(tmp);
+    return (retval);
 }
+
 /**************************************************************************
  *END_RESTORE_ALL_BIGGIEFILES_FROM_STREAM                                 *
@@ -2785 +2811 @@
  */
 int
-restore_all_tarballs_from_stream(struct s_bkpinfo *bkpinfo, struct s_node *filelist)
+restore_all_tarballs_from_stream(struct s_bkpinfo *bkpinfo,
+                                 struct s_node *filelist)
 {
-  int retval = 0;
-  int res;
-  long current_afioball_number = 0;
-  int ctrl_chr;
-  long max_val /*, total_noof_files */;
+    int retval = 0;
+    int res;
+    long current_afioball_number = 0;
+    int ctrl_chr;
+    long max_val /*, total_noof_files */ ;
 
   /** malloc **/
-  char *tmp;
-  char *progress_str;
-  char *tmp_fname;
-  char *xattr_fname;
-  char *acl_fname;
-
-  long long tmp_size;
-
-  malloc_string(tmp);
-  malloc_string(progress_str);
-  malloc_string(tmp_fname);
-  assert(bkpinfo!=NULL);
-  malloc_string(xattr_fname);
-  malloc_string(acl_fname);
-  mvaddstr_and_log_it(g_currentY, 0, "Restoring from archives");
-  read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp);
-  max_val = atol(tmp) + 1;
-
-  chdir(bkpinfo->restore_path); /* I don't know why this is needed _here_ but it seems to be. -HR, 02/04/2002 */
-
-  run_program_and_log_output("pwd", 5);
-
-  sprintf(progress_str,"Restoring from media #%d",g_current_media_number);
-  log_to_screen(progress_str);
-  open_progress_form("Restoring from archives",
-             "Restoring data from the archives." ,
-             "Please wait. This may take some time.",
-             progress_str,max_val);
-
-  log_msg(3, "hey");
-
-  res = read_header_block_from_stream( &tmp_size, tmp_fname, &ctrl_chr);
-  if (res)
-    {
-      log_msg(2, "Warning - error reading afioball from tape");
-    }
-  retval += res;
-  if ( ctrl_chr != BLK_START_AFIOBALLS)
-    {
-      wrong_marker(BLK_START_AFIOBALLS,ctrl_chr);
-    }
-  log_msg(2, "ho");
-  res = read_header_block_from_stream(&tmp_size, tmp_fname, &ctrl_chr);
-  while(ctrl_chr!=BLK_STOP_AFIOBALLS)
-    {
-      update_progress_form(progress_str);
-      sprintf(xattr_fname, "%s/xattr-subset-%ld.tmp", bkpinfo->tmpdir, current_afioball_number);
-      sprintf(acl_fname, "%s/acl-subset-%ld.tmp", bkpinfo->tmpdir, current_afioball_number);
-      unlink(xattr_fname);
-      unlink(acl_fname);
-      if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES)
-        {
-      iamhere("Reading EXAT files from tape");
-      res = read_EXAT_files_from_tape(bkpinfo, &tmp_size, tmp_fname, &ctrl_chr, xattr_fname, acl_fname);
-        }
-      if (ctrl_chr != BLK_START_AN_AFIO_OR_SLICE)
-        { wrong_marker(BLK_START_AN_AFIO_OR_SLICE, ctrl_chr); }
-      sprintf(tmp,
-          "Restoring from fileset #%ld (name=%s, size=%ld K)",
-          current_afioball_number,
-          tmp_fname,
-          (long) tmp_size>>10);
-      res = restore_a_tarball_from_stream(bkpinfo,tmp_fname,current_afioball_number,filelist,tmp_size, xattr_fname, acl_fname);
-      retval += res;
-      if ( res )
-        {
-      sprintf(tmp,"Fileset %ld - errors occurred",current_afioball_number);
-      log_to_screen(tmp);
-    }
-      res = read_header_block_from_stream(&tmp_size, tmp_fname, &ctrl_chr);
-      if (ctrl_chr != BLK_STOP_AN_AFIO_OR_SLICE)
-    {
-      wrong_marker(BLK_STOP_AN_AFIO_OR_SLICE,ctrl_chr);
-    }
-
-      current_afioball_number++;
-      g_current_progress++;
-      sprintf(progress_str,"Restoring from fileset #%ld on %s #%d",current_afioball_number, media_descriptor_string(bkpinfo->backup_media_type), g_current_media_number);      
-      res=read_header_block_from_stream(&tmp_size, tmp_fname, &ctrl_chr);
-      unlink(xattr_fname);
-      unlink(acl_fname);
-    } // next
-  log_msg(1, "All done with afioballs");
-  close_progress_form();
-  if (retval)
-    { 
-      mvaddstr_and_log_it(g_currentY++,74,"Errors."); }
-  else
-    { 
-      mvaddstr_and_log_it(g_currentY++,74,"Done."); }
-  paranoid_free(tmp);
-  paranoid_free(progress_str);
-  paranoid_free(tmp_fname);
-  paranoid_free(xattr_fname);
-  paranoid_free(acl_fname);
-  return(retval);
+    char *tmp;
+    char *progress_str;
+    char *tmp_fname;
+    char *xattr_fname;
+    char *acl_fname;
+
+    long long tmp_size;
+
+    malloc_string(tmp);
+    malloc_string(progress_str);
+    malloc_string(tmp_fname);
+    assert(bkpinfo != NULL);
+    malloc_string(xattr_fname);
+    malloc_string(acl_fname);
+    mvaddstr_and_log_it(g_currentY, 0, "Restoring from archives");
+    read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp);
+    max_val = atol(tmp) + 1;
+
+    chdir(bkpinfo->restore_path);   /* I don't know why this is needed _here_ but it seems to be. -HR, 02/04/2002 */
+
+    run_program_and_log_output("pwd", 5);
+
+    sprintf(progress_str, "Restoring from media #%d",
+            g_current_media_number);
+    log_to_screen(progress_str);
+    open_progress_form("Restoring from archives",
+                       "Restoring data from the archives.",
+                       "Please wait. This may take some time.",
+                       progress_str, max_val);
+
+    log_msg(3, "hey");
+
+    res = read_header_block_from_stream(&tmp_size, tmp_fname, &ctrl_chr);
+    if (res) {
+        log_msg(2, "Warning - error reading afioball from tape");
+    }
+    retval += res;
+    if (ctrl_chr != BLK_START_AFIOBALLS) {
+        wrong_marker(BLK_START_AFIOBALLS, ctrl_chr);
+    }
+    log_msg(2, "ho");
+    res = read_header_block_from_stream(&tmp_size, tmp_fname, &ctrl_chr);
+    while (ctrl_chr != BLK_STOP_AFIOBALLS) {
+        update_progress_form(progress_str);
+        sprintf(xattr_fname, "%s/xattr-subset-%ld.tmp", bkpinfo->tmpdir,
+                current_afioball_number);
+        sprintf(acl_fname, "%s/acl-subset-%ld.tmp", bkpinfo->tmpdir,
+                current_afioball_number);
+        unlink(xattr_fname);
+        unlink(acl_fname);
+        if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
+            iamhere("Reading EXAT files from tape");
+            res =
+                read_EXAT_files_from_tape(bkpinfo, &tmp_size, tmp_fname,
+                                          &ctrl_chr, xattr_fname,
+                                          acl_fname);
+        }
+        if (ctrl_chr != BLK_START_AN_AFIO_OR_SLICE) {
+            wrong_marker(BLK_START_AN_AFIO_OR_SLICE, ctrl_chr);
+        }
+        sprintf(tmp,
+                "Restoring from fileset #%ld (name=%s, size=%ld K)",
+                current_afioball_number, tmp_fname, (long) tmp_size >> 10);
+        res =
+            restore_a_tarball_from_stream(bkpinfo, tmp_fname,
+                                          current_afioball_number,
+                                          filelist, tmp_size, xattr_fname,
+                                          acl_fname);
+        retval += res;
+        if (res) {
+            sprintf(tmp, "Fileset %ld - errors occurred",
+                    current_afioball_number);
+            log_to_screen(tmp);
+        }
+        res =
+            read_header_block_from_stream(&tmp_size, tmp_fname, &ctrl_chr);
+        if (ctrl_chr != BLK_STOP_AN_AFIO_OR_SLICE) {
+            wrong_marker(BLK_STOP_AN_AFIO_OR_SLICE, ctrl_chr);
+        }
+
+        current_afioball_number++;
+        g_current_progress++;
+        sprintf(progress_str, "Restoring from fileset #%ld on %s #%d",
+                current_afioball_number,
+                media_descriptor_string(bkpinfo->backup_media_type),
+                g_current_media_number);
+        res =
+            read_header_block_from_stream(&tmp_size, tmp_fname, &ctrl_chr);
+        unlink(xattr_fname);
+        unlink(acl_fname);
+    }                           // next
+    log_msg(1, "All done with afioballs");
+    close_progress_form();
+    if (retval) {
+        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+    }
+    paranoid_free(tmp);
+    paranoid_free(progress_str);
+    paranoid_free(tmp_fname);
+    paranoid_free(xattr_fname);
+    paranoid_free(acl_fname);
+    return (retval);
 }
+
 /**************************************************************************
  *END_ RESTORE_ALL_TARBALLS_FROM_STREAM                                   *
@@ -2906 +2942 @@
  * @ingroup restoreGroup
  */
-int
-restore_everything(struct s_bkpinfo*bkpinfo,
-           struct s_node *filelist)
+int restore_everything(struct s_bkpinfo *bkpinfo, struct s_node *filelist)
 {
-  int resA;
-  int resB;
+    int resA;
+    int resB;
 
   /** mallco ***/
-  char *cwd;
-  char *newpath;
-  char *tmp;
-  assert(bkpinfo!=NULL);
-
-  malloc_string(cwd);
-  malloc_string(newpath);
-  malloc_string(tmp);
-  log_msg(2, "restore_everything() --- starting");
-  g_current_media_number = 1;
-  getcwd(cwd, MAX_STR_LEN - 1);
-  sprintf(tmp, "mkdir -p %s", bkpinfo->restore_path);
-  run_program_and_log_output(tmp, FALSE);
-  log_msg(1, "Changing dir to %s", bkpinfo->restore_path);
-  chdir(bkpinfo->restore_path);
-  getcwd(newpath,MAX_STR_LEN-1);
-  log_msg(1, "path is now %s", newpath);
-  log_msg(1, "restoring everything");
-  if (!find_home_of_exe("petris") && !g_text_mode)
-    {
-      newtDrawRootText(0, g_noof_rows-2, "Press ALT-<left cursor> twice to play Petris :-) ");
-      newtRefresh();
-    }
-  mvaddstr_and_log_it (g_currentY, 0, "Preparing to read your archives");
-  if ( IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type ) )
-    {
-      mount_cdrom( bkpinfo );
-      mvaddstr_and_log_it ( g_currentY++, 0, "Restoring OS and data from streaming media");
-      if (bkpinfo->backup_media_type == cdstream)
-        {
-      openin_cdstream( bkpinfo );
-    }
-      else
-        {
-      assert_string_is_neither_NULL_nor_zerolength(bkpinfo->media_device);
-      openin_tape(bkpinfo);
-    }
-      resA = restore_all_tarballs_from_stream(bkpinfo, filelist);
-      resB = restore_all_biggiefiles_from_stream(bkpinfo, filelist);
-      if (bkpinfo->backup_media_type == cdstream)
-        {
-      closein_cdstream(bkpinfo);
-    }
-      else
-        {
-      closein_tape(bkpinfo);
-    }
-    }
-  else
-    {
-      mvaddstr_and_log_it (g_currentY++, 0, "Restoring OS and data from CD       ");
-      mount_cdrom(bkpinfo);
-      resA = restore_all_tarballs_from_CD(bkpinfo, filelist);
-      resB = restore_all_biggiefiles_from_CD(bkpinfo, filelist);
-    }
-  chdir(cwd);
-  if ( resA + resB )
-    {
-      log_to_screen("Errors occurred while data was being restored.");
-    }
-  if ( length_of_file("/etc/raidtab") > 0 )
-    {
-      log_msg(2, "Copying local raidtab to restored filesystem");
-      run_program_and_log_output("cp -f /etc/raidtab " MNT_RESTORING "/etc/raidtab", FALSE);
-    }
-  kill_petris();
-  log_msg(2, "restore_everything() --- leaving");
-  paranoid_free(cwd);
-  paranoid_free(newpath);
-  paranoid_free(tmp);
-  return(resA+resB);
+    char *cwd;
+    char *newpath;
+    char *tmp;
+    assert(bkpinfo != NULL);
+
+    malloc_string(cwd);
+    malloc_string(newpath);
+    malloc_string(tmp);
+    log_msg(2, "restore_everything() --- starting");
+    g_current_media_number = 1;
+    getcwd(cwd, MAX_STR_LEN - 1);
+    sprintf(tmp, "mkdir -p %s", bkpinfo->restore_path);
+    run_program_and_log_output(tmp, FALSE);
+    log_msg(1, "Changing dir to %s", bkpinfo->restore_path);
+    chdir(bkpinfo->restore_path);
+    getcwd(newpath, MAX_STR_LEN - 1);
+    log_msg(1, "path is now %s", newpath);
+    log_msg(1, "restoring everything");
+    if (!find_home_of_exe("petris") && !g_text_mode) {
+        newtDrawRootText(0, g_noof_rows - 2,
+                         "Press ALT-<left cursor> twice to play Petris :-) ");
+        newtRefresh();
+    }
+    mvaddstr_and_log_it(g_currentY, 0, "Preparing to read your archives");
+    if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
+        mount_cdrom(bkpinfo);
+        mvaddstr_and_log_it(g_currentY++, 0,
+                            "Restoring OS and data from streaming media");
+        if (bkpinfo->backup_media_type == cdstream) {
+            openin_cdstream(bkpinfo);
+        } else {
+            assert_string_is_neither_NULL_nor_zerolength(bkpinfo->
+                                                         media_device);
+            openin_tape(bkpinfo);
+        }
+        resA = restore_all_tarballs_from_stream(bkpinfo, filelist);
+        resB = restore_all_biggiefiles_from_stream(bkpinfo, filelist);
+        if (bkpinfo->backup_media_type == cdstream) {
+            closein_cdstream(bkpinfo);
+        } else {
+            closein_tape(bkpinfo);
+        }
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 0,
+                            "Restoring OS and data from CD       ");
+        mount_cdrom(bkpinfo);
+        resA = restore_all_tarballs_from_CD(bkpinfo, filelist);
+        resB = restore_all_biggiefiles_from_CD(bkpinfo, filelist);
+    }
+    chdir(cwd);
+    if (resA + resB) {
+        log_to_screen("Errors occurred while data was being restored.");
+    }
+    if (length_of_file("/etc/raidtab") > 0) {
+        log_msg(2, "Copying local raidtab to restored filesystem");
+        run_program_and_log_output("cp -f /etc/raidtab " MNT_RESTORING
+                                   "/etc/raidtab", FALSE);
+    }
+    kill_petris();
+    log_msg(2, "restore_everything() --- leaving");
+    paranoid_free(cwd);
+    paranoid_free(newpath);
+    paranoid_free(tmp);
+    return (resA + resB);
 }
 
@@ -2997 +3024 @@
  */
 int
-restore_live_from_monitas_server(struct s_bkpinfo *bkpinfo, 
-                 char *monitas_device,
-                 char *restore_this_directory, 
-                 char *restore_here)
-     /* NB: bkpinfo hasn't been populated yet, except for ->tmp which is "/tmp" */
+restore_live_from_monitas_server(struct s_bkpinfo *bkpinfo,
+                                 char *monitas_device,
+                                 char *restore_this_directory,
+                                 char *restore_here)
+     /* NB: bkpinfo hasn't been populated yet, except for ->tmp which is "/tmp" */
 {
-  FILE *fout;
-  int retval = 0;
-  int i;
-  int j;
-  struct mountlist_itself the_mountlist;
-  static struct raidlist_itself the_raidlist;
+    FILE *fout;
+    int retval = 0;
+    int i;
+    int j;
+    struct mountlist_itself the_mountlist;
+    static struct raidlist_itself the_raidlist;
   /** malloc **/
-  char tmp[ MAX_STR_LEN + 1 ];
-  char command[ MAX_STR_LEN + 1 ];
-  char datablock[ 256 * 1024 ];
-  char datadisks_fname[ MAX_STR_LEN + 1 ];
-  long k;
-  long length;
-  long long llt;
-  struct s_node *filelist = NULL;
-  assert(bkpinfo!=NULL);
-  assert_string_is_neither_NULL_nor_zerolength(monitas_device);
-  assert(restore_this_directory != NULL);
-  assert(restore_here != NULL);
-
-  sprintf(tmp, "restore_here = '%s'", restore_here);
-
-  log_msg(2, tmp);
-  
-  log_msg(2, "restore_live_from_monitas_server() - starting");
-  unlink("/tmp/mountlist.txt"); unlink("/tmp/filelist.full");
-  unlink("/tmp/biggielist.txt");
-  if ( restore_here[0] == '\0' )
-    {
-      strcpy(bkpinfo->restore_path, MNT_RESTORING); 
-    }
-  else
-    { 
-      strcpy(bkpinfo->restore_path, restore_here); 
-    }
-  log_msg(3, "FYI FYI FYI FYI FYI FYI FYI FYI FYI FYI FYI");
-  sprintf(tmp, "FYI - data will be restored to %s", bkpinfo->restore_path);
-  log_msg(3, tmp);
-  log_msg(3, "FYI FYI FYI FYI FYI FYI FYI FYI FYI FYI FYI");
-  sprintf(datadisks_fname, "/tmp/mondorestore.datadisks.%d", (int)(random()%32768));
-  chdir(bkpinfo->tmpdir);
-
-  sprintf(command, "cat %s", monitas_device);
-  g_tape_stream=popen(command, "r"); // for compatibility with openin_tape()
-  if (!(fout = fopen(datadisks_fname, "w"))) { log_OS_error(datadisks_fname); return(1); }
-  for (i = 0; i < 32; i++)
-    {
-      for (j = 0; j < 4; j++)
-        {
-          for( length = k = 0; length < 256 * 1024; length += k)
-            {
-              k = fread( datablock + length, 1, 256 * 1024 - length, g_tape_stream);
-            }
-          fwrite (datablock, 1, length, fout);
-          g_tape_posK += length;
-        }
-    }
-  paranoid_fclose(fout);
-  sprintf( command,
-       "tar -zxvf %s tmp/mondo-restore.cfg tmp/mountlist.txt tmp/filelist.full tmp/biggielist.txt",
-       datadisks_fname);
-  run_program_and_log_output(command, 4);
-  read_header_block_from_stream (&llt, tmp, &i);
-  read_header_block_from_stream (&llt, tmp, &i);
-
-  unlink(datadisks_fname);
-  read_cfg_file_into_bkpinfo(g_mondo_cfg_file, bkpinfo);
-  retval = load_mountlist( &the_mountlist, g_mountlist_fname); // in case read_cfg_file_into_bkpinfo   strcpy(bkpinfo->media_device, monitas_device);
-  
-
-  load_raidtab_into_raidlist(&the_raidlist, RAIDTAB_FNAME );
-  iamhere("FIXME");
-  fatal_error("This will fail");
-  sprintf( command,
-       "cat %s | grep -x \"%s.*\" > %s",
-       g_filelist_full,
-       restore_this_directory,
-       g_filelist_full);
-  if (system(command))
-    {
-      retval++;
-      log_to_screen("Error(s) occurred while processing filelist and wildcard");
-    }
-  iamhere("FIXME");
-  fatal_error("This will fail");
-  sprintf(command,
-      "cat %s | grep -x \"%s.*\" > %s",
-      g_biggielist_txt,
-      restore_this_directory,
-      g_biggielist_txt);
-  if (system(command))
-    {
-      log_msg(1, "Error(s) occurred while processing biggielist and wildcard");
-    }
-  sprintf(command, "touch %s", g_biggielist_txt);
-  run_program_and_log_output(command, FALSE);
+    char tmp[MAX_STR_LEN + 1];
+    char command[MAX_STR_LEN + 1];
+    char datablock[256 * 1024];
+    char datadisks_fname[MAX_STR_LEN + 1];
+    long k;
+    long length;
+    long long llt;
+    struct s_node *filelist = NULL;
+    assert(bkpinfo != NULL);
+    assert_string_is_neither_NULL_nor_zerolength(monitas_device);
+    assert(restore_this_directory != NULL);
+    assert(restore_here != NULL);
+
+    sprintf(tmp, "restore_here = '%s'", restore_here);
+
+    log_msg(2, tmp);
+
+    log_msg(2, "restore_live_from_monitas_server() - starting");
+    unlink("/tmp/mountlist.txt");
+    unlink("/tmp/filelist.full");
+    unlink("/tmp/biggielist.txt");
+    if (restore_here[0] == '\0') {
+        strcpy(bkpinfo->restore_path, MNT_RESTORING);
+    } else {
+        strcpy(bkpinfo->restore_path, restore_here);
+    }
+    log_msg(3, "FYI FYI FYI FYI FYI FYI FYI FYI FYI FYI FYI");
+    sprintf(tmp, "FYI - data will be restored to %s",
+            bkpinfo->restore_path);
+    log_msg(3, tmp);
+    log_msg(3, "FYI FYI FYI FYI FYI FYI FYI FYI FYI FYI FYI");
+    sprintf(datadisks_fname, "/tmp/mondorestore.datadisks.%d",
+            (int) (random() % 32768));
+    chdir(bkpinfo->tmpdir);
+
+    sprintf(command, "cat %s", monitas_device);
+    g_tape_stream = popen(command, "r");    // for compatibility with openin_tape()
+    if (!(fout = fopen(datadisks_fname, "w"))) {
+        log_OS_error(datadisks_fname);
+        return (1);
+    }
+    for (i = 0; i < 32; i++) {
+        for (j = 0; j < 4; j++) {
+            for (length = k = 0; length < 256 * 1024; length += k) {
+                k = fread(datablock + length, 1, 256 * 1024 - length,
+                          g_tape_stream);
+            }
+            fwrite(datablock, 1, length, fout);
+            g_tape_posK += length;
+        }
+    }
+    paranoid_fclose(fout);
+    sprintf(command,
+            "tar -zxvf %s tmp/mondo-restore.cfg tmp/mountlist.txt tmp/filelist.full tmp/biggielist.txt",
+            datadisks_fname);
+    run_program_and_log_output(command, 4);
+    read_header_block_from_stream(&llt, tmp, &i);
+    read_header_block_from_stream(&llt, tmp, &i);
+
+    unlink(datadisks_fname);
+    read_cfg_file_into_bkpinfo(g_mondo_cfg_file, bkpinfo);
+    retval = load_mountlist(&the_mountlist, g_mountlist_fname); // in case read_cfg_file_into_bkpinfo   strcpy(bkpinfo->media_device, monitas_device);
+
+
+    load_raidtab_into_raidlist(&the_raidlist, RAIDTAB_FNAME);
+    iamhere("FIXME");
+    fatal_error("This will fail");
+    sprintf(command,
+            "cat %s | grep -x \"%s.*\" > %s",
+            g_filelist_full, restore_this_directory, g_filelist_full);
+    if (system(command)) {
+        retval++;
+        log_to_screen
+            ("Error(s) occurred while processing filelist and wildcard");
+    }
+    iamhere("FIXME");
+    fatal_error("This will fail");
+    sprintf(command,
+            "cat %s | grep -x \"%s.*\" > %s",
+            g_biggielist_txt, restore_this_directory, g_biggielist_txt);
+    if (system(command)) {
+        log_msg(1,
+                "Error(s) occurred while processing biggielist and wildcard");
+    }
+    sprintf(command, "touch %s", g_biggielist_txt);
+    run_program_and_log_output(command, FALSE);
 //  filelist = load_filelist(g_filelist_restthese);  // FIXME --- this probably doesn't work because it doesn't include the biggiefiles
-  retval += restore_everything(bkpinfo, filelist);
-  free_filelist(filelist);
-  log_msg(2, "--------End of restore_live_from_monitas_server--------");
-  return(retval);
+    retval += restore_everything(bkpinfo, filelist);
+    free_filelist(filelist);
+    log_msg(2, "--------End of restore_live_from_monitas_server--------");
+    return (retval);
 }
+
 /**************************************************************************
  *END_RESTORE_LIVE_FROM_MONITAS_SERVER                                    *
@@ -3112 +3137 @@
 
 
-extern void wait_until_software_raids_are_prepped(char*, int);
+extern void wait_until_software_raids_are_prepped(char *, int);
 
 
@@ -3123 +3148 @@
 void welcome_to_mondorestore()
 {
-  log_msg(0, "-------------- Mondo Restore v%s -------------", VERSION);
-  log_msg(0, "DON'T PANIC! Mondorestore logs almost everything, so please " );
-  log_msg(0, "don't break out in a cold sweat just because you see a few  " );
-  log_msg(0, "error messages in the log. Read them; analyze them; see if  " );
-  log_msg(0, "they are significant; above all, verify your backups! Please" );
-  log_msg(0, "attach a compressed copy of this log to any e-mail you send " );
-  log_msg(0, "to the Mondo mailing list when you are seeking technical    " );
-  log_msg(0, "support. Without it, we can't help you.               - Hugo" );
-  log_msg(0, "------------------------------------------------------------" );
-  log_msg(0, "BTW, despite (or perhaps because of) the wealth of messages," );
-  log_msg(0, "some users are inclined to stop reading this log.  If Mondo " );
-  log_msg(0, "stopped for some reason, chances are it's detailed here.    " );
-  log_msg(0, "More than likely there's a message at the very end of this  " );
-  log_msg(0, "log that will tell you what is wrong.  Please read it!      " );
-  log_msg(0, "------------------------------------------------------------");
+    log_msg(0, "-------------- Mondo Restore v%s -------------", VERSION);
+    log_msg(0,
+            "DON'T PANIC! Mondorestore logs almost everything, so please ");
+    log_msg(0,
+            "don't break out in a cold sweat just because you see a few  ");
+    log_msg(0,
+            "error messages in the log. Read them; analyze them; see if  ");
+    log_msg(0,
+            "they are significant; above all, verify your backups! Please");
+    log_msg(0,
+            "attach a compressed copy of this log to any e-mail you send ");
+    log_msg(0,
+            "to the Mondo mailing list when you are seeking technical    ");
+    log_msg(0,
+            "support. Without it, we can't help you.               - Hugo");
+    log_msg(0,
+            "------------------------------------------------------------");
+    log_msg(0,
+            "BTW, despite (or perhaps because of) the wealth of messages,");
+    log_msg(0,
+            "some users are inclined to stop reading this log.  If Mondo ");
+    log_msg(0,
+            "stopped for some reason, chances are it's detailed here.    ");
+    log_msg(0,
+            "More than likely there's a message at the very end of this  ");
+    log_msg(0,
+            "log that will tell you what is wrong.  Please read it!      ");
+    log_msg(0,
+            "------------------------------------------------------------");
 }
 
@@ -3146 +3185 @@
  * What did you think it did, anyway? :-)
  */
-int
-main(int argc, char*argv[])
+int main(int argc, char *argv[])
 {
-      FILE*fin;
-      FILE*fout;
-  int retval = 0;
-  int res;
+    FILE *fin;
+    FILE *fout;
+    int retval = 0;
+    int res;
 //  int c;
-  char *tmp;
+    char *tmp;
 
 #ifndef VERSION
@@ -3160 +3198 @@
 #endif
 
-  struct mountlist_itself     *mountlist;
-  struct raidlist_itself      *raidlist;
-  struct s_bkpinfo            *bkpinfo;
-  struct s_node *filelist;
-  char *a, *b;
+    struct mountlist_itself *mountlist;
+    struct raidlist_itself *raidlist;
+    struct s_bkpinfo *bkpinfo;
+    struct s_node *filelist;
+    char *a, *b;
 
   /**************************************************************************
@@ -3171 +3209 @@
    *                                                                        *
    **************************************************************************/
-  if (getuid () != 0)
-    {
-      fprintf (stderr, "Please run as root.\r\n");
-      exit (127);
-    }
-
-  g_loglevel = DEFAULT_MR_LOGLEVEL;
-  malloc_string(tmp);
-  
+    if (getuid() != 0) {
+        fprintf(stderr, "Please run as root.\r\n");
+        exit(127);
+    }
+
+    g_loglevel = DEFAULT_MR_LOGLEVEL;
+    malloc_string(tmp);
+
 /* Configure global variables */
 #ifdef __FreeBSD__
-  if (strstr(call_program_and_get_last_line_of_output("cat /tmp/cmdline"), "textonly"))
+    if (strstr
+        (call_program_and_get_last_line_of_output("cat /tmp/cmdline"),
+         "textonly"))
 #else
-  if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "textonly"))
+    if (strstr
+        (call_program_and_get_last_line_of_output("cat /proc/cmdline"),
+         "textonly"))
 #endif
-    { g_text_mode = TRUE; log_msg(1, "TEXTONLY MODE"); }
-  else
-    { g_text_mode = FALSE; }               // newt :-)
-  if ( ! ( bkpinfo = g_bkpinfo_DONTUSETHIS = malloc( sizeof(struct s_bkpinfo))))
-    { fatal_error( "Cannot malloc bkpinfo" ); }
-  if ( ! ( mountlist = malloc (sizeof(struct mountlist_itself))))
-    { fatal_error ("Cannot malloc mountlist" ); }
-  if ( ! ( raidlist = malloc (sizeof(struct raidlist_itself))))
-    { fatal_error ("Cannot malloc raidlist" ); }
-
-  malloc_libmondo_global_strings();
-
-  strcpy( g_mondo_home, call_program_and_get_last_line_of_output("which mondorestore") );
-  sprintf(g_tmpfs_mountpt, "/tmp/tmpfs");
-  make_hole_for_dir(g_tmpfs_mountpt);
-  g_current_media_number = 1;        // precaution
-
-  run_program_and_log_output ("mkdir -p " MNT_CDROM, FALSE);
-  run_program_and_log_output ("mkdir -p /mnt/floppy", FALSE);
-
-  malloc_string(tmp);
-  malloc_string(a);
-  malloc_string(b);
-  setup_MR_global_filenames( bkpinfo ); // malloc() and set globals, using bkpinfo->tmpdir etc.
-  reset_bkpinfo( bkpinfo );
-  bkpinfo->backup_media_type = none; // in case boot disk was made for one backup type but user wants to restore from another backup type
-  bkpinfo->restore_data = TRUE;      // Well, yeah :-)
-  if (am_I_in_disaster_recovery_mode())
-    { run_program_and_log_output("mount / -o remount,rw",2); } // for b0rken distros
-  g_main_pid = getpid();
-  srandom( (int)(time(NULL)) );
-  register_pid( getpid(), "mondo" );
-  set_signals(TRUE);
-  g_kernel_version = get_kernel_version();
-
-  log_msg(1, "FYI - g_mountlist_fname = %s", g_mountlist_fname);
-  if (strlen(g_mountlist_fname) < 3)
-    { fatal_error("Serious error in malloc()'ing. Could be a bug in your glibc."); }
-  mkdir(MNT_CDROM, 0x770);
-  
+    {
+        g_text_mode = TRUE;
+        log_msg(1, "TEXTONLY MODE");
+    } else {
+        g_text_mode = FALSE;
+    }                           // newt :-)
+    if (!
+        (bkpinfo = g_bkpinfo_DONTUSETHIS =
+         malloc(sizeof(struct s_bkpinfo)))) {
+        fatal_error("Cannot malloc bkpinfo");
+    }
+    if (!(mountlist = malloc(sizeof(struct mountlist_itself)))) {
+        fatal_error("Cannot malloc mountlist");
+    }
+    if (!(raidlist = malloc(sizeof(struct raidlist_itself)))) {
+        fatal_error("Cannot malloc raidlist");
+    }
+
+    malloc_libmondo_global_strings();
+
+    strcpy(g_mondo_home,
+           call_program_and_get_last_line_of_output("which mondorestore"));
+    sprintf(g_tmpfs_mountpt, "/tmp/tmpfs");
+    make_hole_for_dir(g_tmpfs_mountpt);
+    g_current_media_number = 1; // precaution
+
+    run_program_and_log_output("mkdir -p " MNT_CDROM, FALSE);
+    run_program_and_log_output("mkdir -p /mnt/floppy", FALSE);
+
+    malloc_string(tmp);
+    malloc_string(a);
+    malloc_string(b);
+    setup_MR_global_filenames(bkpinfo); // malloc() and set globals, using bkpinfo->tmpdir etc.
+    reset_bkpinfo(bkpinfo);
+    bkpinfo->backup_media_type = none;  // in case boot disk was made for one backup type but user wants to restore from another backup type
+    bkpinfo->restore_data = TRUE;   // Well, yeah :-)
+    if (am_I_in_disaster_recovery_mode()) {
+        run_program_and_log_output("mount / -o remount,rw", 2);
+    }                           // for b0rken distros
+    g_main_pid = getpid();
+    srandom((int) (time(NULL)));
+    register_pid(getpid(), "mondo");
+    set_signals(TRUE);
+    g_kernel_version = get_kernel_version();
+
+    log_msg(1, "FYI - g_mountlist_fname = %s", g_mountlist_fname);
+    if (strlen(g_mountlist_fname) < 3) {
+        fatal_error
+            ("Serious error in malloc()'ing. Could be a bug in your glibc.");
+    }
+    mkdir(MNT_CDROM, 0x770);
+
 /* Backup original mountlist.txt */
-  sprintf (tmp, "%s.orig", g_mountlist_fname);
-  if (!does_file_exist(g_mountlist_fname))
-    {
-      log_msg(2, "%ld: Warning - g_mountlist_fname (%s) does not exist yet", __LINE__, g_mountlist_fname);
-    }
-  else if ( !does_file_exist(tmp) )
-    {
-       sprintf(tmp, "cp -f %s %s.orig", g_mountlist_fname, g_mountlist_fname);
-       run_program_and_log_output(tmp, FALSE);
-    }
+    sprintf(tmp, "%s.orig", g_mountlist_fname);
+    if (!does_file_exist(g_mountlist_fname)) {
+        log_msg(2,
+                "%ld: Warning - g_mountlist_fname (%s) does not exist yet",
+                __LINE__, g_mountlist_fname);
+    } else if (!does_file_exist(tmp)) {
+        sprintf(tmp, "cp -f %s %s.orig", g_mountlist_fname,
+                g_mountlist_fname);
+        run_program_and_log_output(tmp, FALSE);
+    }
 
 /* Init directories */
-  make_hole_for_dir(bkpinfo->tmpdir);
-  sprintf( tmp, "mkdir -p %s", bkpinfo->tmpdir );
-  run_program_and_log_output( tmp, FALSE );
-  make_hole_for_dir( "/var/log");
-  make_hole_for_dir( "/tmp/tmpfs"); /* just in case... */
-  run_program_and_log_output( "umount "MNT_CDROM, FALSE );
-  run_program_and_log_output( "ln -sf /var/log/mondo-archive.log /tmp/mondo-restore.log", FALSE );
-
-  run_program_and_log_output( "rm -Rf /tmp/tmpfs/mondo.tmp.*", FALSE);
+    make_hole_for_dir(bkpinfo->tmpdir);
+    sprintf(tmp, "mkdir -p %s", bkpinfo->tmpdir);
+    run_program_and_log_output(tmp, FALSE);
+    make_hole_for_dir("/var/log");
+    make_hole_for_dir("/tmp/tmpfs");    /* just in case... */
+    run_program_and_log_output("umount " MNT_CDROM, FALSE);
+    run_program_and_log_output
+        ("ln -sf /var/log/mondo-archive.log /tmp/mondo-restore.log",
+         FALSE);
+
+    run_program_and_log_output("rm -Rf /tmp/tmpfs/mondo.tmp.*", FALSE);
 
 /* Init GUI */
-  malloc_libmondo_global_strings();
-  setup_newt_stuff();                       /* call newtInit and setup screen log */
-  welcome_to_mondorestore();
-  if ( bkpinfo->disaster_recovery )
-    { log_msg(1, "I am in disaster recovery mode" ); }
-  else
-    { log_msg(1, "I am in normal, live mode" ); }
-
-  iamhere("what time is it");
+    malloc_libmondo_global_strings();
+    setup_newt_stuff();         /* call newtInit and setup screen log */
+    welcome_to_mondorestore();
+    if (bkpinfo->disaster_recovery) {
+        log_msg(1, "I am in disaster recovery mode");
+    } else {
+        log_msg(1, "I am in normal, live mode");
+    }
+
+    iamhere("what time is it");
 
 /* Process command-line parameters */
-  if (argc == 2 && strcmp( argv[1], "--edit-mountlist" ) == 0 )
-    {
+    if (argc == 2 && strcmp(argv[1], "--edit-mountlist") == 0) {
 #ifdef __FreeBSD__
-    system ("mv -f /tmp/raidconf.txt /etc/raidtab");
-    if (!does_file_exist ("/etc/raidtab"))
-        system ("vinum printconfig > /etc/raidtab");
+        system("mv -f /tmp/raidconf.txt /etc/raidtab");
+        if (!does_file_exist("/etc/raidtab"))
+            system("vinum printconfig > /etc/raidtab");
 #endif
-      load_raidtab_into_raidlist( raidlist, RAIDTAB_FNAME );
-      if (!does_file_exist(g_mountlist_fname)) { strcpy(g_mountlist_fname, "/tmp/mountlist.txt"); }
-      res = let_user_edit_the_mountlist(bkpinfo, mountlist, raidlist);
+        load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
+        if (!does_file_exist(g_mountlist_fname)) {
+            strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
+        }
+        res = let_user_edit_the_mountlist(bkpinfo, mountlist, raidlist);
 #ifdef __FreeBSD__
-      system ("mv -f /etc/raidtab /tmp/raidconf.txt");
+        system("mv -f /etc/raidtab /tmp/raidconf.txt");
 #endif
-      paranoid_MR_finish(res);
-    }
-
-  g_loglevel = DEFAULT_MR_LOGLEVEL;
-  if (argc == 3 && strcmp(argv[1], "--echo-to-screen") == 0)
-    {
-      fout = fopen("/tmp/out.txt", "w");
-      fput_string_one_char_at_a_time(stderr, argv[2]);
-      finish(0);
-    }      
-
-  if (argc == 3 && strcmp( argv[1], "--gendf" ) == 0 )
-    {
-      make_grub_install_scriptlet(argv[2]);
-      finish(0);
-    }
-
-  if (argc >= 2 && strcmp(argv[1], "--pih" ) == 0 )
-    {
-      if (system("mount | grep cdrom 2> /dev/null > /dev/null"))
-        { system("mount "MNT_CDROM); }
-      bkpinfo->compression_level = 1;
-      g_current_media_number = 2;
-      strcpy(bkpinfo->restore_path, "/tmp/TESTING");
-      bkpinfo->backup_media_type = dvd;
-        open_progress_form( "Reassembling /dev/hda1",
-              "Shark is a bit of a silly person." ,
-              "Please wait. This may take some time.",
-              "",
-              1999);
-     system("rm -Rf /tmp/*pih*");
-
-      restore_a_biggiefile_from_CD(bkpinfo, 42, NULL, tmp);
-    }
-
-  if (argc == 5 && strcmp( argv[1], "--common") == 0 )
-    {
-      g_loglevel = 6;
-      filelist = load_filelist(argv[2]);
-      if (!filelist) { fatal_error("Failed to load filelist"); }
-      toggle_node_selection (filelist, FALSE);
-      toggle_all_root_dirs_on (filelist);
-      toggle_path_selection (filelist, "/usr/share", TRUE);
+        paranoid_MR_finish(res);
+    }
+
+    g_loglevel = DEFAULT_MR_LOGLEVEL;
+    if (argc == 3 && strcmp(argv[1], "--echo-to-screen") == 0) {
+        fout = fopen("/tmp/out.txt", "w");
+        fput_string_one_char_at_a_time(stderr, argv[2]);
+        finish(0);
+    }
+
+    if (argc == 3 && strcmp(argv[1], "--gendf") == 0) {
+        make_grub_install_scriptlet(argv[2]);
+        finish(0);
+    }
+
+    if (argc >= 2 && strcmp(argv[1], "--pih") == 0) {
+        if (system("mount | grep cdrom 2> /dev/null > /dev/null")) {
+            system("mount " MNT_CDROM);
+        }
+        bkpinfo->compression_level = 1;
+        g_current_media_number = 2;
+        strcpy(bkpinfo->restore_path, "/tmp/TESTING");
+        bkpinfo->backup_media_type = dvd;
+        open_progress_form("Reassembling /dev/hda1",
+                           "Shark is a bit of a silly person.",
+                           "Please wait. This may take some time.",
+                           "", 1999);
+        system("rm -Rf /tmp/*pih*");
+
+        restore_a_biggiefile_from_CD(bkpinfo, 42, NULL, tmp);
+    }
+
+    if (argc == 5 && strcmp(argv[1], "--common") == 0) {
+        g_loglevel = 6;
+        filelist = load_filelist(argv[2]);
+        if (!filelist) {
+            fatal_error("Failed to load filelist");
+        }
+        toggle_node_selection(filelist, FALSE);
+        toggle_all_root_dirs_on(filelist);
+        toggle_path_selection(filelist, "/usr/share", TRUE);
 //      show_filelist(filelist);
-      save_filelist(filelist, "/tmp/out.txt");
+        save_filelist(filelist, "/tmp/out.txt");
 //      finish(0);
 //      toggle_path_selection (filelist, "/root/stuff", TRUE);
-      strcpy(a, argv[3]);
-      strcpy(b, argv[4]);
-
-      res = save_filelist_entries_in_common(
-                a, filelist, b, FALSE);
-      free_filelist(filelist);
-      printf("res = %d", res);
-      finish(0);
-    }
-
-  if (argc == 3 && strcmp( argv[1], "--popuplist" ) == 0 )
-    {
-      popup_changelist_from_file( argv[2] );
-      paranoid_MR_finish(0);
-    }
-
-   if (argc == 5 && strcmp( argv[1], "--copy" ) == 0 )
-    {
-          log_msg(1, "SCORE");
-      g_loglevel = 10;
-          if (strstr(argv[2], "save"))
-        {
-          log_msg(1, "Saving from %s to %s", argv[3], argv[4]);
-          fin = fopen(argv[3], "r");
-          fout = fopen(argv[4], "w");
-          copy_from_src_to_dest(fin, fout, 'w');
-          fclose(fin);
-          fin = fopen(argv[3], "r");
-          copy_from_src_to_dest(fin, fout, 'w');
-          fclose(fout);
-          fclose(fin);
-        }
-      else if (strstr(argv[2], "restore"))
-        {
-          fout = fopen(argv[3], "w");
-          fin = fopen(argv[4], "r");
-          copy_from_src_to_dest(fout, fin, 'r');
-          fclose(fin);
-          fin = fopen(argv[4], "r");
-          copy_from_src_to_dest(fout, fin, 'r');
-          fclose(fout);
-          fclose(fin);
-        }
-      else
-        { fatal_error("Unknown additional param"); }
-      finish(0);
-    }
-
-  if (argc == 3 && strcmp(argv[1], "--mdstat") == 0)
-    {
-      wait_until_software_raids_are_prepped(argv[2], 100);
-      finish(0);
-    }
-  
-  if (argc == 4 && strcmp(argv[1], "--mdconv") == 0)
-    {
-      finish(create_raidtab_from_mdstat(argv[2], argv[3]));
-    }
-
-
-  if ( argc == 2 && strcmp( argv[1],"--live-grub" ) == 0 )
-    {
-              retval = run_grub( FALSE, "/dev/hda" );
-          if ( retval )
-            {
-              log_to_screen("Failed to write Master Boot Record");
-            }
-      paranoid_MR_finish(0);
-   }
-  if (argc == 3 && strcmp( argv[1], "--paa" ) == 0 )
-    {
-      g_current_media_number = atoi(argv[2]);
-      pause_and_ask_for_cdr(5, NULL);
-      paranoid_MR_finish(0);
-    }
-  else if ( !bkpinfo->disaster_recovery )
-    { // live!
-      if (argc!=1)
-        {
-      popup_and_OK("Live mode doesn't support command-line parameters yet.");
-      paranoid_MR_finish(1);
-//    return(1);
-    }
-      log_msg (1, "I am in normal, live mode.");
-      log_msg (2, "FYI, MOUNTLIST_FNAME = %s", g_mountlist_fname);
-      mount_boot_if_necessary();  /* for Gentoo users */
-      log_msg (2, "Still here.");
-      if ( argc>1 && strcmp( argv[argc-1], "--live-from-cd" ) == 0 )
-        { g_restoring_live_from_cd = TRUE; }
-      if ( argc == 5 && strcmp(argv[1], "--monitas-live" ) == 0 )
-        {
-      retval =
-        restore_live_from_monitas_server( bkpinfo,
-                          argv[2],
-                          argv[3],
-                          argv[4] );
-    }
-      else
-        {
-      log_msg(2, "Calling restore_to_live_filesystem()");
-      retval = restore_to_live_filesystem( bkpinfo );
-    }
-      log_msg(2, "Still here. Yay.");
-      if (strlen(bkpinfo->tmpdir) > 0)
-        {
-          sprintf( tmp, "rm -Rf %s/*", bkpinfo->tmpdir );
-          run_program_and_log_output ( tmp, FALSE );
-        }
-      unmount_boot_if_necessary(); /* for Gentoo users */
-      paranoid_MR_finish( retval );
-    }
-  else
-    {
+        strcpy(a, argv[3]);
+        strcpy(b, argv[4]);
+
+        res = save_filelist_entries_in_common(a, filelist, b, FALSE);
+        free_filelist(filelist);
+        printf("res = %d", res);
+        finish(0);
+    }
+
+    if (argc == 3 && strcmp(argv[1], "--popuplist") == 0) {
+        popup_changelist_from_file(argv[2]);
+        paranoid_MR_finish(0);
+    }
+
+    if (argc == 5 && strcmp(argv[1], "--copy") == 0) {
+        log_msg(1, "SCORE");
+        g_loglevel = 10;
+        if (strstr(argv[2], "save")) {
+            log_msg(1, "Saving from %s to %s", argv[3], argv[4]);
+            fin = fopen(argv[3], "r");
+            fout = fopen(argv[4], "w");
+            copy_from_src_to_dest(fin, fout, 'w');
+            fclose(fin);
+            fin = fopen(argv[3], "r");
+            copy_from_src_to_dest(fin, fout, 'w');
+            fclose(fout);
+            fclose(fin);
+        } else if (strstr(argv[2], "restore")) {
+            fout = fopen(argv[3], "w");
+            fin = fopen(argv[4], "r");
+            copy_from_src_to_dest(fout, fin, 'r');
+            fclose(fin);
+            fin = fopen(argv[4], "r");
+            copy_from_src_to_dest(fout, fin, 'r');
+            fclose(fout);
+            fclose(fin);
+        } else {
+            fatal_error("Unknown additional param");
+        }
+        finish(0);
+    }
+
+    if (argc == 3 && strcmp(argv[1], "--mdstat") == 0) {
+        wait_until_software_raids_are_prepped(argv[2], 100);
+        finish(0);
+    }
+
+    if (argc == 4 && strcmp(argv[1], "--mdconv") == 0) {
+        finish(create_raidtab_from_mdstat(argv[2], argv[3]));
+    }
+
+
+    if (argc == 2 && strcmp(argv[1], "--live-grub") == 0) {
+        retval = run_grub(FALSE, "/dev/hda");
+        if (retval) {
+            log_to_screen("Failed to write Master Boot Record");
+        }
+        paranoid_MR_finish(0);
+    }
+    if (argc == 3 && strcmp(argv[1], "--paa") == 0) {
+        g_current_media_number = atoi(argv[2]);
+        pause_and_ask_for_cdr(5, NULL);
+        paranoid_MR_finish(0);
+    } else if (!bkpinfo->disaster_recovery) {   // live!
+        if (argc != 1) {
+            popup_and_OK
+                ("Live mode doesn't support command-line parameters yet.");
+            paranoid_MR_finish(1);
+//    return(1);
+        }
+        log_msg(1, "I am in normal, live mode.");
+        log_msg(2, "FYI, MOUNTLIST_FNAME = %s", g_mountlist_fname);
+        mount_boot_if_necessary();  /* for Gentoo users */
+        log_msg(2, "Still here.");
+        if (argc > 1 && strcmp(argv[argc - 1], "--live-from-cd") == 0) {
+            g_restoring_live_from_cd = TRUE;
+        }
+        if (argc == 5 && strcmp(argv[1], "--monitas-live") == 0) {
+            retval =
+                restore_live_from_monitas_server(bkpinfo,
+                                                 argv[2],
+                                                 argv[3], argv[4]);
+        } else {
+            log_msg(2, "Calling restore_to_live_filesystem()");
+            retval = restore_to_live_filesystem(bkpinfo);
+        }
+        log_msg(2, "Still here. Yay.");
+        if (strlen(bkpinfo->tmpdir) > 0) {
+            sprintf(tmp, "rm -Rf %s/*", bkpinfo->tmpdir);
+            run_program_and_log_output(tmp, FALSE);
+        }
+        unmount_boot_if_necessary();    /* for Gentoo users */
+        paranoid_MR_finish(retval);
+    } else {
 /* Disaster recovery mode (must be) */
-      log_msg(1, "I must be in disaster recovery mode.");
-      log_msg(2, "FYI, MOUNTLIST_FNAME = %s ", g_mountlist_fname );
-      if (argc == 3 && strcmp(argv[1], "--monitas-memorex" ) == 0 )
-        {
-          log_to_screen( "Uh, that hasn't been implemented yet." );
-          paranoid_MR_finish( 1 );
-        }
-
-      iamhere("About to call load_mountlist and load_raidtab");
-      strcpy( bkpinfo->restore_path, MNT_RESTORING );
-      read_cfg_file_into_bkpinfo( g_mondo_cfg_file, bkpinfo );
-      retval = load_mountlist( mountlist, g_mountlist_fname );
-      retval += load_raidtab_into_raidlist( raidlist, RAIDTAB_FNAME );
-      iamhere("Returned from calling load_mountlist and load_raidtab successfully");
-
-      if (argc>1 && (strcmp( argv[1], "--compare" ) == 0 || strcmp( argv[1], "--nuke" ) == 0 ))
-        {
-          if (bkpinfo->backup_media_type == nfs && !is_this_device_mounted(bkpinfo->nfs_mount))
-            {
-          log_msg(1, "Mounting nfs dir");
-              sprintf(bkpinfo->isodir, "/tmp/isodir");
-          run_program_and_log_output("mkdir -p /tmp/isodir", 5);
-          sprintf(tmp, "mount %s -t nfs -o nolock /tmp/isodir", bkpinfo->nfs_mount);
-          run_program_and_log_output(tmp, 1);
-           }
-        }
-
-      
-      if ( retval ) 
-        { 
-          log_to_screen( "Warning - load_raidtab_into_raidlist returned an error" ); 
-        }
-    
-
-      log_msg(1, "Send in the clowns.");
-
-      if (argc == 2 && strcmp(argv[1], "--partition-only") == 0)
-        {
-      log_msg(0, "Partitioning only.");
-          load_raidtab_into_raidlist( raidlist, RAIDTAB_FNAME );
-          strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
-      load_mountlist( mountlist, g_mountlist_fname );
-          res = partition_everything(mountlist);
-          finish(res);
-        }
-
-      if (argc == 2 && strcmp(argv[1], "--format-only") == 0)
-        {
-      log_msg(0, "Formatting only.");
-          load_raidtab_into_raidlist( raidlist, RAIDTAB_FNAME );
-          strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
-      load_mountlist( mountlist, g_mountlist_fname );
-          res = format_everything(mountlist, FALSE);
-          finish(res);
-        }
-
-      if (argc == 2 && strcmp(argv[1], "--stop-lvm-and-raid") == 0)
-        {
-      log_msg(0, "Stopping LVM and RAID");
-          load_raidtab_into_raidlist( raidlist, RAIDTAB_FNAME );
-          strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
-      load_mountlist( mountlist, g_mountlist_fname );
-          res = do_my_funky_lvm_stuff(TRUE, FALSE);
-      res += stop_all_raid_devices(mountlist);
-          finish(res);
-        }
-
-      if (argc == 2 && strcmp( argv[1], "--nuke" ) == 0 )
-        {
-      iamhere("nuking");
-          retval += nuke_mode( bkpinfo, mountlist, raidlist);
-        }
-      else if (argc == 2 && strcmp( argv[1], "--interactive" ) == 0 )
-        {
-      iamhere("catchall");
-          retval += catchall_mode( bkpinfo, mountlist,raidlist );
-        }
-      else if (argc == 2 && strcmp( argv[1], "--compare" ) == 0 )
-        {
-      iamhere("compare");
-          retval += compare_mode( bkpinfo, mountlist, raidlist );
-        }
-      else if (argc == 2 && strcmp( argv[1], "--iso" ) == 0 )
-        {
-      iamhere("iso");
-      retval = iso_mode( bkpinfo, mountlist, raidlist, FALSE );
-        }
-      else if ( argc == 2 && strcmp( argv[1],"--mbr" ) == 0 )
-        {
-      iamhere("mbr");
-          retval = mount_all_devices( mountlist, TRUE );
-          if ( !retval )
-            {
-              retval += run_boot_loader( FALSE );
-              retval += unmount_all_devices( mountlist );
-            }
-          if ( retval )
-            {
-              log_to_screen("Failed to write Master Boot Record");
-            }
-        }
-      else if ( argc == 2 && strcmp( argv[1],"--isonuke") ==0 )
-        { 
-      iamhere("isonuke");
-          retval = iso_mode( bkpinfo,
-             mountlist,
-             raidlist, 
-             TRUE ); 
-        }
-      else if ( argc != 1 )
-        {
-          log_to_screen( "Invalid paremeters" );
-          paranoid_MR_finish( 1 );
-        }
-      else
-        { 
-      iamhere("catchall (no mode specified in command-line call");
-          retval += catchall_mode( bkpinfo, mountlist, raidlist); 
-        }
-    }
-
-  /* clean up at the end */
-  if (retval)
-    {
-      if (does_file_exist("/tmp/changed.files"))
-    { 
-          log_to_screen( "See /tmp/changed.files for list of files that have changed." );
-    }
-      mvaddstr_and_log_it ( g_currentY++,
-            0,
-            "Run complete. Errors were reported. Please review the logfile." );
-    }
-  else
-    {
-      if (IS_THIS_A_STREAMING_BACKUP ( bkpinfo->backup_media_type ) )
-        {
-      mvaddstr_and_log_it( g_currentY++,
-                   0, 
-                   "Run complete. Please remove floppy/CD/media and reboot." ); 
-    }
-      else
-    {
-      run_program_and_log_output ( "sync", FALSE );
-      if ( is_this_device_mounted( MNT_CDROM ) ) 
-        { 
-          res = run_program_and_log_output( "umount "MNT_CDROM, FALSE );
-        }
-      else 
-        { 
-          res = 0; 
-        }
-     
-          if ( !bkpinfo->please_dont_eject)
-            {
-              res = eject_device("/dev/cdrom");
+        log_msg(1, "I must be in disaster recovery mode.");
+        log_msg(2, "FYI, MOUNTLIST_FNAME = %s ", g_mountlist_fname);
+        if (argc == 3 && strcmp(argv[1], "--monitas-memorex") == 0) {
+            log_to_screen("Uh, that hasn't been implemented yet.");
+            paranoid_MR_finish(1);
+        }
+
+        iamhere("About to call load_mountlist and load_raidtab");
+        strcpy(bkpinfo->restore_path, MNT_RESTORING);
+        read_cfg_file_into_bkpinfo(g_mondo_cfg_file, bkpinfo);
+        retval = load_mountlist(mountlist, g_mountlist_fname);
+        retval += load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
+        iamhere
+            ("Returned from calling load_mountlist and load_raidtab successfully");
+
+        if (argc > 1
+            && (strcmp(argv[1], "--compare") == 0
+                || strcmp(argv[1], "--nuke") == 0)) {
+            if (bkpinfo->backup_media_type == nfs
+                && !is_this_device_mounted(bkpinfo->nfs_mount)) {
+                log_msg(1, "Mounting nfs dir");
+                sprintf(bkpinfo->isodir, "/tmp/isodir");
+                run_program_and_log_output("mkdir -p /tmp/isodir", 5);
+                sprintf(tmp, "mount %s -t nfs -o nolock /tmp/isodir",
+                        bkpinfo->nfs_mount);
+                run_program_and_log_output(tmp, 1);
+            }
+        }
+
+
+        if (retval) {
+            log_to_screen
+                ("Warning - load_raidtab_into_raidlist returned an error");
+        }
+
+
+        log_msg(1, "Send in the clowns.");
+
+        if (argc == 2 && strcmp(argv[1], "--partition-only") == 0) {
+            log_msg(0, "Partitioning only.");
+            load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
+            strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
+            load_mountlist(mountlist, g_mountlist_fname);
+            res = partition_everything(mountlist);
+            finish(res);
+        }
+
+        if (argc == 2 && strcmp(argv[1], "--format-only") == 0) {
+            log_msg(0, "Formatting only.");
+            load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
+            strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
+            load_mountlist(mountlist, g_mountlist_fname);
+            res = format_everything(mountlist, FALSE);
+            finish(res);
+        }
+
+        if (argc == 2 && strcmp(argv[1], "--stop-lvm-and-raid") == 0) {
+            log_msg(0, "Stopping LVM and RAID");
+            load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
+            strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
+            load_mountlist(mountlist, g_mountlist_fname);
+            res = do_my_funky_lvm_stuff(TRUE, FALSE);
+            res += stop_all_raid_devices(mountlist);
+            finish(res);
+        }
+
+        if (argc == 2 && strcmp(argv[1], "--nuke") == 0) {
+            iamhere("nuking");
+            retval += nuke_mode(bkpinfo, mountlist, raidlist);
+        } else if (argc == 2 && strcmp(argv[1], "--interactive") == 0) {
+            iamhere("catchall");
+            retval += catchall_mode(bkpinfo, mountlist, raidlist);
+        } else if (argc == 2 && strcmp(argv[1], "--compare") == 0) {
+            iamhere("compare");
+            retval += compare_mode(bkpinfo, mountlist, raidlist);
+        } else if (argc == 2 && strcmp(argv[1], "--iso") == 0) {
+            iamhere("iso");
+            retval = iso_mode(bkpinfo, mountlist, raidlist, FALSE);
+        } else if (argc == 2 && strcmp(argv[1], "--mbr") == 0) {
+            iamhere("mbr");
+            retval = mount_all_devices(mountlist, TRUE);
+            if (!retval) {
+                retval += run_boot_loader(FALSE);
+                retval += unmount_all_devices(mountlist);
+            }
+            if (retval) {
+                log_to_screen("Failed to write Master Boot Record");
+            }
+        } else if (argc == 2 && strcmp(argv[1], "--isonuke") == 0) {
+            iamhere("isonuke");
+            retval = iso_mode(bkpinfo, mountlist, raidlist, TRUE);
+        } else if (argc != 1) {
+            log_to_screen("Invalid paremeters");
+            paranoid_MR_finish(1);
+        } else {
+            iamhere("catchall (no mode specified in command-line call");
+            retval += catchall_mode(bkpinfo, mountlist, raidlist);
+        }
+    }
+
+    /* clean up at the end */
+    if (retval) {
+        if (does_file_exist("/tmp/changed.files")) {
+            log_to_screen
+                ("See /tmp/changed.files for list of files that have changed.");
+        }
+        mvaddstr_and_log_it(g_currentY++,
+                            0,
+                            "Run complete. Errors were reported. Please review the logfile.");
+    } else {
+        if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
+            mvaddstr_and_log_it(g_currentY++,
+                                0,
+                                "Run complete. Please remove floppy/CD/media and reboot.");
+        } else {
+            run_program_and_log_output("sync", FALSE);
+            if (is_this_device_mounted(MNT_CDROM)) {
+                res =
+                    run_program_and_log_output("umount " MNT_CDROM, FALSE);
+            } else {
+                res = 0;
+            }
+
+            if (!bkpinfo->please_dont_eject) {
+                res = eject_device("/dev/cdrom");
 /*
               if (res) 
@@ -3596 +3602 @@
         }
 */
-            }
-      mvaddstr_and_log_it( g_currentY++,
-                   0,
-                   "Run complete. Please remove media and reboot." );
-    }
-    }
+            }
+            mvaddstr_and_log_it(g_currentY++,
+                                0,
+                                "Run complete. Please remove media and reboot.");
+        }
+    }
 
 // g_I_have_just_nuked is set true by nuke_mode() just before it returns
-  if ( g_I_have_just_nuked || does_file_exist("/POST-NUKE-ANYWAY"))
-    {
-      if (!system("which post-nuke > /dev/null 2> /dev/null"))
-        {
-          log_msg(1, "post-nuke found; running...");
-          if (mount_all_devices(mountlist, TRUE))
-            {
-              log_to_screen("Unable to re-mount partitions for post-nuke stuff");
-            }
-          else
-            {
-              log_msg(1, "Re-mounted partitions for post-nuke stuff");
-              sprintf(tmp, "post-nuke %s %d", bkpinfo->restore_path, retval);
-              if (!g_text_mode) { newtSuspend(); }
-              log_msg(2, "Calling '%s'", tmp);
-              if ((res=system(tmp))) { log_OS_error(tmp); }
-              if (!g_text_mode) { newtResume(); }
+    if (g_I_have_just_nuked || does_file_exist("/POST-NUKE-ANYWAY")) {
+        if (!system("which post-nuke > /dev/null 2> /dev/null")) {
+            log_msg(1, "post-nuke found; running...");
+            if (mount_all_devices(mountlist, TRUE)) {
+                log_to_screen
+                    ("Unable to re-mount partitions for post-nuke stuff");
+            } else {
+                log_msg(1, "Re-mounted partitions for post-nuke stuff");
+                sprintf(tmp, "post-nuke %s %d", bkpinfo->restore_path,
+                        retval);
+                if (!g_text_mode) {
+                    newtSuspend();
+                }
+                log_msg(2, "Calling '%s'", tmp);
+                if ((res = system(tmp))) {
+                    log_OS_error(tmp);
+                }
+                if (!g_text_mode) {
+                    newtResume();
+                }
 //              newtCls();
-              log_msg(1, "post-nuke returned w/ res=%d", res);
-            }
-          unmount_all_devices(mountlist);
-          log_msg(1, "I've finished post-nuking.");
-        }
-    }
+                log_msg(1, "post-nuke returned w/ res=%d", res);
+            }
+            unmount_all_devices(mountlist);
+            log_msg(1, "I've finished post-nuking.");
+        }
+    }
 /*  
   log_to_screen("If you are REALLY in a hurry, hit Ctrl-Alt-Del now.");
@@ -3633 +3642 @@
   wait_until_software_raids_are_prepped("/proc/mdstat", 100);
   log_to_screen("Thank you.");
-*/ 
-  unlink( "/tmp/mondo-run-prog.tmp" );
-  set_signals( FALSE );
-  sprintf( tmp, "rm -Rf %s", bkpinfo->tmpdir );
-  run_program_and_log_output ( tmp, FALSE );
-  log_to_screen( "Restore log copied to /tmp/mondo-restore.log on your hard disk" );
-  sprintf( tmp, "Mondo-restore is exiting (retval=%d)                                      ",retval);
-  log_to_screen( tmp );
-  sprintf(tmp, "umount %s", bkpinfo->isodir);
-  run_program_and_log_output(tmp, 5);
-  paranoid_free(mountlist);
-  paranoid_free(raidlist);
-  if (am_I_in_disaster_recovery_mode())
-    { run_program_and_log_output("mount / -o remount,rw",2); } // for b0rken distros
-  paranoid_MR_finish( retval ); // frees global stuff plus bkpinfo
-  free_libmondo_global_strings(); // it's fine to have this here :) really :)
-  paranoid_free(a);
-  paranoid_free(b);
-  paranoid_free(tmp);
-  
-  unlink("/tmp/filelist.full");
-  unlink("/tmp/filelist.full.gz");
-
-  exit( retval );
+*/
+    unlink("/tmp/mondo-run-prog.tmp");
+    set_signals(FALSE);
+    sprintf(tmp, "rm -Rf %s", bkpinfo->tmpdir);
+    run_program_and_log_output(tmp, FALSE);
+    log_to_screen
+        ("Restore log copied to /tmp/mondo-restore.log on your hard disk");
+    sprintf(tmp,
+            "Mondo-restore is exiting (retval=%d)                                      ",
+            retval);
+    log_to_screen(tmp);
+    sprintf(tmp, "umount %s", bkpinfo->isodir);
+    run_program_and_log_output(tmp, 5);
+    paranoid_free(mountlist);
+    paranoid_free(raidlist);
+    if (am_I_in_disaster_recovery_mode()) {
+        run_program_and_log_output("mount / -o remount,rw", 2);
+    }                           // for b0rken distros
+    paranoid_MR_finish(retval); // frees global stuff plus bkpinfo
+    free_libmondo_global_strings(); // it's fine to have this here :) really :)
+    paranoid_free(a);
+    paranoid_free(b);
+    paranoid_free(tmp);
+
+    unlink("/tmp/filelist.full");
+    unlink("/tmp/filelist.full.gz");
+
+    exit(retval);
 }
 
@@ -3670 +3683 @@
  *END_MONDO-RESTORE.C                                                     *
  **************************************************************************/
-

branches/2.05/mondo/mondo/mondorestore/mondo-restore.h

@@ -1 +1 @@
 /* mondo-restore.h
- * $Id: mondo-restore.h,v 1.3 2004/06/21 20:20:37 hugo Exp $
+ * $Id$
  */
 
@@ -7 +7 @@
  **************************************************************************/
 
-void ask_about_these_imagedevs(char*,char*);
-int catchall_mode(struct s_bkpinfo *, struct mountlist_itself *, struct raidlist_itself*);
-void find_pathname_of_executable_preferably_in_RESTORING(char *, char*, char*);
-int interactive_mode(struct s_bkpinfo *, struct mountlist_itself *, struct raidlist_itself *);
-int nuke_mode(struct s_bkpinfo *, struct mountlist_itself *, struct raidlist_itself *);
-int compare_mode(struct s_bkpinfo *, struct mountlist_itself *, struct raidlist_itself *);
-int iso_mode(struct s_bkpinfo *bkpinfo,
-     struct mountlist_itself *mountlist,
-     struct raidlist_itself *raidlist,
-     bool nuke_me_please);
-int restore_mode(struct s_bkpinfo *, struct mountlist_itself *, struct raidlist_itself *);
-int restore_a_biggiefile_from_CD(struct s_bkpinfo *, long, struct s_node*, char*);
-int restore_a_biggiefile_from_stream(struct s_bkpinfo*, char*, long , char*, long long, struct s_node*, int, char*);
-int restore_a_tarball_from_CD(char *, long, struct s_node*);
-int restore_a_tarball_from_stream(struct s_bkpinfo*, char *, long, struct s_node*, long long, char*, char*);
-int restore_all_biggiefiles_from_CD(struct s_bkpinfo*, struct s_node*);
-int restore_all_biggiefiles_from_stream(struct s_bkpinfo*, struct s_node*);
-int restore_all_tarballs_from_CD(struct s_bkpinfo*, struct s_node*);
-int restore_all_tarballs_from_stream(struct s_bkpinfo*, struct s_node*);
-int restore_everything(struct s_bkpinfo*,struct s_node*);
-int restore_live_from_monitas_server(struct s_bkpinfo *, char*, char*, char*);
-int restore_to_live_filesystem(struct s_bkpinfo*);
-void swap_mountlist_entries(struct mountlist_itself*,int,int);
-void sort_mountlist_by_mountpoint(struct mountlist_itself*,bool);
-void sort_mountlist_by_device(struct mountlist_itself*);
-int what_number_cd_is_this(struct s_bkpinfo*);
+void ask_about_these_imagedevs(char *, char *);
+int catchall_mode(struct s_bkpinfo *, struct mountlist_itself *,
+                  struct raidlist_itself *);
+void find_pathname_of_executable_preferably_in_RESTORING(char *, char *,
+                                                         char *);
+int interactive_mode(struct s_bkpinfo *, struct mountlist_itself *,
+                     struct raidlist_itself *);
+int nuke_mode(struct s_bkpinfo *, struct mountlist_itself *,
+              struct raidlist_itself *);
+int compare_mode(struct s_bkpinfo *, struct mountlist_itself *,
+                 struct raidlist_itself *);
+int iso_mode(struct s_bkpinfo *bkpinfo, struct mountlist_itself *mountlist,
+             struct raidlist_itself *raidlist, bool nuke_me_please);
+int restore_mode(struct s_bkpinfo *, struct mountlist_itself *,
+                 struct raidlist_itself *);
+int restore_a_biggiefile_from_CD(struct s_bkpinfo *, long, struct s_node *,
+                                 char *);
+int restore_a_biggiefile_from_stream(struct s_bkpinfo *, char *, long,
+                                     char *, long long, struct s_node *,
+                                     int, char *);
+int restore_a_tarball_from_CD(char *, long, struct s_node *);
+int restore_a_tarball_from_stream(struct s_bkpinfo *, char *, long,
+                                  struct s_node *, long long, char *,
+                                  char *);
+int restore_all_biggiefiles_from_CD(struct s_bkpinfo *, struct s_node *);
+int restore_all_biggiefiles_from_stream(struct s_bkpinfo *,
+                                        struct s_node *);
+int restore_all_tarballs_from_CD(struct s_bkpinfo *, struct s_node *);
+int restore_all_tarballs_from_stream(struct s_bkpinfo *, struct s_node *);
+int restore_everything(struct s_bkpinfo *, struct s_node *);
+int restore_live_from_monitas_server(struct s_bkpinfo *, char *, char *,
+                                     char *);
+int restore_to_live_filesystem(struct s_bkpinfo *);
+void swap_mountlist_entries(struct mountlist_itself *, int, int);
+void sort_mountlist_by_mountpoint(struct mountlist_itself *, bool);
+void sort_mountlist_by_device(struct mountlist_itself *);
+int what_number_cd_is_this(struct s_bkpinfo *);

branches/2.05/mondo/mondo/mondorestore/mondo-rstr-compare-EXT.h

@@ -2 +2 @@
 
 
-extern int compare_to_CD(struct s_bkpinfo*);
-extern int compare_to_cdstream(struct s_bkpinfo*);
-extern int compare_to_tape(struct s_bkpinfo*);
-extern int compare_mode( struct s_bkpinfo *bkpinfo ,
-          struct mountlist_itself *mountlist, 
-          struct raidlist_itself *raidlist);
+extern int compare_to_CD(struct s_bkpinfo *);
+extern int compare_to_cdstream(struct s_bkpinfo *);
+extern int compare_to_tape(struct s_bkpinfo *);
+extern int compare_mode(struct s_bkpinfo *bkpinfo,
+                        struct mountlist_itself *mountlist,
+                        struct raidlist_itself *raidlist);

branches/2.05/mondo/mondo/mondorestore/mondo-rstr-compare.c

@@ -5 +5 @@
     copyright            : (C) 2000 by Hugo Rabson
     email                : Hugo Rabson <hugorabson@msn.com>
-    cvsid                : $Id: mondo-rstr-compare.c,v 1.1 2004/06/10 15:29:13 hugo Exp $
+    cvsid                : $Id$
 ***************************************************************************/
 
@@ -65 +65 @@
 #include "mondo-rstr-tools-EXT.h"
 
-//static char cvsid[] = "$Id: mondo-rstr-compare.c,v 1.1 2004/06/10 15:29:13 hugo Exp $";
-
-void popup_changelist_from_file(char*);
+//static char cvsid[] = "$Id$";
+
+void popup_changelist_from_file(char *);
 
 
@@ -80 +80 @@
  * @note This function uses an MD5 checksum.
  */
-int 
-compare_a_biggiefile(struct s_bkpinfo *bkpinfo, long bigfileno)
+int compare_a_biggiefile(struct s_bkpinfo *bkpinfo, long bigfileno)
 {
 
-  FILE *fin;
-  FILE *fout;
+    FILE *fin;
+    FILE *fout;
 
   /** needs malloc *******/
-  char *checksum_ptr;
-  char *original_cksum_ptr;
-  char *bigfile_fname_ptr;
-  char *tmp_ptr;
-  char *command_ptr;
-
-  char *checksum, *original_cksum, *bigfile_fname, *tmp, *command;
-  
-  char *p;
-  int i;
-  int retval = 0;
-
-  struct s_filename_and_lstat_info biggiestruct;
-  
-  malloc_string(checksum);
-  malloc_string(original_cksum);
-  malloc_string(bigfile_fname);
-  malloc_string(tmp);
-  malloc_string(command);
-  malloc_string(checksum_ptr);
-  malloc_string(original_cksum_ptr);
-  malloc_string(bigfile_fname_ptr);
-  malloc_string(command_ptr);
-  malloc_string(tmp_ptr);
-  
+    char *checksum_ptr;
+    char *original_cksum_ptr;
+    char *bigfile_fname_ptr;
+    char *tmp_ptr;
+    char *command_ptr;
+
+    char *checksum, *original_cksum, *bigfile_fname, *tmp, *command;
+
+    char *p;
+    int i;
+    int retval = 0;
+
+    struct s_filename_and_lstat_info biggiestruct;
+
+    malloc_string(checksum);
+    malloc_string(original_cksum);
+    malloc_string(bigfile_fname);
+    malloc_string(tmp);
+    malloc_string(command);
+    malloc_string(checksum_ptr);
+    malloc_string(original_cksum_ptr);
+    malloc_string(bigfile_fname_ptr);
+    malloc_string(command_ptr);
+    malloc_string(tmp_ptr);
+
   /*********************************************************************
    * allocate memory clear test                sab 16 feb 2003         *
    *********************************************************************/
-  assert(bkpinfo!=NULL);
-  memset( checksum_ptr, '\0', sizeof(checksum));
-  memset ( original_cksum_ptr, '\0', sizeof(original_cksum));
-  memset (bigfile_fname_ptr, '\0', sizeof(bigfile_fname));
-  memset (tmp_ptr, '\0', sizeof(tmp));
-  memset ( command_ptr, '\0', sizeof( command ) );
+    assert(bkpinfo != NULL);
+    memset(checksum_ptr, '\0', sizeof(checksum));
+    memset(original_cksum_ptr, '\0', sizeof(original_cksum));
+    memset(bigfile_fname_ptr, '\0', sizeof(bigfile_fname));
+    memset(tmp_ptr, '\0', sizeof(tmp));
+    memset(command_ptr, '\0', sizeof(command));
   /** end **/
 
-  if ( !does_file_exist( slice_fname(bigfileno, 0, ARCHIVES_PATH, "" ) ) )
-    {
-      if ( does_file_exist( MNT_CDROM"/archives/NOT-THE-LAST" ) )
-    {
-          insist_on_this_cd_number(bkpinfo, ( ++g_current_media_number ) );
-        }
-      else
-    {
-      sprintf(tmp_ptr, "No CD's left. No biggiefiles left. No prob, Bob." );
-      log_msg(2,  tmp_ptr );
-      return( 0 );
-        }
-    }
-  if ( !( fin = fopen(slice_fname( bigfileno, 0, ARCHIVES_PATH, "" ), "r" ) ) )
-    {
-      sprintf( tmp_ptr, 
-           "Cannot open bigfile %ld (%s)'s info file", 
-           bigfileno + 1, bigfile_fname_ptr);
-      log_to_screen( tmp_ptr );
-      return( 1 );
-    }
-  fread( ( void* )&biggiestruct, 1, sizeof( biggiestruct ), fin);
-  paranoid_fclose( fin );
-  
-  strcpy( checksum_ptr, biggiestruct.checksum );
-  strcpy( bigfile_fname_ptr, biggiestruct.filename );
-  
-  log_msg(2, "biggiestruct.filename = %s", biggiestruct.filename );
-  log_msg(2, "biggiestruct.checksum = %s", biggiestruct.checksum );
-  
-  sprintf( tmp_ptr, "Comparing %s", bigfile_fname_ptr);
-  
-  if (!g_text_mode)
-    {
-      newtDrawRootText( 0, 22, tmp_ptr); 
-      newtRefresh();
-    }
-  if ( !checksum[0] ) {
-    log_msg(2, "Warning - %s has no checksum", bigfile_fname_ptr ); 
-  }
-  if ( !strncmp( bigfile_fname_ptr, "/dev/", 5 ) )
-    {
-      strcpy( original_cksum_ptr, "IGNORE" );
-    }
-  else
-    {
-      sprintf( command_ptr,
-           "md5sum \"%s%s\" > /tmp/md5sum.txt 2> /tmp/errors.txt", 
-           MNT_RESTORING, bigfile_fname_ptr);
-    }
-  log_msg(2, command_ptr );
-  paranoid_system( "cat /tmp/errors >> /tmp/mondo-restore.log 2> /dev/null" );
-  if ( system( command_ptr ) )
-    {
-      log_OS_error( "Warning - command failed" );
-      original_cksum[0] = '\0';
-      return( 1 );
-    }
-  else
-    {
-      if ( !(fin = fopen( "/tmp/md5sum.txt", "r" ) ) )
-    {
-      log_msg(2,  "Unable to open /tmp/md5sum.txt; can't get live checksum" );
-      original_cksum[0] = '\0';
-      return( 1 );
-    }
-      else
-    {
-      fgets( original_cksum_ptr, MAX_STR_LEN - 1, fin );
-      paranoid_fclose( fin );
-      for(i = strlen( original_cksum_ptr ); i > 0 && original_cksum[i-1] < 32; i-- );
-      original_cksum[i] = '\0';
-      p = ( char* ) strchr( original_cksum_ptr, ' ' );
-      if ( p ) 
-        { 
-          *p = '\0'; 
-        }
-    }
-    }
-  sprintf( tmp_ptr, "bigfile #%ld ('%s') ", bigfileno + 1, bigfile_fname_ptr);
-  if ( !strcmp(checksum_ptr, original_cksum_ptr ) != 0 )
-    { 
-      strcat( tmp_ptr," ... OK"); 
-    }
-  else
-    { 
-      strcat( tmp_ptr, "... changed" ); 
-      retval++; 
-    }
-  log_msg(1, tmp_ptr );
-  if ( retval )
-    {
-      if ( !( fout = fopen("/tmp/changed.txt", "a") ) ) 
-    {
-      fatal_error( "Cannot openout changed.txt");
-    }
-      fprintf( fout, "%s\n", bigfile_fname_ptr );
-      paranoid_fclose( fout );
-    }
-
-  paranoid_free (original_cksum_ptr);
-  paranoid_free (original_cksum);
-  paranoid_free (bigfile_fname_ptr);
-  paranoid_free (bigfile_fname);
-  paranoid_free (checksum_ptr);
-  paranoid_free (checksum);
-  paranoid_free (command_ptr);
-  paranoid_free (command);
-  paranoid_free (tmp_ptr);
-  paranoid_free (tmp);
-
-  return( retval );
+    if (!does_file_exist(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""))) {
+        if (does_file_exist(MNT_CDROM "/archives/NOT-THE-LAST")) {
+            insist_on_this_cd_number(bkpinfo, (++g_current_media_number));
+        } else {
+            sprintf(tmp_ptr,
+                    "No CD's left. No biggiefiles left. No prob, Bob.");
+            log_msg(2, tmp_ptr);
+            return (0);
+        }
+    }
+    if (!(fin = fopen(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""), "r"))) {
+        sprintf(tmp_ptr,
+                "Cannot open bigfile %ld (%s)'s info file",
+                bigfileno + 1, bigfile_fname_ptr);
+        log_to_screen(tmp_ptr);
+        return (1);
+    }
+    fread((void *) &biggiestruct, 1, sizeof(biggiestruct), fin);
+    paranoid_fclose(fin);
+
+    strcpy(checksum_ptr, biggiestruct.checksum);
+    strcpy(bigfile_fname_ptr, biggiestruct.filename);
+
+    log_msg(2, "biggiestruct.filename = %s", biggiestruct.filename);
+    log_msg(2, "biggiestruct.checksum = %s", biggiestruct.checksum);
+
+    sprintf(tmp_ptr, "Comparing %s", bigfile_fname_ptr);
+
+    if (!g_text_mode) {
+        newtDrawRootText(0, 22, tmp_ptr);
+        newtRefresh();
+    }
+    if (!checksum[0]) {
+        log_msg(2, "Warning - %s has no checksum", bigfile_fname_ptr);
+    }
+    if (!strncmp(bigfile_fname_ptr, "/dev/", 5)) {
+        strcpy(original_cksum_ptr, "IGNORE");
+    } else {
+        sprintf(command_ptr,
+                "md5sum \"%s%s\" > /tmp/md5sum.txt 2> /tmp/errors.txt",
+                MNT_RESTORING, bigfile_fname_ptr);
+    }
+    log_msg(2, command_ptr);
+    paranoid_system
+        ("cat /tmp/errors >> /tmp/mondo-restore.log 2> /dev/null");
+    if (system(command_ptr)) {
+        log_OS_error("Warning - command failed");
+        original_cksum[0] = '\0';
+        return (1);
+    } else {
+        if (!(fin = fopen("/tmp/md5sum.txt", "r"))) {
+            log_msg(2,
+                    "Unable to open /tmp/md5sum.txt; can't get live checksum");
+            original_cksum[0] = '\0';
+            return (1);
+        } else {
+            fgets(original_cksum_ptr, MAX_STR_LEN - 1, fin);
+            paranoid_fclose(fin);
+            for (i = strlen(original_cksum_ptr);
+                 i > 0 && original_cksum[i - 1] < 32; i--);
+            original_cksum[i] = '\0';
+            p = (char *) strchr(original_cksum_ptr, ' ');
+            if (p) {
+                *p = '\0';
+            }
+        }
+    }
+    sprintf(tmp_ptr, "bigfile #%ld ('%s') ", bigfileno + 1,
+            bigfile_fname_ptr);
+    if (!strcmp(checksum_ptr, original_cksum_ptr) != 0) {
+        strcat(tmp_ptr, " ... OK");
+    } else {
+        strcat(tmp_ptr, "... changed");
+        retval++;
+    }
+    log_msg(1, tmp_ptr);
+    if (retval) {
+        if (!(fout = fopen("/tmp/changed.txt", "a"))) {
+            fatal_error("Cannot openout changed.txt");
+        }
+        fprintf(fout, "%s\n", bigfile_fname_ptr);
+        paranoid_fclose(fout);
+    }
+
+    paranoid_free(original_cksum_ptr);
+    paranoid_free(original_cksum);
+    paranoid_free(bigfile_fname_ptr);
+    paranoid_free(bigfile_fname);
+    paranoid_free(checksum_ptr);
+    paranoid_free(checksum);
+    paranoid_free(command_ptr);
+    paranoid_free(command);
+    paranoid_free(tmp_ptr);
+    paranoid_free(tmp);
+
+    return (retval);
 }
 
@@ -248 +231 @@
  * @return 0 for success, nonzero for failure.
  */
-int 
-compare_all_biggiefiles(struct s_bkpinfo*bkpinfo)
+int compare_all_biggiefiles(struct s_bkpinfo *bkpinfo)
 {
-  int retval = 0;
-  int res;
-  long noof_biggiefiles,bigfileno = 0;
-  char tmp[MAX_STR_LEN];
-
-  assert(bkpinfo!=NULL);
-  log_msg(1, "Comparing biggiefiles" );
-  
-  if ( length_of_file(BIGGIELIST) < 6 )
-    { 
-      log_msg(1, "OK, really teeny-tiny biggielist; not comparing biggiefiles" ); 
-      return( 0 ); 
-    }
-  noof_biggiefiles = count_lines_in_file(BIGGIELIST);
-  if (noof_biggiefiles <= 0 )
-    {
-      log_msg(1, "OK, no biggiefiles; not comparing biggiefiles");
-      return( 0 );
-    }
-  mvaddstr_and_log_it( g_currentY, 0, "Comparing large files                                                  ");
-  open_progress_form("Comparing large files", "I am now comparing the large files" , "against the filesystem. Please wait.", 
-             "", 
-             noof_biggiefiles );
-  for( bigfileno = 0; bigfileno < noof_biggiefiles; bigfileno++ )
-    {
-      sprintf( tmp, "Comparing big file #%ld", bigfileno + 1 );
-      log_msg(1, tmp );
-      update_progress_form( tmp );
-      res = compare_a_biggiefile( bkpinfo, bigfileno );
-      retval += res;
-      g_current_progress++;
-    }
-  close_progress_form();
-  return( 0 );
-  if ( retval )
-    { 
-      mvaddstr_and_log_it( g_currentY++, 74, "Errors." ); 
-    }
-  else
-    { 
-      mvaddstr_and_log_it( g_currentY++,74, "Done." ); 
-    }
-  return( retval );
+    int retval = 0;
+    int res;
+    long noof_biggiefiles, bigfileno = 0;
+    char tmp[MAX_STR_LEN];
+
+    assert(bkpinfo != NULL);
+    log_msg(1, "Comparing biggiefiles");
+
+    if (length_of_file(BIGGIELIST) < 6) {
+        log_msg(1,
+                "OK, really teeny-tiny biggielist; not comparing biggiefiles");
+        return (0);
+    }
+    noof_biggiefiles = count_lines_in_file(BIGGIELIST);
+    if (noof_biggiefiles <= 0) {
+        log_msg(1, "OK, no biggiefiles; not comparing biggiefiles");
+        return (0);
+    }
+    mvaddstr_and_log_it(g_currentY, 0,
+                        "Comparing large files                                                  ");
+    open_progress_form("Comparing large files",
+                       "I am now comparing the large files",
+                       "against the filesystem. Please wait.", "",
+                       noof_biggiefiles);
+    for (bigfileno = 0; bigfileno < noof_biggiefiles; bigfileno++) {
+        sprintf(tmp, "Comparing big file #%ld", bigfileno + 1);
+        log_msg(1, tmp);
+        update_progress_form(tmp);
+        res = compare_a_biggiefile(bkpinfo, bigfileno);
+        retval += res;
+        g_current_progress++;
+    }
+    close_progress_form();
+    return (0);
+    if (retval) {
+        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+    }
+    return (retval);
 }
+
 /**************************************************************************
  *END_COMPARE_ALL_BIGGIEFILES                                             *
@@ -308 +288 @@
  * @return 0 for success, nonzero for failure.
  */
-int 
-compare_a_tarball( char *tarball_fname, int current_tarball_number )
+int compare_a_tarball(char *tarball_fname, int current_tarball_number)
 {
-  int retval = 0;
-  int res;
-  long noof_lines;
-  long archiver_errors;
-  bool use_star;
-  
+    int retval = 0;
+    int res;
+    long noof_lines;
+    long archiver_errors;
+    bool use_star;
+
   /***  needs malloc *********/
-  char *command, *tmp, *filelist_name, *logfile, *archiver_exe, *compressor_exe;
-
-  malloc_string(command);
-  malloc_string(tmp);
-  malloc_string(filelist_name);
-  malloc_string(logfile);
-  malloc_string(archiver_exe);
-  malloc_string(compressor_exe);
-  
-  use_star = (strstr(tarball_fname, ".star"))?TRUE:FALSE;
-  assert_string_is_neither_NULL_nor_zerolength(tarball_fname);
-  sprintf( logfile, "/tmp/afio.log.%d", current_tarball_number );
-  sprintf( filelist_name, MNT_CDROM"/archives/filelist.%d", current_tarball_number );
-
-  noof_lines = count_lines_in_file( filelist_name );
-
-  if ( strstr( tarball_fname, ".bz2") )
-    {
-      strcpy( compressor_exe, "bzip2");
-    }
-  else if ( strstr (tarball_fname, ".lzo") )
-    {
-      strcpy( compressor_exe, "lzop" );
-    }
-  else
-    {
-      compressor_exe[0] = '\0';
-    }
-  
-  if (use_star)
-    { strcpy(archiver_exe, "star"); }
-  else
-    { strcpy(archiver_exe, "afio"); }
-  
-  if (compressor_exe[0])
-    {
-      strcpy(tmp, compressor_exe);
-      if (!find_home_of_exe(tmp))
-        { fatal_error("(compare_a_tarball) Compression program missing"); }
-      if (use_star) // star
-        {
-      if (!strcmp(compressor_exe, "bzip2"))
-        { strcat(archiver_exe, " -bz"); }
-      else { fatal_error("(compare_a_tarball) Please use only bzip2 with star"); }
-    }
-      else      // afio
-        {
-      sprintf(compressor_exe, "-P %s -Z", tmp);
-    }
-    }
+    char *command, *tmp, *filelist_name, *logfile, *archiver_exe,
+        *compressor_exe;
+
+    malloc_string(command);
+    malloc_string(tmp);
+    malloc_string(filelist_name);
+    malloc_string(logfile);
+    malloc_string(archiver_exe);
+    malloc_string(compressor_exe);
+
+    use_star = (strstr(tarball_fname, ".star")) ? TRUE : FALSE;
+    assert_string_is_neither_NULL_nor_zerolength(tarball_fname);
+    sprintf(logfile, "/tmp/afio.log.%d", current_tarball_number);
+    sprintf(filelist_name, MNT_CDROM "/archives/filelist.%d",
+            current_tarball_number);
+
+    noof_lines = count_lines_in_file(filelist_name);
+
+    if (strstr(tarball_fname, ".bz2")) {
+        strcpy(compressor_exe, "bzip2");
+    } else if (strstr(tarball_fname, ".lzo")) {
+        strcpy(compressor_exe, "lzop");
+    } else {
+        compressor_exe[0] = '\0';
+    }
+
+    if (use_star) {
+        strcpy(archiver_exe, "star");
+    } else {
+        strcpy(archiver_exe, "afio");
+    }
+
+    if (compressor_exe[0]) {
+        strcpy(tmp, compressor_exe);
+        if (!find_home_of_exe(tmp)) {
+            fatal_error("(compare_a_tarball) Compression program missing");
+        }
+        if (use_star)           // star
+        {
+            if (!strcmp(compressor_exe, "bzip2")) {
+                strcat(archiver_exe, " -bz");
+            } else {
+                fatal_error
+                    ("(compare_a_tarball) Please use only bzip2 with star");
+            }
+        } else                  // afio
+        {
+            sprintf(compressor_exe, "-P %s -Z", tmp);
+        }
+    }
 // star -diff H=star -bz file=....
 
@@ -375 +354 @@
 #define BUFSIZE (1024L*1024L)/TAPE_BLOCK_SIZE
 #endif
-  if (use_star) // doesn't use compressor_exe
-    {
-      sprintf( command,
-          "%s -diff H=star file=%s >> %s 2>> %s",
-      archiver_exe, tarball_fname, logfile, logfile);
-    }
-  else
-    {
-      sprintf( command,
-       "%s -r -b %ld -M 16m -c %ld %s %s >> %s 2>> %s",
-       archiver_exe,
-       TAPE_BLOCK_SIZE,
-       BUFSIZE,
-       compressor_exe, tarball_fname,
-       logfile,
-       logfile);
-    }
+    if (use_star)               // doesn't use compressor_exe
+    {
+        sprintf(command,
+                "%s -diff H=star file=%s >> %s 2>> %s",
+                archiver_exe, tarball_fname, logfile, logfile);
+    } else {
+        sprintf(command,
+                "%s -r -b %ld -M 16m -c %ld %s %s >> %s 2>> %s",
+                archiver_exe,
+                TAPE_BLOCK_SIZE,
+                BUFSIZE, compressor_exe, tarball_fname, logfile, logfile);
+    }
 #undef BUFSIZE
 
-  res = system( command );
-  retval += res;
-  if ( res )
-    {
-      log_OS_error( command );
-      sprintf( tmp, "Warning - afio returned error = %d", res );
-    }
-  if (length_of_file(logfile)>5)
-    {
-      sprintf(command,
-      "cat %s | sed s/': \\\"'/\\|/ | sed s/'\\\": '/\\|/ | cut -d'|' -f2 | sort | uniq | grep -vx \"dev/.*\" >> /tmp/changed.txt",
-      logfile);
-      system(command);
-      archiver_errors = count_lines_in_file( logfile );
-    }
-  else
-    {
-      archiver_errors = 0;
-    }
-  sprintf(tmp, "%ld difference%c in fileset #%d          ",
-      archiver_errors, (archiver_errors != 1) ? 's' : ' ', current_tarball_number);
-  if (archiver_errors)
-    {
-      sprintf(tmp,
-          "Differences found while processing fileset #%d       ",
-          current_tarball_number);
-      log_msg(1, tmp );
-    }
-  unlink( logfile );
-  paranoid_free(command);
-  paranoid_free(tmp);
-  paranoid_free(filelist_name);
-  paranoid_free(logfile);
-  malloc_string(archiver_exe);
-  malloc_string(compressor_exe);
-  return( retval );
+    res = system(command);
+    retval += res;
+    if (res) {
+        log_OS_error(command);
+        sprintf(tmp, "Warning - afio returned error = %d", res);
+    }
+    if (length_of_file(logfile) > 5) {
+        sprintf(command,
+                "cat %s | sed s/': \\\"'/\\|/ | sed s/'\\\": '/\\|/ | cut -d'|' -f2 | sort | uniq | grep -vx \"dev/.*\" >> /tmp/changed.txt",
+                logfile);
+        system(command);
+        archiver_errors = count_lines_in_file(logfile);
+    } else {
+        archiver_errors = 0;
+    }
+    sprintf(tmp, "%ld difference%c in fileset #%d          ",
+            archiver_errors, (archiver_errors != 1) ? 's' : ' ',
+            current_tarball_number);
+    if (archiver_errors) {
+        sprintf(tmp,
+                "Differences found while processing fileset #%d       ",
+                current_tarball_number);
+        log_msg(1, tmp);
+    }
+    unlink(logfile);
+    paranoid_free(command);
+    paranoid_free(tmp);
+    paranoid_free(filelist_name);
+    paranoid_free(logfile);
+    malloc_string(archiver_exe);
+    malloc_string(compressor_exe);
+    return (retval);
 }
+
 /**************************************************************************
  *END_COMPARE_A_TARBALL                                                   *
@@ -441 +412 @@
  * @return 0 for success, nonzero for failure.
  */
-int 
-compare_all_tarballs( struct s_bkpinfo *bkpinfo )
+int compare_all_tarballs(struct s_bkpinfo *bkpinfo)
 {
-  int retval = 0;
-  int res;
-  int current_tarball_number = 0;
+    int retval = 0;
+    int res;
+    int current_tarball_number = 0;
 
   /**  needs malloc **********/
-  
-  char *tarball_fname, *progress_str, *tmp;
-  long max_val;
-  
-  malloc_string(tarball_fname);
-  malloc_string(progress_str);
-  malloc_string(tmp);
-  
-  assert(bkpinfo!=NULL);
-  mvaddstr_and_log_it( g_currentY,0, "Comparing archives" );
-  read_cfg_var( g_mondo_cfg_file, "last-filelist-number", tmp );
-  
-  max_val = atol( tmp );
-  sprintf( progress_str, "Comparing with %s #%d ", media_descriptor_string(bkpinfo->backup_media_type), g_current_media_number );
-
-  open_progress_form("Comparing files", 
-             "Comparing tarballs against filesystem.", 
-             "Please wait. This may take some time.",
-             progress_str,
-             max_val);
-
-  log_to_screen( progress_str );
-  
-  for( ;; )
-    {
-      insist_on_this_cd_number( bkpinfo, g_current_media_number );
-      update_progress_form( progress_str );
-      sprintf( tarball_fname,
-           MNT_CDROM"/archives/%d.afio.bz2",
-           current_tarball_number);
-      
-      if ( !does_file_exist( tarball_fname ) ) 
-    {
-      sprintf( tarball_fname, MNT_CDROM"/archives/%d.afio.lzo", current_tarball_number );
-    }
-      if (!does_file_exist ( tarball_fname ) ) 
-    {
-      sprintf(tarball_fname, MNT_CDROM"/archives/%d.afio.",
-          current_tarball_number);
-    }
-      if (!does_file_exist ( tarball_fname ) ) 
-    {
-      sprintf(tarball_fname, MNT_CDROM"/archives/%d.star.bz2",
-          current_tarball_number);
-    }
-      if (!does_file_exist ( tarball_fname ) ) 
-    {
-      sprintf(tarball_fname, MNT_CDROM"/archives/%d.star.",
-          current_tarball_number);
-    }
-      if ( !does_file_exist( tarball_fname ) )
-    {
-      if ( !does_file_exist( MNT_CDROM"/archives/NOT-THE-LAST" ) || 
-           system( "find "MNT_CDROM"/archives/slice* > /dev/null 2> /dev/null" )
-           == 0 )
-        {
-          log_msg(2, "OK, I think I'm done with tarballs..." );
-          break;
-        }
-      log_msg(2, "OK, I think it's time for another CD..." );
-      g_current_media_number++;
-      sprintf( progress_str, "Comparing with %s #%d ", media_descriptor_string(bkpinfo->backup_media_type), g_current_media_number );
-      log_to_screen( progress_str );
-    }
-      else
-    {
-      res = 
-        compare_a_tarball( tarball_fname, current_tarball_number );
-      
-      g_current_progress++;
-      current_tarball_number++;
-    }
-    }
-  close_progress_form();
-  if ( retval )
-    { 
-      mvaddstr_and_log_it( g_currentY++,74, "Errors." ); 
-    }
-  else
-    { 
-      mvaddstr_and_log_it( g_currentY++,
-               74,
-               "Done."); 
-    }
-  paranoid_free(tarball_fname);
-  paranoid_free(progress_str);
-  paranoid_free(tmp);
-  return(retval);
+
+    char *tarball_fname, *progress_str, *tmp;
+    long max_val;
+
+    malloc_string(tarball_fname);
+    malloc_string(progress_str);
+    malloc_string(tmp);
+
+    assert(bkpinfo != NULL);
+    mvaddstr_and_log_it(g_currentY, 0, "Comparing archives");
+    read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp);
+
+    max_val = atol(tmp);
+    sprintf(progress_str, "Comparing with %s #%d ",
+            media_descriptor_string(bkpinfo->backup_media_type),
+            g_current_media_number);
+
+    open_progress_form("Comparing files",
+                       "Comparing tarballs against filesystem.",
+                       "Please wait. This may take some time.",
+                       progress_str, max_val);
+
+    log_to_screen(progress_str);
+
+    for (;;) {
+        insist_on_this_cd_number(bkpinfo, g_current_media_number);
+        update_progress_form(progress_str);
+        sprintf(tarball_fname,
+                MNT_CDROM "/archives/%d.afio.bz2", current_tarball_number);
+
+        if (!does_file_exist(tarball_fname)) {
+            sprintf(tarball_fname, MNT_CDROM "/archives/%d.afio.lzo",
+                    current_tarball_number);
+        }
+        if (!does_file_exist(tarball_fname)) {
+            sprintf(tarball_fname, MNT_CDROM "/archives/%d.afio.",
+                    current_tarball_number);
+        }
+        if (!does_file_exist(tarball_fname)) {
+            sprintf(tarball_fname, MNT_CDROM "/archives/%d.star.bz2",
+                    current_tarball_number);
+        }
+        if (!does_file_exist(tarball_fname)) {
+            sprintf(tarball_fname, MNT_CDROM "/archives/%d.star.",
+                    current_tarball_number);
+        }
+        if (!does_file_exist(tarball_fname)) {
+            if (!does_file_exist(MNT_CDROM "/archives/NOT-THE-LAST") ||
+                system("find " MNT_CDROM
+                       "/archives/slice* > /dev/null 2> /dev/null")
+                == 0) {
+                log_msg(2, "OK, I think I'm done with tarballs...");
+                break;
+            }
+            log_msg(2, "OK, I think it's time for another CD...");
+            g_current_media_number++;
+            sprintf(progress_str, "Comparing with %s #%d ",
+                    media_descriptor_string(bkpinfo->backup_media_type),
+                    g_current_media_number);
+            log_to_screen(progress_str);
+        } else {
+            res = compare_a_tarball(tarball_fname, current_tarball_number);
+
+            g_current_progress++;
+            current_tarball_number++;
+        }
+    }
+    close_progress_form();
+    if (retval) {
+        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+    }
+    paranoid_free(tarball_fname);
+    paranoid_free(progress_str);
+    paranoid_free(tmp);
+    return (retval);
 }
+
 /**************************************************************************
  *END_COMPARE_ALL_TARBALLS                                                *
@@ -554 +514 @@
  * @return 0 for success, nonzero for failure.
  */
-int 
-compare_to_CD( struct s_bkpinfo *bkpinfo )
+int compare_to_CD(struct s_bkpinfo *bkpinfo)
 {
   /** needs malloc *********/
-  char *tmp, *cwd, *new, *command;
-  int resA = 0;
-  int resB = 0;
-  long noof_changed_files;
-  
-  malloc_string(tmp);
-  malloc_string(cwd);
-  malloc_string(new);
-  malloc_string(command);
-  
-  assert(bkpinfo!=NULL);
-
-  getcwd( cwd, MAX_STR_LEN - 1 );
-  chdir( bkpinfo->restore_path );
-  getcwd( new, MAX_STR_LEN - 1 );
-  sprintf( tmp, "new path is %s", new );
-  insist_on_this_cd_number( bkpinfo, g_current_media_number );
-  unlink( "/tmp/changed.txt" );
-  
-  resA = compare_all_tarballs( bkpinfo );
-  resB = compare_all_biggiefiles( bkpinfo );
-  chdir( cwd );
-  noof_changed_files = count_lines_in_file( "/tmp/changed.txt" );
-  if ( noof_changed_files )
-    {
-      sprintf( tmp, "%ld files do not match the backup            ",
-           noof_changed_files );
-      //      mvaddstr_and_log_it( g_currentY++, 0, tmp );
-      log_to_screen (tmp);
-      sprintf(command, "cat /tmp/changed.txt >> %s", MONDO_LOGFILE );
-      paranoid_system( command );
-    }
-  else
-    {
-      sprintf( tmp, "All files match the backup                     ");
-      mvaddstr_and_log_it( g_currentY++, 0, tmp );
-      log_to_screen( tmp );
-    }
-  
-  paranoid_free(tmp);
-  paranoid_free(cwd);
-  paranoid_free(new);
-  paranoid_free(command);
-
-  return( resA + resB );
+    char *tmp, *cwd, *new, *command;
+    int resA = 0;
+    int resB = 0;
+    long noof_changed_files;
+
+    malloc_string(tmp);
+    malloc_string(cwd);
+    malloc_string(new);
+    malloc_string(command);
+
+    assert(bkpinfo != NULL);
+
+    getcwd(cwd, MAX_STR_LEN - 1);
+    chdir(bkpinfo->restore_path);
+    getcwd(new, MAX_STR_LEN - 1);
+    sprintf(tmp, "new path is %s", new);
+    insist_on_this_cd_number(bkpinfo, g_current_media_number);
+    unlink("/tmp/changed.txt");
+
+    resA = compare_all_tarballs(bkpinfo);
+    resB = compare_all_biggiefiles(bkpinfo);
+    chdir(cwd);
+    noof_changed_files = count_lines_in_file("/tmp/changed.txt");
+    if (noof_changed_files) {
+        sprintf(tmp, "%ld files do not match the backup            ",
+                noof_changed_files);
+        //      mvaddstr_and_log_it( g_currentY++, 0, tmp );
+        log_to_screen(tmp);
+        sprintf(command, "cat /tmp/changed.txt >> %s", MONDO_LOGFILE);
+        paranoid_system(command);
+    } else {
+        sprintf(tmp, "All files match the backup                     ");
+        mvaddstr_and_log_it(g_currentY++, 0, tmp);
+        log_to_screen(tmp);
+    }
+
+    paranoid_free(tmp);
+    paranoid_free(cwd);
+    paranoid_free(new);
+    paranoid_free(command);
+
+    return (resA + resB);
 }
 
@@ -622 +578 @@
  */
 int
-compare_mode( struct s_bkpinfo *bkpinfo ,
-          struct mountlist_itself *mountlist, 
-          struct raidlist_itself *raidlist)
+compare_mode(struct s_bkpinfo *bkpinfo,
+             struct mountlist_itself *mountlist,
+             struct raidlist_itself *raidlist)
 {
-  int retval = 0;
-  long q;
-  char *tmp;
-  
-  malloc_string(tmp);
+    int retval = 0;
+    long q;
+    char *tmp;
+
+    malloc_string(tmp);
 
   /**************************************************************************
@@ -636 +592 @@
    * restore them from start of tape, if available                          *
    **************************************************************************/
-  assert(bkpinfo!=NULL);
-  assert(mountlist!=NULL);
-  assert(raidlist!=NULL);
-
-  while (get_cfg_file_from_archive( bkpinfo ))
-    {
-      if (!ask_me_yes_or_no("Failed to find config file/archives. Choose another source?"))
-        { fatal_error("Unable to find config file/archives. Aborting."); }
-      interactively_obtain_media_parameters_from_user(bkpinfo, FALSE);
-    }
-
-  read_cfg_file_into_bkpinfo( g_mondo_cfg_file, bkpinfo );
-  g_current_media_number = 1;
-  mvaddstr_and_log_it( 1, 30, "Comparing Automatically" );
-  iamhere("Pre-MAD");
-  retval = mount_all_devices( mountlist, FALSE );
-  iamhere("Post-MAD");
-  if ( retval )
-    { 
-      unmount_all_devices( mountlist ); 
-      return( retval ); 
-    }
-  if ( bkpinfo->backup_media_type == tape || bkpinfo->backup_media_type == udev)
-    { 
-      retval += compare_to_tape( bkpinfo ); 
-    }
-  else if ( bkpinfo->backup_media_type == cdstream )
-    { 
-      retval += compare_to_cdstream( bkpinfo ); 
-    }
-  else
-    { 
-      retval += compare_to_CD( bkpinfo ); 
-    }
-  if ( retval )
-    {
-      mvaddstr_and_log_it( g_currentY++, 
-               0,
-               "Warning - differences found during the compare phase");
-    }
-
-  retval += unmount_all_devices( mountlist );
-
-  if ( count_lines_in_file("/tmp/changed.txt") > 0 )
-    {
-      mvaddstr_and_log_it( g_currentY++, 0, 
-               "Differences found while files were being compared." );
-      streamline_changes_file( "/tmp/changed.files", "/tmp/changed.txt" );
-      if (count_lines_in_file( "/tmp/changed.files" ) <= 0 )
-        { 
-      mvaddstr_and_log_it( g_currentY++,0,
-                   "...but they were logfiles and temporary files. Your archives are fine."); 
-      log_to_screen( "The differences were logfiles and temporary files. Your archives are fine.");
-    }
-      else
-        {
-      q = count_lines_in_file("/tmp/changed.files");
-      sprintf( tmp, "%ld significant difference%s found.", q, (q!=1) ? "s" : "");
-      mvaddstr_and_log_it( g_currentY++, 0, tmp);
-      log_to_screen (tmp);
-
-      strcpy( tmp, "Type 'less /tmp/changed.files' for a list of non-matching files" );
-      mvaddstr_and_log_it( g_currentY++, 0, tmp );
-      log_to_screen( tmp );
-
-          log_msg(2, "calling popup_changelist_from_file()");
-          popup_changelist_from_file("/tmp/changed.files");
-          log_msg(2, "Returning from popup_changelist_from_file()");
-    }
-    }
-  else
-    {
-      log_to_screen( "No significant differences were found. Your backup is perfect." );
-    }
-  kill_petris();
-  paranoid_free(tmp);
-  return( retval );
+    assert(bkpinfo != NULL);
+    assert(mountlist != NULL);
+    assert(raidlist != NULL);
+
+    while (get_cfg_file_from_archive(bkpinfo)) {
+        if (!ask_me_yes_or_no
+            ("Failed to find config file/archives. Choose another source?"))
+        {
+            fatal_error("Unable to find config file/archives. Aborting.");
+        }
+        interactively_obtain_media_parameters_from_user(bkpinfo, FALSE);
+    }
+
+    read_cfg_file_into_bkpinfo(g_mondo_cfg_file, bkpinfo);
+    g_current_media_number = 1;
+    mvaddstr_and_log_it(1, 30, "Comparing Automatically");
+    iamhere("Pre-MAD");
+    retval = mount_all_devices(mountlist, FALSE);
+    iamhere("Post-MAD");
+    if (retval) {
+        unmount_all_devices(mountlist);
+        return (retval);
+    }
+    if (bkpinfo->backup_media_type == tape
+        || bkpinfo->backup_media_type == udev) {
+        retval += compare_to_tape(bkpinfo);
+    } else if (bkpinfo->backup_media_type == cdstream) {
+        retval += compare_to_cdstream(bkpinfo);
+    } else {
+        retval += compare_to_CD(bkpinfo);
+    }
+    if (retval) {
+        mvaddstr_and_log_it(g_currentY++,
+                            0,
+                            "Warning - differences found during the compare phase");
+    }
+
+    retval += unmount_all_devices(mountlist);
+
+    if (count_lines_in_file("/tmp/changed.txt") > 0) {
+        mvaddstr_and_log_it(g_currentY++, 0,
+                            "Differences found while files were being compared.");
+        streamline_changes_file("/tmp/changed.files", "/tmp/changed.txt");
+        if (count_lines_in_file("/tmp/changed.files") <= 0) {
+            mvaddstr_and_log_it(g_currentY++, 0,
+                                "...but they were logfiles and temporary files. Your archives are fine.");
+            log_to_screen
+                ("The differences were logfiles and temporary files. Your archives are fine.");
+        } else {
+            q = count_lines_in_file("/tmp/changed.files");
+            sprintf(tmp, "%ld significant difference%s found.", q,
+                    (q != 1) ? "s" : "");
+            mvaddstr_and_log_it(g_currentY++, 0, tmp);
+            log_to_screen(tmp);
+
+            strcpy(tmp,
+                   "Type 'less /tmp/changed.files' for a list of non-matching files");
+            mvaddstr_and_log_it(g_currentY++, 0, tmp);
+            log_to_screen(tmp);
+
+            log_msg(2, "calling popup_changelist_from_file()");
+            popup_changelist_from_file("/tmp/changed.files");
+            log_msg(2, "Returning from popup_changelist_from_file()");
+        }
+    } else {
+        log_to_screen
+            ("No significant differences were found. Your backup is perfect.");
+    }
+    kill_petris();
+    paranoid_free(tmp);
+    return (retval);
 }
 
@@ -727 +677 @@
  * @return 0 for success, nonzero for failure.
  */
-int
-compare_to_cdstream(struct s_bkpinfo *bkpinfo)
+int compare_to_cdstream(struct s_bkpinfo *bkpinfo)
 {
-  int res;
+    int res;
 
   /** needs malloc **/
-  char *dir, *command;
-  
-  assert(bkpinfo!=NULL);
-  malloc_string(dir);
-  malloc_string(command);
-  getcwd( dir, MAX_STR_LEN );
-  chdir( bkpinfo->restore_path );
-
-  sprintf( command, "cp -f /tmp/LAST-FILELIST-NUMBER %s/tmp", bkpinfo->restore_path );
-  run_program_and_log_output( command, FALSE );
-  mvaddstr_and_log_it(g_currentY,
-              0,
-              "Verifying archives against filesystem" );
-
-  if (bkpinfo->disaster_recovery && does_file_exist("/tmp/CDROM-LIVES-HERE"))
-    { strcpy(bkpinfo->media_device, last_line_of_file("/tmp/CDROM-LIVES-HERE")); }
-  else
-    { find_cdrom_device( bkpinfo->media_device, FALSE ); }
-  res = verify_tape_backups( bkpinfo );
-  chdir( dir );
-  if ( length_of_file ( "/tmp/changed.txt" ) > 2 && length_of_file ( "/tmp/changed.files" ) > 2 )
-    {
-      log_msg(0, "Type 'less /tmp/changed.files' to see which files don't match the archives" );
-      log_msg(2, "Calling popup_changelist_from_file()" );
-      popup_changelist_from_file( "/tmp/changed.files" );
-      log_msg(2, "Returned from popup_changelist_from_file()" );
-    }
-
-  mvaddstr_and_log_it( g_currentY++, 74, "Done." );
-  paranoid_free(dir);
-  paranoid_free(command);
-  return( res );
+    char *dir, *command;
+
+    assert(bkpinfo != NULL);
+    malloc_string(dir);
+    malloc_string(command);
+    getcwd(dir, MAX_STR_LEN);
+    chdir(bkpinfo->restore_path);
+
+    sprintf(command, "cp -f /tmp/LAST-FILELIST-NUMBER %s/tmp",
+            bkpinfo->restore_path);
+    run_program_and_log_output(command, FALSE);
+    mvaddstr_and_log_it(g_currentY,
+                        0, "Verifying archives against filesystem");
+
+    if (bkpinfo->disaster_recovery
+        && does_file_exist("/tmp/CDROM-LIVES-HERE")) {
+        strcpy(bkpinfo->media_device,
+               last_line_of_file("/tmp/CDROM-LIVES-HERE"));
+    } else {
+        find_cdrom_device(bkpinfo->media_device, FALSE);
+    }
+    res = verify_tape_backups(bkpinfo);
+    chdir(dir);
+    if (length_of_file("/tmp/changed.txt") > 2
+        && length_of_file("/tmp/changed.files") > 2) {
+        log_msg(0,
+                "Type 'less /tmp/changed.files' to see which files don't match the archives");
+        log_msg(2, "Calling popup_changelist_from_file()");
+        popup_changelist_from_file("/tmp/changed.files");
+        log_msg(2, "Returned from popup_changelist_from_file()");
+    }
+
+    mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+    paranoid_free(dir);
+    paranoid_free(command);
+    return (res);
 }
+
 /**************************************************************************
  *END_COMPARE_CD_STREAM                                                   *
@@ -782 +736 @@
  * returns: int                                                           *
  **************************************************************************/
-int 
-compare_to_tape( struct s_bkpinfo *bkpinfo )
+int compare_to_tape(struct s_bkpinfo *bkpinfo)
 {
-  int res;
-  char *dir, *command;
-   
-  assert(bkpinfo!=NULL);
-  malloc_string(dir);
-  malloc_string(command);
-
-  getcwd( dir, MAX_STR_LEN );
-  chdir( bkpinfo->restore_path );
-  sprintf(command, "cp -f /tmp/LAST-FILELIST-NUMBER %s/tmp", bkpinfo->restore_path);
-  run_program_and_log_output( command, FALSE );
-  mvaddstr_and_log_it( g_currentY, 
-               0,
-               "Verifying archives against filesystem");
-  res = verify_tape_backups( bkpinfo );
-  chdir( dir );
-  if ( res ) 
-    {
-      mvaddstr_and_log_it( g_currentY++, 74, "Failed." );
-    }
-  else
-    {
-      mvaddstr_and_log_it( g_currentY++, 74, "Done." );
-    }
-  paranoid_free(dir);
-  paranoid_free(command);
-  return( res );
+    int res;
+    char *dir, *command;
+
+    assert(bkpinfo != NULL);
+    malloc_string(dir);
+    malloc_string(command);
+
+    getcwd(dir, MAX_STR_LEN);
+    chdir(bkpinfo->restore_path);
+    sprintf(command, "cp -f /tmp/LAST-FILELIST-NUMBER %s/tmp",
+            bkpinfo->restore_path);
+    run_program_and_log_output(command, FALSE);
+    mvaddstr_and_log_it(g_currentY,
+                        0, "Verifying archives against filesystem");
+    res = verify_tape_backups(bkpinfo);
+    chdir(dir);
+    if (res) {
+        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+    }
+    paranoid_free(dir);
+    paranoid_free(command);
+    return (res);
 }
 
@@ -819 +769 @@
 
 /* @} - end compareGroup */
-

branches/2.05/mondo/mondo/mondorestore/mondo-rstr-compare.h

@@ -1 +1 @@
 /* mondo-rstr-compare.h
- * $Id: mondo-rstr-compare.h,v 1.1 2004/06/10 15:29:13 hugo Exp $
+ * $Id$
  */
 
 
-int compare_to_CD(struct s_bkpinfo*);
-int compare_to_cdstream(struct s_bkpinfo*);
-int compare_to_tape(struct s_bkpinfo*);
+int compare_to_CD(struct s_bkpinfo *);
+int compare_to_cdstream(struct s_bkpinfo *);
+int compare_to_tape(struct s_bkpinfo *);
 
-int 
-compare_mode( struct s_bkpinfo *bkpinfo ,
-          struct mountlist_itself *mountlist, 
-          struct raidlist_itself *raidlist);
+int
+compare_mode(struct s_bkpinfo *bkpinfo,
+             struct mountlist_itself *mountlist,
+             struct raidlist_itself *raidlist);

branches/2.05/mondo/mondo/mondorestore/mondo-rstr-newt.c

@@ -8 +8 @@
 edited by : by Stan Benoit 4/2002
 email     : troff@nakedsoul.org
-cvsid     : $Id: mondo-rstr-newt.c,v 1.5 2004/06/10 15:29:13 hugo Exp $
+cvsid     : $Id$
 ***************************************************************************/
 
@@ -92 +92 @@
 #include "mondo-rstr-newt.h"
 
-//static char cvsid[] = "$Id: mondo-rstr-newt.c,v 1.5 2004/06/10 15:29:13 hugo Exp $";
+//static char cvsid[] = "$Id$";
 
 extern char err_log_lines[NOOF_ERR_LINES][MAX_STR_LEN];
@@ -127 +127 @@
  */
 void
-add_disklist_entry (struct list_of_disks *disklist, char *raid_device,
-            struct mountlist_itself *unallocated_raid_partitions)
+add_disklist_entry(struct list_of_disks *disklist, char *raid_device,
+                   struct mountlist_itself *unallocated_raid_partitions)
 {
     /** buffers ***********************************************************/
-  char tmp[MAX_STR_LEN];
+    char tmp[MAX_STR_LEN];
 
     /** newt **************************************************************/
-  newtComponent myForm;
+    newtComponent myForm;
     newtComponent bOK;
     newtComponent bCancel;
@@ -140 +140 @@
     newtComponent partitionsListbox;
     newtComponent headerMsg;
-    
+
   /** prototypes *********************************************************/
-  void *keylist[ARBITRARY_MAXIMUM];
-  void *curr_choice;
+    void *keylist[ARBITRARY_MAXIMUM];
+    void *curr_choice;
 
     /** int ****************************************************************/
-  int i = 0;
+    int i = 0;
     int index = 0;
     int currline = 0;
     int items = 0;
 
-  assert(disklist!=NULL);
-  assert_string_is_neither_NULL_nor_zerolength(raid_device);
-  assert(unallocated_raid_partitions!=NULL);
-
-  newtPushHelpLine
-    ("   Add one of the following unallocated RAID partitions to this RAID device.");
-  sprintf (tmp, "%-26s %s", "Device", "Size");
-  headerMsg = newtLabel (1, 1, tmp);
-  partitionsListbox =
-    newtListbox (1, 2, 6, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
-  redraw_unallocpartnslist (unallocated_raid_partitions, keylist,
-                partitionsListbox);
-  i = 7;
-  bOK = newtCompactButton (i, 9, "  OK  ");
-  bCancel = newtCompactButton (i += 9, 9, "Cancel");
-  newtOpenWindow (22, 6, 36, 10, "Unallocated RAID partitions");
-  myForm = newtForm (NULL, NULL, 0);
-  newtFormAddComponents (myForm, headerMsg, partitionsListbox, bOK, bCancel,
-             NULL);
-  b_res = newtRunForm (myForm);
-  if (b_res != bCancel)
-    {
-      curr_choice = newtListboxGetCurrent (partitionsListbox);
-      for (currline = 0;
-       currline < unallocated_raid_partitions->entries
-       && keylist[currline] != curr_choice; currline++);
-      if (currline == unallocated_raid_partitions->entries
-      && unallocated_raid_partitions->entries > 0)
-    {
-      log_it ("I don't know what this button does");
-    }
-      else
-    {
-      index = find_next_free_index_in_disklist (disklist);
-    
-      items = disklist->entries;
-      strcpy (disklist->el[items].device,
-          unallocated_raid_partitions->el[currline].device);
-      disklist->el[items].index = index;
-      disklist->entries = ++items;
-    
-    }
-    }
-  newtFormDestroy (myForm);
-  newtPopWindow ();
-  newtPopHelpLine ();
+    assert(disklist != NULL);
+    assert_string_is_neither_NULL_nor_zerolength(raid_device);
+    assert(unallocated_raid_partitions != NULL);
+
+    newtPushHelpLine
+        ("   Add one of the following unallocated RAID partitions to this RAID device.");
+    sprintf(tmp, "%-26s %s", "Device", "Size");
+    headerMsg = newtLabel(1, 1, tmp);
+    partitionsListbox =
+        newtListbox(1, 2, 6, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
+    redraw_unallocpartnslist(unallocated_raid_partitions, keylist,
+                             partitionsListbox);
+    i = 7;
+    bOK = newtCompactButton(i, 9, "  OK  ");
+    bCancel = newtCompactButton(i += 9, 9, "Cancel");
+    newtOpenWindow(22, 6, 36, 10, "Unallocated RAID partitions");
+    myForm = newtForm(NULL, NULL, 0);
+    newtFormAddComponents(myForm, headerMsg, partitionsListbox, bOK,
+                          bCancel, NULL);
+    b_res = newtRunForm(myForm);
+    if (b_res != bCancel) {
+        curr_choice = newtListboxGetCurrent(partitionsListbox);
+        for (currline = 0;
+             currline < unallocated_raid_partitions->entries
+             && keylist[currline] != curr_choice; currline++);
+        if (currline == unallocated_raid_partitions->entries
+            && unallocated_raid_partitions->entries > 0) {
+            log_it("I don't know what this button does");
+        } else {
+            index = find_next_free_index_in_disklist(disklist);
+
+            items = disklist->entries;
+            strcpy(disklist->el[items].device,
+                   unallocated_raid_partitions->el[currline].device);
+            disklist->el[items].index = index;
+            disklist->entries = ++items;
+
+        }
+    }
+    newtFormDestroy(myForm);
+    newtPopWindow();
+    newtPopHelpLine();
 }
 
@@ -212 +208 @@
  */
 void
-add_mountlist_entry (struct mountlist_itself *mountlist,
-             struct raidlist_itself *raidlist, newtComponent listbox,
-             int currline, void *keylist[])
+add_mountlist_entry(struct mountlist_itself *mountlist,
+                    struct raidlist_itself *raidlist,
+                    newtComponent listbox, int currline, void *keylist[])
 {
 
     /** int **************************************************************/
-  int i = 0;
+    int i = 0;
     int num_to_add = 0;
 
     /** newt *************************************************************/
-  newtComponent myForm;
+    newtComponent myForm;
     newtComponent bOK;
     newtComponent bCancel;
@@ -236 +232 @@
 
     /** buffers **********************************************************/
-  char drive_to_add[MAX_STR_LEN];
+    char drive_to_add[MAX_STR_LEN];
     char mountpoint_str[MAX_STR_LEN];
     char size_str[MAX_STR_LEN];
-  char device_str[MAX_STR_LEN];
+    char device_str[MAX_STR_LEN];
     char format_str[MAX_STR_LEN];
 
@@ -248 +244 @@
     char *format_here;
 
-  assert(mountlist!=NULL);
-  assert(raidlist!=NULL);
-  assert(listbox!=NULL);
-  assert(keylist!=NULL);
-
-    strcpy (device_str, "/dev/");
-    strcpy (mountpoint_str, "/");
+    assert(mountlist != NULL);
+    assert(raidlist != NULL);
+    assert(listbox != NULL);
+    assert(keylist != NULL);
+
+    strcpy(device_str, "/dev/");
+    strcpy(mountpoint_str, "/");
 #ifdef __FreeBSD__
-    strcpy (format_str, "ufs");
+    strcpy(format_str, "ufs");
 #else
-  strcpy (format_str, "ext2");
+    strcpy(format_str, "ext2");
 #endif
-  size_str[0] = '\0';
-  /* sprintf(size_str,""); */
-  newtOpenWindow (20, 5, 48, 10, "Add entry");
-  label0 = newtLabel (2, 1, "Device:    ");
-  label1 = newtLabel (2, 2, "Mountpoint:");
-  label2 = newtLabel (2, 3, "Size (MB): ");
-  label3 = newtLabel (2, 4, "Format:    ");
-  deviceComp = newtEntry (14, 1, device_str, 30, (void*)&device_here, 0);
-  mountpointComp = newtEntry (14, 2, mountpoint_str, 30, (void*)&mountpoint_here, 0);
-  formatComp = newtEntry (14, 4, format_str, 15, (void*)&format_here, 0);
-  sizeComp = newtEntry (14, 3, size_str, 10, (void*)&size_here, 0);
-  bOK = newtButton (5, 6, "  OK  ");
-  bCancel = newtButton (17, 6, "Cancel");
-  newtPushHelpLine
-    ("To add an entry to the mountlist, please fill in these fields and then hit 'OK'");
-  myForm = newtForm (NULL, NULL, 0);
-  newtFormAddComponents (myForm, deviceComp, mountpointComp, sizeComp,
-             formatComp, label0, label1, label2, label3, bOK,
-             bCancel, NULL);
-  for (b_res = NULL; b_res != bOK && b_res != bCancel;)
-    {
-      b_res = newtRunForm (myForm);
-      strcpy (device_str, device_here);
-      strcpy (mountpoint_str, mountpoint_here);
-      strcpy (format_str, format_here);
-      strcpy (size_str, size_here);
+    size_str[0] = '\0';
+    /* sprintf(size_str,""); */
+    newtOpenWindow(20, 5, 48, 10, "Add entry");
+    label0 = newtLabel(2, 1, "Device:    ");
+    label1 = newtLabel(2, 2, "Mountpoint:");
+    label2 = newtLabel(2, 3, "Size (MB): ");
+    label3 = newtLabel(2, 4, "Format:    ");
+    deviceComp =
+        newtEntry(14, 1, device_str, 30, (void *) &device_here, 0);
+    mountpointComp =
+        newtEntry(14, 2, mountpoint_str, 30, (void *) &mountpoint_here, 0);
+    formatComp =
+        newtEntry(14, 4, format_str, 15, (void *) &format_here, 0);
+    sizeComp = newtEntry(14, 3, size_str, 10, (void *) &size_here, 0);
+    bOK = newtButton(5, 6, "  OK  ");
+    bCancel = newtButton(17, 6, "Cancel");
+    newtPushHelpLine
+        ("To add an entry to the mountlist, please fill in these fields and then hit 'OK'");
+    myForm = newtForm(NULL, NULL, 0);
+    newtFormAddComponents(myForm, deviceComp, mountpointComp, sizeComp,
+                          formatComp, label0, label1, label2, label3, bOK,
+                          bCancel, NULL);
+    for (b_res = NULL; b_res != bOK && b_res != bCancel;) {
+        b_res = newtRunForm(myForm);
+        strcpy(device_str, device_here);
+        strcpy(mountpoint_str, mountpoint_here);
+        strcpy(format_str, format_here);
+        strcpy(size_str, size_here);
 //      log_it ("Originals = %s,%s,%s,%s", device_str, mountpoint_str, format_str, size_str);
-      strip_spaces (device_str);
-      strip_spaces (mountpoint_str);
-      strip_spaces (format_str);
-      strip_spaces (size_str);
+        strip_spaces(device_str);
+        strip_spaces(mountpoint_str);
+        strip_spaces(format_str);
+        strip_spaces(size_str);
 //      log_it ("Modified = %s,%s,%s,%s", device_str, mountpoint_str, format_str, size_str);
-      if (b_res == bOK)
-    {
-      if (device_str[strlen (device_str) - 1] == '/')
-        {
-          popup_and_OK ("You left the device nearly blank!");
-          b_res = NULL;
-        }
-      if (size_of_specific_device_in_mountlist (mountlist, device_str) >= 0)
-        {
-          popup_and_OK ("Can't add this - you've got one already!");
-          b_res = NULL;
-        }
-    }
-    }
-  newtFormDestroy (myForm);
-  newtPopHelpLine ();
-  newtPopWindow ();
-  if (b_res == bCancel)
-    {
-      return;
-    }
-  strcpy (drive_to_add, device_str);
-  for (i = strlen (drive_to_add); isdigit (drive_to_add[i - 1]); i--);
-  num_to_add = atoi (drive_to_add + i);
-  drive_to_add[i] = '\0';
-  currline = mountlist->entries;
-  strcpy (mountlist->el[currline].device, device_str);
-  strcpy (mountlist->el[currline].mountpoint, mountpoint_str);
-  strcpy (mountlist->el[currline].format, format_str);
-  mountlist->el[currline].size = atol (size_str) * 1024;
-  mountlist->entries++;
-  if (strstr (mountlist->el[currline].device, RAID_DEVICE_STUB))
-    {
-      initiate_new_raidlist_entry (raidlist, mountlist, currline, device_str);
-    }
-  redraw_mountlist (mountlist, keylist, listbox);
+        if (b_res == bOK) {
+            if (device_str[strlen(device_str) - 1] == '/') {
+                popup_and_OK("You left the device nearly blank!");
+                b_res = NULL;
+            }
+            if (size_of_specific_device_in_mountlist(mountlist, device_str)
+                >= 0) {
+                popup_and_OK("Can't add this - you've got one already!");
+                b_res = NULL;
+            }
+        }
+    }
+    newtFormDestroy(myForm);
+    newtPopHelpLine();
+    newtPopWindow();
+    if (b_res == bCancel) {
+        return;
+    }
+    strcpy(drive_to_add, device_str);
+    for (i = strlen(drive_to_add); isdigit(drive_to_add[i - 1]); i--);
+    num_to_add = atoi(drive_to_add + i);
+    drive_to_add[i] = '\0';
+    currline = mountlist->entries;
+    strcpy(mountlist->el[currline].device, device_str);
+    strcpy(mountlist->el[currline].mountpoint, mountpoint_str);
+    strcpy(mountlist->el[currline].format, format_str);
+    mountlist->el[currline].size = atol(size_str) * 1024;
+    mountlist->entries++;
+    if (strstr(mountlist->el[currline].device, RAID_DEVICE_STUB)) {
+        initiate_new_raidlist_entry(raidlist, mountlist, currline,
+                                    device_str);
+    }
+    redraw_mountlist(mountlist, keylist, listbox);
 }
 
@@ -337 +332 @@
  * @ingroup restoreGuiVarslist
  */
-void
-add_varslist_entry (struct raid_device_record *raidrec)
+void add_varslist_entry(struct raid_device_record *raidrec)
 {
 
     /** buffers ***********************************************************/
-  char sz_out[MAX_STR_LEN];
+    char sz_out[MAX_STR_LEN];
 
     /** int ****************************************************************/
-  int items = 0;
+    int items = 0;
     int i = 0;
 
-  assert(raidrec!=NULL);
-
-  sz_out[0] = '\0';
-  if (popup_and_get_string
-      ("Add variable", "Enter the name of the variable to add", sz_out, MAX_STR_LEN))
-    {
-      strip_spaces (sz_out);
-      items = raidrec->additional_vars.entries;
-      for (i = 0;
-       i < items && strcmp (raidrec->additional_vars.el[i].label, sz_out);
-       i++);
-      if (i < items)
-    {
-      popup_and_OK
-        ("No need to add that variable. It is already listed here.");
-    }
-      else
-    {
-      strcpy (raidrec->additional_vars.el[items].label, sz_out);
-      edit_varslist_entry (raidrec, items);
-      raidrec->additional_vars.entries = ++items;
-    }
-    }
+    assert(raidrec != NULL);
+
+    sz_out[0] = '\0';
+    if (popup_and_get_string
+        ("Add variable", "Enter the name of the variable to add", sz_out,
+         MAX_STR_LEN)) {
+        strip_spaces(sz_out);
+        items = raidrec->additional_vars.entries;
+        for (i = 0;
+             i < items
+             && strcmp(raidrec->additional_vars.el[i].label, sz_out); i++);
+        if (i < items) {
+            popup_and_OK
+                ("No need to add that variable. It is already listed here.");
+        } else {
+            strcpy(raidrec->additional_vars.el[items].label, sz_out);
+            edit_varslist_entry(raidrec, items);
+            raidrec->additional_vars.entries = ++items;
+        }
+    }
 }
 #endif
@@ -383 +374 @@
  */
 long
-calculate_raid_device_size (struct mountlist_itself *mountlist,
-                struct raidlist_itself *raidlist,
-                char *raid_device)
+calculate_raid_device_size(struct mountlist_itself *mountlist,
+                           struct raidlist_itself *raidlist,
+                           char *raid_device)
 {
 #ifdef __FreeBSD__
-    /** FreeBSD-specific version of calculate_raid_device_size() **/
+    /** FreeBSD-specific version of calculate_raid_device_size() **/
 
     /** structures ********************************************************/
-  struct vinum_volume *raidrec;
+    struct vinum_volume *raidrec;
 
     /** int ***************************************************************/
-  int i = 0, j = 0;
+    int i = 0, j = 0;
     int noof_partitions = 0;
 
     /** long **************************************************************/
-  long total_size = 0;
-  long plex_size = 0;
-  long smallest_partition = 999999999;
-  long smallest_plex      = 999999999;
+    long total_size = 0;
+    long plex_size = 0;
+    long smallest_partition = 999999999;
+    long smallest_plex = 999999999;
     long sp = 0;
 
     /** buffers ***********************************************************/
-  char tmp[MAX_STR_LEN];
-
-
-
-
-  for (i = 0;
-       i < raidlist->entries
-       && strcmp (raidlist->el[i].volname, basename (raid_device)); i++);
-  if (i == raidlist->entries)
-    {
-      sprintf (tmp,
-           "Cannot calc size of raid device %s - cannot find it in raidlist",
-           raid_device);
-      log_it (tmp);
-      return (0); // Isn't this more sensible than 999999999? If the raid dev !exists,
-                  // then it has no size, right?
-    }
-  raidrec = &raidlist->el[i];
-  total_size = 0;
-  if (raidrec->plexes == 0) return 0;
-  for (j = 0; j < raidrec->plexes; j++) {
-      plex_size = 0;
-      int k = 0, l = 0;
-      for (k = 0; k < raidrec->plex[j].subdisks; ++k) {
-      char devname[64];
-      strcpy (devname, raidrec->plex[j].sd[k].which_device);
-      for (l = 0; l < raidlist->disks.entries; ++l) {
-          if (!strcmp (devname, raidlist->disks.el[l].name)) {
-          switch (raidrec->plex[j].raidlevel) {
-          case -1:
-              plex_size +=
-              size_of_specific_device_in_mountlist (mountlist,
-                                raidlist->disks.el[l].device);
-              break;
-          case 0:
-          case 5:
-              if (size_of_specific_device_in_mountlist (mountlist,
-                                   raidlist->disks.el[l].device) < smallest_partition) {
-              smallest_partition = size_of_specific_device_in_mountlist (mountlist,
-                                            raidlist->disks.el[l].device);
-              }
-              break;
-          }
-          }
-      }
-      }
-      
-      if (!is_this_raid_personality_registered (raidrec->plex[j].raidlevel)) {
-      log_it ("%s has a really weird RAID level - couldn't calc size :(", raid_device);
-      return (999999999);
-      }
-      if (raidrec->plex[j].raidlevel != -1) {
-      plex_size = smallest_partition * (raidrec->plex[j].subdisks -
-                        (raidrec->plex[j].raidlevel == 5 ? 1 : 0));
-      }
-      if (plex_size < smallest_plex)
-      smallest_plex = plex_size;
-
-      smallest_partition = 999999999;
-  }
-
-  sprintf (tmp, "I have calculated %s's real size to be %ld", raid_device,
-       (long) smallest_plex);
-  log_it (tmp);
-  return (smallest_plex);
+    char tmp[MAX_STR_LEN];
+
+
+
+
+    for (i = 0;
+         i < raidlist->entries
+         && strcmp(raidlist->el[i].volname, basename(raid_device)); i++);
+    if (i == raidlist->entries) {
+        sprintf(tmp,
+                "Cannot calc size of raid device %s - cannot find it in raidlist",
+                raid_device);
+        log_it(tmp);
+        return (0);             // Isn't this more sensible than 999999999? If the raid dev !exists,
+        // then it has no size, right?
+    }
+    raidrec = &raidlist->el[i];
+    total_size = 0;
+    if (raidrec->plexes == 0)
+        return 0;
+    for (j = 0; j < raidrec->plexes; j++) {
+        plex_size = 0;
+        int k = 0, l = 0;
+        for (k = 0; k < raidrec->plex[j].subdisks; ++k) {
+            char devname[64];
+            strcpy(devname, raidrec->plex[j].sd[k].which_device);
+            for (l = 0; l < raidlist->disks.entries; ++l) {
+                if (!strcmp(devname, raidlist->disks.el[l].name)) {
+                    switch (raidrec->plex[j].raidlevel) {
+                    case -1:
+                        plex_size +=
+                            size_of_specific_device_in_mountlist(mountlist,
+                                                                 raidlist->
+                                                                 disks.
+                                                                 el[l].
+                                                                 device);
+                        break;
+                    case 0:
+                    case 5:
+                        if (size_of_specific_device_in_mountlist(mountlist,
+                                                                 raidlist->
+                                                                 disks.
+                                                                 el[l].
+                                                                 device) <
+                            smallest_partition) {
+                            smallest_partition =
+                                size_of_specific_device_in_mountlist
+                                (mountlist, raidlist->disks.el[l].device);
+                        }
+                        break;
+                    }
+                }
+            }
+        }
+
+        if (!is_this_raid_personality_registered
+            (raidrec->plex[j].raidlevel)) {
+            log_it
+                ("%s has a really weird RAID level - couldn't calc size :(",
+                 raid_device);
+            return (999999999);
+        }
+        if (raidrec->plex[j].raidlevel != -1) {
+            plex_size = smallest_partition * (raidrec->plex[j].subdisks -
+                                              (raidrec->plex[j].
+                                               raidlevel == 5 ? 1 : 0));
+        }
+        if (plex_size < smallest_plex)
+            smallest_plex = plex_size;
+
+        smallest_partition = 999999999;
+    }
+
+    sprintf(tmp, "I have calculated %s's real size to be %ld", raid_device,
+            (long) smallest_plex);
+    log_it(tmp);
+    return (smallest_plex);
 #else
-    /** Linux-specific version of calculate_raid_device_size() **/
+    /** Linux-specific version of calculate_raid_device_size() **/
 
     /** structures ********************************************************/
-  struct raid_device_record *raidrec;
+    struct raid_device_record *raidrec;
 
     /** int ***************************************************************/
-  int i = 0;
+    int i = 0;
     int noof_partitions = 0;
 
     /** long **************************************************************/
-  long total_size = 0;
+    long total_size = 0;
     long smallest_partition = 999999999;
     long sp = 0;
 
     /** buffers ***********************************************************/
-  char tmp[MAX_STR_LEN];
-
-  assert(mountlist!=NULL);
-  assert(raidlist!=NULL);
-  assert_string_is_neither_NULL_nor_zerolength(raid_device);
-
-  for (i = 0;
-       i < raidlist->entries
-       && strcmp (raidlist->el[i].raid_device, raid_device); i++);
-  if (i == raidlist->entries)
-    {
-      sprintf (tmp,
-           "Cannot calc size of raid device %s - cannot find it in raidlist",
-           raid_device);
-      log_it (tmp);
-      return (999999999);
-    }
-  raidrec = &raidlist->el[i];
-  noof_partitions = raidrec->data_disks.entries;
-  if (raidrec->raid_level == -1 || raidrec->raid_level == 0)
-    {
-      for (total_size = 0, i = 0; i < noof_partitions; i++)
-    {
-      total_size +=
-        size_of_specific_device_in_mountlist (mountlist,
-                     raidrec->data_disks.el[i].device);
-    }
-    }
-  else
-    {
-      for (i = 0; i < noof_partitions; i++)
-    {
-      sp =
-        size_of_specific_device_in_mountlist (mountlist,
-                     raidrec->data_disks.el[i].device);
-      if (smallest_partition > sp)
-        {
-          smallest_partition = sp;
-        }
-    }
-      total_size = smallest_partition * (noof_partitions - 1);
-    }
-  sprintf (tmp, "I have calculated %s's real size to be %ld", raid_device,
-       (long) total_size);
-  log_it (tmp);
-  return (total_size);
+    char tmp[MAX_STR_LEN];
+
+    assert(mountlist != NULL);
+    assert(raidlist != NULL);
+    assert_string_is_neither_NULL_nor_zerolength(raid_device);
+
+    for (i = 0;
+         i < raidlist->entries
+         && strcmp(raidlist->el[i].raid_device, raid_device); i++);
+    if (i == raidlist->entries) {
+        sprintf(tmp,
+                "Cannot calc size of raid device %s - cannot find it in raidlist",
+                raid_device);
+        log_it(tmp);
+        return (999999999);
+    }
+    raidrec = &raidlist->el[i];
+    noof_partitions = raidrec->data_disks.entries;
+    if (raidrec->raid_level == -1 || raidrec->raid_level == 0) {
+        for (total_size = 0, i = 0; i < noof_partitions; i++) {
+            total_size +=
+                size_of_specific_device_in_mountlist(mountlist,
+                                                     raidrec->data_disks.
+                                                     el[i].device);
+        }
+    } else {
+        for (i = 0; i < noof_partitions; i++) {
+            sp = size_of_specific_device_in_mountlist(mountlist,
+                                                      raidrec->data_disks.
+                                                      el[i].device);
+            if (smallest_partition > sp) {
+                smallest_partition = sp;
+            }
+        }
+        total_size = smallest_partition * (noof_partitions - 1);
+    }
+    sprintf(tmp, "I have calculated %s's real size to be %ld", raid_device,
+            (long) total_size);
+    log_it(tmp);
+    return (total_size);
 #endif
 }
@@ -543 +540 @@
  */
 void
-choose_raid_level (struct OSSWAP (raid_device_record, vinum_plex) *raidrec)
+choose_raid_level(struct OSSWAP (raid_device_record, vinum_plex) * raidrec)
 {
 
 #ifdef __FreeBSD__
-    
+
     /** int ***************************************************************/
-  int res = 0;
+    int res = 0;
     int out = 0;
 
     /** buffers ***********************************************************/
-  char tmp[MAX_STR_LEN];
-  char prompt[MAX_STR_LEN];
-  char sz[MAX_STR_LEN];
-
-  sprintf (prompt, "Please enter the RAID level you want. (concat, striped, raid5)");
-  if (raidrec->raidlevel == -1)
-    {
-      strcpy (tmp, "concat");
-    }
-  else if (raidrec->raidlevel == 0)
-    {
-      strcpy (tmp, "striped");
-    } else {
-    sprintf (tmp, "raid%i", raidrec->raidlevel);
-    }
-  for (out = 999; out == 999;)
-    {
-      res = popup_and_get_string ("Specify RAID level", prompt, tmp, 10);
-      if (!res)
-    {
-      return;
-    }
-      strip_spaces (tmp);
-      if (tmp[0] == '[' && tmp[strlen (tmp) - 1] == ']')
-    {
-      strcpy (sz, tmp);
-      strncpy (tmp, sz + 1, strlen (sz) - 2);
-      tmp[strlen (sz) - 2] = '\0';
-    }
-      if (!strcmp (tmp, "concat"))
-    {
-      out = -1;
-    }
-      else if (!strcmp (tmp, "striped"))
-    {
-        out = 0;
-    }
-      else if (!strcmp (tmp, "raid5"))
-    {
-      out = 5;
-    }
-      log_it (tmp);
-      if (is_this_raid_personality_registered (out))
-    {
-      log_it
-        ("Groovy. You've picked a RAID personality which is registered.");
-    }
-      else
-    {
-      if (ask_me_yes_or_no
-          ("You have chosen a RAID personality which is not registered with the kernel. Make another selection?"))
-        {
-          out = 999;
-        }
-    }
-    }
-  raidrec->raidlevel = out;
+    char tmp[MAX_STR_LEN];
+    char prompt[MAX_STR_LEN];
+    char sz[MAX_STR_LEN];
+
+    sprintf(prompt,
+            "Please enter the RAID level you want. (concat, striped, raid5)");
+    if (raidrec->raidlevel == -1) {
+        strcpy(tmp, "concat");
+    } else if (raidrec->raidlevel == 0) {
+        strcpy(tmp, "striped");
+    } else {
+        sprintf(tmp, "raid%i", raidrec->raidlevel);
+    }
+    for (out = 999; out == 999;) {
+        res = popup_and_get_string("Specify RAID level", prompt, tmp, 10);
+        if (!res) {
+            return;
+        }
+        strip_spaces(tmp);
+        if (tmp[0] == '[' && tmp[strlen(tmp) - 1] == ']') {
+            strcpy(sz, tmp);
+            strncpy(tmp, sz + 1, strlen(sz) - 2);
+            tmp[strlen(sz) - 2] = '\0';
+        }
+        if (!strcmp(tmp, "concat")) {
+            out = -1;
+        } else if (!strcmp(tmp, "striped")) {
+            out = 0;
+        } else if (!strcmp(tmp, "raid5")) {
+            out = 5;
+        }
+        log_it(tmp);
+        if (is_this_raid_personality_registered(out)) {
+            log_it
+                ("Groovy. You've picked a RAID personality which is registered.");
+        } else {
+            if (ask_me_yes_or_no
+                ("You have chosen a RAID personality which is not registered with the kernel. Make another selection?"))
+            {
+                out = 999;
+            }
+        }
+    }
+    raidrec->raidlevel = out;
 #else
     /** buffers ***********************************************************/
-  char tmp[MAX_STR_LEN];
+    char tmp[MAX_STR_LEN];
     char personalities[MAX_STR_LEN];
     char prompt[MAX_STR_LEN];
     char sz[MAX_STR_LEN];
-    int out=0, res=0;
-
-
-  assert(raidrec!=NULL);
-  system
-    ("cat /proc/mdstat | grep Pers > /tmp/raid-personalities.txt 2> /dev/null");
-  strcpy (personalities, last_line_of_file ("/tmp/raid-personalities.txt"));
-  sprintf (prompt, "Please enter the RAID level you want. %s", personalities);
-  if (raidrec->raid_level == -1)
-    {
-      strcpy (tmp, "linear");
-    }
-  else
-    {
-      sprintf (tmp, "%d", raidrec->raid_level);
-    }
-  for (out = 999;
-       out != -1 && out != 0 && out != 1 && out != 4 && out != 5
-       && out != 10;)
-    {
-      res = popup_and_get_string ("Specify RAID level", prompt, tmp, 10);
-      if (!res)
-    {
-      return;
-    }
-      strip_spaces (tmp);
-      if (tmp[0] == '[' && tmp[strlen (tmp) - 1] == ']')
-    {
-      strcpy (sz, tmp);
-      strncpy (tmp, sz + 1, strlen (sz) - 2);
-      tmp[strlen (sz) - 2] = '\0';
-    }
-      if (!strcmp (tmp, "linear"))
-    {
-      out = -1;
-    }
-      else if (!strncmp (tmp, "raid", 4))
-    {
-      out = atoi (tmp + 4);
-    }
-      else
-    {
-      out = atoi (tmp);
-    }
-      log_it (tmp);
-      if (is_this_raid_personality_registered (out))
-    {
-      log_it
-        ("Groovy. You've picked a RAID personality which is registered.");
-    }
-      else
-    {
-      if (ask_me_yes_or_no
-          ("You have chosen a RAID personality which is not registered with the kernel. Make another selection?"))
-        {
-          out = 999;
-        }
-    }
-    }
-  raidrec->raid_level = out;
+    int out = 0, res = 0;
+
+
+    assert(raidrec != NULL);
+    system
+        ("cat /proc/mdstat | grep Pers > /tmp/raid-personalities.txt 2> /dev/null");
+    strcpy(personalities,
+           last_line_of_file("/tmp/raid-personalities.txt"));
+    sprintf(prompt, "Please enter the RAID level you want. %s",
+            personalities);
+    if (raidrec->raid_level == -1) {
+        strcpy(tmp, "linear");
+    } else {
+        sprintf(tmp, "%d", raidrec->raid_level);
+    }
+    for (out = 999;
+         out != -1 && out != 0 && out != 1 && out != 4 && out != 5
+         && out != 10;) {
+        res = popup_and_get_string("Specify RAID level", prompt, tmp, 10);
+        if (!res) {
+            return;
+        }
+        strip_spaces(tmp);
+        if (tmp[0] == '[' && tmp[strlen(tmp) - 1] == ']') {
+            strcpy(sz, tmp);
+            strncpy(tmp, sz + 1, strlen(sz) - 2);
+            tmp[strlen(sz) - 2] = '\0';
+        }
+        if (!strcmp(tmp, "linear")) {
+            out = -1;
+        } else if (!strncmp(tmp, "raid", 4)) {
+            out = atoi(tmp + 4);
+        } else {
+            out = atoi(tmp);
+        }
+        log_it(tmp);
+        if (is_this_raid_personality_registered(out)) {
+            log_it
+                ("Groovy. You've picked a RAID personality which is registered.");
+        } else {
+            if (ask_me_yes_or_no
+                ("You have chosen a RAID personality which is not registered with the kernel. Make another selection?"))
+            {
+                out = 999;
+            }
+        }
+    }
+    raidrec->raid_level = out;
 #endif
 }
@@ -690 +662 @@
  */
 void
-del_partns_listed_in_disklist (struct mountlist_itself *mountlist,
-                   struct raidlist_itself *raidlist,
-                   struct list_of_disks *disklist)
+del_partns_listed_in_disklist(struct mountlist_itself *mountlist,
+                              struct raidlist_itself *raidlist,
+                              struct list_of_disks *disklist)
 {
 
     /** int ***************************************************************/
-  int i = 0;
+    int i = 0;
     int pos = 0;
 
     /** buffers ***********************************************************/
-  char tmp[MAX_STR_LEN];
-
-  assert(mountlist!=NULL);
-  assert(raidlist!=NULL);
-  assert(disklist!=NULL);
-
-  for (i = 0; i < disklist->entries; i++)
-    {
-      for (pos = 0;
-       pos < mountlist->entries
-       && strcmp (mountlist->el[pos].device, disklist->el[i].device);
-       pos++);
-      if (pos < mountlist->entries)
-    {
-      sprintf (tmp,
-           "Deleting partition %s cos it was part of a now-defunct RAID",
-           mountlist->el[pos].device);
-      log_it (tmp);
-      memcpy ((void *) &mountlist->el[pos],
-          (void *) &mountlist->el[mountlist->entries - 1],
-          sizeof (struct mountlist_line));
-      mountlist->entries--;
-    }
-    }
+    char tmp[MAX_STR_LEN];
+
+    assert(mountlist != NULL);
+    assert(raidlist != NULL);
+    assert(disklist != NULL);
+
+    for (i = 0; i < disklist->entries; i++) {
+        for (pos = 0;
+             pos < mountlist->entries
+             && strcmp(mountlist->el[pos].device, disklist->el[i].device);
+             pos++);
+        if (pos < mountlist->entries) {
+            sprintf(tmp,
+                    "Deleting partition %s cos it was part of a now-defunct RAID",
+                    mountlist->el[pos].device);
+            log_it(tmp);
+            memcpy((void *) &mountlist->el[pos],
+                   (void *) &mountlist->el[mountlist->entries - 1],
+                   sizeof(struct mountlist_line));
+            mountlist->entries--;
+        }
+    }
 }
 
@@ -737 +707 @@
  */
 void
-delete_disklist_entry (struct list_of_disks *disklist, char *raid_device,
-               int currline)
+delete_disklist_entry(struct list_of_disks *disklist, char *raid_device,
+                      int currline)
 {
 
     /** int ***************************************************************/
-  int pos = 0;
+    int pos = 0;
 
     /** buffers ***********************************************************/
-  char tmp[MAX_STR_LEN];
-
-  assert(disklist!=NULL);
-  assert_string_is_neither_NULL_nor_zerolength(raid_device);
-
-  sprintf (tmp, "Delete %s from RAID device %s - are you sure?",
-       disklist->el[currline].device, raid_device);
-  if (!ask_me_yes_or_no (tmp))
-    {
-      return;
-    }
-  for (pos = currline; pos < disklist->entries - 1; pos++)
-    {
-      /* memcpy((void*)&disklist->el[pos], (void*)&disklist->el[pos+1], sizeof(struct s_disk)); */
-      strcpy (disklist->el[pos].device, disklist->el[pos + 1].device);
-    }
-  disklist->entries--;
+    char tmp[MAX_STR_LEN];
+
+    assert(disklist != NULL);
+    assert_string_is_neither_NULL_nor_zerolength(raid_device);
+
+    sprintf(tmp, "Delete %s from RAID device %s - are you sure?",
+            disklist->el[currline].device, raid_device);
+    if (!ask_me_yes_or_no(tmp)) {
+        return;
+    }
+    for (pos = currline; pos < disklist->entries - 1; pos++) {
+        /* memcpy((void*)&disklist->el[pos], (void*)&disklist->el[pos+1], sizeof(struct s_disk)); */
+        strcpy(disklist->el[pos].device, disklist->el[pos + 1].device);
+    }
+    disklist->entries--;
 }
 
@@ -776 +744 @@
  */
 void
-delete_mountlist_entry (struct mountlist_itself *mountlist,
-            struct raidlist_itself *raidlist,
-            newtComponent listbox, int currline, void *keylist[])
+delete_mountlist_entry(struct mountlist_itself *mountlist,
+                       struct raidlist_itself *raidlist,
+                       newtComponent listbox, int currline,
+                       void *keylist[])
 {
 
     /** int ***************************************************************/
-  int pos = 0;
+    int pos = 0;
 
     /** buffers ***********************************************************/
-  char tmp[MAX_STR_LEN];
+    char tmp[MAX_STR_LEN];
     char device[MAX_STR_LEN];
 
 
-  assert(mountlist!=NULL);
-  assert(raidlist!=NULL);
-  assert(listbox!=NULL);
-  assert(keylist!=NULL);
-
-  pos =
-    which_raid_device_is_using_this_partition (raidlist,
-                           mountlist->el[currline].
-                           device);
-  if (pos >= 0)
-    {
-      sprintf (tmp, "Cannot delete %s: it is in use by RAID device %s",
-           mountlist->el[currline].device, raidlist->el[pos].OSSWAP (raid_device, volname));
-      popup_and_OK (tmp);
-      return;
-    }
-  sprintf (tmp, "Delete %s - are you sure?", mountlist->el[currline].device);
-  if (!ask_me_yes_or_no (tmp))
-    {
-      return;
-    }
-  if (strstr (mountlist->el[currline].device, RAID_DEVICE_STUB))
-    {
-      strcpy (device, mountlist->el[currline].device);
-      delete_raidlist_entry (mountlist, raidlist, device);
-      for (currline = 0;
-       currline < mountlist->entries
-       && strcmp (mountlist->el[currline].device, device); currline++);
-      if (currline == mountlist->entries)
-    {
-      log_it ("Dev is gone. I can't delete it. Ho-hum");
-      return;
-    }
-    }
-  memcpy ((void *) &mountlist->el[currline],
-      (void *) &mountlist->el[mountlist->entries - 1],
-      sizeof (struct mountlist_line));
-  mountlist->entries--;
-  redraw_mountlist (mountlist, keylist, listbox);
+    assert(mountlist != NULL);
+    assert(raidlist != NULL);
+    assert(listbox != NULL);
+    assert(keylist != NULL);
+
+    pos =
+        which_raid_device_is_using_this_partition(raidlist,
+                                                  mountlist->el[currline].
+                                                  device);
+    if (pos >= 0) {
+        sprintf(tmp, "Cannot delete %s: it is in use by RAID device %s",
+                mountlist->el[currline].device,
+                raidlist->el[pos].OSSWAP(raid_device, volname));
+        popup_and_OK(tmp);
+        return;
+    }
+    sprintf(tmp, "Delete %s - are you sure?",
+            mountlist->el[currline].device);
+    if (!ask_me_yes_or_no(tmp)) {
+        return;
+    }
+    if (strstr(mountlist->el[currline].device, RAID_DEVICE_STUB)) {
+        strcpy(device, mountlist->el[currline].device);
+        delete_raidlist_entry(mountlist, raidlist, device);
+        for (currline = 0;
+             currline < mountlist->entries
+             && strcmp(mountlist->el[currline].device, device);
+             currline++);
+        if (currline == mountlist->entries) {
+            log_it("Dev is gone. I can't delete it. Ho-hum");
+            return;
+        }
+    }
+    memcpy((void *) &mountlist->el[currline],
+           (void *) &mountlist->el[mountlist->entries - 1],
+           sizeof(struct mountlist_line));
+    mountlist->entries--;
+    redraw_mountlist(mountlist, keylist, listbox);
 }
 
@@ -839 +807 @@
  */
 void
-delete_raidlist_entry (struct mountlist_itself *mountlist,
-               struct raidlist_itself *raidlist, char *device)
-{
-    
+delete_raidlist_entry(struct mountlist_itself *mountlist,
+                      struct raidlist_itself *raidlist, char *device)
+{
+
     /** int ***************************************************************/
-  int i = 0;
-    int items =0;
+    int i = 0;
+    int items = 0;
 
     /** bool **************************************************************/
-  bool delete_partitions_too;
+    bool delete_partitions_too;
 
     /** buffers ***********************************************************/
-  char tmp[MAX_STR_LEN];
-
-  assert(mountlist!=NULL);
-  assert(raidlist!=NULL);
-  assert_string_is_neither_NULL_nor_zerolength(device);
-
-  i = find_raid_device_in_raidlist (raidlist, device);
-  if (i < 0)
-    {
-      return;
-    }
-  sprintf (tmp, "Do you want me to delete %s's partitions, too?", device);
-  delete_partitions_too = ask_me_yes_or_no (tmp);
-  if (delete_partitions_too)
-    {
+    char tmp[MAX_STR_LEN];
+
+    assert(mountlist != NULL);
+    assert(raidlist != NULL);
+    assert_string_is_neither_NULL_nor_zerolength(device);
+
+    i = find_raid_device_in_raidlist(raidlist, device);
+    if (i < 0) {
+        return;
+    }
+    sprintf(tmp, "Do you want me to delete %s's partitions, too?", device);
+    delete_partitions_too = ask_me_yes_or_no(tmp);
+    if (delete_partitions_too) {
 #ifdef __FreeBSD__
-      // static so it's zeroed
-      static struct list_of_disks d;
-      int x, y, z;
-      
-      for (x = 0; x < raidlist->el[i].plexes; ++x) {
-          for (y = 0; y < raidlist->el[i].plex[x].subdisks; ++y) {
-          for (z = 0; z < raidlist->disks.entries; ++z) {
-              if (!strcmp (raidlist->el[i].plex[x].sd[y].which_device,
-                   raidlist->disks.el[z].name)) {
-              strcpy (d.el [d.entries  ].name, raidlist->disks.el[z].name);
-              strcpy (d.el [d.entries++].device, raidlist->disks.el[z].device);
-              }
-          }
-          }
-      }
-      
-      del_partns_listed_in_disklist (mountlist, raidlist, &d);
+        // static so it's zeroed
+        static struct list_of_disks d;
+        int x, y, z;
+
+        for (x = 0; x < raidlist->el[i].plexes; ++x) {
+            for (y = 0; y < raidlist->el[i].plex[x].subdisks; ++y) {
+                for (z = 0; z < raidlist->disks.entries; ++z) {
+                    if (!strcmp(raidlist->el[i].plex[x].sd[y].which_device,
+                                raidlist->disks.el[z].name)) {
+                        strcpy(d.el[d.entries].name,
+                               raidlist->disks.el[z].name);
+                        strcpy(d.el[d.entries++].device,
+                               raidlist->disks.el[z].device);
+                    }
+                }
+            }
+        }
+
+        del_partns_listed_in_disklist(mountlist, raidlist, &d);
 #else
-      del_partns_listed_in_disklist (mountlist, raidlist,
-                     &raidlist->el[i].data_disks);
-      del_partns_listed_in_disklist (mountlist, raidlist,
-                     &raidlist->el[i].spare_disks);
-      del_partns_listed_in_disklist (mountlist, raidlist,
-                     &raidlist->el[i].parity_disks);
-      del_partns_listed_in_disklist (mountlist, raidlist,
-                     &raidlist->el[i].failed_disks);
+        del_partns_listed_in_disklist(mountlist, raidlist,
+                                      &raidlist->el[i].data_disks);
+        del_partns_listed_in_disklist(mountlist, raidlist,
+                                      &raidlist->el[i].spare_disks);
+        del_partns_listed_in_disklist(mountlist, raidlist,
+                                      &raidlist->el[i].parity_disks);
+        del_partns_listed_in_disklist(mountlist, raidlist,
+                                      &raidlist->el[i].failed_disks);
 #endif
-    }
-  items = raidlist->entries;
-  if (items == 1)
-    {
-      items = 0;
-    }
-  else
-    {
-      log_it (tmp);
-      memcpy ((void *) &raidlist->el[i], (void *) &raidlist->el[items - 1],
-          sizeof (struct OSSWAP(raid_device_record, vinum_volume)));
-      items--;
-    }
-  raidlist->entries = items;
+    }
+    items = raidlist->entries;
+    if (items == 1) {
+        items = 0;
+    } else {
+        log_it(tmp);
+        memcpy((void *) &raidlist->el[i],
+               (void *) &raidlist->el[items - 1],
+               sizeof(struct OSSWAP (raid_device_record, vinum_volume)));
+        items--;
+    }
+    raidlist->entries = items;
 }
 
@@ -918 +884 @@
  * @ingroup restoreGuiVarslist
  */
-void
-delete_varslist_entry (struct raid_device_record *raidrec, int lino)
+void delete_varslist_entry(struct raid_device_record *raidrec, int lino)
 {
 
     /** buffers ************************************************************/
-  char tmp[MAX_STR_LEN];
+    char tmp[MAX_STR_LEN];
 
     /** structures *********************************************************/
-  struct additional_raid_variables *av;
-
-  assert(raidrec!=NULL);
-
-  av = &raidrec->additional_vars;
-  sprintf (tmp, "Delete %s - are you sure?", av->el[lino].label);
-  if (ask_me_yes_or_no (tmp))
-    {
-      if (!strcmp (av->el[lino].label, "persistent-superblock")
-      || !strcmp (av->el[lino].label, "chunk-size"))
-    {
-      sprintf (tmp, "%s must not be deleted. It would be bad.",
-           av->el[lino].label);
-      popup_and_OK (tmp);
-    }
-      else
-    {
-      memcpy ((void *) &av->el[lino], (void *) &av->el[av->entries--],
-          sizeof (struct raid_var_line));
-    }
-    }
+    struct additional_raid_variables *av;
+
+    assert(raidrec != NULL);
+
+    av = &raidrec->additional_vars;
+    sprintf(tmp, "Delete %s - are you sure?", av->el[lino].label);
+    if (ask_me_yes_or_no(tmp)) {
+        if (!strcmp(av->el[lino].label, "persistent-superblock")
+            || !strcmp(av->el[lino].label, "chunk-size")) {
+            sprintf(tmp, "%s must not be deleted. It would be bad.",
+                    av->el[lino].label);
+            popup_and_OK(tmp);
+        } else {
+            memcpy((void *) &av->el[lino], (void *) &av->el[av->entries--],
+                   sizeof(struct raid_var_line));
+        }
+    }
 }
 #endif
@@ -960 +921 @@
  */
 int
-redraw_filelist (struct s_node *filelist, void *keylist[ARBITRARY_MAXIMUM],
-         newtComponent listbox)
+redraw_filelist(struct s_node *filelist, void *keylist[ARBITRARY_MAXIMUM],
+                newtComponent listbox)
 {
 
     /** int ***************************************************************/
-  static int lines_in_flist_window = 0;
-  static int depth = 0;
-  int i = 0;
+    static int lines_in_flist_window = 0;
+    static int depth = 0;
+    int i = 0;
 
     /** structures *******************************************************/
-  struct s_node *node;
+    struct s_node *node;
 
     /** buffers **********************************************************/
-  static char current_filename[MAX_STR_LEN];
-  char tmp[MAX_STR_LEN + 2];
+    static char current_filename[MAX_STR_LEN];
+    char tmp[MAX_STR_LEN + 2];
 
     /** bool *************************************************************/
     /*  void*dummyptr; */
-  bool dummybool;
-  static bool warned_already;
-
-  assert(filelist!=NULL);
-  assert(keylist!=NULL);
-  assert(listbox!=NULL);
-
-
-  if (depth == 0)
-    {
-      lines_in_flist_window = 0;
-      warned_already = FALSE;
-      for (i = 0; i < ARBITRARY_MAXIMUM; i++)
-    {
-      g_strings_of_flist_window[i][0] = '\0';
-      g_is_path_selected[i] = FALSE;
-    }
-    }
-  for (node = filelist; node != NULL; node = node->right)
-    {
-      current_filename[depth] = node->ch;
-      if (node->down)
-    {
-      depth++;
-      i = redraw_filelist (node->down, keylist, listbox);
-      depth--;
-    }
-      if (node->ch == '\0' && node->expanded)
-    {
-      if (lines_in_flist_window == ARBITRARY_MAXIMUM)
-        {
-          if (!warned_already)
-        {
-          warned_already = TRUE;
-          sprintf (tmp,
-               "Too many lines. Displaying first %d entries only. Close a directory to see more.",
-               ARBITRARY_MAXIMUM);
-          popup_and_OK (tmp);
-        }
-        }
-      else
-        {
-          strcpy (g_strings_of_flist_window[lines_in_flist_window],
-              current_filename);
-          g_is_path_selected[lines_in_flist_window] = node->selected;
-          lines_in_flist_window++;
-        }
-    }
-    }
-  if (depth == 0)
-    {
-      if (lines_in_flist_window > ARBITRARY_MAXIMUM)
-    {
-      lines_in_flist_window = ARBITRARY_MAXIMUM;
-    }
+    bool dummybool;
+    static bool warned_already;
+
+    assert(filelist != NULL);
+    assert(keylist != NULL);
+    assert(listbox != NULL);
+
+
+    if (depth == 0) {
+        lines_in_flist_window = 0;
+        warned_already = FALSE;
+        for (i = 0; i < ARBITRARY_MAXIMUM; i++) {
+            g_strings_of_flist_window[i][0] = '\0';
+            g_is_path_selected[i] = FALSE;
+        }
+    }
+    for (node = filelist; node != NULL; node = node->right) {
+        current_filename[depth] = node->ch;
+        if (node->down) {
+            depth++;
+            i = redraw_filelist(node->down, keylist, listbox);
+            depth--;
+        }
+        if (node->ch == '\0' && node->expanded) {
+            if (lines_in_flist_window == ARBITRARY_MAXIMUM) {
+                if (!warned_already) {
+                    warned_already = TRUE;
+                    sprintf(tmp,
+                            "Too many lines. Displaying first %d entries only. Close a directory to see more.",
+                            ARBITRARY_MAXIMUM);
+                    popup_and_OK(tmp);
+                }
+            } else {
+                strcpy(g_strings_of_flist_window[lines_in_flist_window],
+                       current_filename);
+                g_is_path_selected[lines_in_flist_window] = node->selected;
+                lines_in_flist_window++;
+            }
+        }
+    }
+    if (depth == 0) {
+        if (lines_in_flist_window > ARBITRARY_MAXIMUM) {
+            lines_in_flist_window = ARBITRARY_MAXIMUM;
+        }
 /* do an elementary sort */
-      for (i = 1; i < lines_in_flist_window; i++)
-    {
-      if (strcmp
-          (g_strings_of_flist_window[i],
-           g_strings_of_flist_window[i - 1]) < 0)
-        {
-          strcpy (tmp, g_strings_of_flist_window[i]);
-          strcpy (g_strings_of_flist_window[i],
-              g_strings_of_flist_window[i - 1]);
-          strcpy (g_strings_of_flist_window[i - 1], tmp);
-          dummybool = g_is_path_selected[i];
-          g_is_path_selected[i] = g_is_path_selected[i - 1];
-          g_is_path_selected[i - 1] = dummybool;
-          i = 0;
-        }
-    }
+        for (i = 1; i < lines_in_flist_window; i++) {
+            if (strcmp
+                (g_strings_of_flist_window[i],
+                 g_strings_of_flist_window[i - 1]) < 0) {
+                strcpy(tmp, g_strings_of_flist_window[i]);
+                strcpy(g_strings_of_flist_window[i],
+                       g_strings_of_flist_window[i - 1]);
+                strcpy(g_strings_of_flist_window[i - 1], tmp);
+                dummybool = g_is_path_selected[i];
+                g_is_path_selected[i] = g_is_path_selected[i - 1];
+                g_is_path_selected[i - 1] = dummybool;
+                i = 0;
+            }
+        }
 /* write list to screen */
-      newtListboxClear (listbox);
-      for (i = 0; i < lines_in_flist_window; i++)
-    {
-      sprintf (tmp, "%c%c %-80s", (g_is_path_selected[i] ? '*' : ' '),
-           (g_is_path_expanded[i] ? '+' : '-'),
-           strip_path(g_strings_of_flist_window[i]));
-      tmp[70] = '\0';
-      keylist[i] = (void *) i;
-      newtListboxAppendEntry (listbox, tmp, keylist[i]);
-    }
-      return (lines_in_flist_window);
-    }
-  else
-    {
-      return (0);
-    }
+        newtListboxClear(listbox);
+        for (i = 0; i < lines_in_flist_window; i++) {
+            sprintf(tmp, "%c%c %-80s", (g_is_path_selected[i] ? '*' : ' '),
+                    (g_is_path_expanded[i] ? '+' : '-'),
+                    strip_path(g_strings_of_flist_window[i]));
+            tmp[70] = '\0';
+            keylist[i] = (void *) i;
+            newtListboxAppendEntry(listbox, tmp, keylist[i]);
+        }
+        return (lines_in_flist_window);
+    } else {
+        return (0);
+    }
 }
 
@@ -1077 +1022 @@
  * @ingroup restoreUtilityGroup
  */
-char *strip_path(char *tmp) 
+char *strip_path(char *tmp)
 {
 
@@ -1083 +1028 @@
     int slashloc = 0, lastslashloc = 0;
 
-    while(tmp[i] != '\0')
-    { /* Count the slashes in tmp
-         1 slash per dir */
-      if( tmp[i] == '/')
-      {
-        slashcount++;
-        lastslashloc = slashloc;
-        slashloc = i;
-        if(tmp[i + 1] == '\0')
-        { /* if this slash is last char, back off */
-          slashcount--;
-          slashloc = lastslashloc;
-        }
-      }
-      i++;
-    }
-    if(slashcount > 0) slashcount--; /* Keep one slash 'cos Hugh does... */
-
-    for(i=0; i<slashcount; i++)
-    { /* Replace each dir with a space char */
-      tmpnopath[i] = ' ';
+    while (tmp[i] != '\0') {    /* Count the slashes in tmp
+                                   1 slash per dir */
+        if (tmp[i] == '/') {
+            slashcount++;
+            lastslashloc = slashloc;
+            slashloc = i;
+            if (tmp[i + 1] == '\0') {   /* if this slash is last char, back off */
+                slashcount--;
+                slashloc = lastslashloc;
+            }
+        }
+        i++;
+    }
+    if (slashcount > 0)
+        slashcount--;           /* Keep one slash 'cos Hugh does... */
+
+    for (i = 0; i < slashcount; i++) {  /* Replace each dir with a space char */
+        tmpnopath[i] = ' ';
     }
 
     i = slashloc;
     j = slashcount;
-    while(tmp[i] != '\0')
-    { /* Now add what's left of tmp */
-      if( (tmpprevpath[j] == ' ' || tmpprevpath[j] == '^') 
-          && tmp[i] == '/' 
-          && tmpnopath[j - 1] != '^' 
-          && j != 0) 
-      { /* Add a pointer upwards if this is not in the same dir as line above */
-          tmpnopath[j - 1] = '^';
-      } else {
-        tmpnopath[j++] = tmp[i++];
-      }
+    while (tmp[i] != '\0') {    /* Now add what's left of tmp */
+        if ((tmpprevpath[j] == ' ' || tmpprevpath[j] == '^')
+            && tmp[i] == '/' && tmpnopath[j - 1] != '^' && j != 0) {    /* Add a pointer upwards if this is not in the same dir as line above */
+            tmpnopath[j - 1] = '^';
+        } else {
+            tmpnopath[j++] = tmp[i++];
+        }
     }
     tmpnopath[j] = '\0';
 
-    strcpy(tmpprevpath, tmpnopath); /* Make a copy for next iteration */
-    
-    return(tmpnopath);
+    strcpy(tmpprevpath, tmpnopath); /* Make a copy for next iteration */
+
+    return (tmpnopath);
 }
 
@@ -1133 +1071 @@
  * @return 0 if the user pressed OK, 1 if they pressed Cancel.
  */
-int
-edit_filelist (struct s_node *filelist)
+int edit_filelist(struct s_node *filelist)
 {
 
     /** newt **************************************************************/
-  newtComponent myForm;
-    newtComponent bLess=NULL;
-    newtComponent bMore=NULL;
-    newtComponent bToggle=NULL;
-    newtComponent bOK=NULL;
-    newtComponent bCancel=NULL;
-    newtComponent b_res=NULL;
-    newtComponent filelistListbox=NULL;
-    newtComponent bRegex=NULL;
+    newtComponent myForm;
+    newtComponent bLess = NULL;
+    newtComponent bMore = NULL;
+    newtComponent bToggle = NULL;
+    newtComponent bOK = NULL;
+    newtComponent bCancel = NULL;
+    newtComponent b_res = NULL;
+    newtComponent filelistListbox = NULL;
+    newtComponent bRegex = NULL;
 
     /** int ***************************************************************/
@@ -1155 +1092 @@
 
     /** ???? **************************************************************/
-  void *curr_choice;
-  void *keylist[ARBITRARY_MAXIMUM];
+    void *curr_choice;
+    void *keylist[ARBITRARY_MAXIMUM];
 
     /** buffers ***********************************************************/
-  char tmp[MAX_STR_LEN];
+    char tmp[MAX_STR_LEN];
 
     /** bool **************************************************************/
-  bool dummybool;
+    bool dummybool;
 
 /*  struct s_node *node; */
 
-  assert(filelist!=NULL);
-
-  log_to_screen ("Editing filelist");
-  newtPushHelpLine
-    ("   Please edit the filelist to your satisfaction, then click OK or Cancel.");
-  j = 4;
-  bLess = newtCompactButton (j, 17, " Less ");
-  bMore = newtCompactButton (j += 12, 17, " More ");
-  bToggle = newtCompactButton (j += 12, 17, "Toggle");
-  bRegex = newtCompactButton (j += 12, 17, "RegEx");
-  bCancel = newtCompactButton (j += 12, 17, "Cancel");
-  bOK = newtCompactButton (j += 12, 17, "  OK  ");
-  filelistListbox =
-    newtListbox (2, 1, 15, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
-  toggle_all_root_dirs_on (filelist);
-  lines_in_flist_window =
-    redraw_filelist (filelist, keylist, filelistListbox);
-  newtOpenWindow (1, 3, 77, 18, "Editing filelist");
-  myForm = newtForm (NULL, NULL, 0);
-  newtFormAddComponents (myForm, filelistListbox, bLess, bMore, bToggle,
-             bRegex, bCancel, bOK, NULL);
-  while (!finished)
-    {
-      b_res = newtRunForm (myForm);
-      if (b_res == bOK)
-    {
-      finished =
-        ask_me_yes_or_no ("Are you happy with your file selection?");
-    }
-      else if (b_res == bCancel)
-    {
-      finished = TRUE;
-    }
-      else if (b_res == bRegex)
-    {
-      popup_and_OK ("I haven't implemented this yet...");
-    }
-      else
-    {
-      curr_choice = newtListboxGetCurrent (filelistListbox);
-      for (indexno = 0;
-           indexno < lines_in_flist_window
-           && keylist[indexno] != curr_choice; indexno++);
-      if (indexno == lines_in_flist_window)
-        {
-          log_it
-        ("I don't know what this button does; assuming I am to toggle 1st entry");
-          indexno = 0;
-        }
-      sprintf (tmp, "You selected '%s'",
-           g_strings_of_flist_window[indexno]);
-      log_it (tmp);
-      if (b_res == bMore)
-        {
-          g_is_path_expanded[indexno] = TRUE;
-          toggle_path_expandability (filelist,
-                     g_strings_of_flist_window[indexno],
-                     TRUE);
-          lines_in_flist_window =
-        redraw_filelist (filelist, keylist, filelistListbox);
-          newtListboxSetCurrentByKey (filelistListbox, curr_choice);
-        }
-      else if (b_res == bLess)
-        {
-          g_is_path_expanded[indexno] = FALSE;
-          toggle_path_expandability (filelist,
-                     g_strings_of_flist_window[indexno],
-                     FALSE);
-          lines_in_flist_window =
-        redraw_filelist (filelist, keylist, filelistListbox);
-          newtListboxSetCurrentByKey (filelistListbox, curr_choice);
-        }
-      else
-        {
-          if (!strcmp (g_strings_of_flist_window[indexno], "/"))
-        {
-          dummybool = !g_is_path_selected[indexno];
-          for (j = 1; j < lines_in_flist_window; j++)
-            {
-              toggle_path_selection (filelist,
-                         g_strings_of_flist_window[j],
-                         dummybool);
-            }
-        }
-          else
-        {
-          toggle_path_selection (filelist,
-                     g_strings_of_flist_window[indexno],
-                     !g_is_path_selected[indexno]);
-          lines_in_flist_window =
-            redraw_filelist (filelist, keylist, filelistListbox);
-        }
-          newtListboxSetCurrentByKey (filelistListbox, curr_choice);
-        }
-      for (indexno = 0;
-           indexno < lines_in_flist_window
-           && keylist[indexno] != curr_choice; indexno++);
-      if (indexno == lines_in_flist_window)
-        {
-          log_it
-        ("Layout of table has changed. Y pointer is reverting to zero.");
-          indexno = 0;
-        }
-    }
-    }
-  newtFormDestroy (myForm);
-  newtPopWindow ();
-  newtPopHelpLine ();
-  if (b_res == bOK)
-    {
-      return (0);
-    }
-  else
-    {
+    assert(filelist != NULL);
+
+    log_to_screen("Editing filelist");
+    newtPushHelpLine
+        ("   Please edit the filelist to your satisfaction, then click OK or Cancel.");
+    j = 4;
+    bLess = newtCompactButton(j, 17, " Less ");
+    bMore = newtCompactButton(j += 12, 17, " More ");
+    bToggle = newtCompactButton(j += 12, 17, "Toggle");
+    bRegex = newtCompactButton(j += 12, 17, "RegEx");
+    bCancel = newtCompactButton(j += 12, 17, "Cancel");
+    bOK = newtCompactButton(j += 12, 17, "  OK  ");
+    filelistListbox =
+        newtListbox(2, 1, 15, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
+    toggle_all_root_dirs_on(filelist);
+    lines_in_flist_window =
+        redraw_filelist(filelist, keylist, filelistListbox);
+    newtOpenWindow(1, 3, 77, 18, "Editing filelist");
+    myForm = newtForm(NULL, NULL, 0);
+    newtFormAddComponents(myForm, filelistListbox, bLess, bMore, bToggle,
+                          bRegex, bCancel, bOK, NULL);
+    while (!finished) {
+        b_res = newtRunForm(myForm);
+        if (b_res == bOK) {
+            finished =
+                ask_me_yes_or_no
+                ("Are you happy with your file selection?");
+        } else if (b_res == bCancel) {
+            finished = TRUE;
+        } else if (b_res == bRegex) {
+            popup_and_OK("I haven't implemented this yet...");
+        } else {
+            curr_choice = newtListboxGetCurrent(filelistListbox);
+            for (indexno = 0;
+                 indexno < lines_in_flist_window
+                 && keylist[indexno] != curr_choice; indexno++);
+            if (indexno == lines_in_flist_window) {
+                log_it
+                    ("I don't know what this button does; assuming I am to toggle 1st entry");
+                indexno = 0;
+            }
+            sprintf(tmp, "You selected '%s'",
+                    g_strings_of_flist_window[indexno]);
+            log_it(tmp);
+            if (b_res == bMore) {
+                g_is_path_expanded[indexno] = TRUE;
+                toggle_path_expandability(filelist,
+                                          g_strings_of_flist_window
+                                          [indexno], TRUE);
+                lines_in_flist_window =
+                    redraw_filelist(filelist, keylist, filelistListbox);
+                newtListboxSetCurrentByKey(filelistListbox, curr_choice);
+            } else if (b_res == bLess) {
+                g_is_path_expanded[indexno] = FALSE;
+                toggle_path_expandability(filelist,
+                                          g_strings_of_flist_window
+                                          [indexno], FALSE);
+                lines_in_flist_window =
+                    redraw_filelist(filelist, keylist, filelistListbox);
+                newtListboxSetCurrentByKey(filelistListbox, curr_choice);
+            } else {
+                if (!strcmp(g_strings_of_flist_window[indexno], "/")) {
+                    dummybool = !g_is_path_selected[indexno];
+                    for (j = 1; j < lines_in_flist_window; j++) {
+                        toggle_path_selection(filelist,
+                                              g_strings_of_flist_window[j],
+                                              dummybool);
+                    }
+                } else {
+                    toggle_path_selection(filelist,
+                                          g_strings_of_flist_window
+                                          [indexno],
+                                          !g_is_path_selected[indexno]);
+                    lines_in_flist_window =
+                        redraw_filelist(filelist, keylist,
+                                        filelistListbox);
+                }
+                newtListboxSetCurrentByKey(filelistListbox, curr_choice);
+            }
+            for (indexno = 0;
+                 indexno < lines_in_flist_window
+                 && keylist[indexno] != curr_choice; indexno++);
+            if (indexno == lines_in_flist_window) {
+                log_it
+                    ("Layout of table has changed. Y pointer is reverting to zero.");
+                indexno = 0;
+            }
+        }
+    }
+    newtFormDestroy(myForm);
+    newtPopWindow();
+    newtPopHelpLine();
+    if (b_res == bOK) {
+        return (0);
+    } else {
 /*    popup_and_OK("You pushed 'cancel'. I shall now abort."); */
-      return (1);
-    }
+        return (1);
+    }
 }
 
@@ -1296 +1214 @@
  */
 void
-edit_mountlist_entry (struct mountlist_itself *mountlist,
-              struct raidlist_itself *raidlist, newtComponent listbox,
-              int currline, void *keylist[])
+edit_mountlist_entry(struct mountlist_itself *mountlist,
+                     struct raidlist_itself *raidlist,
+                     newtComponent listbox, int currline, void *keylist[])
 {
 
     /** structures ********************************************************/
-  static struct raidlist_itself bkp_raidlist;
+    static struct raidlist_itself bkp_raidlist;
 
     /** newt **************************************************************/
-  newtComponent myForm;
+    newtComponent myForm;
     newtComponent bOK;
     newtComponent bCancel;
@@ -1324 +1242 @@
     char size_str[MAX_STR_LEN];
     char format_str[MAX_STR_LEN];
-  char tmp[MAX_STR_LEN];
-  char device_used_to_be[MAX_STR_LEN];
+    char tmp[MAX_STR_LEN];
+    char device_used_to_be[MAX_STR_LEN];
     char mountpt_used_to_be[MAX_STR_LEN];
 
@@ -1335 +1253 @@
 
     /** int ***************************************************************/
-  int j = 0;
-
-  assert(mountlist!=NULL);
-  assert(raidlist!=NULL);
-  assert(listbox!=NULL);
-  assert(keylist!=NULL);
-
-  memcpy ((void *) &bkp_raidlist, (void *) raidlist,
-      sizeof (struct raidlist_itself));
-  strcpy (device_str, mountlist->el[currline].device);
-  strcpy (device_used_to_be, mountlist->el[currline].device);
-  strcpy (mountpoint_str, mountlist->el[currline].mountpoint);
-  strcpy (mountpt_used_to_be, mountlist->el[currline].mountpoint);
-  strcpy (format_str, mountlist->el[currline].format);
-  sprintf (size_str, "%lld", mountlist->el[currline].size / 1024);
-  newtOpenWindow (20, 5, 48, 10, "Edit entry");
-  label0 = newtLabel (2, 1, "Device:");
-  label1 = newtLabel (2, 2, "Mountpoint:");
-  label2 = newtLabel (2, 3, "Size (MB): ");
-  label3 = newtLabel (2, 4, "Format:    ");
-  deviceComp = newtEntry (14, 1, device_str, 30, (void*)&device_here, 0);
-  mountpointComp = newtEntry (14, 2, mountpoint_str, 30, (void*)&mountpoint_here, 0);
-  formatComp = newtEntry (14, 4, format_str, 15, (void*)&format_here, 0);
-  if (strstr (mountlist->el[currline].device, RAID_DEVICE_STUB)
-      || !strcmp (mountlist->el[currline].mountpoint, "image"))
-    {
-      sizeComp = newtLabel (14, 3, size_str);
-    }
-  else
-    {
-      sizeComp = newtEntry (14, 3, size_str, 10, (void*)&size_here, 0);
-    }
-  bOK = newtButton (2, 6, "  OK  ");
-  bCancel = newtButton (14, 6, "Cancel");
-  if (strstr (mountlist->el[currline].device, RAID_DEVICE_STUB))
-    {
-      b_raid = newtButton (26, 6, "RAID..");
-    }
-  newtPushHelpLine
-    ("       Edit this partition's mountpoint, size and format; then click 'OK'.");
-  myForm = newtForm (NULL, NULL, 0);
-  newtFormAddComponents (myForm, deviceComp, mountpointComp, sizeComp,
-             formatComp, label0, label1, label2, label3, bOK,
-             bCancel, b_raid, NULL);
-  for (b_res = NULL; b_res != bOK && b_res != bCancel;)
-    {
-      b_res = newtRunForm (myForm);
-      strcpy (device_str, device_here);
-      strip_spaces (device_str);
-      strcpy (mountpoint_str, mountpoint_here);
-      strip_spaces (mountpoint_str);
-      strcpy (format_str, format_here);
-      strip_spaces (format_str);
-      if (b_res == bOK && strstr (device_str, RAID_DEVICE_STUB)
-      && strstr (device_used_to_be, RAID_DEVICE_STUB)
-      && strcmp (device_str, device_used_to_be))
-    {
-      popup_and_OK ("You can't change /dev/mdX to /dev/mdY.");
-      b_res = NULL;
-      continue;
-    }
-      else if (b_res == bOK && !strcmp (mountpoint_str, "image")
-           && strcmp (mountpt_used_to_be, "image"))
-    {
-      popup_and_OK ("You can't change a regular device to an image.");
-      b_res = NULL;
-      continue;
-    }
-      if (!strstr (mountlist->el[currline].device, RAID_DEVICE_STUB)
-      && strcmp (mountlist->el[currline].mountpoint, "image"))
-    {
-      strcpy (size_str, size_here);
-      strip_spaces (size_str);
-    }
-      else
-    {
-      sprintf (size_str, "%ld",
-           calculate_raid_device_size (mountlist, raidlist,
-                           mountlist->el[currline].
-                           device) / 1024);
-      newtLabelSetText (sizeComp, size_str);
-    }
-      /* do not let user click RAID button if user has changed device_str */
-      if (b_res == b_raid)
-    {
-      if (strcmp (device_str, mountlist->el[currline].device))
-        {
-          /*
-             can't change mountlist's entry from /dex/mdX to /dev/mdY: it would ugly 
-             when you try to map the changes over to the raidtab list, trust me
-           */
-          popup_and_OK
-        ("You cannot edit the RAID settings until you have OK'd your change to the device node.");
-        }
-      else
-        {
-          j =
-        find_raid_device_in_raidlist (raidlist,
-                          mountlist->el[currline].device);
-          if (j < 0)
-        {
-          sprintf (tmp,
-               "/etc/raidtab does not have an entry for %s; please delete it and add it again",
-               mountlist->el[currline].device);
-          popup_and_OK (tmp);
-        }
-          else
-        {
-          log_it ("edit_raidlist_entry - calling");
-          edit_raidlist_entry (mountlist, raidlist, &raidlist->el[j],
-                       currline);
-        }
-        }
-    }
-    }
-  newtFormDestroy (myForm);
-  newtPopHelpLine ();
-  newtPopWindow ();
-  if (b_res == bCancel)
-    {
-      memcpy ((void *) raidlist, (void *) &bkp_raidlist,
-          sizeof (struct raidlist_itself));
-      return;
-    }
-  strcpy (mountlist->el[currline].device, device_str);
-  strcpy (mountlist->el[currline].mountpoint, mountpoint_str);
-  strcpy (mountlist->el[currline].format, format_str);
-  if (strstr (mountlist->el[currline].device, RAID_DEVICE_STUB)
-      || !strcmp (mountlist->el[currline].mountpoint, "image"))
-    {
-      mountlist->el[currline].size =
-    calculate_raid_device_size (mountlist, raidlist,
-                    mountlist->el[currline].device);
-    }
-  else
-    {
-      mountlist->el[currline].size = atol (size_str) * 1024;
-    }
-  newtListboxSetEntry (listbox, (int) keylist[currline],
-               mountlist_entry_to_string (mountlist, currline));
-  /* if new /dev/md RAID device then do funky stuff */
-  if (strstr (mountlist->el[currline].device, RAID_DEVICE_STUB)
-      && !strstr (device_used_to_be, RAID_DEVICE_STUB))
-    {
-      initiate_new_raidlist_entry (raidlist, mountlist, currline, device_str);
-    }
-  /* if moving from RAID to non-RAID then do funky stuff */
-  else if (strstr (device_used_to_be, RAID_DEVICE_STUB)
-       && !strstr (device_str, RAID_DEVICE_STUB))
-    {
-      delete_raidlist_entry (mountlist, raidlist, device_str);
-    }
-  /* if moving a non-RAID to another non-RAID then re-jig any RAID disks, if necessary */
-  else if (!strstr (device_used_to_be, RAID_DEVICE_STUB)
-       && !strstr (device_str, RAID_DEVICE_STUB))
-    {
-      rejig_partition_name_in_raidlist_if_necessary (raidlist,
-                             device_used_to_be,
-                             device_str);
-    }
+    int j = 0;
+
+    assert(mountlist != NULL);
+    assert(raidlist != NULL);
+    assert(listbox != NULL);
+    assert(keylist != NULL);
+
+    memcpy((void *) &bkp_raidlist, (void *) raidlist,
+           sizeof(struct raidlist_itself));
+    strcpy(device_str, mountlist->el[currline].device);
+    strcpy(device_used_to_be, mountlist->el[currline].device);
+    strcpy(mountpoint_str, mountlist->el[currline].mountpoint);
+    strcpy(mountpt_used_to_be, mountlist->el[currline].mountpoint);
+    strcpy(format_str, mountlist->el[currline].format);
+    sprintf(size_str, "%lld", mountlist->el[currline].size / 1024);
+    newtOpenWindow(20, 5, 48, 10, "Edit entry");
+    label0 = newtLabel(2, 1, "Device:");
+    label1 = newtLabel(2, 2, "Mountpoint:");
+    label2 = newtLabel(2, 3, "Size (MB): ");
+    label3 = newtLabel(2, 4, "Format:    ");
+    deviceComp =
+        newtEntry(14, 1, device_str, 30, (void *) &device_here, 0);
+    mountpointComp =
+        newtEntry(14, 2, mountpoint_str, 30, (void *) &mountpoint_here, 0);
+    formatComp =
+        newtEntry(14, 4, format_str, 15, (void *) &format_here, 0);
+    if (strstr(mountlist->el[currline].device, RAID_DEVICE_STUB)
+        || !strcmp(mountlist->el[currline].mountpoint, "image")) {
+        sizeComp = newtLabel(14, 3, size_str);
+    } else {
+        sizeComp = newtEntry(14, 3, size_str, 10, (void *) &size_here, 0);
+    }
+    bOK = newtButton(2, 6, "  OK  ");
+    bCancel = newtButton(14, 6, "Cancel");
+    if (strstr(mountlist->el[currline].device, RAID_DEVICE_STUB)) {
+        b_raid = newtButton(26, 6, "RAID..");
+    }
+    newtPushHelpLine
+        ("       Edit this partition's mountpoint, size and format; then click 'OK'.");
+    myForm = newtForm(NULL, NULL, 0);
+    newtFormAddComponents(myForm, deviceComp, mountpointComp, sizeComp,
+                          formatComp, label0, label1, label2, label3, bOK,
+                          bCancel, b_raid, NULL);
+    for (b_res = NULL; b_res != bOK && b_res != bCancel;) {
+        b_res = newtRunForm(myForm);
+        strcpy(device_str, device_here);
+        strip_spaces(device_str);
+        strcpy(mountpoint_str, mountpoint_here);
+        strip_spaces(mountpoint_str);
+        strcpy(format_str, format_here);
+        strip_spaces(format_str);
+        if (b_res == bOK && strstr(device_str, RAID_DEVICE_STUB)
+            && strstr(device_used_to_be, RAID_DEVICE_STUB)
+            && strcmp(device_str, device_used_to_be)) {
+            popup_and_OK("You can't change /dev/mdX to /dev/mdY.");
+            b_res = NULL;
+            continue;
+        } else if (b_res == bOK && !strcmp(mountpoint_str, "image")
+                   && strcmp(mountpt_used_to_be, "image")) {
+            popup_and_OK("You can't change a regular device to an image.");
+            b_res = NULL;
+            continue;
+        }
+        if (!strstr(mountlist->el[currline].device, RAID_DEVICE_STUB)
+            && strcmp(mountlist->el[currline].mountpoint, "image")) {
+            strcpy(size_str, size_here);
+            strip_spaces(size_str);
+        } else {
+            sprintf(size_str, "%ld",
+                    calculate_raid_device_size(mountlist, raidlist,
+                                               mountlist->el[currline].
+                                               device) / 1024);
+            newtLabelSetText(sizeComp, size_str);
+        }
+        /* do not let user click RAID button if user has changed device_str */
+        if (b_res == b_raid) {
+            if (strcmp(device_str, mountlist->el[currline].device)) {
+                /*
+                   can't change mountlist's entry from /dex/mdX to /dev/mdY: it would ugly 
+                   when you try to map the changes over to the raidtab list, trust me
+                 */
+                popup_and_OK
+                    ("You cannot edit the RAID settings until you have OK'd your change to the device node.");
+            } else {
+                j = find_raid_device_in_raidlist(raidlist,
+                                                 mountlist->el[currline].
+                                                 device);
+                if (j < 0) {
+                    sprintf(tmp,
+                            "/etc/raidtab does not have an entry for %s; please delete it and add it again",
+                            mountlist->el[currline].device);
+                    popup_and_OK(tmp);
+                } else {
+                    log_it("edit_raidlist_entry - calling");
+                    edit_raidlist_entry(mountlist, raidlist,
+                                        &raidlist->el[j], currline);
+                }
+            }
+        }
+    }
+    newtFormDestroy(myForm);
+    newtPopHelpLine();
+    newtPopWindow();
+    if (b_res == bCancel) {
+        memcpy((void *) raidlist, (void *) &bkp_raidlist,
+               sizeof(struct raidlist_itself));
+        return;
+    }
+    strcpy(mountlist->el[currline].device, device_str);
+    strcpy(mountlist->el[currline].mountpoint, mountpoint_str);
+    strcpy(mountlist->el[currline].format, format_str);
+    if (strstr(mountlist->el[currline].device, RAID_DEVICE_STUB)
+        || !strcmp(mountlist->el[currline].mountpoint, "image")) {
+        mountlist->el[currline].size =
+            calculate_raid_device_size(mountlist, raidlist,
+                                       mountlist->el[currline].device);
+    } else {
+        mountlist->el[currline].size = atol(size_str) * 1024;
+    }
+    newtListboxSetEntry(listbox, (int) keylist[currline],
+                        mountlist_entry_to_string(mountlist, currline));
+    /* if new /dev/md RAID device then do funky stuff */
+    if (strstr(mountlist->el[currline].device, RAID_DEVICE_STUB)
+        && !strstr(device_used_to_be, RAID_DEVICE_STUB)) {
+        initiate_new_raidlist_entry(raidlist, mountlist, currline,
+                                    device_str);
+    }
+    /* if moving from RAID to non-RAID then do funky stuff */
+    else if (strstr(device_used_to_be, RAID_DEVICE_STUB)
+             && !strstr(device_str, RAID_DEVICE_STUB)) {
+        delete_raidlist_entry(mountlist, raidlist, device_str);
+    }
+    /* if moving a non-RAID to another non-RAID then re-jig any RAID disks, if necessary */
+    else if (!strstr(device_used_to_be, RAID_DEVICE_STUB)
+             && !strstr(device_str, RAID_DEVICE_STUB)) {
+        rejig_partition_name_in_raidlist_if_necessary(raidlist,
+                                                      device_used_to_be,
+                                                      device_str);
+    }
 /* else, moving a RAID to another RAID; bad idea, or so I thought */
-#ifndef __FreeBSD__ /* It works fine under FBSD. */
-  else if (strcmp (device_used_to_be, device_str))
-    {
-      popup_and_OK
-    ("You are renaming a RAID device as another RAID device. I don't like it but I'll allow it.");
-    }
+#ifndef __FreeBSD__             /* It works fine under FBSD. */
+    else if (strcmp(device_used_to_be, device_str)) {
+        popup_and_OK
+            ("You are renaming a RAID device as another RAID device. I don't like it but I'll allow it.");
+    }
 #endif
-  redraw_mountlist (mountlist, keylist, listbox);
+    redraw_mountlist(mountlist, keylist, listbox);
 }
 
@@ -1517 +1413 @@
  */
 void
-add_raid_subdisk (struct raidlist_itself *raidlist, struct vinum_plex *raidrec, char *temp)
-{
-    int i;
-    bool found = FALSE;
-    
-    for (i = 0; i < raidlist->disks.entries; ++i) {
-    if (!strcmp (raidlist->disks.el[i].device, temp)) {
-        strcpy (raidrec->sd [raidrec->subdisks].which_device,
-            raidlist->disks.el[i].name);
-        found = TRUE;
-    }
-    }
-    if (!found) {
-    sprintf (raidlist->disks.el[raidlist->disks.entries].name, "drive%i", raidlist->disks.entries);
-    sprintf (raidrec->sd [raidrec->subdisks].which_device, "drive%i", raidlist->disks.entries);
-    strcpy (raidlist->disks.el[raidlist->disks.entries++].device, temp);
-    }
-    raidrec->subdisks++;
+add_raid_subdisk(struct raidlist_itself *raidlist,
+                 struct vinum_plex *raidrec, char *temp)
+{
+    int i;
+    bool found = FALSE;
+
+    for (i = 0; i < raidlist->disks.entries; ++i) {
+        if (!strcmp(raidlist->disks.el[i].device, temp)) {
+            strcpy(raidrec->sd[raidrec->subdisks].which_device,
+                   raidlist->disks.el[i].name);
+            found = TRUE;
+        }
+    }
+    if (!found) {
+        sprintf(raidlist->disks.el[raidlist->disks.entries].name,
+                "drive%i", raidlist->disks.entries);
+        sprintf(raidrec->sd[raidrec->subdisks].which_device, "drive%i",
+                raidlist->disks.entries);
+        strcpy(raidlist->disks.el[raidlist->disks.entries++].device, temp);
+    }
+    raidrec->subdisks++;
 }
 
@@ -1547 +1446 @@
  * @ingroup restoreUtilityGroup
  */
-char *
-find_dev_entry_for_raid_device_name (struct raidlist_itself *raidlist, char *vinum_name) 
-{
-    int i;
-    for (i = 0; i < raidlist->disks.entries; ++i) {
-    if (!strcmp (raidlist->disks.el[i].name, vinum_name)) {
-        return raidlist->disks.el[i].device;
-    }
-    }
-    return NULL;
+char *find_dev_entry_for_raid_device_name(struct raidlist_itself *raidlist,
+                                          char *vinum_name)
+{
+    int i;
+    for (i = 0; i < raidlist->disks.entries; ++i) {
+        if (!strcmp(raidlist->disks.el[i].name, vinum_name)) {
+            return raidlist->disks.el[i].device;
+        }
+    }
+    return NULL;
 }
 
 void
-edit_raidlist_plex (struct mountlist_itself *mountlist,
-            struct raidlist_itself *raidlist,
-            struct vinum_plex *raidrec, int currline, int currline2);
+edit_raidlist_plex(struct mountlist_itself *mountlist,
+                   struct raidlist_itself *raidlist,
+                   struct vinum_plex *raidrec, int currline,
+                   int currline2);
 
 #endif
@@ -1576 +1476 @@
  */
 void
-edit_raidlist_entry (struct mountlist_itself *mountlist,
-             struct raidlist_itself *raidlist,
-             struct OSSWAP (raid_device_record, vinum_volume) *raidrec, int currline)
+edit_raidlist_entry(struct mountlist_itself *mountlist,
+                    struct raidlist_itself *raidlist,
+                    struct OSSWAP (raid_device_record,
+                                   vinum_volume) * raidrec, int currline)
 {
 
 #ifdef __FreeBSD__
     /** structures ********************************************************/
-  struct vinum_volume bkp_raidrec;
+    struct vinum_volume bkp_raidrec;
 
 
     /** buffers ***********************************************************/
-  char title_of_editraidForm_window[MAX_STR_LEN];
+    char title_of_editraidForm_window[MAX_STR_LEN];
 
     /** newt **************************************************************/
-  newtComponent editraidForm;
-  newtComponent bOK;
-  newtComponent bCancel;
-  newtComponent bEdit;
-  newtComponent bAdd;
-  newtComponent bDelete;
-  newtComponent b_res;
-  newtComponent plexesListbox;
-  newtComponent plexesHeader;
-
-  void *keylist[10];
-  void *curr_choice;
-
-  int currline2 = 0;
-
-  log_it ("Started edit_raidlist_entry");
-  memcpy ((void *) &bkp_raidrec, (void *) raidrec,
-      sizeof (struct vinum_volume));
-  sprintf (title_of_editraidForm_window, "Plexes on %s", raidrec->volname);
-  newtPushHelpLine ("   Please select a plex to edit");
-  newtOpenWindow (13, 5, 54, 15, title_of_editraidForm_window);
-  for (;;)
-    {
-    int i;
-    char headerstr[MAX_STR_LEN];
-    snprintf (headerstr, MAX_STR_LEN, "%-14s %-8s  %11s  %8s",
-          "Plex", "Level", "Stripe Size", "Subdisks");
-
-    bOK = newtCompactButton (2, 13, "  OK  ");
-    bCancel = newtCompactButton (12, 13, "Cancel");
-    bAdd  = newtCompactButton (22, 13, " Add ");
-    bEdit = newtCompactButton (32, 13, " Edit ");
-    bDelete = newtCompactButton (42, 13, "Delete");
-
-    plexesListbox = newtListbox (2, 3, 9, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
-    plexesHeader  = newtLabel (2, 2, headerstr);
-    editraidForm = newtForm (NULL, NULL, 0);
-
-    newtListboxClear (plexesListbox);
-    for (i = 0; i < 10; ++i) {
-        keylist[i] = (void *) i;
-        if (i < raidrec->plexes) {
-        char pname[64], entry[MAX_STR_LEN], raidlevel[64], chunksize[64];
-        switch (raidrec->plex[i].raidlevel) {
-        case -1:
-            strcpy (raidlevel, "concat");
-            break;
-        case 0:
-            strcpy (raidlevel, "striped");
-            break;
-        case 5:
-            strcpy (raidlevel, "raid5");
-            break;
-        default:
-            sprintf (raidlevel, "raid%i", raidrec->plex[i].raidlevel);
-            break;
-        }
-
-        if (raidrec->plex[i].raidlevel == -1) {
-            strcpy (chunksize, "N/A");
-        } else {
-            sprintf (chunksize, "%dk", raidrec->plex[i].stripesize);
-        }
-        snprintf (pname, 64, "%s.p%i", raidrec->volname, i);
-        snprintf (entry, MAX_STR_LEN, "%-14s %-8s  %11s  %8d", pname, raidlevel, chunksize,
-              raidrec->plex[i].subdisks);
-        newtListboxAppendEntry (plexesListbox, entry, keylist[i]);
-        }
-    }
-
-    newtFormAddComponents (editraidForm, bOK, bCancel, bAdd, bEdit,
-                   bDelete, plexesListbox, plexesHeader, NULL);
-
-    b_res = newtRunForm (editraidForm);
-      if (b_res == bOK || b_res == bCancel)
-    {
-      break;
-    }
-
-      curr_choice = newtListboxGetCurrent (plexesListbox);
-      for (currline2 = 0; currline2 < raidrec->plexes; ++currline2) {
-      if (currline2 > 9) break;
-      if (keylist[currline2] == curr_choice) break;
-      }
-
-      if (b_res == bDelete) {
-      char msg[MAX_STR_LEN];
-      sprintf (msg, "Are you sure you want to delete %s.p%i?", raidrec->volname, currline2);
-      if (ask_me_yes_or_no (msg)) {
-          log_it ("Deleting RAID plex");
-          memcpy ((void *) &raidrec->plex[currline2],
-              (void *) &raidrec->plex[raidrec->plexes - 1],
-              sizeof (struct vinum_plex));
-          raidrec->plexes--;
-      }
-      continue;
-      }
-      if (b_res == bAdd) {
-      raidrec->plex[raidrec->plexes].raidlevel = 0;
-      raidrec->plex[raidrec->plexes].stripesize = 279;
-      raidrec->plex[raidrec->plexes].subdisks = 0;
-      currline2 = raidrec->plexes++;
-      }
-      edit_raidlist_plex (mountlist, raidlist, &raidrec->plex[currline2], currline, currline2);
-      newtFormDestroy (editraidForm);
-    }
-  if (b_res == bCancel)
-    {
-      memcpy ((void *) raidrec, (void *) &bkp_raidrec,
-          sizeof (struct vinum_volume));
-    }
-  newtPopHelpLine ();
-  newtPopWindow ();
-  mountlist->el[currline].size =
-    calculate_raid_device_size (mountlist, raidlist, raidrec->volname);
+    newtComponent editraidForm;
+    newtComponent bOK;
+    newtComponent bCancel;
+    newtComponent bEdit;
+    newtComponent bAdd;
+    newtComponent bDelete;
+    newtComponent b_res;
+    newtComponent plexesListbox;
+    newtComponent plexesHeader;
+
+    void *keylist[10];
+    void *curr_choice;
+
+    int currline2 = 0;
+
+    log_it("Started edit_raidlist_entry");
+    memcpy((void *) &bkp_raidrec, (void *) raidrec,
+           sizeof(struct vinum_volume));
+    sprintf(title_of_editraidForm_window, "Plexes on %s",
+            raidrec->volname);
+    newtPushHelpLine("   Please select a plex to edit");
+    newtOpenWindow(13, 5, 54, 15, title_of_editraidForm_window);
+    for (;;) {
+        int i;
+        char headerstr[MAX_STR_LEN];
+        snprintf(headerstr, MAX_STR_LEN, "%-14s %-8s  %11s  %8s",
+                 "Plex", "Level", "Stripe Size", "Subdisks");
+
+        bOK = newtCompactButton(2, 13, "  OK  ");
+        bCancel = newtCompactButton(12, 13, "Cancel");
+        bAdd = newtCompactButton(22, 13, " Add ");
+        bEdit = newtCompactButton(32, 13, " Edit ");
+        bDelete = newtCompactButton(42, 13, "Delete");
+
+        plexesListbox =
+            newtListbox(2, 3, 9, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
+        plexesHeader = newtLabel(2, 2, headerstr);
+        editraidForm = newtForm(NULL, NULL, 0);
+
+        newtListboxClear(plexesListbox);
+        for (i = 0; i < 10; ++i) {
+            keylist[i] = (void *) i;
+            if (i < raidrec->plexes) {
+                char pname[64], entry[MAX_STR_LEN], raidlevel[64],
+                    chunksize[64];
+                switch (raidrec->plex[i].raidlevel) {
+                case -1:
+                    strcpy(raidlevel, "concat");
+                    break;
+                case 0:
+                    strcpy(raidlevel, "striped");
+                    break;
+                case 5:
+                    strcpy(raidlevel, "raid5");
+                    break;
+                default:
+                    sprintf(raidlevel, "raid%i",
+                            raidrec->plex[i].raidlevel);
+                    break;
+                }
+
+                if (raidrec->plex[i].raidlevel == -1) {
+                    strcpy(chunksize, "N/A");
+                } else {
+                    sprintf(chunksize, "%dk", raidrec->plex[i].stripesize);
+                }
+                snprintf(pname, 64, "%s.p%i", raidrec->volname, i);
+                snprintf(entry, MAX_STR_LEN, "%-14s %-8s  %11s  %8d",
+                         pname, raidlevel, chunksize,
+                         raidrec->plex[i].subdisks);
+                newtListboxAppendEntry(plexesListbox, entry, keylist[i]);
+            }
+        }
+
+        newtFormAddComponents(editraidForm, bOK, bCancel, bAdd, bEdit,
+                              bDelete, plexesListbox, plexesHeader, NULL);
+
+        b_res = newtRunForm(editraidForm);
+        if (b_res == bOK || b_res == bCancel) {
+            break;
+        }
+
+        curr_choice = newtListboxGetCurrent(plexesListbox);
+        for (currline2 = 0; currline2 < raidrec->plexes; ++currline2) {
+            if (currline2 > 9)
+                break;
+            if (keylist[currline2] == curr_choice)
+                break;
+        }
+
+        if (b_res == bDelete) {
+            char msg[MAX_STR_LEN];
+            sprintf(msg, "Are you sure you want to delete %s.p%i?",
+                    raidrec->volname, currline2);
+            if (ask_me_yes_or_no(msg)) {
+                log_it("Deleting RAID plex");
+                memcpy((void *) &raidrec->plex[currline2],
+                       (void *) &raidrec->plex[raidrec->plexes - 1],
+                       sizeof(struct vinum_plex));
+                raidrec->plexes--;
+            }
+            continue;
+        }
+        if (b_res == bAdd) {
+            raidrec->plex[raidrec->plexes].raidlevel = 0;
+            raidrec->plex[raidrec->plexes].stripesize = 279;
+            raidrec->plex[raidrec->plexes].subdisks = 0;
+            currline2 = raidrec->plexes++;
+        }
+        edit_raidlist_plex(mountlist, raidlist, &raidrec->plex[currline2],
+                           currline, currline2);
+        newtFormDestroy(editraidForm);
+    }
+    if (b_res == bCancel) {
+        memcpy((void *) raidrec, (void *) &bkp_raidrec,
+               sizeof(struct vinum_volume));
+    }
+    newtPopHelpLine();
+    newtPopWindow();
+    mountlist->el[currline].size =
+        calculate_raid_device_size(mountlist, raidlist, raidrec->volname);
 #else
     /** structures ********************************************************/
-  struct raid_device_record *bkp_raidrec;
+    struct raid_device_record *bkp_raidrec;
 
 
     /** buffers ***********************************************************/
-    char *title_of_editraidForm_window;
+    char *title_of_editraidForm_window;
     char *sz_raid_level;
     char *sz_data_disks;
@@ -1719 +1626 @@
 
     /** newt **************************************************************/
-  newtComponent editraidForm;
+    newtComponent editraidForm;
     newtComponent bOK;
     newtComponent bCancel;
@@ -1730 +1637 @@
     newtComponent b_res;
 
-  assert(mountlist!=NULL);
-  assert(raidlist!=NULL);
-  assert(raidrec!=NULL);
-
-  malloc_string(title_of_editraidForm_window);
-  malloc_string(sz_raid_level);
-  malloc_string(sz_data_disks);
-  malloc_string(sz_spare_disks);
-  malloc_string(sz_parity_disks);
-  malloc_string(sz_failed_disks);
-  if (!(bkp_raidrec = malloc(sizeof(struct raid_device_record))))
-    { fatal_error("Cannot malloc space for raidrec"); }
-
-  log_it ("Started edit_raidlist_entry");
-
-  memcpy ((void *) bkp_raidrec, (void *) raidrec,
-      sizeof (struct raid_device_record));
-  sprintf (title_of_editraidForm_window, "%s", raidrec->raid_device);
-  log_msg(2, "Opening newt window");
-  newtOpenWindow (20, 5, 40, 14, title_of_editraidForm_window);
-  for (;;)
-    {
-      log_msg(2, "Main loop");
-      sprintf (title_of_editraidForm_window, "Edit %s", raidrec->raid_device);
-      strcpy (sz_raid_level,
-          turn_raid_level_number_to_string (raidrec->raid_level));
-      strcpy (sz_data_disks,
-          number_of_disks_as_string (raidrec->data_disks.entries,
-                     "data"));
-      strcpy (sz_spare_disks,
-          number_of_disks_as_string (raidrec->spare_disks.entries,
-                     "spare"));
-      strcpy (sz_parity_disks,
-          number_of_disks_as_string (raidrec->parity_disks.entries,
-                     "parity"));
-      strcpy (sz_failed_disks,
-          number_of_disks_as_string (raidrec->failed_disks.entries,
-                     "failed"));
-      bSelectData = newtButton (1, 1, sz_data_disks);
-      bSelectSpare = newtButton (20, 1, sz_spare_disks);
-      bSelectParity = newtButton (1, 5, sz_parity_disks);
-      bSelectFailed = newtButton (20, 5, sz_failed_disks);
-      bChangeRaid = newtButton (1, 9, sz_raid_level);
-      bOK = newtButton (16 + (raidrec->raid_level == -1), 9, "  OK  ");
-      bCancel = newtButton (28, 9, "Cancel");
-      bAdditional =
-    newtCompactButton (1, 13, "Additional settings and information");
-      newtPushHelpLine
-    ("  Edit the RAID device's settings to your heart's content, then hit OK/Cancel.");
-      editraidForm = newtForm (NULL, NULL, 0);
-      newtFormAddComponents (editraidForm, bSelectData, bSelectParity,
-                 bChangeRaid, bSelectSpare, bSelectFailed, bOK,
-                 bCancel, bAdditional);
-      b_res = newtRunForm (editraidForm);
-      if (b_res == bChangeRaid)
-    {
-      choose_raid_level (raidrec);
-    }
-      else if (b_res == bSelectData)
-    {
-      select_raid_disks (mountlist, raidlist, raidrec, "data",
-                 &raidrec->data_disks);
-    }
-      else if (b_res == bSelectSpare)
-    {
-      select_raid_disks (mountlist, raidlist, raidrec, "spare",
-                 &raidrec->spare_disks);
-    }
-      else if (b_res == bSelectParity)
-    {
-      select_raid_disks (mountlist, raidlist, raidrec, "parity",
-                 &raidrec->parity_disks);
-    }
-      else if (b_res == bSelectFailed)
-    {
-      select_raid_disks (mountlist, raidlist, raidrec, "failed",
-                 &raidrec->failed_disks);
-    }
-      else if (b_res == bAdditional)
-    {
-      edit_raidrec_additional_vars (raidrec);
-    }
-      newtFormDestroy (editraidForm);
-      if (b_res == bOK || b_res == bCancel)
-    {
-      break;
-    }
-    }
-  if (b_res == bCancel)
-    {
-      memcpy ((void *) raidrec, (void *) bkp_raidrec,
-          sizeof (struct raid_device_record));
-    }
-  newtPopHelpLine ();
-  newtPopWindow ();
-  mountlist->el[currline].size =
-    calculate_raid_device_size (mountlist, raidlist, raidrec->raid_device);
-  paranoid_free(title_of_editraidForm_window);
-  paranoid_free(sz_raid_level);
-  paranoid_free(sz_data_disks);
-  paranoid_free(sz_spare_disks);
-  paranoid_free(sz_parity_disks);
-  paranoid_free(sz_failed_disks);
-  paranoid_free(bkp_raidrec);
+    assert(mountlist != NULL);
+    assert(raidlist != NULL);
+    assert(raidrec != NULL);
+
+    malloc_string(title_of_editraidForm_window);
+    malloc_string(sz_raid_level);
+    malloc_string(sz_data_disks);
+    malloc_string(sz_spare_disks);
+    malloc_string(sz_parity_disks);
+    malloc_string(sz_failed_disks);
+    if (!(bkp_raidrec = malloc(sizeof(struct raid_device_record)))) {
+        fatal_error("Cannot malloc space for raidrec");
+    }
+
+    log_it("Started edit_raidlist_entry");
+
+    memcpy((void *) bkp_raidrec, (void *) raidrec,
+           sizeof(struct raid_device_record));
+    sprintf(title_of_editraidForm_window, "%s", raidrec->raid_device);
+    log_msg(2, "Opening newt window");
+    newtOpenWindow(20, 5, 40, 14, title_of_editraidForm_window);
+    for (;;) {
+        log_msg(2, "Main loop");
+        sprintf(title_of_editraidForm_window, "Edit %s",
+                raidrec->raid_device);
+        strcpy(sz_raid_level,
+               turn_raid_level_number_to_string(raidrec->raid_level));
+        strcpy(sz_data_disks,
+               number_of_disks_as_string(raidrec->data_disks.entries,
+                                         "data"));
+        strcpy(sz_spare_disks,
+               number_of_disks_as_string(raidrec->spare_disks.entries,
+                                         "spare"));
+        strcpy(sz_parity_disks,
+               number_of_disks_as_string(raidrec->parity_disks.entries,
+                                         "parity"));
+        strcpy(sz_failed_disks,
+               number_of_disks_as_string(raidrec->failed_disks.entries,
+                                         "failed"));
+        bSelectData = newtButton(1, 1, sz_data_disks);
+        bSelectSpare = newtButton(20, 1, sz_spare_disks);
+        bSelectParity = newtButton(1, 5, sz_parity_disks);
+        bSelectFailed = newtButton(20, 5, sz_failed_disks);
+        bChangeRaid = newtButton(1, 9, sz_raid_level);
+        bOK = newtButton(16 + (raidrec->raid_level == -1), 9, "  OK  ");
+        bCancel = newtButton(28, 9, "Cancel");
+        bAdditional =
+            newtCompactButton(1, 13,
+                              "Additional settings and information");
+        newtPushHelpLine
+            ("  Edit the RAID device's settings to your heart's content, then hit OK/Cancel.");
+        editraidForm = newtForm(NULL, NULL, 0);
+        newtFormAddComponents(editraidForm, bSelectData, bSelectParity,
+                              bChangeRaid, bSelectSpare, bSelectFailed,
+                              bOK, bCancel, bAdditional);
+        b_res = newtRunForm(editraidForm);
+        if (b_res == bChangeRaid) {
+            choose_raid_level(raidrec);
+        } else if (b_res == bSelectData) {
+            select_raid_disks(mountlist, raidlist, raidrec, "data",
+                              &raidrec->data_disks);
+        } else if (b_res == bSelectSpare) {
+            select_raid_disks(mountlist, raidlist, raidrec, "spare",
+                              &raidrec->spare_disks);
+        } else if (b_res == bSelectParity) {
+            select_raid_disks(mountlist, raidlist, raidrec, "parity",
+                              &raidrec->parity_disks);
+        } else if (b_res == bSelectFailed) {
+            select_raid_disks(mountlist, raidlist, raidrec, "failed",
+                              &raidrec->failed_disks);
+        } else if (b_res == bAdditional) {
+            edit_raidrec_additional_vars(raidrec);
+        }
+        newtFormDestroy(editraidForm);
+        if (b_res == bOK || b_res == bCancel) {
+            break;
+        }
+    }
+    if (b_res == bCancel) {
+        memcpy((void *) raidrec, (void *) bkp_raidrec,
+               sizeof(struct raid_device_record));
+    }
+    newtPopHelpLine();
+    newtPopWindow();
+    mountlist->el[currline].size =
+        calculate_raid_device_size(mountlist, raidlist,
+                                   raidrec->raid_device);
+    paranoid_free(title_of_editraidForm_window);
+    paranoid_free(sz_raid_level);
+    paranoid_free(sz_data_disks);
+    paranoid_free(sz_spare_disks);
+    paranoid_free(sz_parity_disks);
+    paranoid_free(sz_failed_disks);
+    paranoid_free(bkp_raidrec);
 #endif
 }
@@ -1850 +1747 @@
  */
 void
-edit_raidlist_plex (struct mountlist_itself *mountlist,
-            struct raidlist_itself *raidlist,
-            struct vinum_plex *raidrec, int currline, int currline2)
+edit_raidlist_plex(struct mountlist_itself *mountlist,
+                   struct raidlist_itself *raidlist,
+                   struct vinum_plex *raidrec, int currline, int currline2)
 {
 
     /** structures ********************************************************/
-  struct vinum_plex bkp_raidrec;
+    struct vinum_plex bkp_raidrec;
 
 
     /** buffers ***********************************************************/
-  char title_of_editraidForm_window[MAX_STR_LEN];
+    char title_of_editraidForm_window[MAX_STR_LEN];
 
     /** newt **************************************************************/
-  newtComponent editraidForm;
-  newtComponent bOK;
-  newtComponent bCancel;
-  newtComponent bEdit;
-  newtComponent bAdd;
-  newtComponent bDelete;
-  newtComponent b_res;
-  newtComponent unallocListbox, allocListbox;
-  newtComponent bLevel, sLevel;
-  newtComponent bStripeSize, sStripeSize;
-  newtComponent bAlloc, bUnalloc;
-
-  void *keylist[ARBITRARY_MAXIMUM];
-  void *curr_choice_a, *curr_choice_u;
-  int currline_a, currline_u;
-
-  struct mountlist_itself *unallocparts;
-  
-  unallocparts = malloc (sizeof (struct mountlist_itself));
-
-  log_it ("Started edit_raidlist_entry");
-  memcpy ((void *) &bkp_raidrec, (void *) raidrec,
-      sizeof (struct vinum_plex));
-  sprintf (title_of_editraidForm_window, "%s.p%i", raidlist->el[currline].volname, currline2);
-  newtPushHelpLine ("   Please select a subdisk to edit, or edit this plex's parameters");
-  newtOpenWindow (13, 3, 54, 18, title_of_editraidForm_window); 
- for (;;)
-    {
-    int i;
-    char headerstr[MAX_STR_LEN];
-    char tmp[64];
-    snprintf (headerstr, MAX_STR_LEN, "%-24s %s", 
-          "Subdisk", "Device");
-    
-    
-    switch (raidrec->raidlevel) {
-    case -1:
-        strcpy (tmp, "concat");
-        break;
-    case 0:
-        strcpy (tmp, "striped");
-        break;
-    case 5:
-        strcpy (tmp, "raid5");
-        break;
-    default:
-        sprintf (tmp, "unknown (%i)", raidrec->raidlevel);
-        break;
-    }
-    bLevel = newtCompactButton (2, 2, " RAID level ");
-    sLevel = newtLabel (19, 2, tmp);
-
-    if (raidrec->raidlevel >= 0) {
-        sprintf (tmp, "%ik", raidrec->stripesize);
-        bStripeSize = newtCompactButton (2, 4, " Stripe size ");
-    } else {
-        strcpy (tmp, "N/A");
-        bStripeSize = newtLabel (2, 4, "Stripe size:");     
-    }
-    sStripeSize = newtLabel (19, 4, tmp);
-    
-    bOK = newtCompactButton (2, 16, "  OK  ");
-    bCancel = newtCompactButton (12, 16, "Cancel");
-    bAdd  = newtCompactButton (22, 16, " Add ");
-    bEdit = newtCompactButton (32, 16, " Edit ");
-    bDelete = newtCompactButton (42, 16, "Delete");
-    
-    
-    //  plexesListbox = newtListbox (2, 7, 9, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
-    //  plexesHeader  = newtLabel (2, 6, headerstr);
-    unallocListbox  = newtListbox (2, 7, 7, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
-    allocListbox   = newtListbox (33, 7, 7, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
-    bAlloc   = newtButton (23, 7, " -> ");
-    bUnalloc = newtButton (23, 11, " <- ");
-    
-    editraidForm = newtForm (NULL, NULL, 0);
-
-    newtListboxClear (allocListbox);
-    newtListboxClear (unallocListbox);
-    bzero (unallocparts, sizeof (struct mountlist_itself));
-    make_list_of_unallocated_raid_partitions (unallocparts, mountlist, raidlist);
-    for (i = 0; i < ARBITRARY_MAXIMUM; ++i) {
-        char entry[MAX_STR_LEN];
-        keylist[i] = (void *) i;
-        if (i < raidrec->subdisks) {
-        snprintf (entry, MAX_STR_LEN, "%-17s", find_dev_entry_for_raid_device_name (raidlist, raidrec->sd[i].which_device));
-        newtListboxAppendEntry (allocListbox, entry, keylist[i]);
-        }
-        if (i < unallocparts->entries) {
-        snprintf (entry, MAX_STR_LEN, "%-17s", unallocparts->el[i].device);
-        newtListboxAppendEntry (unallocListbox, entry, keylist[i]);
-        }
-    }
-    
+    newtComponent editraidForm;
+    newtComponent bOK;
+    newtComponent bCancel;
+    newtComponent bEdit;
+    newtComponent bAdd;
+    newtComponent bDelete;
+    newtComponent b_res;
+    newtComponent unallocListbox, allocListbox;
+    newtComponent bLevel, sLevel;
+    newtComponent bStripeSize, sStripeSize;
+    newtComponent bAlloc, bUnalloc;
+
+    void *keylist[ARBITRARY_MAXIMUM];
+    void *curr_choice_a, *curr_choice_u;
+    int currline_a, currline_u;
+
+    struct mountlist_itself *unallocparts;
+
+    unallocparts = malloc(sizeof(struct mountlist_itself));
+
+    log_it("Started edit_raidlist_entry");
+    memcpy((void *) &bkp_raidrec, (void *) raidrec,
+           sizeof(struct vinum_plex));
+    sprintf(title_of_editraidForm_window, "%s.p%i",
+            raidlist->el[currline].volname, currline2);
+    newtPushHelpLine
+        ("   Please select a subdisk to edit, or edit this plex's parameters");
+    newtOpenWindow(13, 3, 54, 18, title_of_editraidForm_window);
+    for (;;) {
+        int i;
+        char headerstr[MAX_STR_LEN];
+        char tmp[64];
+        snprintf(headerstr, MAX_STR_LEN, "%-24s %s", "Subdisk", "Device");
+
+
+        switch (raidrec->raidlevel) {
+        case -1:
+            strcpy(tmp, "concat");
+            break;
+        case 0:
+            strcpy(tmp, "striped");
+            break;
+        case 5:
+            strcpy(tmp, "raid5");
+            break;
+        default:
+            sprintf(tmp, "unknown (%i)", raidrec->raidlevel);
+            break;
+        }
+        bLevel = newtCompactButton(2, 2, " RAID level ");
+        sLevel = newtLabel(19, 2, tmp);
+
+        if (raidrec->raidlevel >= 0) {
+            sprintf(tmp, "%ik", raidrec->stripesize);
+            bStripeSize = newtCompactButton(2, 4, " Stripe size ");
+        } else {
+            strcpy(tmp, "N/A");
+            bStripeSize = newtLabel(2, 4, "Stripe size:");
+        }
+        sStripeSize = newtLabel(19, 4, tmp);
+
+        bOK = newtCompactButton(2, 16, "  OK  ");
+        bCancel = newtCompactButton(12, 16, "Cancel");
+        bAdd = newtCompactButton(22, 16, " Add ");
+        bEdit = newtCompactButton(32, 16, " Edit ");
+        bDelete = newtCompactButton(42, 16, "Delete");
+
+
+        //  plexesListbox = newtListbox (2, 7, 9, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
+        //  plexesHeader  = newtLabel (2, 6, headerstr);
+        unallocListbox =
+            newtListbox(2, 7, 7, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
+        allocListbox =
+            newtListbox(33, 7, 7, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
+        bAlloc = newtButton(23, 7, " -> ");
+        bUnalloc = newtButton(23, 11, " <- ");
+
+        editraidForm = newtForm(NULL, NULL, 0);
+
+        newtListboxClear(allocListbox);
+        newtListboxClear(unallocListbox);
+        bzero(unallocparts, sizeof(struct mountlist_itself));
+        make_list_of_unallocated_raid_partitions(unallocparts, mountlist,
+                                                 raidlist);
+        for (i = 0; i < ARBITRARY_MAXIMUM; ++i) {
+            char entry[MAX_STR_LEN];
+            keylist[i] = (void *) i;
+            if (i < raidrec->subdisks) {
+                snprintf(entry, MAX_STR_LEN, "%-17s",
+                         find_dev_entry_for_raid_device_name(raidlist,
+                                                             raidrec->
+                                                             sd[i].
+                                                             which_device));
+                newtListboxAppendEntry(allocListbox, entry, keylist[i]);
+            }
+            if (i < unallocparts->entries) {
+                snprintf(entry, MAX_STR_LEN, "%-17s",
+                         unallocparts->el[i].device);
+                newtListboxAppendEntry(unallocListbox, entry, keylist[i]);
+            }
+        }
+
 #define COMP(x)  newtFormAddComponent (editraidForm, x)
 #define UCOMP(x) if (unallocparts->entries > 0) COMP(x)
 #define ACOMP(x) if (raidrec->subdisks > 0) COMP(x)
-    editraidForm = newtForm (NULL, NULL, 0);
-    UCOMP (unallocListbox);
-    UCOMP (bAlloc);
-    ACOMP (allocListbox);
-    ACOMP (bUnalloc);
-    COMP (bOK);
-    COMP (bCancel);
-    COMP (bLevel);
-    COMP (sLevel);
-    if (raidrec->raidlevel != -1) {
-        COMP (bStripeSize);
-        COMP (sStripeSize);
-    }
+        editraidForm = newtForm(NULL, NULL, 0);
+        UCOMP(unallocListbox);
+        UCOMP(bAlloc);
+        ACOMP(allocListbox);
+        ACOMP(bUnalloc);
+        COMP(bOK);
+        COMP(bCancel);
+        COMP(bLevel);
+        COMP(sLevel);
+        if (raidrec->raidlevel != -1) {
+            COMP(bStripeSize);
+            COMP(sStripeSize);
+        }
 #undef COMP
 #undef UCOMP
 #undef ACOMP
 
+        newtRefresh();
+        b_res = newtRunForm(editraidForm);
+        if (b_res == bOK || b_res == bCancel) {
+            break;
+        }
+
+        curr_choice_a = (raidrec->subdisks > 0) ?
+            newtListboxGetCurrent(allocListbox) : (void *) 1234;
+        curr_choice_u = (unallocparts->entries > 0) ?
+            newtListboxGetCurrent(unallocListbox) : (void *) 1234;
+        for (currline_a = 0; currline_a < raidrec->subdisks; ++currline_a) {
+            if (currline_a > ARBITRARY_MAXIMUM)
+                break;
+            if (keylist[currline_a] == curr_choice_a)
+                break;
+        }
+        for (currline_u = 0; currline_u < unallocparts->entries;
+             ++currline_u) {
+            if (currline_u > ARBITRARY_MAXIMUM)
+                break;
+            if (keylist[currline_u] == curr_choice_u)
+                break;
+        }
+        if (b_res == bLevel) {
+            choose_raid_level(raidrec);
+        } else if (b_res == bStripeSize) {
+            char tmp[64];
+            sprintf(tmp, "%i", raidrec->stripesize);
+            if (popup_and_get_string
+                ("Stripe size",
+                 "Please enter the stripe size in kilobytes.", tmp, 20)) {
+                raidrec->stripesize = atoi(tmp);
+            }
+        } else if ((b_res == bAlloc) || (b_res == unallocListbox)) {
+            if (currline_u <= unallocparts->entries)
+                add_raid_subdisk(raidlist, raidrec,
+                                 unallocparts->el[currline_u].device);
+        } else if ((b_res == bUnalloc) || (b_res == allocListbox)) {
+            if (currline_a <= raidrec->subdisks) {
+                memcpy((void *) &raidrec->sd[currline_a],
+                       (void *) &raidrec->sd[raidrec->subdisks - 1],
+                       sizeof(struct vinum_subdisk));
+                raidrec->subdisks--;
+            }
+        }
+#if 0
+    } else {
+        edit_raid_subdisk(raidlist, raidrec, &raidrec->sd[currline3],
+                          currline3);
+    }
+#endif
+    newtFormDestroy(editraidForm);
     newtRefresh();
-    b_res = newtRunForm (editraidForm);
-      if (b_res == bOK || b_res == bCancel)
-    {
-      break;
-    }
-
-      curr_choice_a = (raidrec->subdisks > 0)     ?
-      newtListboxGetCurrent (allocListbox)    : (void *)1234;
-      curr_choice_u = (unallocparts->entries > 0) ?
-      newtListboxGetCurrent (unallocListbox)  : (void *)1234;
-      for (currline_a = 0; currline_a < raidrec->subdisks; ++currline_a) {
-      if (currline_a > ARBITRARY_MAXIMUM) break;
-      if (keylist[currline_a] == curr_choice_a) break;
-      }
-      for (currline_u = 0; currline_u < unallocparts->entries; ++currline_u) {
-      if (currline_u > ARBITRARY_MAXIMUM) break;
-      if (keylist[currline_u] == curr_choice_u) break;
-      }
-      if (b_res == bLevel) {
-      choose_raid_level (raidrec);
-      }
-      else if (b_res == bStripeSize) {
-      char tmp[64];
-      sprintf (tmp, "%i", raidrec->stripesize);
-      if (popup_and_get_string ("Stripe size", "Please enter the stripe size in kilobytes.",
-                    tmp, 20)) {
-          raidrec->stripesize = atoi (tmp);
-      }
-      }
-      else if ((b_res == bAlloc) || (b_res == unallocListbox)) {
-      if (currline_u <= unallocparts->entries)
-          add_raid_subdisk (raidlist, raidrec, unallocparts->el[currline_u].device);
-      }
-      else if ((b_res == bUnalloc) || (b_res == allocListbox)) {
-      if (currline_a <= raidrec->subdisks) {
-          memcpy ((void *) &raidrec->sd[currline_a],
-              (void *) &raidrec->sd[raidrec->subdisks - 1],
-              sizeof (struct vinum_subdisk));
-          raidrec->subdisks--;
-      }
-      }
-#if 0     
-      } else {
-      edit_raid_subdisk (raidlist, raidrec, &raidrec->sd[currline3], currline3);
-      }
-#endif
-      newtFormDestroy (editraidForm);
-      newtRefresh();
-    }
-  if (b_res == bCancel)
-    {
-    memcpy ((void *) raidrec, (void *) &bkp_raidrec,
-        sizeof (struct vinum_plex));
-    }
-  newtPopWindow();
-  newtPopHelpLine ();
+}
+
+if (b_res == bCancel) {
+    memcpy((void *) raidrec, (void *) &bkp_raidrec,
+           sizeof(struct vinum_plex));
+}
+newtPopWindow();
+newtPopHelpLine();
 }
 #else
@@ -2042 +1951 @@
  * @ingroup restoreGuiVarslist
  */
-void
-edit_varslist_entry (struct raid_device_record *raidrec, int lino)
+void edit_varslist_entry(struct raid_device_record *raidrec, int lino)
 {
 
     /** buffers ***********************************************************/
-  char header[MAX_STR_LEN];
+    char header[MAX_STR_LEN];
     char comment[MAX_STR_LEN];
     char sz_out[MAX_STR_LEN];
 
-  assert(raidrec!=0);
-  assert(lino>=0);
-
-  strcpy (sz_out, raidrec->additional_vars.el[lino].value);
-  sprintf (header, "Edit %s", raidrec->additional_vars.el[lino].label);
-  sprintf (comment, "Please set %s's value (currently '%s')",
-       raidrec->additional_vars.el[lino].label, sz_out);
-  if (popup_and_get_string (header, comment, sz_out, MAX_STR_LEN))
-    {
-      strip_spaces (sz_out);
-      strcpy (raidrec->additional_vars.el[lino].value, sz_out);
-    }
+    assert(raidrec != 0);
+    assert(lino >= 0);
+
+    strcpy(sz_out, raidrec->additional_vars.el[lino].value);
+    sprintf(header, "Edit %s", raidrec->additional_vars.el[lino].label);
+    sprintf(comment, "Please set %s's value (currently '%s')",
+            raidrec->additional_vars.el[lino].label, sz_out);
+    if (popup_and_get_string(header, comment, sz_out, MAX_STR_LEN)) {
+        strip_spaces(sz_out);
+        strcpy(raidrec->additional_vars.el[lino].value, sz_out);
+    }
 }
 
@@ -2077 +1984 @@
  */
 int
-edit_mountlist_in_newt (char*mountlist_fname, struct mountlist_itself *mountlist,
-        struct raidlist_itself *raidlist)
+edit_mountlist_in_newt(char *mountlist_fname,
+                       struct mountlist_itself *mountlist,
+                       struct raidlist_itself *raidlist)
 {
 
     /** newt **************************************************************/
-  newtComponent myForm;
+    newtComponent myForm;
     newtComponent bAdd;
     newtComponent bEdit;
@@ -2097 +2005 @@
 
     /** ???? *************************************************************/
-  void *curr_choice;
-  void *keylist[ARBITRARY_MAXIMUM];
+    void *curr_choice;
+    void *keylist[ARBITRARY_MAXIMUM];
 
     /** int **************************************************************/
-  int i = 0;
+    int i = 0;
     int currline = 0;
     int finished = FALSE;
@@ -2111 +2019 @@
     char flaws_str_C[MAX_STR_LEN];
 
-  assert(mountlist!=NULL);
-  assert(raidlist!=NULL);
-
-  strcpy (flaws_str_A, "xxxxxxxxx");
-  strcpy (flaws_str_B, "xxxxxxxxx");
-  strcpy (flaws_str_C, "xxxxxxxxx");
-  if (mountlist->entries > ARBITRARY_MAXIMUM)
-    {
-      log_to_screen ("Arbitrary limits suck, man!");
-      finish (1);
-    }
-  newtPushHelpLine
-    ("   Please edit the mountlist to your satisfaction, then click OK or Cancel.");
-  i = 4;
-  bAdd = newtCompactButton (i, 17, " Add ");
-  bEdit = newtCompactButton (i += 11, 17, " Edit ");
-  bDelete = newtCompactButton (i += 12, 17, "Delete");
-  bReload = newtCompactButton (i += 12, 17, "Reload");
-  bCancel = newtCompactButton (i += 12, 17, "Cancel");
-  bOK = newtCompactButton (i += 12, 17, "  OK  ");
-  sprintf (tmp, "%-24s %-24s %-8s  %s", "Device", "Mountpoint", "Format",
-       "Size (MB)");
-  headerMsg = newtLabel (2, 1, tmp);
-  flawsLabelA = newtLabel (2, 13, flaws_str_A);
-  flawsLabelB = newtLabel (2, 14, flaws_str_B);
-  flawsLabelC = newtLabel (2, 15, flaws_str_C);
-  partitionsListbox =
-    newtListbox (2, 2, 10, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
-  redraw_mountlist (mountlist, keylist, partitionsListbox);
-  newtOpenWindow (1, 3, 77, 18, "Editing mountlist");
-  myForm = newtForm (NULL, NULL, 0);
-  newtFormAddComponents (myForm, headerMsg, partitionsListbox, flawsLabelA,
-             flawsLabelB, flawsLabelC, bAdd, bEdit, bDelete,
-             bReload, bCancel, bOK, NULL);
-  while (!finished)
-    {
-      evaluate_mountlist (mountlist, flaws_str_A, flaws_str_B, flaws_str_C);
-      newtLabelSetText (flawsLabelA, flaws_str_A);
-      newtLabelSetText (flawsLabelB, flaws_str_B);
-      newtLabelSetText (flawsLabelC, flaws_str_C);
-      b_res = newtRunForm (myForm);
-      if (b_res == bOK)
-    {
-      if (!evaluate_mountlist
-          (mountlist, flaws_str_A, flaws_str_B, flaws_str_C))
-        {
-          finished =
-        ask_me_yes_or_no
-        ("Your mountlist might not work. Continue anyway?");
-        }
-      else
-        {
-          finished =
-        ask_me_yes_or_no
-        ("Are you sure you want to save your mountlist and continue? (No changes will be made to your partition table at this time.)");
-        }
-    }
-      else if (b_res == bCancel)
-    {
-      finished = TRUE;
-    }
-      else if (b_res == bReload)
-    {
-      if (ask_me_yes_or_no ("Reload original mountlist?"))
-        {
+    assert(mountlist != NULL);
+    assert(raidlist != NULL);
+
+    strcpy(flaws_str_A, "xxxxxxxxx");
+    strcpy(flaws_str_B, "xxxxxxxxx");
+    strcpy(flaws_str_C, "xxxxxxxxx");
+    if (mountlist->entries > ARBITRARY_MAXIMUM) {
+        log_to_screen("Arbitrary limits suck, man!");
+        finish(1);
+    }
+    newtPushHelpLine
+        ("   Please edit the mountlist to your satisfaction, then click OK or Cancel.");
+    i = 4;
+    bAdd = newtCompactButton(i, 17, " Add ");
+    bEdit = newtCompactButton(i += 11, 17, " Edit ");
+    bDelete = newtCompactButton(i += 12, 17, "Delete");
+    bReload = newtCompactButton(i += 12, 17, "Reload");
+    bCancel = newtCompactButton(i += 12, 17, "Cancel");
+    bOK = newtCompactButton(i += 12, 17, "  OK  ");
+    sprintf(tmp, "%-24s %-24s %-8s  %s", "Device", "Mountpoint", "Format",
+            "Size (MB)");
+    headerMsg = newtLabel(2, 1, tmp);
+    flawsLabelA = newtLabel(2, 13, flaws_str_A);
+    flawsLabelB = newtLabel(2, 14, flaws_str_B);
+    flawsLabelC = newtLabel(2, 15, flaws_str_C);
+    partitionsListbox =
+        newtListbox(2, 2, 10, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
+    redraw_mountlist(mountlist, keylist, partitionsListbox);
+    newtOpenWindow(1, 3, 77, 18, "Editing mountlist");
+    myForm = newtForm(NULL, NULL, 0);
+    newtFormAddComponents(myForm, headerMsg, partitionsListbox,
+                          flawsLabelA, flawsLabelB, flawsLabelC, bAdd,
+                          bEdit, bDelete, bReload, bCancel, bOK, NULL);
+    while (!finished) {
+        evaluate_mountlist(mountlist, flaws_str_A, flaws_str_B,
+                           flaws_str_C);
+        newtLabelSetText(flawsLabelA, flaws_str_A);
+        newtLabelSetText(flawsLabelB, flaws_str_B);
+        newtLabelSetText(flawsLabelC, flaws_str_C);
+        b_res = newtRunForm(myForm);
+        if (b_res == bOK) {
+            if (!evaluate_mountlist
+                (mountlist, flaws_str_A, flaws_str_B, flaws_str_C)) {
+                finished =
+                    ask_me_yes_or_no
+                    ("Your mountlist might not work. Continue anyway?");
+            } else {
+                finished =
+                    ask_me_yes_or_no
+                    ("Are you sure you want to save your mountlist and continue? (No changes will be made to your partition table at this time.)");
+            }
+        } else if (b_res == bCancel) {
+            finished = TRUE;
+        } else if (b_res == bReload) {
+            if (ask_me_yes_or_no("Reload original mountlist?")) {
 /*
 This would be really dumb. RAIDTAB_FNAME is #define'd.   --- Hugo, 2003/04/24
@@ -2184 +2082 @@
         }
 */
-          load_mountlist (mountlist, mountlist_fname);
-          load_raidtab_into_raidlist (raidlist, RAIDTAB_FNAME);
-          redraw_mountlist (mountlist, keylist, partitionsListbox);
-        }
-    }
-      else
-    {
-      curr_choice = newtListboxGetCurrent (partitionsListbox);
-      for (i = 0; i < mountlist->entries && keylist[i] != curr_choice;
-           i++);
-      if (i == mountlist->entries && mountlist->entries > 0)
-        {
-          log_to_screen ("I don't know what that button does!");
-        }
-      else
-        {
-          currline = i;
-          if (b_res == bAdd)
-        {
-          add_mountlist_entry (mountlist, raidlist, partitionsListbox,
-                       currline, keylist);
-        }
-          else if (b_res == bDelete)
-        {
-          delete_mountlist_entry (mountlist, raidlist,
-                      partitionsListbox, currline,
-                      keylist);
-        }
-          else
-        {
-          if (mountlist->entries > 0)
-            {
-              edit_mountlist_entry (mountlist, raidlist,
-                        partitionsListbox, currline,
-                        keylist);
-            }
-          else
-            {
-              popup_and_OK
-            ("Please add an entry. Then press ENTER to edit it.");
-            }
-        }
-        }
-    }
-    }
-  newtFormDestroy (myForm);
-  newtPopWindow ();
-  newtPopHelpLine ();
-  if (b_res == bOK)
-    {
-      log_it("You pushed 'OK'. I shall now continue.");
-      return (0);
-    }
-  else
-    {
-      /* popup_and_OK("You pushed 'cancel'. I shall now abort."); */
-      return (1);
-    }
+                load_mountlist(mountlist, mountlist_fname);
+                load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
+                redraw_mountlist(mountlist, keylist, partitionsListbox);
+            }
+        } else {
+            curr_choice = newtListboxGetCurrent(partitionsListbox);
+            for (i = 0;
+                 i < mountlist->entries && keylist[i] != curr_choice; i++);
+            if (i == mountlist->entries && mountlist->entries > 0) {
+                log_to_screen("I don't know what that button does!");
+            } else {
+                currline = i;
+                if (b_res == bAdd) {
+                    add_mountlist_entry(mountlist, raidlist,
+                                        partitionsListbox, currline,
+                                        keylist);
+                } else if (b_res == bDelete) {
+                    delete_mountlist_entry(mountlist, raidlist,
+                                           partitionsListbox, currline,
+                                           keylist);
+                } else {
+                    if (mountlist->entries > 0) {
+                        edit_mountlist_entry(mountlist, raidlist,
+                                             partitionsListbox, currline,
+                                             keylist);
+                    } else {
+                        popup_and_OK
+                            ("Please add an entry. Then press ENTER to edit it.");
+                    }
+                }
+            }
+        }
+    }
+    newtFormDestroy(myForm);
+    newtPopWindow();
+    newtPopHelpLine();
+    if (b_res == bOK) {
+        log_it("You pushed 'OK'. I shall now continue.");
+        return (0);
+    } else {
+        /* popup_and_OK("You pushed 'cancel'. I shall now abort."); */
+        return (1);
+    }
 }
 
@@ -2253 +2136 @@
  */
 int
-edit_mountlist (char *mountlist_fname, struct mountlist_itself *mountlist,
-        struct raidlist_itself *raidlist)
-{
-  int res=0;
+edit_mountlist(char *mountlist_fname, struct mountlist_itself *mountlist,
+               struct raidlist_itself *raidlist)
+{
+    int res = 0;
 //  char tmp[MAX_STR_LEN];
 
-  iamhere("entering eml");
-
-  if (g_text_mode)
-    {
-      fatal_error("Don't call edit_mountlist() in text mode");
-    }
-  else
-    {
-      log_it("I'm in GUI mode, so I shall edit mountlist using edit_mountlist()");
-      res = edit_mountlist_in_newt(mountlist_fname, mountlist, raidlist);
-    }
-  iamhere("leaving eml");
-  return(res);
+    iamhere("entering eml");
+
+    if (g_text_mode) {
+        fatal_error("Don't call edit_mountlist() in text mode");
+    } else {
+        log_it
+            ("I'm in GUI mode, so I shall edit mountlist using edit_mountlist()");
+        res = edit_mountlist_in_newt(mountlist_fname, mountlist, raidlist);
+    }
+    iamhere("leaving eml");
+    return (res);
 }
 
@@ -2283 +2164 @@
  * @ingroup restoreGuiVarslist
  */
-void
-edit_raidrec_additional_vars (struct raid_device_record *raidrec)
+void edit_raidrec_additional_vars(struct raid_device_record *raidrec)
 {
 
     /** structure *********************************************************/
-  struct raid_device_record bkp_raidrec;
+    struct raid_device_record bkp_raidrec;
 
     /** newt **************************************************************/
-  newtComponent myForm;
+    newtComponent myForm;
     newtComponent bAdd;
     newtComponent bEdit;
@@ -2302 +2182 @@
 
     /** ?? ***************************************************************/
-  void *keylist[ARBITRARY_MAXIMUM], *curr_choice;
+    void *keylist[ARBITRARY_MAXIMUM], *curr_choice;
 
     /** buffers **********************************************************/
-  char title_of_window[MAX_STR_LEN];
+    char title_of_window[MAX_STR_LEN];
 
     /** int **************************************************************/
-  int i = 0;
+    int i = 0;
     int currline = 0;
 
 
-  assert(raidrec!=NULL);
-
-  memcpy ((void *) &bkp_raidrec, (void *) raidrec,
-      sizeof (struct raid_device_record));
-  sprintf (title_of_window, "Additional variables");
-  newtPushHelpLine
-    ("  Edit the additional fields to your heart's content, then click OK or Cancel.");
-  headerMsg = newtLabel (1, 1, "Label                            Value");
-  varsListbox =
-    newtListbox (1, 2, 6, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
-  i = 1;
-  bAdd = newtCompactButton (i, 9, " Add ");
-  bEdit = newtCompactButton (i += 8, 9, " Edit ");
-  bDelete = newtCompactButton (i += 9, 9, "Delete");
-  bOK = newtCompactButton (i += 9, 9, "  OK  ");
-  bCancel = newtCompactButton (i += 9, 9, "Cancel");
-  newtOpenWindow (17, 7, 46, 10, title_of_window);
-  myForm = newtForm (NULL, NULL, 0);
-  newtFormAddComponents (myForm, headerMsg, varsListbox, bAdd, bEdit, bDelete,
-             bOK, bCancel, NULL);
-  insert_essential_additionalvars (raidrec);
-  redraw_varslist (&raidrec->additional_vars, keylist, varsListbox);
-  for (b_res = NULL; b_res != bOK && b_res != bCancel;)
-    {
-      b_res = newtRunForm (myForm);
-      curr_choice = newtListboxGetCurrent (varsListbox);
-      for (currline = 0;
-       currline < raidrec->additional_vars.entries
-       && keylist[currline] != curr_choice; currline++);
-      if (currline == raidrec->additional_vars.entries
-      && raidrec->additional_vars.entries > 0)
-    {
-      log_it ("Warning - I don't know what this button does");
-    }
-      if (b_res == bOK)
-    {           /* do nothing */
-    }
-      else if (b_res == bCancel)
-    {           /* do nothing */
-    }
-      else if (b_res == bAdd)
-    {
-      add_varslist_entry (raidrec);
-    }
-      else if (b_res == bDelete)
-    {
-      delete_varslist_entry (raidrec, currline);
-    }
-      else
-    {
-      edit_varslist_entry (raidrec, currline);
-    }
-      redraw_varslist (&raidrec->additional_vars, keylist, varsListbox);
-    }
-  remove_essential_additionalvars (raidrec);
-  newtFormDestroy (myForm);
-  newtPopWindow ();
-  newtPopHelpLine ();
-  if (b_res == bCancel)
-    {
-      memcpy ((void *) raidrec, (void *) &bkp_raidrec,
-          sizeof (struct raid_device_record));
-    }
-  return;
+    assert(raidrec != NULL);
+
+    memcpy((void *) &bkp_raidrec, (void *) raidrec,
+           sizeof(struct raid_device_record));
+    sprintf(title_of_window, "Additional variables");
+    newtPushHelpLine
+        ("  Edit the additional fields to your heart's content, then click OK or Cancel.");
+    headerMsg = newtLabel(1, 1, "Label                            Value");
+    varsListbox =
+        newtListbox(1, 2, 6, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
+    i = 1;
+    bAdd = newtCompactButton(i, 9, " Add ");
+    bEdit = newtCompactButton(i += 8, 9, " Edit ");
+    bDelete = newtCompactButton(i += 9, 9, "Delete");
+    bOK = newtCompactButton(i += 9, 9, "  OK  ");
+    bCancel = newtCompactButton(i += 9, 9, "Cancel");
+    newtOpenWindow(17, 7, 46, 10, title_of_window);
+    myForm = newtForm(NULL, NULL, 0);
+    newtFormAddComponents(myForm, headerMsg, varsListbox, bAdd, bEdit,
+                          bDelete, bOK, bCancel, NULL);
+    insert_essential_additionalvars(raidrec);
+    redraw_varslist(&raidrec->additional_vars, keylist, varsListbox);
+    for (b_res = NULL; b_res != bOK && b_res != bCancel;) {
+        b_res = newtRunForm(myForm);
+        curr_choice = newtListboxGetCurrent(varsListbox);
+        for (currline = 0;
+             currline < raidrec->additional_vars.entries
+             && keylist[currline] != curr_choice; currline++);
+        if (currline == raidrec->additional_vars.entries
+            && raidrec->additional_vars.entries > 0) {
+            log_it("Warning - I don't know what this button does");
+        }
+        if (b_res == bOK) {     /* do nothing */
+        } else if (b_res == bCancel) {  /* do nothing */
+        } else if (b_res == bAdd) {
+            add_varslist_entry(raidrec);
+        } else if (b_res == bDelete) {
+            delete_varslist_entry(raidrec, currline);
+        } else {
+            edit_varslist_entry(raidrec, currline);
+        }
+        redraw_varslist(&raidrec->additional_vars, keylist, varsListbox);
+    }
+    remove_essential_additionalvars(raidrec);
+    newtFormDestroy(myForm);
+    newtPopWindow();
+    newtPopHelpLine();
+    if (b_res == bCancel) {
+        memcpy((void *) raidrec, (void *) &bkp_raidrec,
+               sizeof(struct raid_device_record));
+    }
+    return;
 }
 #endif
@@ -2386 +2254 @@
  * @ingroup restoreGuiDisklist
  */
-int
-find_next_free_index_in_disklist (struct list_of_disks *disklist)
+int find_next_free_index_in_disklist(struct list_of_disks *disklist)
 {
 
     /** int ***************************************************************/
-  int index = -1;
+    int index = -1;
     int pos = 0;
-    
+
   /** bool **************************************************************/
-  bool done;
-
-  assert(disklist!=NULL);
-
-  for (done = FALSE; !done;)
-    {
-      for (pos = 0;
-       pos < disklist->entries && disklist->el[pos].index <= index;
-       pos++);
-      if (pos >= disklist->entries)
-    {
-      done = TRUE;
-    }
-      else
-    {
-      index = disklist->el[pos].index;
-    }
-    }
-  return (index + 1);
+    bool done;
+
+    assert(disklist != NULL);
+
+    for (done = FALSE; !done;) {
+        for (pos = 0;
+             pos < disklist->entries && disklist->el[pos].index <= index;
+             pos++);
+        if (pos >= disklist->entries) {
+            done = TRUE;
+        } else {
+            index = disklist->el[pos].index;
+        }
+    }
+    return (index + 1);
 }
 
@@ -2426 +2289 @@
  */
 int
-find_raid_device_in_raidlist (struct raidlist_itself *raidlist, char *device)
+find_raid_device_in_raidlist(struct raidlist_itself *raidlist,
+                             char *device)
 {
 
     /** int ***************************************************************/
-  int i = 0;
+    int i = 0;
 #ifdef __FreeBSD__
-  char vdev [64];
+    char vdev[64];
 #else
 // Linux
 #endif
-  
-  assert(raidlist!=NULL);
-  assert_string_is_neither_NULL_nor_zerolength(device);
+
+    assert(raidlist != NULL);
+    assert_string_is_neither_NULL_nor_zerolength(device);
 
 #ifdef __FreeBSD__
-  for (i = 0; i < raidlist->entries; i++) {
-      sprintf (vdev, "/dev/vinum/%s", raidlist->el[i].volname);
-      if (!strcmp (device, vdev)) break;
-  }
+    for (i = 0; i < raidlist->entries; i++) {
+        sprintf(vdev, "/dev/vinum/%s", raidlist->el[i].volname);
+        if (!strcmp(device, vdev))
+            break;
+    }
 #else
 
-  for (i = 0;
-       strcmp (raidlist->el[i].raid_device, device) && i < raidlist->entries;
-       i++);
+    for (i = 0;
+         strcmp(raidlist->el[i].raid_device, device)
+         && i < raidlist->entries; i++);
 #endif
-  if (i == raidlist->entries)
-    {
-      return (-1);
-    }
-  else
-    {
-      return (i);
-    }
+    if (i == raidlist->entries) {
+        return (-1);
+    } else {
+        return (i);
+    }
 }
 
@@ -2471 +2333 @@
  */
 bool
-get_isodir_info (char *isodir_device, char *isodir_format, char *isodir_path, bool nuke_me_please)
+get_isodir_info(char *isodir_device, char *isodir_format,
+                char *isodir_path, bool nuke_me_please)
 {
 
     /** initialize ********************************************************/
 
-  assert(isodir_device!=NULL);
-  assert(isodir_format!=NULL);
-  assert(isodir_path!=NULL);
-
-  log_it("%d - AAA - isodir_path = %s", isodir_path);
-  isodir_format[0] = '\0';
-  if (isodir_device[0]=='\0') { strcpy (isodir_device, "/dev/"); }
-  if (isodir_path[0]=='\0') { strcpy (isodir_path, "/"); }
-  if (does_file_exist ("/tmp/NFS-SERVER-PATH"))
-    {
-      strcpy (isodir_device, last_line_of_file ("/tmp/NFS-SERVER-MOUNT"));
-      strcpy (isodir_format, "nfs");
-      strcpy (isodir_path, last_line_of_file ("/tmp/NFS-SERVER-PATH"));
-    }
-  if (nuke_me_please) { return(TRUE); }
-
-  if (popup_and_get_string
-      ("ISO Mode - device", "On what device do the ISO files live?",
-       isodir_device, MAX_STR_LEN/4))
-    {
-      if (popup_and_get_string
-      ("ISO Mode - format",
-       "What is the disk format of the device? (Hit ENTER if you don't know.)",
-       isodir_format, 16))
-    {
-      if (popup_and_get_string
-          ("ISO Mode - path",
-           "At what path on this device can the ISO files be found?",
-           isodir_path, MAX_STR_LEN/4))
-        {
-          strip_spaces (isodir_device);
-          strip_spaces (isodir_format);
-          strip_spaces (isodir_path);
-  log_it("%d - BBB - isodir_path = %s", isodir_path);
-          return (TRUE);
-        }
-    }
-    }
-  return (FALSE);
+    assert(isodir_device != NULL);
+    assert(isodir_format != NULL);
+    assert(isodir_path != NULL);
+
+    log_it("%d - AAA - isodir_path = %s", isodir_path);
+    isodir_format[0] = '\0';
+    if (isodir_device[0] == '\0') {
+        strcpy(isodir_device, "/dev/");
+    }
+    if (isodir_path[0] == '\0') {
+        strcpy(isodir_path, "/");
+    }
+    if (does_file_exist("/tmp/NFS-SERVER-PATH")) {
+        strcpy(isodir_device, last_line_of_file("/tmp/NFS-SERVER-MOUNT"));
+        strcpy(isodir_format, "nfs");
+        strcpy(isodir_path, last_line_of_file("/tmp/NFS-SERVER-PATH"));
+    }
+    if (nuke_me_please) {
+        return (TRUE);
+    }
+
+    if (popup_and_get_string
+        ("ISO Mode - device", "On what device do the ISO files live?",
+         isodir_device, MAX_STR_LEN / 4)) {
+        if (popup_and_get_string
+            ("ISO Mode - format",
+             "What is the disk format of the device? (Hit ENTER if you don't know.)",
+             isodir_format, 16)) {
+            if (popup_and_get_string
+                ("ISO Mode - path",
+                 "At what path on this device can the ISO files be found?",
+                 isodir_path, MAX_STR_LEN / 4)) {
+                strip_spaces(isodir_device);
+                strip_spaces(isodir_format);
+                strip_spaces(isodir_path);
+                log_it("%d - BBB - isodir_path = %s", isodir_path);
+                return (TRUE);
+            }
+        }
+    }
+    return (FALSE);
 }
 
@@ -2527 +2392 @@
  */
 void
-initiate_new_raidlist_entry (struct raidlist_itself *raidlist,
-                 struct mountlist_itself *mountlist, int currline,
-                 char *device)
+initiate_new_raidlist_entry(struct raidlist_itself *raidlist,
+                            struct mountlist_itself *mountlist,
+                            int currline, char *device)
 {
 
     /** structure *********************************************************/
-  struct OSSWAP (raid_device_record, vinum_volume) *raidrec;
+    struct OSSWAP (raid_device_record, vinum_volume) * raidrec;
 
     /** int ***************************************************************/
-  int pos_in_raidlist = 0;
-
-  assert(raidlist!=NULL);
-  assert(mountlist!=NULL);
-  assert_string_is_neither_NULL_nor_zerolength(device);
-
-  pos_in_raidlist =
-    find_raid_device_in_raidlist (raidlist, mountlist->el[currline].device);
-  if (pos_in_raidlist >= 0)
-    {
-      fatal_error ("Sorry, that RAID device already exists. Weird.");
-    }
-  pos_in_raidlist = raidlist->entries++;
-  raidrec = &raidlist->el[pos_in_raidlist];
-  initialize_raidrec (raidrec);
-  strcpy (raidrec->OSSWAP (raid_device, volname), OSSWAP (device, basename (device)));
+    int pos_in_raidlist = 0;
+
+    assert(raidlist != NULL);
+    assert(mountlist != NULL);
+    assert_string_is_neither_NULL_nor_zerolength(device);
+
+    pos_in_raidlist =
+        find_raid_device_in_raidlist(raidlist,
+                                     mountlist->el[currline].device);
+    if (pos_in_raidlist >= 0) {
+        fatal_error("Sorry, that RAID device already exists. Weird.");
+    }
+    pos_in_raidlist = raidlist->entries++;
+    raidrec = &raidlist->el[pos_in_raidlist];
+    initialize_raidrec(raidrec);
+    strcpy(raidrec->OSSWAP(raid_device, volname),
+           OSSWAP(device, basename(device)));
 #ifndef __FreeBSD__
-  choose_raid_level (raidrec);
-  select_raid_disks (mountlist, raidlist, raidrec, "data",
-             &raidrec->data_disks);
+    choose_raid_level(raidrec);
+    select_raid_disks(mountlist, raidlist, raidrec, "data",
+                      &raidrec->data_disks);
 #endif
-  edit_raidlist_entry (mountlist, raidlist, raidrec, currline);
+    edit_raidlist_entry(mountlist, raidlist, raidrec, currline);
 }
 
@@ -2567 +2433 @@
  * @ingroup restoreGuiVarslist
  */
-void
-insert_essential_additionalvars (struct raid_device_record *raidrec)
+void insert_essential_additionalvars(struct raid_device_record *raidrec)
 {
 
     /** int **************************************************************/
-  int items = 0;
-
-  assert(raidrec!=NULL);
-
-  items = raidrec->additional_vars.entries;
-  write_variableINT_to_raid_var_line (raidrec, items++,
-                      "persistent-superblock",
-                      raidrec->persistent_superblock);
-  write_variableINT_to_raid_var_line (raidrec, items++, "chunk-size",
-                      raidrec->chunk_size);
-  raidrec->additional_vars.entries = items;
+    int items = 0;
+
+    assert(raidrec != NULL);
+
+    items = raidrec->additional_vars.entries;
+    write_variableINT_to_raid_var_line(raidrec, items++,
+                                       "persistent-superblock",
+                                       raidrec->persistent_superblock);
+    write_variableINT_to_raid_var_line(raidrec, items++, "chunk-size",
+                                       raidrec->chunk_size);
+    raidrec->additional_vars.entries = items;
 }
 
@@ -2590 +2455 @@
  * Dummy function that proves that we can get to the point where Mondo is run.
  */
-void
-nuke_mode_dummy ()
+void nuke_mode_dummy()
 {
 
     /** newt *************************************************************/
-  newtComponent myForm;
+    newtComponent myForm;
     newtComponent b1;
     newtComponent b2;
@@ -2602 +2466 @@
 
 
-  newtPushHelpLine
-    ("This is where I nuke your hard drives. Mhahahahaha. No-one can stop Mojo Jojo!");
-  newtOpenWindow (24, 3, 32, 13, "Nuking");
-  b1 = newtButton (7, 1, "Slowly");
-  b2 = newtButton (7, 5, "Medium");
-  b3 = newtButton (7, 9, "Quickly");
-  myForm = newtForm (NULL, NULL, 0);
-  newtFormAddComponents (myForm, b1, b2, b3, NULL);
-  b_res = newtRunForm (myForm);
-  newtFormDestroy (myForm);
-  newtPopWindow ();
-  newtPopHelpLine ();
+    newtPushHelpLine
+        ("This is where I nuke your hard drives. Mhahahahaha. No-one can stop Mojo Jojo!");
+    newtOpenWindow(24, 3, 32, 13, "Nuking");
+    b1 = newtButton(7, 1, "Slowly");
+    b2 = newtButton(7, 5, "Medium");
+    b3 = newtButton(7, 9, "Quickly");
+    myForm = newtForm(NULL, NULL, 0);
+    newtFormAddComponents(myForm, b1, b2, b3, NULL);
+    b_res = newtRunForm(myForm);
+    newtFormDestroy(myForm);
+    newtPopWindow();
+    newtPopHelpLine();
 }
 
@@ -2626 +2490 @@
  */
 void
-redraw_disklist (struct list_of_disks *disklist,
-         void *keylist[ARBITRARY_MAXIMUM], newtComponent listbox)
+redraw_disklist(struct list_of_disks *disklist,
+                void *keylist[ARBITRARY_MAXIMUM], newtComponent listbox)
 {
 
     /** int *************************************************************/
-  int i = 0;
-
-  assert(disklist!=NULL);
-  assert(keylist!=NULL);
-  assert(listbox!=NULL);
-
-  newtListboxClear (listbox);
-
-  for (i = 0; i < ARBITRARY_MAXIMUM; i++)
-    {
-      keylist[i] = (void *) i;
-    }
-  for (i = 0; i < disklist->entries; i++)
-    {
-      newtListboxAppendEntry (listbox, disklist_entry_to_string (disklist, i),
-                  keylist[i]);
-    }
+    int i = 0;
+
+    assert(disklist != NULL);
+    assert(keylist != NULL);
+    assert(listbox != NULL);
+
+    newtListboxClear(listbox);
+
+    for (i = 0; i < ARBITRARY_MAXIMUM; i++) {
+        keylist[i] = (void *) i;
+    }
+    for (i = 0; i < disklist->entries; i++) {
+        newtListboxAppendEntry(listbox,
+                               disklist_entry_to_string(disklist, i),
+                               keylist[i]);
+    }
 }
 
@@ -2659 +2522 @@
  */
 void
-redraw_mountlist (struct mountlist_itself *mountlist,
-          void *keylist[ARBITRARY_MAXIMUM], newtComponent listbox)
-{
-    
+redraw_mountlist(struct mountlist_itself *mountlist,
+                 void *keylist[ARBITRARY_MAXIMUM], newtComponent listbox)
+{
+
     /** int **************************************************************/
-  int i = 0;
-
-  assert(mountlist!=NULL);
-  assert(keylist!=NULL);
-  assert(listbox!=NULL);
-
-  newtListboxClear (listbox);
+    int i = 0;
+
+    assert(mountlist != NULL);
+    assert(keylist != NULL);
+    assert(listbox != NULL);
+
+    newtListboxClear(listbox);
 //  sort_mountlist_by_device (mountlist);
-  for (i = 0; i < ARBITRARY_MAXIMUM; i++)
-    {
-      keylist[i] = (void *) i;
-    }
-  for (i = 0; i < mountlist->entries; i++)
-    {
-      newtListboxAppendEntry (listbox,
-                  mountlist_entry_to_string (mountlist, i),
-                  keylist[i]);
-    }
+    for (i = 0; i < ARBITRARY_MAXIMUM; i++) {
+        keylist[i] = (void *) i;
+    }
+    for (i = 0; i < mountlist->entries; i++) {
+        newtListboxAppendEntry(listbox,
+                               mountlist_entry_to_string(mountlist, i),
+                               keylist[i]);
+    }
 }
 
@@ -2694 +2555 @@
  * @ingroup restoreGuiDisklist
  */
-void
-redraw_unallocpartnslist (struct mountlist_itself
-              *unallocated_raid_partitions,
-              void *keylist[ARBITRARY_MAXIMUM],
-              newtComponent listbox)
+void redraw_unallocpartnslist(struct mountlist_itself
+                              *unallocated_raid_partitions,
+                              void *keylist[ARBITRARY_MAXIMUM],
+                              newtComponent listbox)
 {
 
     /** int **************************************************************/
-  int i = 0;
+    int i = 0;
 
     /** buffers **********************************************************/
-  char tmp[MAX_STR_LEN];
-
-  assert(unallocated_raid_partitions!=NULL);
-  assert(keylist!=NULL);
-  assert(listbox!=NULL);
-
-  newtListboxClear (listbox);
-  for (i = 0; i < ARBITRARY_MAXIMUM; i++)
-    {
-      keylist[i] = (void *) i;
-    }
-  for (i = 0; i < unallocated_raid_partitions->entries; i++)
-    {
-      sprintf (tmp, "%-22s %8lld", unallocated_raid_partitions->el[i].device,
-           unallocated_raid_partitions->el[i].size / 1024);
-      newtListboxAppendEntry (listbox, tmp, keylist[i]);
-    }
+    char tmp[MAX_STR_LEN];
+
+    assert(unallocated_raid_partitions != NULL);
+    assert(keylist != NULL);
+    assert(listbox != NULL);
+
+    newtListboxClear(listbox);
+    for (i = 0; i < ARBITRARY_MAXIMUM; i++) {
+        keylist[i] = (void *) i;
+    }
+    for (i = 0; i < unallocated_raid_partitions->entries; i++) {
+        sprintf(tmp, "%-22s %8lld",
+                unallocated_raid_partitions->el[i].device,
+                unallocated_raid_partitions->el[i].size / 1024);
+        newtListboxAppendEntry(listbox, tmp, keylist[i]);
+    }
 }
 
@@ -2733 +2592 @@
  */
 void
-redraw_varslist (struct additional_raid_variables *additional_vars,
-         void *keylist[], newtComponent listbox)
+redraw_varslist(struct additional_raid_variables *additional_vars,
+                void *keylist[], newtComponent listbox)
 {
     /** int *************************************************************/
-  int i = 0;
+    int i = 0;
 
     /** buffers *********************************************************/
-  char tmp[MAX_STR_LEN];
-
-  assert(additional_vars!=NULL);
-  assert(keylist!=NULL);
-  assert(listbox!=NULL);
-
-  newtListboxClear (listbox);
-
-  for (i = 0; i < ARBITRARY_MAXIMUM; i++)
-    {
-      keylist[i] = (void *) i;
-    }
-  for (i = 0; i < additional_vars->entries; i++)
-    {
-      sprintf (tmp, "%-32s %-8s", additional_vars->el[i].label,
-           additional_vars->el[i].value);
-      newtListboxAppendEntry (listbox, tmp, keylist[i]);
-    }
+    char tmp[MAX_STR_LEN];
+
+    assert(additional_vars != NULL);
+    assert(keylist != NULL);
+    assert(listbox != NULL);
+
+    newtListboxClear(listbox);
+
+    for (i = 0; i < ARBITRARY_MAXIMUM; i++) {
+        keylist[i] = (void *) i;
+    }
+    for (i = 0; i < additional_vars->entries; i++) {
+        sprintf(tmp, "%-32s %-8s", additional_vars->el[i].label,
+                additional_vars->el[i].value);
+        newtListboxAppendEntry(listbox, tmp, keylist[i]);
+    }
 }
 
@@ -2769 +2626 @@
  */
 int
-read_variableINT_and_remove_from_raidvars (struct OSSWAP (raid_device_record, vinum_volume) *raidrec,
-                       char *label)
+read_variableINT_and_remove_from_raidvars(struct
+                                          OSSWAP (raid_device_record,
+                                                  vinum_volume) * raidrec,
+                                          char *label)
 {
     /** int ***************************************************************/
-  int i = 0;
+    int i = 0;
     int res = 0;
 
 
-  assert(raidrec!=NULL);
-  assert(label!=NULL);
-
-  for (i = 0;
-       i < raidrec->additional_vars.entries
-       && strcmp (raidrec->additional_vars.el[i].label, label); i++);
-  if (i == raidrec->additional_vars.entries)
-    {
-      res = -1;
-    }
-  else
-    {
-      res = atoi (raidrec->additional_vars.el[i].value);
-      for (i++; i < raidrec->additional_vars.entries; i++)
-    {
-      memcpy ((void *) &raidrec->additional_vars.el[i - 1],
-          (void *) &raidrec->additional_vars.el[i],
-          sizeof (struct raid_var_line));
-    }
-      raidrec->additional_vars.entries--;
-    }
-  return (res);
+    assert(raidrec != NULL);
+    assert(label != NULL);
+
+    for (i = 0;
+         i < raidrec->additional_vars.entries
+         && strcmp(raidrec->additional_vars.el[i].label, label); i++);
+    if (i == raidrec->additional_vars.entries) {
+        res = -1;
+    } else {
+        res = atoi(raidrec->additional_vars.el[i].value);
+        for (i++; i < raidrec->additional_vars.entries; i++) {
+            memcpy((void *) &raidrec->additional_vars.el[i - 1],
+                   (void *) &raidrec->additional_vars.el[i],
+                   sizeof(struct raid_var_line));
+        }
+        raidrec->additional_vars.entries--;
+    }
+    return (res);
 }
 #endif
@@ -2809 +2664 @@
  * @ingroup restoreGuiMountlist
  */
-void
-rejig_partition_name_in_raidlist_if_necessary (struct raidlist_itself
-                           *raidlist, char *old_dev,
-                           char *new_dev)
+void rejig_partition_name_in_raidlist_if_necessary(struct raidlist_itself
+                                                   *raidlist,
+                                                   char *old_dev,
+                                                   char *new_dev)
 {
     /** buffers ********************************************************/
-  char tmp[MAX_STR_LEN];
+    char tmp[MAX_STR_LEN];
 
     /** int ************************************************************/
-  int pos = 0;
+    int pos = 0;
     int j = 0;
 
-  assert(raidlist!=NULL);
-  assert_string_is_neither_NULL_nor_zerolength(old_dev);
-  assert_string_is_neither_NULL_nor_zerolength(new_dev);
-
-  pos = which_raid_device_is_using_this_partition (raidlist, old_dev);
-  if (pos < 0)
-    {
-      sprintf (tmp, "No need to rejig %s in raidlist: it's not listed.",
-           old_dev);
-      log_it (tmp);
-    }
-  else
-    {
-      if ((j =
-       where_in_drivelist_is_drive (&raidlist->OSSWAP (el[pos].data_disks, disks),
-                    old_dev)) >= 0)
-    {
-      strcpy (raidlist->OSSWAP (el[pos].data_disks, disks).el[j].device, new_dev);
-    }
-      else
-    if ((j =
-         where_in_drivelist_is_drive (&raidlist->OSSWAP (el[pos].spare_disks, spares),
-                      old_dev)) >= 0)
-    {
-      strcpy (raidlist->OSSWAP (el[pos].spare_disks, spares).el[j].device, new_dev);
-    }
+    assert(raidlist != NULL);
+    assert_string_is_neither_NULL_nor_zerolength(old_dev);
+    assert_string_is_neither_NULL_nor_zerolength(new_dev);
+
+    pos = which_raid_device_is_using_this_partition(raidlist, old_dev);
+    if (pos < 0) {
+        sprintf(tmp, "No need to rejig %s in raidlist: it's not listed.",
+                old_dev);
+        log_it(tmp);
+    } else {
+        if ((j =
+             where_in_drivelist_is_drive(&raidlist->
+                                         OSSWAP(el[pos].data_disks, disks),
+                                         old_dev)) >= 0) {
+            strcpy(raidlist->OSSWAP(el[pos].data_disks, disks).el[j].
+                   device, new_dev);
+        } else
+            if ((j =
+                 where_in_drivelist_is_drive(&raidlist->
+                                             OSSWAP(el[pos].spare_disks,
+                                                    spares),
+                                             old_dev)) >= 0) {
+            strcpy(raidlist->OSSWAP(el[pos].spare_disks, spares).el[j].
+                   device, new_dev);
+        }
 #ifndef __FreeBSD__
-      else
-    if ((j =
-         where_in_drivelist_is_drive (&raidlist->el[pos].parity_disks,
-                      old_dev)) >= 0)
-    {
-      strcpy (raidlist->el[pos].parity_disks.el[j].device, new_dev);
-    }
-      else
-    if ((j =
-         where_in_drivelist_is_drive (&raidlist->el[pos].failed_disks,
-                      old_dev)) >= 0)
-    {
-      strcpy (raidlist->el[pos].failed_disks.el[j].device, new_dev);
-    }
+        else if ((j =
+                  where_in_drivelist_is_drive(&raidlist->el[pos].
+                                              parity_disks,
+                                              old_dev)) >= 0) {
+            strcpy(raidlist->el[pos].parity_disks.el[j].device, new_dev);
+        } else
+            if ((j =
+                 where_in_drivelist_is_drive(&raidlist->el[pos].
+                                             failed_disks,
+                                             old_dev)) >= 0) {
+            strcpy(raidlist->el[pos].failed_disks.el[j].device, new_dev);
+        }
 #endif
-      else
-    {
-      sprintf (tmp,
-           "%s is supposed to be listed in this raid dev but it's not...",
-           old_dev);
-      log_it (tmp);
-    }
-    }
+        else {
+            sprintf(tmp,
+                    "%s is supposed to be listed in this raid dev but it's not...",
+                    old_dev);
+            log_it(tmp);
+        }
+    }
 }
 
@@ -2881 +2732 @@
  * @ingroup restoreUtilityVarslist
  */
-void
-remove_essential_additionalvars (struct raid_device_record *raidrec)
+void remove_essential_additionalvars(struct raid_device_record *raidrec)
 {
 
     /** int **************************************************************/
-  int res = 0;
-
-  assert(raidrec!=NULL);
-
-res =
-    read_variableINT_and_remove_from_raidvars (raidrec,
-                           "persistent-superblock");
-  if (res > 0)
-    {
-      raidrec->persistent_superblock = res;
-    }
-  res = read_variableINT_and_remove_from_raidvars (raidrec, "chunk-size");
-  if (res > 0)
-    {
-      raidrec->chunk_size = res;
-    }
-  res = read_variableINT_and_remove_from_raidvars (raidrec, "block-size");
+    int res = 0;
+
+    assert(raidrec != NULL);
+
+    res =
+        read_variableINT_and_remove_from_raidvars(raidrec,
+                                                  "persistent-superblock");
+    if (res > 0) {
+        raidrec->persistent_superblock = res;
+    }
+    res = read_variableINT_and_remove_from_raidvars(raidrec, "chunk-size");
+    if (res > 0) {
+        raidrec->chunk_size = res;
+    }
+    res = read_variableINT_and_remove_from_raidvars(raidrec, "block-size");
 }
 
@@ -2915 +2763 @@
  */
 void
-select_raid_disks (struct mountlist_itself *mountlist_dontedit,
-           struct raidlist_itself *raidlist,
-           struct raid_device_record *raidrec,
-           char *description_of_list, struct list_of_disks *disklist)
-{
-  void *curr_choice;
+select_raid_disks(struct mountlist_itself *mountlist_dontedit,
+                  struct raidlist_itself *raidlist,
+                  struct raid_device_record *raidrec,
+                  char *description_of_list,
+                  struct list_of_disks *disklist)
+{
+    void *curr_choice;
 
     /** ??? ***************************************************************/
 
     /** structures ********************************************************/
-  struct raidlist_itself *bkp_raidlist;
-  struct raid_device_record *bkp_raidrec;
-  struct list_of_disks *bkp_disklist;
-  struct mountlist_itself *unallocated_raid_partitions;
+    struct raidlist_itself *bkp_raidlist;
+    struct raid_device_record *bkp_raidrec;
+    struct list_of_disks *bkp_disklist;
+    struct mountlist_itself *unallocated_raid_partitions;
 
     /** newt **************************************************************/
-  newtComponent myForm=NULL;
-  newtComponent bAdd=NULL;
-    newtComponent bDelete=NULL;
-    newtComponent bOK=NULL;
-    newtComponent bCancel=NULL;
-    newtComponent b_res=NULL;
-    newtComponent partitionsListbox=NULL;
-    newtComponent headerMsg=NULL;
+    newtComponent myForm = NULL;
+    newtComponent bAdd = NULL;
+    newtComponent bDelete = NULL;
+    newtComponent bOK = NULL;
+    newtComponent bCancel = NULL;
+    newtComponent b_res = NULL;
+    newtComponent partitionsListbox = NULL;
+    newtComponent headerMsg = NULL;
 
     /** buffers **********************************************************/
-  void *keylist[ARBITRARY_MAXIMUM];
-  char *tmp;
-  char *help_text;
-  char *title_of_window;
-  char *sz_res;
-  char *header_text;
+    void *keylist[ARBITRARY_MAXIMUM];
+    char *tmp;
+    char *help_text;
+    char *title_of_window;
+    char *sz_res;
+    char *header_text;
 
   /** int **************************************************************/
-  int i = 0;
-  int currline = 0;
-
-  assert(mountlist_dontedit!=NULL);
-  assert(raidlist!=NULL);
-  assert(raidrec!=NULL);
-  assert(description_of_list!=NULL);
-  assert(disklist!=NULL);
-
-  iamhere("malloc'ing");
-  malloc_string(tmp);
-  malloc_string(help_text);
-  malloc_string(title_of_window);
-  malloc_string(sz_res);
-  malloc_string(header_text);
-  if (!(bkp_raidrec = malloc(sizeof(struct raid_device_record))))
-    { fatal_error("Cannot malloc space for raidrec"); }
-  if (!(bkp_disklist = malloc(sizeof(struct list_of_disks))))
-    { fatal_error("Cannot malloc space for disklist"); }
-  if (!(bkp_raidlist = malloc(sizeof(struct raidlist_itself))))
-    { fatal_error("Cannot malloc space for raidlist"); }
-  if (!(unallocated_raid_partitions = malloc(sizeof(struct mountlist_itself))))
-    { fatal_error("Cannot malloc space for unallocated_raid_partitions"); }
-
-  memcpy ((void *) bkp_raidlist, (void *) raidlist,
-      sizeof (struct raidlist_itself));
-  memcpy ((void *) bkp_raidrec, (void *) raidrec,
-      sizeof (struct raid_device_record));
-  memcpy ((void *) bkp_disklist, (void *) disklist,
-      sizeof (struct list_of_disks));
-
-  iamhere("Post-malloc");
-  strcpy (help_text,
-      "   Edit this RAID device's list of partitions. Choose OK or Cancel when done.");
-  sprintf (header_text, "%-24s    %s", "Device", "Index");
-  sprintf (title_of_window, "%s contains...", raidrec->raid_device);
-  newtPushHelpLine (help_text);
-  for (b_res = (newtComponent) 12345; b_res != bOK && b_res != bCancel;)
-    {
-      headerMsg = newtLabel (1, 1, header_text);
-      partitionsListbox =
-    newtListbox (1, 2, 6, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
-      redraw_disklist (disklist, keylist, partitionsListbox);
-      i = 1;
-      bAdd = newtCompactButton (i, 9, " Add ");
-      bDelete = newtCompactButton (i += 8, 9, "Delete");
-      bOK = newtCompactButton (i += 9, 9, "  OK  ");
-      bCancel = newtCompactButton (i += 9, 9, "Cancel");
-      newtOpenWindow (21, 7, 38, 10, title_of_window);
-      myForm = newtForm (NULL, NULL, 0);
-      if (disklist->entries == 0)
-    {
-      newtFormAddComponents (myForm, headerMsg, bAdd, bDelete, bOK,
-                 bCancel, NULL);
-    }
-      else
-    {
-      newtFormAddComponents (myForm, headerMsg, partitionsListbox, bAdd,
-                 bDelete, bOK, bCancel, NULL);
-    }
-      b_res = newtRunForm (myForm);
-      if (b_res == bOK || b_res == bCancel)
-    {           /* do nothing */
+    int i = 0;
+    int currline = 0;
+
+    assert(mountlist_dontedit != NULL);
+    assert(raidlist != NULL);
+    assert(raidrec != NULL);
+    assert(description_of_list != NULL);
+    assert(disklist != NULL);
+
+    iamhere("malloc'ing");
+    malloc_string(tmp);
+    malloc_string(help_text);
+    malloc_string(title_of_window);
+    malloc_string(sz_res);
+    malloc_string(header_text);
+    if (!(bkp_raidrec = malloc(sizeof(struct raid_device_record)))) {
+        fatal_error("Cannot malloc space for raidrec");
+    }
+    if (!(bkp_disklist = malloc(sizeof(struct list_of_disks)))) {
+        fatal_error("Cannot malloc space for disklist");
+    }
+    if (!(bkp_raidlist = malloc(sizeof(struct raidlist_itself)))) {
+        fatal_error("Cannot malloc space for raidlist");
+    }
+    if (!
+        (unallocated_raid_partitions =
+         malloc(sizeof(struct mountlist_itself)))) {
+        fatal_error("Cannot malloc space for unallocated_raid_partitions");
+    }
+
+    memcpy((void *) bkp_raidlist, (void *) raidlist,
+           sizeof(struct raidlist_itself));
+    memcpy((void *) bkp_raidrec, (void *) raidrec,
+           sizeof(struct raid_device_record));
+    memcpy((void *) bkp_disklist, (void *) disklist,
+           sizeof(struct list_of_disks));
+
+    iamhere("Post-malloc");
+    strcpy(help_text,
+           "   Edit this RAID device's list of partitions. Choose OK or Cancel when done.");
+    sprintf(header_text, "%-24s    %s", "Device", "Index");
+    sprintf(title_of_window, "%s contains...", raidrec->raid_device);
+    newtPushHelpLine(help_text);
+    for (b_res = (newtComponent) 12345; b_res != bOK && b_res != bCancel;) {
+        headerMsg = newtLabel(1, 1, header_text);
+        partitionsListbox =
+            newtListbox(1, 2, 6, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
+        redraw_disklist(disklist, keylist, partitionsListbox);
+        i = 1;
+        bAdd = newtCompactButton(i, 9, " Add ");
+        bDelete = newtCompactButton(i += 8, 9, "Delete");
+        bOK = newtCompactButton(i += 9, 9, "  OK  ");
+        bCancel = newtCompactButton(i += 9, 9, "Cancel");
+        newtOpenWindow(21, 7, 38, 10, title_of_window);
+        myForm = newtForm(NULL, NULL, 0);
+        if (disklist->entries == 0) {
+            newtFormAddComponents(myForm, headerMsg, bAdd, bDelete, bOK,
+                                  bCancel, NULL);
+        } else {
+            newtFormAddComponents(myForm, headerMsg, partitionsListbox,
+                                  bAdd, bDelete, bOK, bCancel, NULL);
+        }
+        b_res = newtRunForm(myForm);
+        if (b_res == bOK || b_res == bCancel) { /* do nothing */
 // That's OK. At the end of this subroutine (after this do/while loop),
 // we'll throw away the changes if Cancel was pushed.
-    }
-      else
-    {
-      curr_choice = newtListboxGetCurrent (partitionsListbox);
-      for (i = 0; i < disklist->entries && keylist[i] != curr_choice;
-           i++);
-      if (i == disklist->entries && disklist->entries > 0)
-        {
-          log_to_screen ("I don't know what that button does!");
-        }
-      else
-        {
-          currline = i;
-          if (b_res == bAdd)
-        {
-          log_it ("Making list of unallocated RAID slices");
-          make_list_of_unallocated_raid_partitions
-            (unallocated_raid_partitions, mountlist_dontedit,
-             raidlist);
-          if (unallocated_raid_partitions->entries <= 0)
-            {
-              popup_and_OK
-            ("There are no unallocated partitions marked for RAID.");
-            }
-          else
-            {
-              log_it
-            ("Done. The user may add one or more of the above to RAID device");
-              add_disklist_entry (disklist, raidrec->raid_device,
-                      unallocated_raid_partitions);
-              log_it ("I have finished adding a disklist entry.");
-              redraw_disklist (disklist, keylist, partitionsListbox);
-            }
-        }
-          else if (b_res == bDelete)
-        {
-          delete_disklist_entry (disklist, raidrec->raid_device,
-                     currline);
-          redraw_disklist (disklist, keylist, partitionsListbox);
-        }
-          else
-        {
-          sprintf (tmp, "%s's index is %d. What should it be?",
-               raidrec->raid_device,
-               disklist->el[currline].index);
-          sprintf (sz_res, "%d", disklist->el[currline].index);
-          if (popup_and_get_string ("Set index", tmp, sz_res, 10))
-            {
-              disklist->el[currline].index = atoi (sz_res);
-            }
-          redraw_disklist (disklist, keylist, partitionsListbox);
-        }
-        }
-    }
-      newtFormDestroy (myForm);
-      newtPopWindow ();
-    }
-  newtPopHelpLine ();
-  if (b_res == bCancel)
-    {
-      memcpy ((void *) raidlist, (void *) bkp_raidlist,
-          sizeof (struct raidlist_itself));
-      memcpy ((void *) raidrec, (void *) bkp_raidrec,
-          sizeof (struct raid_device_record));
-      memcpy ((void *) disklist, (void *) bkp_disklist,
-          sizeof (struct list_of_disks));
-    }
-  paranoid_free(tmp);
-  paranoid_free(help_text);
-  paranoid_free(title_of_window);
-  paranoid_free(sz_res);
-  paranoid_free(header_text);
-  paranoid_free(bkp_raidrec);
-  paranoid_free(bkp_disklist);
-  paranoid_free(bkp_raidlist);
-  paranoid_free(unallocated_raid_partitions);
+        } else {
+            curr_choice = newtListboxGetCurrent(partitionsListbox);
+            for (i = 0; i < disklist->entries && keylist[i] != curr_choice;
+                 i++);
+            if (i == disklist->entries && disklist->entries > 0) {
+                log_to_screen("I don't know what that button does!");
+            } else {
+                currline = i;
+                if (b_res == bAdd) {
+                    log_it("Making list of unallocated RAID slices");
+                    make_list_of_unallocated_raid_partitions
+                        (unallocated_raid_partitions, mountlist_dontedit,
+                         raidlist);
+                    if (unallocated_raid_partitions->entries <= 0) {
+                        popup_and_OK
+                            ("There are no unallocated partitions marked for RAID.");
+                    } else {
+                        log_it
+                            ("Done. The user may add one or more of the above to RAID device");
+                        add_disklist_entry(disklist, raidrec->raid_device,
+                                           unallocated_raid_partitions);
+                        log_it("I have finished adding a disklist entry.");
+                        redraw_disklist(disklist, keylist,
+                                        partitionsListbox);
+                    }
+                } else if (b_res == bDelete) {
+                    delete_disklist_entry(disklist, raidrec->raid_device,
+                                          currline);
+                    redraw_disklist(disklist, keylist, partitionsListbox);
+                } else {
+                    sprintf(tmp, "%s's index is %d. What should it be?",
+                            raidrec->raid_device,
+                            disklist->el[currline].index);
+                    sprintf(sz_res, "%d", disklist->el[currline].index);
+                    if (popup_and_get_string("Set index", tmp, sz_res, 10)) {
+                        disklist->el[currline].index = atoi(sz_res);
+                    }
+                    redraw_disklist(disklist, keylist, partitionsListbox);
+                }
+            }
+        }
+        newtFormDestroy(myForm);
+        newtPopWindow();
+    }
+    newtPopHelpLine();
+    if (b_res == bCancel) {
+        memcpy((void *) raidlist, (void *) bkp_raidlist,
+               sizeof(struct raidlist_itself));
+        memcpy((void *) raidrec, (void *) bkp_raidrec,
+               sizeof(struct raid_device_record));
+        memcpy((void *) disklist, (void *) bkp_disklist,
+               sizeof(struct list_of_disks));
+    }
+    paranoid_free(tmp);
+    paranoid_free(help_text);
+    paranoid_free(title_of_window);
+    paranoid_free(sz_res);
+    paranoid_free(header_text);
+    paranoid_free(bkp_raidrec);
+    paranoid_free(bkp_disklist);
+    paranoid_free(bkp_raidlist);
+    paranoid_free(unallocated_raid_partitions);
 }
 #endif
@@ -3100 +2936 @@
  * or 'E' (or any other letter) for exit.
  */
-char
-which_restore_mode ()
-{
-  
+char which_restore_mode()
+{
+
   /** char *************************************************************/
-  char output = '\0';
-  char tmp[MAX_STR_LEN];
-  
+    char output = '\0';
+    char tmp[MAX_STR_LEN];
+
   /** newt *************************************************************/
 
-  newtComponent b1;
-  newtComponent b2;
-  newtComponent b3;
-  newtComponent b4;
-  newtComponent b_res;
-  newtComponent myForm;
-  
-  if (g_text_mode)
-    {
-      for(output='z'; !strchr("AICE", output); output=tmp[0])
-    {
-      printf("Which mode - (A)utomatic, (I)nteractive, \n(C)ompare only, or (E)xit to shell?\n--> ");
-      fgets(tmp, MAX_STR_LEN-1, stdin);
-    }
-      return(output);
-    }
-
-  newtPushHelpLine
-    ("   Do you want to 'nuke' your system, restore interactively, or just compare?");
-  newtOpenWindow (24, 3, 32, 17, "How should I restore?");
-  b1 = newtButton (7, 1, "Automatically");
-  b2 = newtButton (7, 5, "Interactively");
-  b3 = newtButton (7, 9, "Compare only!");
-  b4 = newtButton (7, 13, "Exit to shell");
-  myForm = newtForm (NULL, NULL, 0);
-  newtFormAddComponents (myForm, b1, b2, b3, b4, NULL);
-  b_res = newtRunForm (myForm);
-  newtFormDestroy (myForm);
-  newtPopWindow ();
-  if (b_res == b1)
-    {
-      output = 'N';
-    }
-  if (b_res == b2)
-    {
-      output = 'I';
-    }
-  if (b_res == b3)
-    {
-      output = 'C';
-    }
-  if (b_res == b4)
-    {
-      output = 'E';
-    }
-  newtPopHelpLine ();
-  return (output);
-}
-
+    newtComponent b1;
+    newtComponent b2;
+    newtComponent b3;
+    newtComponent b4;
+    newtComponent b_res;
+    newtComponent myForm;
+
+    if (g_text_mode) {
+        for (output = 'z'; !strchr("AICE", output); output = tmp[0]) {
+            printf
+                ("Which mode - (A)utomatic, (I)nteractive, \n(C)ompare only, or (E)xit to shell?\n--> ");
+            fgets(tmp, MAX_STR_LEN - 1, stdin);
+        }
+        return (output);
+    }
+
+    newtPushHelpLine
+        ("   Do you want to 'nuke' your system, restore interactively, or just compare?");
+    newtOpenWindow(24, 3, 32, 17, "How should I restore?");
+    b1 = newtButton(7, 1, "Automatically");
+    b2 = newtButton(7, 5, "Interactively");
+    b3 = newtButton(7, 9, "Compare only!");
+    b4 = newtButton(7, 13, "Exit to shell");
+    myForm = newtForm(NULL, NULL, 0);
+    newtFormAddComponents(myForm, b1, b2, b3, b4, NULL);
+    b_res = newtRunForm(myForm);
+    newtFormDestroy(myForm);
+    newtPopWindow();
+    if (b_res == b1) {
+        output = 'N';
+    }
+    if (b_res == b2) {
+        output = 'I';
+    }
+    if (b_res == b3) {
+        output = 'C';
+    }
+    if (b_res == b4) {
+        output = 'E';
+    }
+    newtPopHelpLine();
+    return (output);
+}

branches/2.05/mondo/mondo/mondorestore/mondo-rstr-newt.h

@@ -5 +5 @@
     copyright            : (C) 2002 by Stan Benoit
     email                : troff@nakedsoul.org
-    cvsid                : $Id: mondo-rstr-newt.h,v 1.3 2004/06/10 15:29:13 hugo Exp $
+    cvsid                : $Id$
  ***************************************************************************/
 
@@ -37 +37 @@
 /* external subroutines and global vars */
 
-extern long get_time (void);
-extern char *last_line_of_file (char *);
-extern void center_string (char *, int);
-extern bool does_file_exist (char *);
-extern void finish (int);
-extern long get_phys_size_of_drive (char *);
-extern bool is_this_device_mounted (char *);
-extern void strip_spaces (char *);
-extern void initialize_raidrec (struct raid_device_record *);
-extern int make_list_of_drives (struct mountlist_itself *,
-                char[ARBITRARY_MAXIMUM][MAX_STR_LEN]);
-char *number_to_text (int);
-extern void reload_filelist (struct s_node *);
-extern void toggle_all_root_dirs_on (struct s_node *);
-extern void toggle_path_expandability (struct s_node *, char *, bool);
-extern void toggle_path_selection (struct s_node *, char *, bool);
-extern void toggle_node_selection (struct s_node *, bool);
-extern struct s_node *find_node_in_filelist (struct s_node *, char *filename);
-extern int what_number_cd_is_this (struct s_bkpinfo*);
+extern long get_time(void);
+extern char *last_line_of_file(char *);
+extern void center_string(char *, int);
+extern bool does_file_exist(char *);
+extern void finish(int);
+extern long get_phys_size_of_drive(char *);
+extern bool is_this_device_mounted(char *);
+extern void strip_spaces(char *);
+extern void initialize_raidrec(struct raid_device_record *);
+extern int make_list_of_drives(struct mountlist_itself *,
+                               char[ARBITRARY_MAXIMUM][MAX_STR_LEN]);
+char *number_to_text(int);
+extern void reload_filelist(struct s_node *);
+extern void toggle_all_root_dirs_on(struct s_node *);
+extern void toggle_path_expandability(struct s_node *, char *, bool);
+extern void toggle_path_selection(struct s_node *, char *, bool);
+extern void toggle_node_selection(struct s_node *, bool);
+extern struct s_node *find_node_in_filelist(struct s_node *,
+                                            char *filename);
+extern int what_number_cd_is_this(struct s_bkpinfo *);
 //extern void fatal_error (char *);
-extern void sort_mountlist_by_device (struct mountlist_itself *);
-extern int load_mountlist (struct mountlist_itself *a, char *b);
+extern void sort_mountlist_by_device(struct mountlist_itself *);
+extern int load_mountlist(struct mountlist_itself *a, char *b);
 extern bool g_text_mode;
 
 
 /* hacks */
-extern int load_raidtab_into_raidlist (struct raidlist_itself *a, char *b);
+extern int load_raidtab_into_raidlist(struct raidlist_itself *a, char *b);
 
 
 
 extern long g_start_time, g_minimum_progress, g_maximum_progress,
-  g_current_progress, g_currentY;
+    g_current_progress, g_currentY;
 extern bool g_ISO_restore_mode;
 
@@ -92 +93 @@
 /* my subroutines */
 
-void add_disklist_entry (struct list_of_disks *, char *,
-             struct mountlist_itself *);
-void add_mountlist_entry (struct mountlist_itself *, struct raidlist_itself *,
-              newtComponent, int, void *keylist[]);
-void add_varslist_entry (struct raid_device_record *);
-bool ask_me_yes_or_no (char *);
-bool ask_me_OK_or_cancel (char *);
-long calculate_raid_device_size (struct mountlist_itself *,
-                 struct raidlist_itself *, char *);
-void choose_raid_level (struct
+void add_disklist_entry(struct list_of_disks *, char *,
+                        struct mountlist_itself *);
+void add_mountlist_entry(struct mountlist_itself *,
+                         struct raidlist_itself *, newtComponent, int,
+                         void *keylist[]);
+void add_varslist_entry(struct raid_device_record *);
+bool ask_me_yes_or_no(char *);
+bool ask_me_OK_or_cancel(char *);
+long calculate_raid_device_size(struct mountlist_itself *,
+                                struct raidlist_itself *, char *);
+void choose_raid_level(struct
 #ifdef __FreeBSD__
-vinum_plex
+                       vinum_plex
 #else
-raid_device_record
+                       raid_device_record
 #endif
-*);
-void close_evalcall_form (void);
-void close_progress_form (void);
-void del_partns_listed_in_disklist (struct mountlist_itself *,
-                    struct raidlist_itself *,
-                    struct list_of_disks *);
-void delete_disklist_entry (struct list_of_disks *, char *, int);
-void delete_mountlist_entry (struct mountlist_itself *,
-                 struct raidlist_itself *, newtComponent, int,
-                 void *keylist[]);
-void delete_raidlist_entry (struct mountlist_itself *,
-                struct raidlist_itself *, char *);
-void delete_varslist_entry (struct raid_device_record *, int);
-char *disklist_entry_to_string (struct list_of_disks *, int);
-int edit_filelist (struct s_node *);
-void edit_mountlist_entry (struct mountlist_itself *,
-               struct raidlist_itself *, newtComponent, int,
-               void *keylist[]);
-void edit_raidlist_entry (struct mountlist_itself *, struct raidlist_itself *,
-              struct raid_device_record *, int);
-void edit_varslist_entry (struct raid_device_record *, int);
-int edit_mountlist_in_newt (char *mountlist_fname, struct mountlist_itself *, struct raidlist_itself *);
-int edit_mountlist (char *mountlist_fname, struct mountlist_itself *, struct raidlist_itself *);
-void edit_raidrec_additional_vars (struct raid_device_record *);
-int evaluate_drive_within_mountlist (struct mountlist_itself *, char *,
-                     char *);
-int evaluate_mountlist (struct mountlist_itself *, char *, char *, char *);
-int find_device_in_mountlist (struct mountlist_itself *, char *);
-int find_next_free_index_in_disklist (struct list_of_disks *);
-int find_raid_device_in_raidlist (struct raidlist_itself *, char *);
-bool get_isodir_info (char *, char *, char *, bool);
-void initiate_new_raidlist_entry (struct raidlist_itself *,
-                  struct mountlist_itself *, int, char *);
-void insert_essential_additionalvars (struct raid_device_record *);
-bool is_this_raid_personality_registered (int);
-void log_file_end_to_screen (char *, char *);
-void log_to_screen (const char *fmt, ...);
-int look_for_duplicate_mountpoints (struct mountlist_itself *, char *);
-int look_for_weird_formats (struct mountlist_itself *, char *);
-void make_list_of_unallocated_raid_partitions (struct mountlist_itself *,
-                           struct mountlist_itself *,
-                           struct raidlist_itself *);
-char *mountlist_entry_to_string (struct mountlist_itself *, int);
-void mvaddstr_and_log_it (int, int, char *);
-void nuke_mode_dummy ();
-char *number_of_disks_as_string (int, char *);
-void open_evalcall_form (char *);
-void open_progress_form (char *, char *, char *, char *, long);
-void popup_and_OK (char *);
-bool popup_and_get_string (char *, char *, char *, int);
-bool popup_with_buttons (char *, char *, char *);
-void redraw_disklist (struct list_of_disks *, void *keylist[], newtComponent);
-void redraw_mountlist (struct mountlist_itself *, void *keylist[],
-               newtComponent);
-void redraw_unallocpartnslist (struct mountlist_itself *, void *keylist[],
-                   newtComponent);
-void redraw_varslist (struct additional_raid_variables *, void *keylist[],
-              newtComponent);
-int read_variableINT_and_remove_from_raidvars (struct raid_device_record *,
-                           char *);
-void refresh_log_screen (void);
-void rejig_partition_name_in_raidlist_if_necessary (struct raidlist_itself *,
-                            char *, char *);
-void remove_essential_additionalvars (struct raid_device_record *);
-void select_raid_disks (struct mountlist_itself *, struct raidlist_itself *,
-            struct raid_device_record *, char *,
-            struct list_of_disks *);
-void setup_newt_stuff (void);
-long size_of_specific_device (struct mountlist_itself *, char *);
-bool spread_flaws_across_three_lines (char *, char *, char *, char *, int);
-char *turn_raid_level_number_to_string (int);
-void update_evalcall_form (int);
-void update_progress_form (char *);
-void update_progress_form_full (char *, char *, char *);
-char which_restore_mode (void);
-void write_variableINT_to_raid_var_line (struct raid_device_record *, int,
-                     char *, int);
-int where_in_drivelist_is_drive (struct list_of_disks *, char *);
+                       *);
+void close_evalcall_form(void);
+void close_progress_form(void);
+void del_partns_listed_in_disklist(struct mountlist_itself *,
+                                   struct raidlist_itself *,
+                                   struct list_of_disks *);
+void delete_disklist_entry(struct list_of_disks *, char *, int);
+void delete_mountlist_entry(struct mountlist_itself *,
+                            struct raidlist_itself *, newtComponent, int,
+                            void *keylist[]);
+void delete_raidlist_entry(struct mountlist_itself *,
+                           struct raidlist_itself *, char *);
+void delete_varslist_entry(struct raid_device_record *, int);
+char *disklist_entry_to_string(struct list_of_disks *, int);
+int edit_filelist(struct s_node *);
+void edit_mountlist_entry(struct mountlist_itself *,
+                          struct raidlist_itself *, newtComponent, int,
+                          void *keylist[]);
+void edit_raidlist_entry(struct mountlist_itself *,
+                         struct raidlist_itself *,
+                         struct raid_device_record *, int);
+void edit_varslist_entry(struct raid_device_record *, int);
+int edit_mountlist_in_newt(char *mountlist_fname,
+                           struct mountlist_itself *,
+                           struct raidlist_itself *);
+int edit_mountlist(char *mountlist_fname, struct mountlist_itself *,
+                   struct raidlist_itself *);
+void edit_raidrec_additional_vars(struct raid_device_record *);
+int evaluate_drive_within_mountlist(struct mountlist_itself *, char *,
+                                    char *);
+int evaluate_mountlist(struct mountlist_itself *, char *, char *, char *);
+int find_device_in_mountlist(struct mountlist_itself *, char *);
+int find_next_free_index_in_disklist(struct list_of_disks *);
+int find_raid_device_in_raidlist(struct raidlist_itself *, char *);
+bool get_isodir_info(char *, char *, char *, bool);
+void initiate_new_raidlist_entry(struct raidlist_itself *,
+                                 struct mountlist_itself *, int, char *);
+void insert_essential_additionalvars(struct raid_device_record *);
+bool is_this_raid_personality_registered(int);
+void log_file_end_to_screen(char *, char *);
+void log_to_screen(const char *fmt, ...);
+int look_for_duplicate_mountpoints(struct mountlist_itself *, char *);
+int look_for_weird_formats(struct mountlist_itself *, char *);
+void make_list_of_unallocated_raid_partitions(struct mountlist_itself *,
+                                              struct mountlist_itself *,
+                                              struct raidlist_itself *);
+char *mountlist_entry_to_string(struct mountlist_itself *, int);
+void mvaddstr_and_log_it(int, int, char *);
+void nuke_mode_dummy();
+char *number_of_disks_as_string(int, char *);
+void open_evalcall_form(char *);
+void open_progress_form(char *, char *, char *, char *, long);
+void popup_and_OK(char *);
+bool popup_and_get_string(char *, char *, char *, int);
+bool popup_with_buttons(char *, char *, char *);
+void redraw_disklist(struct list_of_disks *, void *keylist[],
+                     newtComponent);
+void redraw_mountlist(struct mountlist_itself *, void *keylist[],
+                      newtComponent);
+void redraw_unallocpartnslist(struct mountlist_itself *, void *keylist[],
+                              newtComponent);
+void redraw_varslist(struct additional_raid_variables *, void *keylist[],
+                     newtComponent);
+int read_variableINT_and_remove_from_raidvars(struct raid_device_record *,
+                                              char *);
+void refresh_log_screen(void);
+void rejig_partition_name_in_raidlist_if_necessary(struct raidlist_itself
+                                                   *, char *, char *);
+void remove_essential_additionalvars(struct raid_device_record *);
+void select_raid_disks(struct mountlist_itself *, struct raidlist_itself *,
+                       struct raid_device_record *, char *,
+                       struct list_of_disks *);
+void setup_newt_stuff(void);
+long size_of_specific_device(struct mountlist_itself *, char *);
+bool spread_flaws_across_three_lines(char *, char *, char *, char *, int);
+char *turn_raid_level_number_to_string(int);
+void update_evalcall_form(int);
+void update_progress_form(char *);
+void update_progress_form_full(char *, char *, char *);
+char which_restore_mode(void);
+void write_variableINT_to_raid_var_line(struct raid_device_record *, int,
+                                        char *, int);
+int where_in_drivelist_is_drive(struct list_of_disks *, char *);
 char *strip_path(char *);
 

branches/2.05/mondo/mondo/mondorestore/mondo-rstr-tools-EXT.h

@@ -4 +4 @@
 
 extern void free_MR_global_filenames();
-extern void get_cfg_file_from_archive_or_bust(struct s_bkpinfo*);
-extern bool is_file_in_list(char*, char*, char*); /* needle, haystack, preamble */
+extern void get_cfg_file_from_archive_or_bust(struct s_bkpinfo *);
+extern bool is_file_in_list(char *, char *, char *);    /* needle, haystack, preamble */
 extern int iso_fiddly_bits(struct s_bkpinfo *bkpinfo, bool nuke_me_please);
 extern void kill_petris(void);
-extern int modify_rclocal_one_time( char *path );
+extern int modify_rclocal_one_time(char *path);
 extern int mount_cdrom(struct s_bkpinfo *bkpinfo);
-extern int mount_device(char*,char*,char*,bool);
-extern int mount_all_devices(struct mountlist_itself*, bool);
+extern int mount_device(char *, char *, char *, bool);
+extern int mount_all_devices(struct mountlist_itself *, bool);
 extern void protect_against_braindead_sysadmins(void);
-extern int read_cfg_file_into_bkpinfo( char* cfg_file, struct s_bkpinfo *bkpinfo);
+extern int read_cfg_file_into_bkpinfo(char *cfg_file,
+                                      struct s_bkpinfo *bkpinfo);
 struct s_node *process_filelist_and_biggielist(struct s_bkpinfo *);
-extern int backup_crucial_file(char *path_root, char*filename);
+extern int backup_crucial_file(char *path_root, char *filename);
 extern int run_boot_loader(bool);
-extern int run_grub(bool, char*);
+extern int run_grub(bool, char *);
 extern int run_lilo(bool);
 extern int run_elilo(bool);
@@ -23 +24 @@
 extern char *find_my_editor(void);
 
-extern void streamline_changes_file(char*,char*);
-extern void  set_signals( int on );
+extern void streamline_changes_file(char *, char *);
+extern void set_signals(int on);
 extern void setup_MR_global_filenames(struct s_bkpinfo *bkpinfo);
 //extern void setup_signals(int);
 extern void terminate_daemon(int);
 extern void termination_in_progress(int);
-extern int unmount_all_devices(struct mountlist_itself*);
+extern int unmount_all_devices(struct mountlist_itself *);
 extern int get_cfg_file_from_archive(struct s_bkpinfo *bkpinfo);
-extern int 
-extract_config_file_from_ramdisk( struct s_bkpinfo *bkpinfo, 
-                  char *ramdisk_fname, 
-                  char *output_cfg_file, 
-                  char *output_mountlist_file);
+extern int
+extract_config_file_from_ramdisk(struct s_bkpinfo *bkpinfo,
+                                 char *ramdisk_fname,
+                                 char *output_cfg_file,
+                                 char *output_mountlist_file);
 
-extern void ask_about_these_imagedevs( char *infname, char *outfname );
+extern void ask_about_these_imagedevs(char *infname, char *outfname);
 
-extern void wait_until_software_raids_are_prepped(char*mdstat_file, int wait_for_percentage);
+extern void wait_until_software_raids_are_prepped(char *mdstat_file,
+                                                  int wait_for_percentage);

branches/2.05/mondo/mondo/mondorestore/mondo-rstr-tools.c

@@ -134 +134 @@
 
 extern bool g_sigpipe_caught;
-extern bool g_ISO_restore_mode; /* are we in Iso Mode? */
+extern bool g_ISO_restore_mode; /* are we in Iso Mode? */
 extern bool g_I_have_just_nuked;
 extern char *g_tmpfs_mountpt;
@@ -140 +140 @@
 extern char *g_isodir_format;
 extern long g_current_progress, g_maximum_progress;
-extern char *g_biggielist_txt;// where 'biggielist.txt' is stored, on ramdisk / tempdir;
-                          // biggielist.txt is the list of big files stored on the
-                          // backup media set in question
-extern char    *g_filelist_full; // filelist.full.gz is the list of all regular files
-                          // (excluding big files) stored on the backup media set
-extern char    *g_biggielist_pot;// list of big files which _could_ be restored, if the
-                          // user chooses them
-extern char  *g_filelist_imagedevs; // list of devices (e.g. /dev/hda1, /dev/sda5) which
-                             // were archived as images, not just /dev entries
-                             // ... e.g. NTFS, BeOS partitions
-extern char  *g_imagedevs_restthese; // of the imagedevs listed in FILELIST_IMAGEDEVS,
-                              // restore only these
-extern char  *g_mondo_cfg_file;      // where m*ndo-restore.cfg (the config file) is stored
-extern char  *g_mountlist_fname;     // where mountlist.txt (the mountlist file) is stored
-extern char    *g_mondo_home;        // homedir of Mondo; usually /usr/local/share/mondo
+extern char *g_biggielist_txt;  // where 'biggielist.txt' is stored, on ramdisk / tempdir;
+                          // biggielist.txt is the list of big files stored on the
+                          // backup media set in question
+extern char *g_filelist_full;   // filelist.full.gz is the list of all regular files
+                          // (excluding big files) stored on the backup media set
+extern char *g_biggielist_pot;  // list of big files which _could_ be restored, if the
+                          // user chooses them
+extern char *g_filelist_imagedevs;  // list of devices (e.g. /dev/hda1, /dev/sda5) which
+                             // were archived as images, not just /dev entries
+                             // ... e.g. NTFS, BeOS partitions
+extern char *g_imagedevs_restthese; // of the imagedevs listed in FILELIST_IMAGEDEVS,
+                              // restore only these
+extern char *g_mondo_cfg_file;  // where m*ndo-restore.cfg (the config file) is stored
+extern char *g_mountlist_fname; // where mountlist.txt (the mountlist file) is stored
+extern char *g_mondo_home;      // homedir of Mondo; usually /usr/local/share/mondo
 extern struct s_bkpinfo *g_bkpinfo_DONTUSETHIS;
 
@@ -170 +170 @@
 void free_MR_global_filenames()
 {
-  paranoid_free ( g_biggielist_txt );
-  paranoid_free ( g_filelist_full );
-  paranoid_free ( g_filelist_imagedevs );
+    paranoid_free(g_biggielist_txt);
+    paranoid_free(g_filelist_full);
+    paranoid_free(g_filelist_imagedevs);
 //  paranoid_free (g_imagedevs_pot );
-  paranoid_free ( g_imagedevs_restthese );
-  paranoid_free ( g_mondo_cfg_file );
-  paranoid_free ( g_mountlist_fname );
-  paranoid_free ( g_mondo_home );
-  paranoid_free ( g_tmpfs_mountpt );
-  paranoid_free ( g_isodir_device );
-  paranoid_free ( g_isodir_format );
+    paranoid_free(g_imagedevs_restthese);
+    paranoid_free(g_mondo_cfg_file);
+    paranoid_free(g_mountlist_fname);
+    paranoid_free(g_mondo_home);
+    paranoid_free(g_tmpfs_mountpt);
+    paranoid_free(g_isodir_device);
+    paranoid_free(g_isodir_format);
 
 }
@@ -193 +193 @@
  * @ingroup restoreUtilityGroup
  */
-void 
-ask_about_these_imagedevs( char *infname, char *outfname )
-{
-  FILE *fin;
-  FILE *fout;
+void ask_about_these_imagedevs(char *infname, char *outfname)
+{
+    FILE *fin;
+    FILE *fout;
   /************************************************************************
    * allocate memory regions. test and set  -sab 16 feb 2003              *
    ************************************************************************/
-  char *incoming_ptr;
-  char *question_ptr;
-
-  char incoming[ MAX_STR_LEN ];
-  char question[ MAX_STR_LEN ];
-
-  assert_string_is_neither_NULL_nor_zerolength(infname);
-  assert_string_is_neither_NULL_nor_zerolength(outfname);
-
-  incoming_ptr = malloc(sizeof(incoming));
-  if ( incoming_ptr == NULL )
-    {
-      fprintf(stderr, "Out of Memory\n");
-      exit (EXIT_FAILURE);
-    }
-
-  question_ptr = malloc(sizeof(question));
-  if ( question_ptr == NULL)
-    {
-      fprintf(stderr, "Out of Memory\n");
-      exit (EXIT_FAILURE);
-    }
-
-  memset (incoming_ptr, '\0', sizeof(incoming));
-  memset (question_ptr, '\0', sizeof(question));
-
-  
-
-  if (!( fin = fopen( infname,"r") ) )  
-    {
-      fatal_error( "Cannot openin infname" );
-    }
-  if ( !( fout = fopen( outfname, "w" ) ) )
-    {
-      fatal_error( "Cannot openin outfname");
-    }
-  for( fgets( incoming_ptr, MAX_STR_LEN, fin); 
-       !feof( fin ); 
-       fgets( incoming_ptr, MAX_STR_LEN, fin ) )
-    {
-      strip_spaces( incoming_ptr );
-
-      if ( incoming[0] == '\0') 
-    { 
-      continue; 
-    }
-
-      sprintf( question_ptr, 
-           "Should I restore the image of %s ?", 
-           incoming_ptr );
-
-      if ( ask_me_yes_or_no( question_ptr ) )
-        {
-          fprintf( fout, "%s\n", incoming_ptr );
-        }
-    }
-  
+    char *incoming_ptr;
+    char *question_ptr;
+
+    char incoming[MAX_STR_LEN];
+    char question[MAX_STR_LEN];
+
+    assert_string_is_neither_NULL_nor_zerolength(infname);
+    assert_string_is_neither_NULL_nor_zerolength(outfname);
+
+    incoming_ptr = malloc(sizeof(incoming));
+    if (incoming_ptr == NULL) {
+        fprintf(stderr, "Out of Memory\n");
+        exit(EXIT_FAILURE);
+    }
+
+    question_ptr = malloc(sizeof(question));
+    if (question_ptr == NULL) {
+        fprintf(stderr, "Out of Memory\n");
+        exit(EXIT_FAILURE);
+    }
+
+    memset(incoming_ptr, '\0', sizeof(incoming));
+    memset(question_ptr, '\0', sizeof(question));
+
+
+
+    if (!(fin = fopen(infname, "r"))) {
+        fatal_error("Cannot openin infname");
+    }
+    if (!(fout = fopen(outfname, "w"))) {
+        fatal_error("Cannot openin outfname");
+    }
+    for (fgets(incoming_ptr, MAX_STR_LEN, fin);
+         !feof(fin); fgets(incoming_ptr, MAX_STR_LEN, fin)) {
+        strip_spaces(incoming_ptr);
+
+        if (incoming[0] == '\0') {
+            continue;
+        }
+
+        sprintf(question_ptr,
+                "Should I restore the image of %s ?", incoming_ptr);
+
+        if (ask_me_yes_or_no(question_ptr)) {
+            fprintf(fout, "%s\n", incoming_ptr);
+        }
+    }
+
   /*** free memory ***********/
-  paranoid_free(incoming_ptr);
-  incoming_ptr = NULL;
-  paranoid_free(question_ptr);
-  question_ptr = NULL;
-  
-
-  paranoid_fclose( fout );
-  paranoid_fclose( fin );
+    paranoid_free(incoming_ptr);
+    incoming_ptr = NULL;
+    paranoid_free(question_ptr);
+    question_ptr = NULL;
+
+
+    paranoid_fclose(fout);
+    paranoid_fclose(fin);
 }
 
@@ -289 +279 @@
  * @ingroup restoreUtilityGroup
  */
-int 
-extract_config_file_from_ramdisk( struct s_bkpinfo *bkpinfo, 
-                  char *ramdisk_fname, 
-                  char *output_cfg_file, 
-                  char *output_mountlist_file)
-{
-  char *mountpt;
-  char *command;
-  char *orig_fname;
-  int retval=0;
-  
-  assert(bkpinfo!=NULL);
-  malloc_string(mountpt);
-  malloc_string(command);
-  malloc_string(orig_fname);
-  assert_string_is_neither_NULL_nor_zerolength(ramdisk_fname);
-  assert_string_is_neither_NULL_nor_zerolength(output_cfg_file);
-  assert_string_is_neither_NULL_nor_zerolength(output_mountlist_file);
-  sprintf( mountpt, "%s/mount.bootdisk", bkpinfo->tmpdir );
-  sprintf( command, "mkdir -p %s", mountpt );
-  run_program_and_log_output ( command, FALSE );
-  sprintf( command, "gzip -dc %s > %s/mindi.rd 2> /dev/null", 
-       ramdisk_fname, 
-       bkpinfo->tmpdir );
-
-  run_program_and_log_output( command, FALSE );
-  sprintf( command, "umount %s", mountpt );
-
-  run_program_and_log_output( command, FALSE );
-
-  sprintf( command, "mount -o loop %s/mindi.rd -t ext2 %s", 
-       bkpinfo->tmpdir, 
-       mountpt );
-
-  run_program_and_log_output( command, FALSE );
-
-  sprintf( command, "mkdir -p %s/tmp", bkpinfo->tmpdir);
-
-  run_program_and_log_output( command, FALSE );
-
-  sprintf( command,
-           "cp -f %s/%s %s", // %s/%s becomes {mountpt}/tmp/m*ndo-restore.cfg
-       mountpt, g_mondo_cfg_file, 
-       output_cfg_file );
-  run_program_and_log_output(command, FALSE);
-
-  sprintf( orig_fname, "%s/%s", mountpt, g_mountlist_fname );
-  if (does_file_exist( orig_fname ))
-    {
-      sprintf( command, 
-       "cp -f %s %s",
-       orig_fname, output_mountlist_file );
-      run_program_and_log_output( command, FALSE );
-    }
-  sprintf( command, "umount %s", mountpt );
-  run_program_and_log_output( command, FALSE );
-  if ( !does_file_exist(output_cfg_file) || (!does_file_exist(output_mountlist_file) && does_file_exist(orig_fname)) )
-    {
-      log_msg(2, "Failed to extract %s and/or %s from ramdisk", 
-          output_cfg_file, 
-          output_mountlist_file );
-      retval=1;
-    }
-  else
-    {
-      retval=0;
-    }
-  paranoid_free(mountpt);
-  paranoid_free(command);
-  paranoid_free(orig_fname);
-  return(retval);
+int
+extract_config_file_from_ramdisk(struct s_bkpinfo *bkpinfo,
+                                 char *ramdisk_fname,
+                                 char *output_cfg_file,
+                                 char *output_mountlist_file)
+{
+    char *mountpt;
+    char *command;
+    char *orig_fname;
+    int retval = 0;
+
+    assert(bkpinfo != NULL);
+    malloc_string(mountpt);
+    malloc_string(command);
+    malloc_string(orig_fname);
+    assert_string_is_neither_NULL_nor_zerolength(ramdisk_fname);
+    assert_string_is_neither_NULL_nor_zerolength(output_cfg_file);
+    assert_string_is_neither_NULL_nor_zerolength(output_mountlist_file);
+    sprintf(mountpt, "%s/mount.bootdisk", bkpinfo->tmpdir);
+    sprintf(command, "mkdir -p %s", mountpt);
+    run_program_and_log_output(command, FALSE);
+    sprintf(command, "gzip -dc %s > %s/mindi.rd 2> /dev/null",
+            ramdisk_fname, bkpinfo->tmpdir);
+
+    run_program_and_log_output(command, FALSE);
+    sprintf(command, "umount %s", mountpt);
+
+    run_program_and_log_output(command, FALSE);
+
+    sprintf(command, "mount -o loop %s/mindi.rd -t ext2 %s",
+            bkpinfo->tmpdir, mountpt);
+
+    run_program_and_log_output(command, FALSE);
+
+    sprintf(command, "mkdir -p %s/tmp", bkpinfo->tmpdir);
+
+    run_program_and_log_output(command, FALSE);
+
+    sprintf(command, "cp -f %s/%s %s",  // %s/%s becomes {mountpt}/tmp/m*ndo-restore.cfg
+            mountpt, g_mondo_cfg_file, output_cfg_file);
+    run_program_and_log_output(command, FALSE);
+
+    sprintf(orig_fname, "%s/%s", mountpt, g_mountlist_fname);
+    if (does_file_exist(orig_fname)) {
+        sprintf(command, "cp -f %s %s", orig_fname, output_mountlist_file);
+        run_program_and_log_output(command, FALSE);
+    }
+    sprintf(command, "umount %s", mountpt);
+    run_program_and_log_output(command, FALSE);
+    if (!does_file_exist(output_cfg_file)
+        || (!does_file_exist(output_mountlist_file)
+            && does_file_exist(orig_fname))) {
+        log_msg(2, "Failed to extract %s and/or %s from ramdisk",
+                output_cfg_file, output_mountlist_file);
+        retval = 1;
+    } else {
+        retval = 0;
+    }
+    paranoid_free(mountpt);
+    paranoid_free(command);
+    paranoid_free(orig_fname);
+    return (retval);
 
 }
@@ -372 +353 @@
 void get_cfg_file_from_archive_or_bust(struct s_bkpinfo *bkpinfo)
 {
-  while(get_cfg_file_from_archive(bkpinfo))
-    {
-      if (!ask_me_yes_or_no("Failed to find config file/archives. Choose another source?"))
-    { fatal_error("Could not find config file/archives. Aborting."); }
-      interactively_obtain_media_parameters_from_user(bkpinfo, FALSE);
-    }
+    while (get_cfg_file_from_archive(bkpinfo)) {
+        if (!ask_me_yes_or_no
+            ("Failed to find config file/archives. Choose another source?"))
+        {
+            fatal_error("Could not find config file/archives. Aborting.");
+        }
+        interactively_obtain_media_parameters_from_user(bkpinfo, FALSE);
+    }
 }
 
@@ -388 +371 @@
  * @return TRUE if it's in the list, FALSE if it's not.
  */
-bool
-is_file_in_list(char *f, char *list_fname, char *preamble)
+bool is_file_in_list(char *f, char *list_fname, char *preamble)
 {
 
   /** needs malloc **/
-  char *command;
-  char *file;
-  char *tmp;
-  int res;
-
-  malloc_string(command);
-  malloc_string(file);
-  malloc_string(tmp);
-  assert_string_is_neither_NULL_nor_zerolength(f);
-  assert_string_is_neither_NULL_nor_zerolength(list_fname);
-  assert(preamble!=NULL);
-
-  if ( strncmp( preamble, f, strlen(preamble ) ) == 0 )
-    {
-      strcpy( file, f + strlen(preamble) );
-    }
-  else
-    {
-      strcpy( file, f );
-    }
-  if ( file[0] == '/' && file[1] == '/')
-    {
-      strcpy( tmp, file );
-      strcpy( file,tmp + 1 );
-    }
-  sprintf( tmp,"Checking to see if f=%s, file=%s, is in the list of biggiefiles", f, file);
-  log_msg(2, tmp );
-  sprintf( command, "cat %s | grep -x \"%s\"",  list_fname, file );
-  res = run_program_and_log_output( command, FALSE);
-  paranoid_free(command);
-  paranoid_free(file);
-  paranoid_free(tmp);
-  if (res)
-    {
-      return(FALSE);
-    }
-  else
-    {
-      return(TRUE);
-    }
-}
+    char *command;
+    char *file;
+    char *tmp;
+    int res;
+
+    malloc_string(command);
+    malloc_string(file);
+    malloc_string(tmp);
+    assert_string_is_neither_NULL_nor_zerolength(f);
+    assert_string_is_neither_NULL_nor_zerolength(list_fname);
+    assert(preamble != NULL);
+
+    if (strncmp(preamble, f, strlen(preamble)) == 0) {
+        strcpy(file, f + strlen(preamble));
+    } else {
+        strcpy(file, f);
+    }
+    if (file[0] == '/' && file[1] == '/') {
+        strcpy(tmp, file);
+        strcpy(file, tmp + 1);
+    }
+    sprintf(tmp,
+            "Checking to see if f=%s, file=%s, is in the list of biggiefiles",
+            f, file);
+    log_msg(2, tmp);
+    sprintf(command, "cat %s | grep -x \"%s\"", list_fname, file);
+    res = run_program_and_log_output(command, FALSE);
+    paranoid_free(command);
+    paranoid_free(file);
+    paranoid_free(tmp);
+    if (res) {
+        return (FALSE);
+    } else {
+        return (TRUE);
+    }
+}
+
 /**************************************************************************
  *END_IS_FILE_IN_LIST                                                     *
@@ -451 +429 @@
 int iso_fiddly_bits(struct s_bkpinfo *bkpinfo, bool nuke_me_please)
 {
-  char *mount_isodir_command, *tmp,
-    *command;
-  int retval=0, i;
-  bool already_mounted=FALSE;
-
-  assert(bkpinfo!=NULL);
-  malloc_string(mount_isodir_command);
-  malloc_string(tmp);
-  malloc_string(command);
-  g_ISO_restore_mode=TRUE;
-  read_cfg_var( g_mondo_cfg_file, "iso-dev", g_isodir_device);
-  if (bkpinfo->disaster_recovery)
-    {
+    char *mount_isodir_command, *tmp, *command;
+    int retval = 0, i;
+    bool already_mounted = FALSE;
+
+    assert(bkpinfo != NULL);
+    malloc_string(mount_isodir_command);
+    malloc_string(tmp);
+    malloc_string(command);
+    g_ISO_restore_mode = TRUE;
+    read_cfg_var(g_mondo_cfg_file, "iso-dev", g_isodir_device);
+    if (bkpinfo->disaster_recovery) {
 /* Patch Conor Daly 26-june-2004 
  * Don't let this clobber an existing bkpinfo->isodir */
-      if (!bkpinfo->isodir[0]) {
-        strcpy(bkpinfo->isodir, "/tmp/isodir");
-      }
+        if (!bkpinfo->isodir[0]) {
+            strcpy(bkpinfo->isodir, "/tmp/isodir");
+        }
 /* End patch */
-      sprintf(command, "mkdir -p %s", bkpinfo->isodir);
-      run_program_and_log_output(command, 5);
-      log_msg(2,"Setting isodir to %s", bkpinfo->isodir);
-    }
-
-  if (!get_isodir_info(g_isodir_device, g_isodir_format, bkpinfo->isodir, nuke_me_please)) {return(1);}
-  paranoid_system("umount "MNT_CDROM" 2> /dev/null"); /* just in case */
-
-  if (is_this_device_mounted(g_isodir_device))
-    {
-      log_to_screen("WARNING - isodir is already mounted");
-      already_mounted=TRUE;
-    }
-  else
-    {
-      sprintf(mount_isodir_command,"mount %s", g_isodir_device);
-      if (strlen(g_isodir_format)>1)
-        { sprintf(mount_isodir_command+strlen(mount_isodir_command)," -t %s", g_isodir_format); }
-      strcat(mount_isodir_command," -o ro ");
-      strcat(mount_isodir_command, bkpinfo->isodir);
-      run_program_and_log_output("df -m", FALSE);
-      sprintf(tmp, "The 'mount' command is '%s'. PLEASE report this command to be if you have problems, ok?", mount_isodir_command);
-      log_msg(1,tmp);
-      if (run_program_and_log_output(mount_isodir_command, FALSE))
-        { popup_and_OK("Cannot mount the device where the ISO files are stored."); return(1); }
-      log_to_screen("I have mounted the device where the ISO files are stored.");
-    }
-  if (!IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) { mount_cdrom(bkpinfo); }
-  i=what_number_cd_is_this(bkpinfo); /* has the side-effect of calling mount_cdrom() */
-  sprintf(tmp,"%s #%d has been mounted via loopback mount", media_descriptor_string(bkpinfo->backup_media_type), i);
-  log_msg(1,tmp);
-  if (i<0)
-    { popup_and_OK("Cannot find ISO images in the directory you specified."); retval=1; }
-  log_msg(2,"%ld: bkpinfo->isodir is now %s", __LINE__, bkpinfo->isodir);
-  paranoid_free(mount_isodir_command);
-  paranoid_free(tmp);
-  paranoid_free(command);
-  return(retval);
+        sprintf(command, "mkdir -p %s", bkpinfo->isodir);
+        run_program_and_log_output(command, 5);
+        log_msg(2, "Setting isodir to %s", bkpinfo->isodir);
+    }
+
+    if (!get_isodir_info
+        (g_isodir_device, g_isodir_format, bkpinfo->isodir,
+         nuke_me_please)) {
+        return (1);
+    }
+    paranoid_system("umount " MNT_CDROM " 2> /dev/null");   /* just in case */
+
+    if (is_this_device_mounted(g_isodir_device)) {
+        log_to_screen("WARNING - isodir is already mounted");
+        already_mounted = TRUE;
+    } else {
+        sprintf(mount_isodir_command, "mount %s", g_isodir_device);
+        if (strlen(g_isodir_format) > 1) {
+            sprintf(mount_isodir_command + strlen(mount_isodir_command),
+                    " -t %s", g_isodir_format);
+        }
+        strcat(mount_isodir_command, " -o ro ");
+        strcat(mount_isodir_command, bkpinfo->isodir);
+        run_program_and_log_output("df -m", FALSE);
+        sprintf(tmp,
+                "The 'mount' command is '%s'. PLEASE report this command to be if you have problems, ok?",
+                mount_isodir_command);
+        log_msg(1, tmp);
+        if (run_program_and_log_output(mount_isodir_command, FALSE)) {
+            popup_and_OK
+                ("Cannot mount the device where the ISO files are stored.");
+            return (1);
+        }
+        log_to_screen
+            ("I have mounted the device where the ISO files are stored.");
+    }
+    if (!IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
+        mount_cdrom(bkpinfo);
+    }
+    i = what_number_cd_is_this(bkpinfo);    /* has the side-effect of calling mount_cdrom() */
+    sprintf(tmp, "%s #%d has been mounted via loopback mount",
+            media_descriptor_string(bkpinfo->backup_media_type), i);
+    log_msg(1, tmp);
+    if (i < 0) {
+        popup_and_OK
+            ("Cannot find ISO images in the directory you specified.");
+        retval = 1;
+    }
+    log_msg(2, "%ld: bkpinfo->isodir is now %s", __LINE__,
+            bkpinfo->isodir);
+    paranoid_free(mount_isodir_command);
+    paranoid_free(tmp);
+    paranoid_free(command);
+    return (retval);
 }
 
@@ -516 +508 @@
  * Kill all Petris processes.
  */
-void
-kill_petris(void)
-{
-  char *command;
-  malloc_string(command);
-  sprintf( command, "kill `ps wax 2> /dev/null | grep petris 2> /dev/null | grep -v grep | cut -d' ' -f2` 2> /dev/null");
-  paranoid_system( command );
-  paranoid_free(command);
-}
+void kill_petris(void)
+{
+    char *command;
+    malloc_string(command);
+    sprintf(command,
+            "kill `ps wax 2> /dev/null | grep petris 2> /dev/null | grep -v grep | cut -d' ' -f2` 2> /dev/null");
+    paranoid_system(command);
+    paranoid_free(command);
+}
+
 /**************************************************************************
  *END_KILL_PETRIS                                                         *
@@ -537 +530 @@
  * @return 0 for success, nonzero for failure.
  */
-int
-modify_rclocal_one_time( char *path )
+int modify_rclocal_one_time(char *path)
 {
   /** malloc **/
-  char *rclocal_fname;
-  char *newfile_fname;
-  char *tmp;
-
-  malloc_string(rclocal_fname);
-  malloc_string(newfile_fname);
-  malloc_string(tmp);
-  assert_string_is_neither_NULL_nor_zerolength(path);
-
-  sprintf( rclocal_fname, "%s/rc.local", path );
+    char *rclocal_fname;
+    char *newfile_fname;
+    char *tmp;
+
+    malloc_string(rclocal_fname);
+    malloc_string(newfile_fname);
+    malloc_string(tmp);
+    assert_string_is_neither_NULL_nor_zerolength(path);
+
+    sprintf(rclocal_fname, "%s/rc.local", path);
 
 //  sprintf(tmp, "chmod 1777 %s/tmp", MNT_RESTORING);
 //  run_program_and_log_output( tmp, FALSE );
-  return( 0 ); /* remove this line to open the floodgates... */
-
-  if (! does_file_exist( rclocal_fname ) )
-    {
-      sprintf( rclocal_fname, "%s/rc.d/rc.local", path );
-    }
-  if (! does_file_exist( rclocal_fname ) )
-    {
-paranoid_free(rclocal_fname);
-paranoid_free(newfile_fname);
-paranoid_free(tmp);
-      return( 1 );
-    }
-  sprintf( newfile_fname, "%s/rc.local.mondorescue", path );
-  sprintf( tmp, "cat %s | grep mondorescue > /dev/null 2> /dev/null",rclocal_fname );
-  if (system( tmp ) )
-    {
-      sprintf( tmp,"echo \"[ -e %s ] && %s\n\" >> %s",
-           newfile_fname,
-           newfile_fname,
-           rclocal_fname);
-
-      paranoid_system( tmp );
-    }
-  sprintf( tmp, "echo -en \"#!/bin/sh\
+    return (0);                 /* remove this line to open the floodgates... */
+
+    if (!does_file_exist(rclocal_fname)) {
+        sprintf(rclocal_fname, "%s/rc.d/rc.local", path);
+    }
+    if (!does_file_exist(rclocal_fname)) {
+        paranoid_free(rclocal_fname);
+        paranoid_free(newfile_fname);
+        paranoid_free(tmp);
+        return (1);
+    }
+    sprintf(newfile_fname, "%s/rc.local.mondorescue", path);
+    sprintf(tmp, "cat %s | grep mondorescue > /dev/null 2> /dev/null",
+            rclocal_fname);
+    if (system(tmp)) {
+        sprintf(tmp, "echo \"[ -e %s ] && %s\n\" >> %s",
+                newfile_fname, newfile_fname, rclocal_fname);
+
+        paranoid_system(tmp);
+    }
+    sprintf(tmp, "echo -en \"#!/bin/sh\
 \\n\
 \\n\
@@ -587 +575 @@
 service xfs start\\n\
 yes | rm -f %s\\n\
-\" > %s",rclocal_fname,rclocal_fname,newfile_fname,newfile_fname);
-  sprintf( tmp, "chmod +x \"%s\"", newfile_fname );
-  run_program_and_log_output( tmp, FALSE );
-paranoid_free(rclocal_fname);
-paranoid_free(newfile_fname);
-paranoid_free(tmp);
-  return( 0 );
-}
+\" > %s", rclocal_fname, rclocal_fname, newfile_fname, newfile_fname);
+    sprintf(tmp, "chmod +x \"%s\"", newfile_fname);
+    run_program_and_log_output(tmp, FALSE);
+    paranoid_free(rclocal_fname);
+    paranoid_free(newfile_fname);
+    paranoid_free(tmp);
+    return (0);
+}
+
 /**************************************************************************
  *END_ MODIFY_RCLOCAL_ONE_TIME                                            *
@@ -609 +598 @@
  * @return The number of errors encountered (0 for success).
  */
-int mount_all_devices(struct mountlist_itself *p_external_copy_of_mountlist, bool writeable)
-{
-  int retval=0,lino,res;
-  char *tmp, *these_failed, *format;
-  struct mountlist_itself *mountlist;
-
-  malloc_string(tmp);
-  malloc_string(format);
-  malloc_string(these_failed);
-  assert(p_external_copy_of_mountlist!=NULL);
-  mountlist = malloc(sizeof(struct mountlist_itself));
-  memcpy((void*)mountlist, (void*)p_external_copy_of_mountlist, sizeof(struct mountlist_itself));
-  sort_mountlist_by_mountpoint(mountlist, 0);
+int mount_all_devices(struct mountlist_itself
+                      *p_external_copy_of_mountlist, bool writeable)
+{
+    int retval = 0, lino, res;
+    char *tmp, *these_failed, *format;
+    struct mountlist_itself *mountlist;
+
+    malloc_string(tmp);
+    malloc_string(format);
+    malloc_string(these_failed);
+    assert(p_external_copy_of_mountlist != NULL);
+    mountlist = malloc(sizeof(struct mountlist_itself));
+    memcpy((void *) mountlist, (void *) p_external_copy_of_mountlist,
+           sizeof(struct mountlist_itself));
+    sort_mountlist_by_mountpoint(mountlist, 0);
 
   /** menset **/
-  these_failed[0] = '\0';
-
-  mvaddstr_and_log_it( g_currentY, 0, "Mounting devices         ");
-  open_progress_form("Mounting devices", 
-             "I am now mounting all the drives.",
-             "This should not take long.", 
-             "",
-             mountlist->entries);
-  
-  for( lino = 0; lino < mountlist->entries; lino++ )
-    {
-      if ( !strcmp( mountlist->el[lino].device, "/proc" ) )
-        {
-      log_msg(1, "Again with the /proc - why is this in your mountlist?");
-    }
-      else if ( is_this_device_mounted( mountlist->el[lino].device ) )
-    {
-      sprintf( tmp, "%s is already mounted",mountlist->el[lino].device );
-      log_to_screen( tmp );
-    }
-      else if ( strcmp( mountlist->el[lino].mountpoint, "none" ) && strcmp( mountlist->el[lino].mountpoint, "lvm" ) && strcmp( mountlist->el[lino].mountpoint,"raid" ) && strcmp(mountlist->el[lino].mountpoint, "image" ) )
-    {
-      sprintf( tmp, "Mounting %s",mountlist->el[lino].device );
-      update_progress_form( tmp );
-      strcpy(format, mountlist->el[lino].format);
-      if (!strcmp(format, "ext3")) { strcpy(format, "ext2"); }
-      res = mount_device( mountlist->el[lino].device,
-                  mountlist->el[lino].mountpoint, 
-                  format,
-                  writeable );
-      retval += res;
-          if ( res )
-        { 
-          strcat( these_failed,mountlist->el[lino].device ); 
-          strcat( these_failed, " " ); 
-        }
-    }
-      g_current_progress++;
-    }
-  close_progress_form();
-  run_program_and_log_output( "df -m", TRUE );
-  if ( retval )
-    {
-      if (g_partition_table_locked_up > 0)
-        {
-          log_to_screen(
-"fdisk's ictol() call to refresh its copy of the partition table causes the kernel to");
-      log_to_screen(
-"lock up the partition table. You might have to reboot and use Interactive Mode to");
-      log_to_screen(
-"format and restore *without* partitioning first. Sorry for the inconvenience.");
-        }
-      sprintf( tmp, "Could not mount devices %s- shall I abort?", these_failed );
-      if ( !ask_me_yes_or_no( tmp ) ) 
-    {
-      retval = 0;
-      log_to_screen( "Continuing, although some devices failed to be mounted" );
-      mvaddstr_and_log_it( g_currentY++, 74, "Done." );
-    }
-      else
-    {
-      mvaddstr_and_log_it( g_currentY++, 74, "Failed." );
-      log_to_screen( "Unable to mount some or all of your partitions." );
-    }
-    }
-  else
-    {
-      log_to_screen("All partitions were mounted OK.");
-      mvaddstr_and_log_it(g_currentY++,74,"Done.");
-    }
-  run_program_and_log_output("df -m", 3);
-  paranoid_free(mountlist);
-  paranoid_free(tmp);
-  paranoid_free(format);
-  paranoid_free(these_failed);
-  return(retval);
-}
+    these_failed[0] = '\0';
+
+    mvaddstr_and_log_it(g_currentY, 0, "Mounting devices         ");
+    open_progress_form("Mounting devices",
+                       "I am now mounting all the drives.",
+                       "This should not take long.",
+                       "", mountlist->entries);
+
+    for (lino = 0; lino < mountlist->entries; lino++) {
+        if (!strcmp(mountlist->el[lino].device, "/proc")) {
+            log_msg(1,
+                    "Again with the /proc - why is this in your mountlist?");
+        } else if (is_this_device_mounted(mountlist->el[lino].device)) {
+            sprintf(tmp, "%s is already mounted",
+                    mountlist->el[lino].device);
+            log_to_screen(tmp);
+        } else if (strcmp(mountlist->el[lino].mountpoint, "none")
+                   && strcmp(mountlist->el[lino].mountpoint, "lvm")
+                   && strcmp(mountlist->el[lino].mountpoint, "raid")
+                   && strcmp(mountlist->el[lino].mountpoint, "image")) {
+            sprintf(tmp, "Mounting %s", mountlist->el[lino].device);
+            update_progress_form(tmp);
+            strcpy(format, mountlist->el[lino].format);
+            if (!strcmp(format, "ext3")) {
+                strcpy(format, "ext2");
+            }
+            res = mount_device(mountlist->el[lino].device,
+                               mountlist->el[lino].mountpoint,
+                               format, writeable);
+            retval += res;
+            if (res) {
+                strcat(these_failed, mountlist->el[lino].device);
+                strcat(these_failed, " ");
+            }
+        }
+        g_current_progress++;
+    }
+    close_progress_form();
+    run_program_and_log_output("df -m", TRUE);
+    if (retval) {
+        if (g_partition_table_locked_up > 0) {
+            log_to_screen
+                ("fdisk's ictol() call to refresh its copy of the partition table causes the kernel to");
+            log_to_screen
+                ("lock up the partition table. You might have to reboot and use Interactive Mode to");
+            log_to_screen
+                ("format and restore *without* partitioning first. Sorry for the inconvenience.");
+        }
+        sprintf(tmp, "Could not mount devices %s- shall I abort?",
+                these_failed);
+        if (!ask_me_yes_or_no(tmp)) {
+            retval = 0;
+            log_to_screen
+                ("Continuing, although some devices failed to be mounted");
+            mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+        } else {
+            mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
+            log_to_screen
+                ("Unable to mount some or all of your partitions.");
+        }
+    } else {
+        log_to_screen("All partitions were mounted OK.");
+        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+    }
+    run_program_and_log_output("df -m", 3);
+    paranoid_free(mountlist);
+    paranoid_free(tmp);
+    paranoid_free(format);
+    paranoid_free(these_failed);
+    return (retval);
+}
+
  /**************************************************************************
   *END_MOUNT_ALL_DEVICES                                                   *
@@ -717 +703 @@
 int mount_cdrom(struct s_bkpinfo *bkpinfo)
 {
-  char *mount_cmd;
-  int i,res;
+    char *mount_cmd;
+    int i, res;
 #ifdef __FreeBSD__
-  char mdd[32];
-  char *mddev = mdd;
+    char mdd[32];
+    char *mddev = mdd;
 #endif
 
-  malloc_string(mount_cmd);
-  assert(bkpinfo!=NULL);
-  
-  if (bkpinfo->backup_media_type == tape || bkpinfo->backup_media_type == udev)
-    {
-      log_msg(8, "Tape/udev. Therefore, no need to mount CDROM.");
-      paranoid_free(mount_cmd);
-      return 0;
-    }
-
-  if (!run_program_and_log_output("mount | fgrep " MNT_CDROM, FALSE))
-    {
-      log_msg(2,"mount_cdrom() - CD already mounted. Fair enough.");
-      paranoid_free(mount_cmd);
-      return(0);
-    }
-
-  if (bkpinfo->backup_media_type == nfs)
-    {
-      log_msg(2,"Mounting for NFS thingy");
-      log_msg(2, "isodir = %s", bkpinfo->isodir);
-      if ((!bkpinfo->isodir[0] || !strcmp(bkpinfo->isodir, "/"))
-      && am_I_in_disaster_recovery_mode())
-        {
-      strcpy(bkpinfo->isodir, "/tmp/isodir");
-          log_msg(1, "isodir is being set to %s", bkpinfo->isodir);
-    }
-
+    malloc_string(mount_cmd);
+    assert(bkpinfo != NULL);
+
+    if (bkpinfo->backup_media_type == tape
+        || bkpinfo->backup_media_type == udev) {
+        log_msg(8, "Tape/udev. Therefore, no need to mount CDROM.");
+        paranoid_free(mount_cmd);
+        return 0;
+    }
+
+    if (!run_program_and_log_output("mount | fgrep " MNT_CDROM, FALSE)) {
+        log_msg(2, "mount_cdrom() - CD already mounted. Fair enough.");
+        paranoid_free(mount_cmd);
+        return (0);
+    }
+
+    if (bkpinfo->backup_media_type == nfs) {
+        log_msg(2, "Mounting for NFS thingy");
+        log_msg(2, "isodir = %s", bkpinfo->isodir);
+        if ((!bkpinfo->isodir[0] || !strcmp(bkpinfo->isodir, "/"))
+            && am_I_in_disaster_recovery_mode()) {
+            strcpy(bkpinfo->isodir, "/tmp/isodir");
+            log_msg(1, "isodir is being set to %s", bkpinfo->isodir);
+        }
 #ifdef __FreeBSD__
-      sprintf (mount_cmd, "/mnt/isodir/%s/%s/%d.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir, g_current_media_number);
-      mddev = make_vn (mount_cmd);
-      sprintf (mount_cmd, "mount_cd9660 -r %s "MNT_CDROM, mddev);
+        sprintf(mount_cmd, "/mnt/isodir/%s/%s/%d.iso", bkpinfo->isodir,
+                bkpinfo->nfs_remote_dir, g_current_media_number);
+        mddev = make_vn(mount_cmd);
+        sprintf(mount_cmd, "mount_cd9660 -r %s " MNT_CDROM, mddev);
 #else
-      sprintf(mount_cmd, "mount %s/%s/%d.iso -t iso9660 -o loop,ro %s", bkpinfo->isodir, bkpinfo->nfs_remote_dir, g_current_media_number, MNT_CDROM);
+        sprintf(mount_cmd, "mount %s/%s/%d.iso -t iso9660 -o loop,ro %s",
+                bkpinfo->isodir, bkpinfo->nfs_remote_dir,
+                g_current_media_number, MNT_CDROM);
 #endif
 
-    }
-  else
-
-  if (bkpinfo->backup_media_type == iso)
-    {
+    } else
+     if (bkpinfo->backup_media_type == iso) {
 #ifdef __FreeBSD__
-      sprintf (mount_cmd, "%s/%d.iso", bkpinfo->isodir, g_current_media_number);
-      mddev = make_vn (mount_cmd);
-      sprintf (mount_cmd, "mount_cd9660 -r %s %s", mddev, MNT_CDROM);
+        sprintf(mount_cmd, "%s/%d.iso", bkpinfo->isodir,
+                g_current_media_number);
+        mddev = make_vn(mount_cmd);
+        sprintf(mount_cmd, "mount_cd9660 -r %s %s", mddev, MNT_CDROM);
 #else
-      sprintf(mount_cmd, "mount %s/%d.iso -t iso9660 -o loop,ro %s", bkpinfo->isodir, g_current_media_number, MNT_CDROM);
+        sprintf(mount_cmd, "mount %s/%d.iso -t iso9660 -o loop,ro %s",
+                bkpinfo->isodir, g_current_media_number, MNT_CDROM);
 #endif
-    }
-  else if (strstr(bkpinfo->media_device, "/dev/"))
-
+    } else if (strstr(bkpinfo->media_device, "/dev/"))
 #ifdef __FreeBSD__
-    { sprintf(mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device, MNT_CDROM); }
+    {
+        sprintf(mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device,
+                MNT_CDROM);
+    }
 #else
-    { sprintf(mount_cmd, "mount %s -t iso9660 -o ro %s", bkpinfo->media_device, MNT_CDROM); }
+    {
+        sprintf(mount_cmd, "mount %s -t iso9660 -o ro %s",
+                bkpinfo->media_device, MNT_CDROM);
+    }
 #endif
 
-  else
-    {
-      if (bkpinfo->disaster_recovery && does_file_exist("/tmp/CDROM-LIVES-HERE"))
-        { strcpy(bkpinfo->media_device, last_line_of_file("/tmp/CDROM-LIVES-HERE")); }
-      else
-        { find_cdrom_device( bkpinfo->media_device, TRUE ); }
+    else {
+        if (bkpinfo->disaster_recovery
+            && does_file_exist("/tmp/CDROM-LIVES-HERE")) {
+            strcpy(bkpinfo->media_device,
+                   last_line_of_file("/tmp/CDROM-LIVES-HERE"));
+        } else {
+            find_cdrom_device(bkpinfo->media_device, TRUE);
+        }
 
 #ifdef __FreeBSD__
-      sprintf(mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device, MNT_CDROM);
+        sprintf(mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device,
+                MNT_CDROM);
 #else
-      sprintf(mount_cmd, "mount %s -t iso9660 -o ro %s", bkpinfo->media_device, MNT_CDROM);
+        sprintf(mount_cmd, "mount %s -t iso9660 -o ro %s",
+                bkpinfo->media_device, MNT_CDROM);
 #endif
 
-    }
-  log_msg(2,"(mount_cdrom) --- command = %s", mount_cmd);
-  for(i=0;i<2;i++)
-    {
-      res=run_program_and_log_output(mount_cmd, FALSE);
-      if (!res)
-    {
-      break;
-    }
-      else
-    {
-      log_msg(2,"Failed to mount CD-ROM drive.");
-      sleep(5);
-      run_program_and_log_output( "sync", FALSE );
-    }
-    }
-  if (res) { log_msg(2,"Failed, despite %d attempts", i); }
-  else { log_msg(2,"Mounted CD-ROM drive OK"); }
-  paranoid_free(mount_cmd);
-  return(res);
+    }
+    log_msg(2, "(mount_cdrom) --- command = %s", mount_cmd);
+    for (i = 0; i < 2; i++) {
+        res = run_program_and_log_output(mount_cmd, FALSE);
+        if (!res) {
+            break;
+        } else {
+            log_msg(2, "Failed to mount CD-ROM drive.");
+            sleep(5);
+            run_program_and_log_output("sync", FALSE);
+        }
+    }
+    if (res) {
+        log_msg(2, "Failed, despite %d attempts", i);
+    } else {
+        log_msg(2, "Mounted CD-ROM drive OK");
+    }
+    paranoid_free(mount_cmd);
+    return (res);
 }
 
@@ -833 +824 @@
  * @return 0 for success, nonzero for failure.
  */
-int
-mount_device( char *device, char *mpt, char *format, bool writeable)
-{
-  int res = 0;
+int mount_device(char *device, char *mpt, char *format, bool writeable)
+{
+    int res = 0;
 
   /** malloc **/
-  char *tmp, *command, *mountdir, *mountpoint, *additional_parameters;
-
-  assert_string_is_neither_NULL_nor_zerolength(device);
-  assert_string_is_neither_NULL_nor_zerolength(mpt);
-  assert(format!=NULL);
-  malloc_string(tmp);
-  malloc_string(command);
-  malloc_string(mountdir);
-  malloc_string(mountpoint);
-  malloc_string(additional_parameters);
-
-      if (!strcmp (mpt, "/1"))
-      {
-          strcpy (mountpoint, "/");
-          log_msg (3,"Mommm! SME is being a dildo!");
-      }
-      else
-      {
-          strcpy (mountpoint, mpt);
-      }
-
-  if ( !strcmp(mountpoint,"lvm" ) )
-    {
-      return( 0 );
-    }
-  if ( !strcmp(mountpoint,"image" ) )
-    {
-      return( 0 );
-    }
-  sprintf( tmp, "Mounting device %s   ", device );
-  log_msg( 1, tmp );
-  if ( writeable )
-    {
-      strcpy( additional_parameters, "-o rw");
-    }
-  else
-    {
-      strcpy( additional_parameters, "-o ro");
-    }
-  if (find_home_of_exe("setfattr"))
-    {
-      strcat( additional_parameters, ",user_xattr");
-    }
-  if (find_home_of_exe("setfacl"))
-    {
-      strcat( additional_parameters, ",acl");
-    }
-    
-  if ( !strcmp( mountpoint,"swap" ) )
-    {
-      sprintf( command, "swapon %s", device );
-    }
-  else
-    {
-      if ( !strcmp( mountpoint,"/" ) )
-        {
-      strcpy( mountdir, MNT_RESTORING);
-    }
-      else
-        {
-      sprintf( mountdir, "%s%s", MNT_RESTORING, mountpoint);
-    }
-      sprintf( command, "mkdir -p %s", mountdir );
-      run_program_and_log_output( command, FALSE );
-      sprintf( command, "mount -t %s %s %s %s 2>> %s", format, device, additional_parameters, mountdir, MONDO_LOGFILE );
-      log_msg(2, "command='%s'", command);
-    }
-  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");
-      sprintf( 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" );
-      sprintf( 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 );
-        }
-        }
-    }
-  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;
-    }
-
-  paranoid_free(tmp);
-  paranoid_free(command);
-  paranoid_free(mountdir);
-  paranoid_free(mountpoint);
-  paranoid_free(additional_parameters);
-
-  return( res );
-}
+    char *tmp, *command, *mountdir, *mountpoint, *additional_parameters;
+
+    assert_string_is_neither_NULL_nor_zerolength(device);
+    assert_string_is_neither_NULL_nor_zerolength(mpt);
+    assert(format != NULL);
+    malloc_string(tmp);
+    malloc_string(command);
+    malloc_string(mountdir);
+    malloc_string(mountpoint);
+    malloc_string(additional_parameters);
+
+    if (!strcmp(mpt, "/1")) {
+        strcpy(mountpoint, "/");
+        log_msg(3, "Mommm! SME is being a dildo!");
+    } else {
+        strcpy(mountpoint, mpt);
+    }
+
+    if (!strcmp(mountpoint, "lvm")) {
+        return (0);
+    }
+    if (!strcmp(mountpoint, "image")) {
+        return (0);
+    }
+    sprintf(tmp, "Mounting device %s   ", device);
+    log_msg(1, tmp);
+    if (writeable) {
+        strcpy(additional_parameters, "-o rw");
+    } else {
+        strcpy(additional_parameters, "-o ro");
+    }
+    if (find_home_of_exe("setfattr")) {
+        strcat(additional_parameters, ",user_xattr");
+    }
+    if (find_home_of_exe("setfacl")) {
+        strcat(additional_parameters, ",acl");
+    }
+
+    if (!strcmp(mountpoint, "swap")) {
+        sprintf(command, "swapon %s", device);
+    } else {
+        if (!strcmp(mountpoint, "/")) {
+            strcpy(mountdir, MNT_RESTORING);
+        } else {
+            sprintf(mountdir, "%s%s", MNT_RESTORING, mountpoint);
+        }
+        sprintf(command, "mkdir -p %s", mountdir);
+        run_program_and_log_output(command, FALSE);
+        sprintf(command, "mount -t %s %s %s %s 2>> %s", format, device,
+                additional_parameters, mountdir, MONDO_LOGFILE);
+        log_msg(2, "command='%s'", command);
+    }
+    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");
+        sprintf(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");
+            sprintf(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);
+            }
+        }
+    }
+    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;
+    }
+
+    paranoid_free(tmp);
+    paranoid_free(command);
+    paranoid_free(mountdir);
+    paranoid_free(mountpoint);
+    paranoid_free(additional_parameters);
+
+    return (res);
+}
+
 /**************************************************************************
  *END_MOUNT_DEVICE                                                        *
@@ -962 +933 @@
  * up correctly on the first boot.
  */
-void
-protect_against_braindead_sysadmins()
-{
-  run_program_and_log_output( "touch " MNT_RESTORING "/var/log/pacct", FALSE );
-  run_program_and_log_output( "touch " MNT_RESTORING "/var/account/pacct", FALSE );
-  if (run_program_and_log_output( "ls " MNT_RESTORING" /tmp", FALSE ) )
-     {
-      run_program_and_log_output( "chmod 1777 " MNT_RESTORING "/tmp", FALSE );
-    }
-  run_program_and_log_output( "mkdir -p " MNT_RESTORING "/var/run/console", FALSE );
-  run_program_and_log_output( "chmod 777 " MNT_RESTORING "/dev/null", FALSE );
-  run_program_and_log_output( "cd " MNT_RESTORING "; for i in `ls home/`; do echo \"Moving $i's spurious files to $i/.disabled\"; mkdir $i/.disabled ; mv -f $i/.DCOP* $i/.MCOP* $i/.*authority $i/.kde/tmp* $i/.kde/socket* $i/.disabled/ ; done", TRUE);
-  run_program_and_log_output( "rm -f " MNT_RESTORING "/var/run/*.pid", TRUE);
-  run_program_and_log_output( "rm -f " MNT_RESTORING "/var/lock/subsys/*", TRUE);
-}
+void protect_against_braindead_sysadmins()
+{
+    run_program_and_log_output("touch " MNT_RESTORING "/var/log/pacct",
+                               FALSE);
+    run_program_and_log_output("touch " MNT_RESTORING "/var/account/pacct",
+                               FALSE);
+    if (run_program_and_log_output("ls " MNT_RESTORING " /tmp", FALSE)) {
+        run_program_and_log_output("chmod 1777 " MNT_RESTORING "/tmp",
+                                   FALSE);
+    }
+    run_program_and_log_output("mkdir -p " MNT_RESTORING
+                               "/var/run/console", FALSE);
+    run_program_and_log_output("chmod 777 " MNT_RESTORING "/dev/null",
+                               FALSE);
+    run_program_and_log_output("cd " MNT_RESTORING
+                               "; for i in `ls home/`; do echo \"Moving $i's spurious files to $i/.disabled\"; mkdir $i/.disabled ; mv -f $i/.DCOP* $i/.MCOP* $i/.*authority $i/.kde/tmp* $i/.kde/socket* $i/.disabled/ ; done",
+                               TRUE);
+    run_program_and_log_output("rm -f " MNT_RESTORING "/var/run/*.pid",
+                               TRUE);
+    run_program_and_log_output("rm -f " MNT_RESTORING "/var/lock/subsys/*",
+                               TRUE);
+}
+
 /**************************************************************************
  *END_PROTECT_AGAINST_BRAINDEAD_SYSADMINS                                 *
@@ -991 +970 @@
  * @return 0 for success, nonzero for failure.
  */
-int
-read_cfg_file_into_bkpinfo( char* cfgf, struct s_bkpinfo *bkpinfo)
+int read_cfg_file_into_bkpinfo(char *cfgf, struct s_bkpinfo *bkpinfo)
 {
   /** add mallocs **/
-  char *value;
-  char *tmp;
-      char *command;
-      char *iso_mnt;
-      char *iso_path;
-      char *old_isodir;
-      char cfg_file[100];
-  t_bkptype media_specified_by_user;
-
-  malloc_string(command);
-  malloc_string(iso_mnt);
-  malloc_string(iso_path);
-  malloc_string(old_isodir);
-  malloc_string(value);
-  malloc_string(tmp);
+    char *value;
+    char *tmp;
+    char *command;
+    char *iso_mnt;
+    char *iso_path;
+    char *old_isodir;
+    char cfg_file[100];
+    t_bkptype media_specified_by_user;
+
+    malloc_string(command);
+    malloc_string(iso_mnt);
+    malloc_string(iso_path);
+    malloc_string(old_isodir);
+    malloc_string(value);
+    malloc_string(tmp);
 //  assert_string_is_neither_NULL_nor_zerolength(cfg_file);
-  assert(bkpinfo!=NULL);
-
-  if (!cfgf)
-    { strcpy(cfg_file, g_mondo_cfg_file); }
-  else
-    { strcpy(cfg_file, cfgf); }
-
-  media_specified_by_user = bkpinfo->backup_media_type; // or 'none', if not specified
-
-  if (0 == read_cfg_var(cfg_file, "backup-media-type", value))
-    {
-      if ( !strcmp(value, "cdstream" ) ) 
-    {
-      bkpinfo->backup_media_type = cdstream; 
-    }
-      else if (!strcmp(value, "cdr"))
-    {
-      bkpinfo->backup_media_type = cdr;
-    }
-      else if (!strcmp(value, "cdrw"))
-    {
-      bkpinfo->backup_media_type = cdrw;
-    }
-      else if (!strcmp(value, "dvd"))
-    {
-      bkpinfo->backup_media_type = dvd;
-    }
-      else if (!strcmp(value, "iso"))
-    {
+    assert(bkpinfo != NULL);
+
+    if (!cfgf) {
+        strcpy(cfg_file, g_mondo_cfg_file);
+    } else {
+        strcpy(cfg_file, cfgf);
+    }
+
+    media_specified_by_user = bkpinfo->backup_media_type;   // or 'none', if not specified
+
+    if (0 == read_cfg_var(cfg_file, "backup-media-type", value)) {
+        if (!strcmp(value, "cdstream")) {
+            bkpinfo->backup_media_type = cdstream;
+        } else if (!strcmp(value, "cdr")) {
+            bkpinfo->backup_media_type = cdr;
+        } else if (!strcmp(value, "cdrw")) {
+            bkpinfo->backup_media_type = cdrw;
+        } else if (!strcmp(value, "dvd")) {
+            bkpinfo->backup_media_type = dvd;
+        } else if (!strcmp(value, "iso")) {
 /*
       if (am_I_in_disaster_recovery_mode()
@@ -1047 +1016 @@
 
 // Patch by Conor Daly - 2004/07/12
-          bkpinfo->backup_media_type = iso;
-          if (am_I_in_disaster_recovery_mode())
-        {
- /* Check to see if CD is already mounted before mounting it... */
-              if (!is_this_device_mounted("/dev/cdrom"))
-            {
-                  log_msg(2, "NB: CDROM device not mounted, mounting...");
-                  run_program_and_log_output("mount /dev/cdrom "MNT_CDROM, 1);
-                }
-              if( does_file_exist(MNT_CDROM"/archives/filelist.0"))
+            bkpinfo->backup_media_type = iso;
+            if (am_I_in_disaster_recovery_mode()) {
+                /* Check to see if CD is already mounted before mounting it... */
+                if (!is_this_device_mounted("/dev/cdrom")) {
+                    log_msg(2,
+                            "NB: CDROM device not mounted, mounting...");
+                    run_program_and_log_output("mount /dev/cdrom "
+                                               MNT_CDROM, 1);
+                }
+                if (does_file_exist(MNT_CDROM "/archives/filelist.0"))
 // End patch
-            {
-                  bkpinfo->backup_media_type = cdr;
-              run_program_and_log_output("umount "MNT_CDROM, 1);
-              log_it("Re-jigging configuration AGAIN. CD-R, not ISO.");
-                }
-          else
-            {
-              bkpinfo->backup_media_type = iso;
-            }
-        }
-    }
-      else if (!strcmp(value, "nfs"))
-    { 
-      bkpinfo->backup_media_type = nfs; 
-    }
-      else if (!strcmp(value, "tape")) 
-    { 
-      bkpinfo->backup_media_type = tape; 
-    }
-      else if (!strcmp(value, "udev")) 
-    { 
-      bkpinfo->backup_media_type = udev; 
-    }
-      else
-    {
-      fatal_error("UNKNOWN bkp-media-type");
-    }
-    }
-  else
-    {
-      fatal_error("backup-media-type not specified!");
-    }
-  if (bkpinfo->disaster_recovery)
-    {
-      if (bkpinfo->backup_media_type == cdstream)
-        {
-          sprintf(bkpinfo->media_device, "/dev/cdrom");
+                {
+                    bkpinfo->backup_media_type = cdr;
+                    run_program_and_log_output("umount " MNT_CDROM, 1);
+                    log_it
+                        ("Re-jigging configuration AGAIN. CD-R, not ISO.");
+                } else {
+                    bkpinfo->backup_media_type = iso;
+                }
+            }
+        } else if (!strcmp(value, "nfs")) {
+            bkpinfo->backup_media_type = nfs;
+        } else if (!strcmp(value, "tape")) {
+            bkpinfo->backup_media_type = tape;
+        } else if (!strcmp(value, "udev")) {
+            bkpinfo->backup_media_type = udev;
+        } else {
+            fatal_error("UNKNOWN bkp-media-type");
+        }
+    } else {
+        fatal_error("backup-media-type not specified!");
+    }
+    if (bkpinfo->disaster_recovery) {
+        if (bkpinfo->backup_media_type == cdstream) {
+            sprintf(bkpinfo->media_device, "/dev/cdrom");
 //          bkpinfo->media_size[0] = -1;
-          bkpinfo->media_size[0] = 1999*1024;
-          bkpinfo->media_size[1] = 650; /* good guess */
-        }
-      else if (bkpinfo->backup_media_type == tape || bkpinfo->backup_media_type == udev)
-        {
-          if (read_cfg_var(cfg_file, "media-dev", value)) { fatal_error("Cannot get tape device name from cfg file"); }
-          strcpy(bkpinfo->media_device, value);
-          read_cfg_var(cfg_file, "media-size", value);
-          bkpinfo->media_size[1] = atol(value);
-          sprintf(tmp,"Backup medium is TAPE --- dev=%s",bkpinfo->media_device);
-          log_msg(2, tmp);
-        }
-       else
-         {
-           strcpy(bkpinfo->media_device,"/dev/cdrom"); /* we don't really need this var */
-           bkpinfo->media_size[0]= 1999*1024; /* 650, probably, but we don't need this var anyway */
-           bkpinfo->media_size[1]=1999*1024; /* 650, probably, but we don't need this var anyway */
-           log_msg(2, "Backup medium is CD-R[W]");
-         }
-      }
-  else
-    {
-      log_msg(2, "Not in Disaster Recovery Mode. No need to derive device name from config file.");
-    }
-  
-  read_cfg_var(cfg_file, "use-star", value);
-  if (strstr(value,"yes"))
-    {
-      bkpinfo->use_star = TRUE;
-      log_msg(1, "Goody! ... bkpinfo->use_star is now true.");
-    }
-
-  if (0 == read_cfg_var(cfg_file, "internal-tape-block-size", value))
-    {
-      bkpinfo->internal_tape_block_size = atol(value);
-      log_msg(1, "Internal tape block size has been custom-set to %ld", bkpinfo->internal_tape_block_size);
-    }
-  else
-    {
-      bkpinfo->internal_tape_block_size = DEFAULT_INTERNAL_TAPE_BLOCK_SIZE;
-      log_msg(1, "Internal tape block size = default (%ld)", DEFAULT_INTERNAL_TAPE_BLOCK_SIZE);
-    }
-
-  read_cfg_var(cfg_file, "use-lzo", value);
-  if (strstr(value,"yes"))
-    {
-      bkpinfo->use_lzo = TRUE;
-      strcpy(bkpinfo->zip_exe, "lzop");
-      strcpy(bkpinfo->zip_suffix, "lzo");
-    }
-  else
-    {
-      read_cfg_var(cfg_file, "use-comp", value);
-      if (strstr(value,"yes"))
-    {
-      bkpinfo->use_lzo = FALSE;
-      strcpy(bkpinfo->zip_exe, "bzip2");
-      strcpy(bkpinfo->zip_suffix, "bz2");
-    }
-      else
-    {
-      bkpinfo->zip_exe[0] = bkpinfo->zip_suffix[0] = '\0';
-    }
-    }
-
-  value[0] = '\0';
-  read_cfg_var( cfg_file, "differential", value);
-  if (!strcmp(value, "yes") || !strcmp(value, "1")) 
-    { 
-      bkpinfo->differential = TRUE; 
-    }
-  log_msg(2, "differential var = '%s'", value);
-  if (bkpinfo->differential)
-    { 
-      log_msg(2, "THIS IS A DIFFERENTIAL BACKUP" ); 
-    }
-  else 
-    { 
-      log_msg(2, "This is a regular (full) backup"); 
-    }
-
-  read_cfg_var( g_mondo_cfg_file, "please-dont-eject", tmp);
-  if (tmp[0] || strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "donteject"))
-    { bkpinfo->please_dont_eject = TRUE; log_msg(2, "Ok, I shan't eject when restoring! Groovy."); }
-
-  if (bkpinfo->backup_media_type == nfs)
-    {
-      if (!cfgf)
-        {
-          log_msg(2, "nfs_mount remains %s", bkpinfo->nfs_mount);
-          log_msg(2, "nfs_remote_dir remains %s", bkpinfo->nfs_remote_dir);
-      log_msg(2, "...cos it wouldn't make sense to abandon the values that GOT ME to this config file in the first place");
-    }
-      else
-        {
-          read_cfg_var(g_mondo_cfg_file, "nfs-server-mount", bkpinfo->nfs_mount);
-          read_cfg_var(g_mondo_cfg_file, "nfs-server-path", bkpinfo->nfs_remote_dir);
-          log_msg(2, "nfs_mount is %s", bkpinfo->nfs_mount);
-          log_msg(2, "nfs_remote_dir is %s", bkpinfo->nfs_remote_dir);
-    }
-    }
-  else if (bkpinfo->backup_media_type == iso)
-    {
- /* Patch by Conor Daly 23-june-2004 
-  * to correctly mount iso-dev and set a sensible
-  * isodir in disaster recovery mode
-  */
-      strcpy (old_isodir, bkpinfo->isodir);
-      read_cfg_var(g_mondo_cfg_file, "iso-mnt", iso_mnt);
-      read_cfg_var(g_mondo_cfg_file, "isodir", iso_path);
-      sprintf(bkpinfo->isodir, "%s%s", iso_mnt, iso_path);
-      if (!bkpinfo->isodir[0]) {
-      strcpy (bkpinfo->isodir, old_isodir);
-      }
-      if (!bkpinfo->disaster_recovery)
-        {
-        if (strcmp(old_isodir, bkpinfo->isodir)) {
-          log_it("user nominated isodir differs from archive, keeping user's choice: %s %s\n", old_isodir, bkpinfo->isodir);
-        strcpy (bkpinfo->isodir, old_isodir);
-        }
-        }
-      read_cfg_var(g_mondo_cfg_file, "iso-dev", g_isodir_device);
-      log_msg(2, "isodir=%s; iso-dev=%s", bkpinfo->isodir, g_isodir_device);
-      if (bkpinfo->disaster_recovery) {
-      if (is_this_device_mounted(g_isodir_device))
-          { log_msg(2, "NB: isodir is already mounted");
-        /* Find out where it's mounted */
-         sprintf(command, "mount | grep -w %s | tail -n1 | cut -d' ' -f3", g_isodir_device);
-        log_it("command = %s", command);
-        log_it("res of it = %s", call_program_and_get_last_line_of_output(command));
-        sprintf(iso_mnt, "%s", call_program_and_get_last_line_of_output(command));
-          }
-      else
-          {
-          sprintf(iso_mnt, "/tmp/isodir");
-          sprintf(tmp, "mkdir -p %s", iso_mnt);
-          run_program_and_log_output(tmp, 5);
-          sprintf(tmp, "mount %s %s", g_isodir_device, iso_mnt);
-          if (run_program_and_log_output(tmp, 3))
-              {
-                log_msg(1, "Unable to mount isodir. Perhaps this is really a CD backup?");
-            bkpinfo->backup_media_type = cdr;
-            strcpy(bkpinfo->media_device,"/dev/cdrom"); /* superfluous */
-            bkpinfo->isodir[0] = iso_mnt[0] = iso_path[0] = '\0';
-            if ( mount_cdrom( bkpinfo ) )
-              {
-                    fatal_error( "Unable to mount isodir. Failed to mount CD-ROM as well.");
-              }
-            else
-              {
-                log_msg(1, "You backed up to disk, then burned some CDs. Naughty monkey!" );
-              }
-              }
-          }
-      /* bkpinfo->isodir should now be the true path to 1.iso etc... */
-      if (bkpinfo->backup_media_type == iso)
-        {
-              sprintf(bkpinfo->isodir, "%s%s", iso_mnt, iso_path);
-        }
-      }
-    }
-
-  if (media_specified_by_user != none)
-    {
-      if (g_restoring_live_from_cd)
-        {
-          if (bkpinfo->backup_media_type != media_specified_by_user)
-            {
-              log_msg(2, "bkpinfo->backup_media_type != media_specified_by_user, so I'd better ask :)");
-              interactively_obtain_media_parameters_from_user( bkpinfo, FALSE);
-              media_specified_by_user = bkpinfo->backup_media_type;
-              get_cfg_file_from_archive(bkpinfo);
+            bkpinfo->media_size[0] = 1999 * 1024;
+            bkpinfo->media_size[1] = 650;   /* good guess */
+        } else if (bkpinfo->backup_media_type == tape
+                   || bkpinfo->backup_media_type == udev) {
+            if (read_cfg_var(cfg_file, "media-dev", value)) {
+                fatal_error("Cannot get tape device name from cfg file");
+            }
+            strcpy(bkpinfo->media_device, value);
+            read_cfg_var(cfg_file, "media-size", value);
+            bkpinfo->media_size[1] = atol(value);
+            sprintf(tmp, "Backup medium is TAPE --- dev=%s",
+                    bkpinfo->media_device);
+            log_msg(2, tmp);
+        } else {
+            strcpy(bkpinfo->media_device, "/dev/cdrom");    /* we don't really need this var */
+            bkpinfo->media_size[0] = 1999 * 1024;   /* 650, probably, but we don't need this var anyway */
+            bkpinfo->media_size[1] = 1999 * 1024;   /* 650, probably, but we don't need this var anyway */
+            log_msg(2, "Backup medium is CD-R[W]");
+        }
+    } else {
+        log_msg(2,
+                "Not in Disaster Recovery Mode. No need to derive device name from config file.");
+    }
+
+    read_cfg_var(cfg_file, "use-star", value);
+    if (strstr(value, "yes")) {
+        bkpinfo->use_star = TRUE;
+        log_msg(1, "Goody! ... bkpinfo->use_star is now true.");
+    }
+
+    if (0 == read_cfg_var(cfg_file, "internal-tape-block-size", value)) {
+        bkpinfo->internal_tape_block_size = atol(value);
+        log_msg(1, "Internal tape block size has been custom-set to %ld",
+                bkpinfo->internal_tape_block_size);
+    } else {
+        bkpinfo->internal_tape_block_size =
+            DEFAULT_INTERNAL_TAPE_BLOCK_SIZE;
+        log_msg(1, "Internal tape block size = default (%ld)",
+                DEFAULT_INTERNAL_TAPE_BLOCK_SIZE);
+    }
+
+    read_cfg_var(cfg_file, "use-lzo", value);
+    if (strstr(value, "yes")) {
+        bkpinfo->use_lzo = TRUE;
+        strcpy(bkpinfo->zip_exe, "lzop");
+        strcpy(bkpinfo->zip_suffix, "lzo");
+    } else {
+        read_cfg_var(cfg_file, "use-comp", value);
+        if (strstr(value, "yes")) {
+            bkpinfo->use_lzo = FALSE;
+            strcpy(bkpinfo->zip_exe, "bzip2");
+            strcpy(bkpinfo->zip_suffix, "bz2");
+        } else {
+            bkpinfo->zip_exe[0] = bkpinfo->zip_suffix[0] = '\0';
+        }
+    }
+
+    value[0] = '\0';
+    read_cfg_var(cfg_file, "differential", value);
+    if (!strcmp(value, "yes") || !strcmp(value, "1")) {
+        bkpinfo->differential = TRUE;
+    }
+    log_msg(2, "differential var = '%s'", value);
+    if (bkpinfo->differential) {
+        log_msg(2, "THIS IS A DIFFERENTIAL BACKUP");
+    } else {
+        log_msg(2, "This is a regular (full) backup");
+    }
+
+    read_cfg_var(g_mondo_cfg_file, "please-dont-eject", tmp);
+    if (tmp[0]
+        ||
+        strstr(call_program_and_get_last_line_of_output
+               ("cat /proc/cmdline"), "donteject")) {
+        bkpinfo->please_dont_eject = TRUE;
+        log_msg(2, "Ok, I shan't eject when restoring! Groovy.");
+    }
+
+    if (bkpinfo->backup_media_type == nfs) {
+        if (!cfgf) {
+            log_msg(2, "nfs_mount remains %s", bkpinfo->nfs_mount);
+            log_msg(2, "nfs_remote_dir remains %s",
+                    bkpinfo->nfs_remote_dir);
+            log_msg(2,
+                    "...cos it wouldn't make sense to abandon the values that GOT ME to this config file in the first place");
+        } else {
+            read_cfg_var(g_mondo_cfg_file, "nfs-server-mount",
+                         bkpinfo->nfs_mount);
+            read_cfg_var(g_mondo_cfg_file, "nfs-server-path",
+                         bkpinfo->nfs_remote_dir);
+            log_msg(2, "nfs_mount is %s", bkpinfo->nfs_mount);
+            log_msg(2, "nfs_remote_dir is %s", bkpinfo->nfs_remote_dir);
+        }
+    } else if (bkpinfo->backup_media_type == iso) {
+        /* Patch by Conor Daly 23-june-2004 
+         * to correctly mount iso-dev and set a sensible
+         * isodir in disaster recovery mode
+         */
+        strcpy(old_isodir, bkpinfo->isodir);
+        read_cfg_var(g_mondo_cfg_file, "iso-mnt", iso_mnt);
+        read_cfg_var(g_mondo_cfg_file, "isodir", iso_path);
+        sprintf(bkpinfo->isodir, "%s%s", iso_mnt, iso_path);
+        if (!bkpinfo->isodir[0]) {
+            strcpy(bkpinfo->isodir, old_isodir);
+        }
+        if (!bkpinfo->disaster_recovery) {
+            if (strcmp(old_isodir, bkpinfo->isodir)) {
+                log_it
+                    ("user nominated isodir differs from archive, keeping user's choice: %s %s\n",
+                     old_isodir, bkpinfo->isodir);
+                strcpy(bkpinfo->isodir, old_isodir);
+            }
+        }
+        read_cfg_var(g_mondo_cfg_file, "iso-dev", g_isodir_device);
+        log_msg(2, "isodir=%s; iso-dev=%s", bkpinfo->isodir,
+                g_isodir_device);
+        if (bkpinfo->disaster_recovery) {
+            if (is_this_device_mounted(g_isodir_device)) {
+                log_msg(2, "NB: isodir is already mounted");
+                /* Find out where it's mounted */
+                sprintf(command,
+                        "mount | grep -w %s | tail -n1 | cut -d' ' -f3",
+                        g_isodir_device);
+                log_it("command = %s", command);
+                log_it("res of it = %s",
+                       call_program_and_get_last_line_of_output(command));
+                sprintf(iso_mnt, "%s",
+                        call_program_and_get_last_line_of_output(command));
+            } else {
+                sprintf(iso_mnt, "/tmp/isodir");
+                sprintf(tmp, "mkdir -p %s", iso_mnt);
+                run_program_and_log_output(tmp, 5);
+                sprintf(tmp, "mount %s %s", g_isodir_device, iso_mnt);
+                if (run_program_and_log_output(tmp, 3)) {
+                    log_msg(1,
+                            "Unable to mount isodir. Perhaps this is really a CD backup?");
+                    bkpinfo->backup_media_type = cdr;
+                    strcpy(bkpinfo->media_device, "/dev/cdrom");    /* superfluous */
+                    bkpinfo->isodir[0] = iso_mnt[0] = iso_path[0] = '\0';
+                    if (mount_cdrom(bkpinfo)) {
+                        fatal_error
+                            ("Unable to mount isodir. Failed to mount CD-ROM as well.");
+                    } else {
+                        log_msg(1,
+                                "You backed up to disk, then burned some CDs. Naughty monkey!");
+                    }
+                }
+            }
+            /* bkpinfo->isodir should now be the true path to 1.iso etc... */
+            if (bkpinfo->backup_media_type == iso) {
+                sprintf(bkpinfo->isodir, "%s%s", iso_mnt, iso_path);
+            }
+        }
+    }
+
+    if (media_specified_by_user != none) {
+        if (g_restoring_live_from_cd) {
+            if (bkpinfo->backup_media_type != media_specified_by_user) {
+                log_msg(2,
+                        "bkpinfo->backup_media_type != media_specified_by_user, so I'd better ask :)");
+                interactively_obtain_media_parameters_from_user(bkpinfo,
+                                                                FALSE);
+                media_specified_by_user = bkpinfo->backup_media_type;
+                get_cfg_file_from_archive(bkpinfo);
 /*
               if (media_specified_by_user != cdr && media_specified_by_user == cdrw)
                 { g_restoring_live_from_cd = FALSE; }
 */
-            }
-        }
-      bkpinfo->backup_media_type = media_specified_by_user;
-   }
-  g_backup_media_type = bkpinfo->backup_media_type;
-  paranoid_free(value);
-  paranoid_free(tmp);
-  paranoid_free(command);
-  paranoid_free(iso_mnt);
-  paranoid_free(iso_path);
-  paranoid_free(old_isodir);
-  return( 0 );
-
-}
+            }
+        }
+        bkpinfo->backup_media_type = media_specified_by_user;
+    }
+    g_backup_media_type = bkpinfo->backup_media_type;
+    paranoid_free(value);
+    paranoid_free(tmp);
+    paranoid_free(command);
+    paranoid_free(iso_mnt);
+    paranoid_free(iso_path);
+    paranoid_free(old_isodir);
+    return (0);
+
+}
+
 /**************************************************************************
  *END_READ_CFG_FILE_INTO_BKPINFO                                          *
@@ -1291 +1240 @@
 
 
- 
+
 
 /**
@@ -1304 +1253 @@
  */
 struct
-s_node *process_filelist_and_biggielist( struct s_bkpinfo *bkpinfo )
-{
-  struct s_node *filelist;
+s_node *process_filelist_and_biggielist(struct s_bkpinfo *bkpinfo)
+{
+    struct s_node *filelist;
 
   /** add mallocs**/
-  char *command;
-  char *tmp;
-  int res=0;
-  pid_t pid;
-
-  assert(bkpinfo!=NULL);
-  malloc_string(command);
-  malloc_string(tmp);
-
-  if ( does_file_exist( g_filelist_full ) && does_file_exist( g_biggielist_txt ) )
-    {
-      log_msg(1, "%s exists", g_filelist_full);
-      log_msg(1, "%s exists", g_biggielist_txt);
-      log_msg(2, "Filelist and biggielist already recovered from media. Yay!" );
-    }
-  else
-    {
-      getcwd( tmp, MAX_STR_LEN );
-      chdir( bkpinfo->tmpdir );
-      log_msg(1, "chdir(%s)", bkpinfo->tmpdir);
-      log_to_screen( "Extracting filelist and biggielist from media..." );
-      unlink("/tmp/filelist.full");
-      unlink("/" FILELIST_FULL_STUB);
-      unlink("/tmp/i-want-my-lvm");
-      if ( IS_THIS_A_STREAMING_BACKUP( bkpinfo->backup_media_type ) )
-        {
-      sprintf( command,
-           "tar -zxf %s %s %s %s %s %s",
-           bkpinfo->media_device,
-           MOUNTLIST_FNAME_STUB,
-           BIGGIELIST_TXT_STUB,
-           FILELIST_FULL_STUB,
-           "tmp/i-want-my-lvm",
-           MONDO_CFG_FILE_STUB);
-          log_msg(1, "tarcommand = %s", command);
-          run_program_and_log_output( command, 1 );
-        }
-      else
-        {
-          log_msg(2,"Calling insist_on_this_cd_number; bkpinfo->isodir=%s", bkpinfo->isodir);
-      insist_on_this_cd_number( bkpinfo, 1 );
-          log_msg(2, "Back from iotcn");
-      run_program_and_log_output("mount", 1);
-          sprintf( command,
-           "tar -zxf %s/images/all.tar.gz %s %s %s %s %s",
-           MNT_CDROM,
-           MOUNTLIST_FNAME_STUB,
-           BIGGIELIST_TXT_STUB,
-           FILELIST_FULL_STUB,
-           "tmp/i-want-my-lvm",
-           MONDO_CFG_FILE_STUB);
-
-          log_msg(1, "tarcommand = %s", command);
-      run_program_and_log_output(command, 1);
-//    popup_and_OK("Press ENTER to continue");
-          if ( !does_file_exist( BIGGIELIST_TXT_STUB ) )
-            {
-          fatal_error( "all.tar.gz did not include tmp/biggielist.txt");
-        }
-          if ( !does_file_exist( FILELIST_FULL_STUB ) )
-            {
-          fatal_error( "all.tar.gz did not include tmp/filelist.full.gz");
-        }
-        }
-      sprintf( command, "cp -f %s %s", MONDO_CFG_FILE_STUB, g_mondo_cfg_file );
-      run_program_and_log_output( command, FALSE );
-
-      sprintf(command, "cp -f %s/%s %s", bkpinfo->tmpdir, BIGGIELIST_TXT_STUB, g_biggielist_txt);
-      log_msg(1, "command = %s", command);
-      paranoid_system(command);
-      sprintf(command, "ln -sf %s/%s %s", bkpinfo->tmpdir, FILELIST_FULL_STUB, g_filelist_full);
-      log_msg(1, "command = %s", command);
-      paranoid_system(command);
-    }
-
-  if (am_I_in_disaster_recovery_mode() && ask_me_yes_or_no("Do you want to retrieve the mountlist as well?"))
-    {
+    char *command;
+    char *tmp;
+    int res = 0;
+    pid_t pid;
+
+    assert(bkpinfo != NULL);
+    malloc_string(command);
+    malloc_string(tmp);
+
+    if (does_file_exist(g_filelist_full)
+        && does_file_exist(g_biggielist_txt)) {
+        log_msg(1, "%s exists", g_filelist_full);
+        log_msg(1, "%s exists", g_biggielist_txt);
+        log_msg(2,
+                "Filelist and biggielist already recovered from media. Yay!");
+    } else {
+        getcwd(tmp, MAX_STR_LEN);
+        chdir(bkpinfo->tmpdir);
+        log_msg(1, "chdir(%s)", bkpinfo->tmpdir);
+        log_to_screen("Extracting filelist and biggielist from media...");
+        unlink("/tmp/filelist.full");
+        unlink("/" FILELIST_FULL_STUB);
+        unlink("/tmp/i-want-my-lvm");
+        if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
+            sprintf(command,
+                    "tar -zxf %s %s %s %s %s %s",
+                    bkpinfo->media_device,
+                    MOUNTLIST_FNAME_STUB,
+                    BIGGIELIST_TXT_STUB,
+                    FILELIST_FULL_STUB,
+                    "tmp/i-want-my-lvm", MONDO_CFG_FILE_STUB);
+            log_msg(1, "tarcommand = %s", command);
+            run_program_and_log_output(command, 1);
+        } else {
+            log_msg(2,
+                    "Calling insist_on_this_cd_number; bkpinfo->isodir=%s",
+                    bkpinfo->isodir);
+            insist_on_this_cd_number(bkpinfo, 1);
+            log_msg(2, "Back from iotcn");
+            run_program_and_log_output("mount", 1);
+            sprintf(command,
+                    "tar -zxf %s/images/all.tar.gz %s %s %s %s %s",
+                    MNT_CDROM,
+                    MOUNTLIST_FNAME_STUB,
+                    BIGGIELIST_TXT_STUB,
+                    FILELIST_FULL_STUB,
+                    "tmp/i-want-my-lvm", MONDO_CFG_FILE_STUB);
+
+            log_msg(1, "tarcommand = %s", command);
+            run_program_and_log_output(command, 1);
+//    popup_and_OK("Press ENTER to continue");
+            if (!does_file_exist(BIGGIELIST_TXT_STUB)) {
+                fatal_error
+                    ("all.tar.gz did not include tmp/biggielist.txt");
+            }
+            if (!does_file_exist(FILELIST_FULL_STUB)) {
+                fatal_error
+                    ("all.tar.gz did not include tmp/filelist.full.gz");
+            }
+        }
+        sprintf(command, "cp -f %s %s", MONDO_CFG_FILE_STUB,
+                g_mondo_cfg_file);
+        run_program_and_log_output(command, FALSE);
+
+        sprintf(command, "cp -f %s/%s %s", bkpinfo->tmpdir,
+                BIGGIELIST_TXT_STUB, g_biggielist_txt);
+        log_msg(1, "command = %s", command);
+        paranoid_system(command);
+        sprintf(command, "ln -sf %s/%s %s", bkpinfo->tmpdir,
+                FILELIST_FULL_STUB, g_filelist_full);
+        log_msg(1, "command = %s", command);
+        paranoid_system(command);
+    }
+
+    if (am_I_in_disaster_recovery_mode()
+        &&
+        ask_me_yes_or_no("Do you want to retrieve the mountlist as well?"))
+    {
 //      sprintf(command, "cp -f tmp/mountlist.txt /tmp");
-      sprintf(command, "ln -sf %s/%s /tmp", MOUNTLIST_FNAME_STUB, bkpinfo->tmpdir);
-      paranoid_system(command);
-    }
-
-  chdir( tmp );
-
-  if (!does_file_exist( g_biggielist_txt) )
-    {
-      log_msg(1, "Warning - %s not found", g_biggielist_txt);
-    }
-  if (!does_file_exist(g_filelist_full) )
-    {
-      log_msg(1, "Warning - %s does not exist", g_filelist_full);
-    }
-
+        sprintf(command, "ln -sf %s/%s /tmp", MOUNTLIST_FNAME_STUB,
+                bkpinfo->tmpdir);
+        paranoid_system(command);
+    }
+
+    chdir(tmp);
+
+    if (!does_file_exist(g_biggielist_txt)) {
+        log_msg(1, "Warning - %s not found", g_biggielist_txt);
+    }
+    if (!does_file_exist(g_filelist_full)) {
+        log_msg(1, "Warning - %s does not exist", g_filelist_full);
+    }
 //  popup_and_OK("Wonderful.");
 
-  log_msg(2, "Forking" );
-  pid = fork();
-  switch( pid )
-    {
-    case -1:
-      fatal_error("Forking error");
-      break;
-
-    case 0:
-      log_to_screen("Pre-processing filelist");
-      if (!does_file_exist(g_biggielist_txt))
-    {
-      sprintf(command,"> %s",g_biggielist_txt);
-      paranoid_system(command);
-    }
-      sprintf(command,"cat %s | grep  -x \"/dev/.*\" > %s", g_biggielist_txt, g_filelist_imagedevs);
-      paranoid_system(command);
-      exit( 0 );
-      break;
-
-    default:
-      open_evalcall_form("Pre-processing filelist");
-      while( !waitpid( pid, (int*)0, WNOHANG ) )
-    {
-      usleep( 100000 );
-      update_evalcall_form( 0 );
-    }
-    }
-  close_evalcall_form();
-
-  log_msg(3, "loading filelist");
-  filelist = load_filelist( g_filelist_full );
-  log_msg(3, "deleting original filelist");
-  unlink(g_filelist_full);
-  if (g_text_mode)
-    {
-      printf("Restore which directory? --> ");
-      fgets(tmp, sizeof(tmp), stdin);
-      toggle_path_selection (filelist, tmp, TRUE);
-      if (strlen(tmp)==0) { res=1; } else { res=0; }
-    }
-  else
-    {
-      res = edit_filelist( filelist );
-    }
-  if (res)
-    {
-      log_msg(2, "User hit 'cancel'. Freeing filelist and aborting.");
-      free_filelist( filelist );
-      return( NULL );
-    }
-  ask_about_these_imagedevs( g_filelist_imagedevs, g_imagedevs_restthese );
-  close_evalcall_form();
-
-  // NB: It's not necessary to add g_biggielist_txt to the filelist.full
-  // file. The filelist.full file already contains the filename of EVERY
-  // file backed up - regular and biggie files.
-
-  // However, we do want to make sure the imagedevs selected by the user
-  // are flagged for restoring.
-  if ( length_of_file( g_imagedevs_restthese ) > 2 )
-    { add_list_of_files_to_filelist(filelist, g_imagedevs_restthese, TRUE); }
-
-  paranoid_free(command);
-  paranoid_free(tmp);
-  return( filelist );
-}
+    log_msg(2, "Forking");
+    pid = fork();
+    switch (pid) {
+    case -1:
+        fatal_error("Forking error");
+        break;
+
+    case 0:
+        log_to_screen("Pre-processing filelist");
+        if (!does_file_exist(g_biggielist_txt)) {
+            sprintf(command, "> %s", g_biggielist_txt);
+            paranoid_system(command);
+        }
+        sprintf(command, "cat %s | grep  -x \"/dev/.*\" > %s",
+                g_biggielist_txt, g_filelist_imagedevs);
+        paranoid_system(command);
+        exit(0);
+        break;
+
+    default:
+        open_evalcall_form("Pre-processing filelist");
+        while (!waitpid(pid, (int *) 0, WNOHANG)) {
+            usleep(100000);
+            update_evalcall_form(0);
+        }
+    }
+    close_evalcall_form();
+
+    log_msg(3, "loading filelist");
+    filelist = load_filelist(g_filelist_full);
+    log_msg(3, "deleting original filelist");
+    unlink(g_filelist_full);
+    if (g_text_mode) {
+        printf("Restore which directory? --> ");
+        fgets(tmp, sizeof(tmp), stdin);
+        toggle_path_selection(filelist, tmp, TRUE);
+        if (strlen(tmp) == 0) {
+            res = 1;
+        } else {
+            res = 0;
+        }
+    } else {
+        res = edit_filelist(filelist);
+    }
+    if (res) {
+        log_msg(2, "User hit 'cancel'. Freeing filelist and aborting.");
+        free_filelist(filelist);
+        return (NULL);
+    }
+    ask_about_these_imagedevs(g_filelist_imagedevs, g_imagedevs_restthese);
+    close_evalcall_form();
+
+    // NB: It's not necessary to add g_biggielist_txt to the filelist.full
+    // file. The filelist.full file already contains the filename of EVERY
+    // file backed up - regular and biggie files.
+
+    // However, we do want to make sure the imagedevs selected by the user
+    // are flagged for restoring.
+    if (length_of_file(g_imagedevs_restthese) > 2) {
+        add_list_of_files_to_filelist(filelist, g_imagedevs_restthese,
+                                      TRUE);
+    }
+
+    paranoid_free(command);
+    paranoid_free(tmp);
+    return (filelist);
+}
+
 /**************************************************************************
  *END_ PROCESS_FILELIST_AND_BIGGIELIST                                    *
@@ -1485 +1434 @@
  * @return 0 for success, nonzero for failure.
  */
-int backup_crucial_file(char *path_root, char*filename)
-{
-  char *tmp;
-  char *command;
-  int res;
-  
-  malloc_string(tmp);
-  malloc_string(command);
-  assert(path_root!=NULL);
-  assert_string_is_neither_NULL_nor_zerolength(filename);
-
-  sprintf(tmp, "%s/%s", path_root, filename);
-  sprintf(command, "cp -f %s %s.pristine", tmp, tmp);
- 
-  res = run_program_and_log_output(command, 5);
-  paranoid_free(tmp);
-  paranoid_free(command);
-  return(res);
+int backup_crucial_file(char *path_root, char *filename)
+{
+    char *tmp;
+    char *command;
+    int res;
+
+    malloc_string(tmp);
+    malloc_string(command);
+    assert(path_root != NULL);
+    assert_string_is_neither_NULL_nor_zerolength(filename);
+
+    sprintf(tmp, "%s/%s", path_root, filename);
+    sprintf(command, "cp -f %s %s.pristine", tmp, tmp);
+
+    res = run_program_and_log_output(command, 5);
+    paranoid_free(tmp);
+    paranoid_free(command);
+    return (res);
 }
 
@@ -1512 +1461 @@
  * @return 0 for success, nonzero for failure.
  */
-int
-run_boot_loader(bool offer_to_hack_scripts)
-{
-  int res;
-  int retval = 0;
+int run_boot_loader(bool offer_to_hack_scripts)
+{
+    int res;
+    int retval = 0;
 
   /** malloc *******/
-  char *device;
-  char *tmp;
-  char *name;
-
-  malloc_string(device);
-  malloc_string(tmp);
-  malloc_string(name);
-  backup_crucial_file( MNT_RESTORING, "/etc/fstab");
-  backup_crucial_file( MNT_RESTORING, "/etc/grub.conf");
-  backup_crucial_file( MNT_RESTORING, "/etc/lilo.conf");
-  backup_crucial_file( MNT_RESTORING, "/etc/elilo.conf");
-  read_cfg_var(g_mondo_cfg_file, "bootloader.device", device);
-  read_cfg_var(g_mondo_cfg_file, "bootloader.name", name);
-  sprintf(tmp,"run_boot_loader: device='%s', name='%s'",device,name);
-  log_msg(2, tmp);
-  system("sync");
-  if (!strcmp(name,"LILO"))
-    {
-      res = run_lilo(offer_to_hack_scripts);
-    }
-  else if (!strcmp(name,"ELILO"))
-    {
-      res = run_elilo(offer_to_hack_scripts);
-    }
-  else if (!strcmp(name,"GRUB"))
-    {
+    char *device;
+    char *tmp;
+    char *name;
+
+    malloc_string(device);
+    malloc_string(tmp);
+    malloc_string(name);
+    backup_crucial_file(MNT_RESTORING, "/etc/fstab");
+    backup_crucial_file(MNT_RESTORING, "/etc/grub.conf");
+    backup_crucial_file(MNT_RESTORING, "/etc/lilo.conf");
+    backup_crucial_file(MNT_RESTORING, "/etc/elilo.conf");
+    read_cfg_var(g_mondo_cfg_file, "bootloader.device", device);
+    read_cfg_var(g_mondo_cfg_file, "bootloader.name", name);
+    sprintf(tmp, "run_boot_loader: device='%s', name='%s'", device, name);
+    log_msg(2, tmp);
+    system("sync");
+    if (!strcmp(name, "LILO")) {
+        res = run_lilo(offer_to_hack_scripts);
+    } else if (!strcmp(name, "ELILO")) {
+        res = run_elilo(offer_to_hack_scripts);
+    } else if (!strcmp(name, "GRUB")) {
 //      if ( does_file_exist(DO_MBR_PLEASE) || (offer_to_hack_scripts && ask_me_yes_or_no("Because of bugs in GRUB, you're much better off running mondorestore --mbr after this program terminates. Are you sure you want to install GRUB right now?")))
 //        {
-      res = run_grub(offer_to_hack_scripts, device);
-//    unlink(DO_MBR_PLEASE);
-//  }
+        res = run_grub(offer_to_hack_scripts, device);
+//    unlink(DO_MBR_PLEASE);
+//  }
 //      else
 //        {
-//    log_msg(1, "Not running run_grub(). Was a bad idea anyway.");
-//    res = 1;
-//  }
-    }
-  else if (!strcmp(name,"RAW"))
-    {
-      res = run_raw_mbr(offer_to_hack_scripts, device);
-    }
+//    log_msg(1, "Not running run_grub(). Was a bad idea anyway.");
+//    res = 1;
+//  }
+    } else if (!strcmp(name, "RAW")) {
+        res = run_raw_mbr(offer_to_hack_scripts, device);
+    }
 #ifdef __FreeBSD__
-  else if (!strcmp(name,"BOOT0"))
-      {
-      sprintf (tmp, "boot0cfg -B %s", device);
-      res = run_program_and_log_output (tmp, FALSE);
-      } else {
-      sprintf (tmp, "ls /dev | grep -xq %ss[1-4].*", device);
-      if (!system (tmp)) {
-          sprintf (tmp, MNT_RESTORING "/sbin/fdisk -B %s", device);
-          res = run_program_and_log_output (tmp, 3);
-      } else {
-          log_msg (1, "I'm not running any boot loader. You have a DD boot drive. It's already loaded up.");
-      }
-      }
+    else if (!strcmp(name, "BOOT0")) {
+        sprintf(tmp, "boot0cfg -B %s", device);
+        res = run_program_and_log_output(tmp, FALSE);
+    } else {
+        sprintf(tmp, "ls /dev | grep -xq %ss[1-4].*", device);
+        if (!system(tmp)) {
+            sprintf(tmp, MNT_RESTORING "/sbin/fdisk -B %s", device);
+            res = run_program_and_log_output(tmp, 3);
+        } else {
+            log_msg(1,
+                    "I'm not running any boot loader. You have a DD boot drive. It's already loaded up.");
+        }
+    }
 #else
-  else
-    {
-      log_to_screen("Unable to determine type of boot loader. Defaulting to LILO.");
-      res=run_lilo(offer_to_hack_scripts);
-    }
+    else {
+        log_to_screen
+            ("Unable to determine type of boot loader. Defaulting to LILO.");
+        res = run_lilo(offer_to_hack_scripts);
+    }
 #endif
-  retval += res;
-  if (res)
-    {
-      log_to_screen("Your boot loader returned an error");
-    }
-  else
-    {
-      log_to_screen("Your boot loader ran OK");
-    }
-  paranoid_free(device);
-  paranoid_free(tmp);
-  paranoid_free(name);
-  return(retval);
-}
+    retval += res;
+    if (res) {
+        log_to_screen("Your boot loader returned an error");
+    } else {
+        log_to_screen("Your boot loader ran OK");
+    }
+    paranoid_free(device);
+    paranoid_free(tmp);
+    paranoid_free(name);
+    return (retval);
+}
+
 /**************************************************************************
  *END_ RUN_BOOT_LOADER                                                    *
@@ -1608 +1547 @@
 char *find_my_editor(void)
 {
-  static char output[MAX_STR_LEN];
-  if (find_home_of_exe("pico"))
-    { strcpy(output, "pico"); }
-  else if (find_home_of_exe("nano"))
-    { strcpy(output, "nano"); }
-  else if (find_home_of_exe ("e3em"))
-      {
-      strcpy (output, "e3em");
-      }
-  else if (find_home_of_exe ("e3vi"))
-      {
-      strcpy (output, "e3vi");
-      }
-  else
-    { strcpy(output, "vi"); }
-  if (!find_home_of_exe(output))
-    { log_msg(2, " (find_my_editor) --- warning - %s not found", output); }
-  return(output);
+    static char output[MAX_STR_LEN];
+    if (find_home_of_exe("pico")) {
+        strcpy(output, "pico");
+    } else if (find_home_of_exe("nano")) {
+        strcpy(output, "nano");
+    } else if (find_home_of_exe("e3em")) {
+        strcpy(output, "e3em");
+    } else if (find_home_of_exe("e3vi")) {
+        strcpy(output, "e3vi");
+    } else {
+        strcpy(output, "vi");
+    }
+    if (!find_home_of_exe(output)) {
+        log_msg(2, " (find_my_editor) --- warning - %s not found", output);
+    }
+    return (output);
 }
 
@@ -1635 +1572 @@
  * @return 0 for success, nonzero for failure.
  */
-int
-run_grub(bool offer_to_run_stabgrub, char*bd)
+int run_grub(bool offer_to_run_stabgrub, char *bd)
 {
   /** malloc **/
-  char *command;
-  char *boot_device;
-  char *rootdev;
-  char *rootdrive;
-  char *conffile;
-  char *tmp;
-  char *editor;
-
-  int res;
-  int done;
-
-  malloc_string(command);
-  malloc_string(boot_device);
-  malloc_string(tmp);
-  malloc_string(editor);
-  malloc_string(rootdev);
-  malloc_string(rootdrive);
-  malloc_string(conffile);
-  assert_string_is_neither_NULL_nor_zerolength(bd);
-  strcpy( editor, "vi" ); // find_my_editor() );
-  strcpy( boot_device, bd);
-  
-  if (!run_program_and_log_output("which grub-MR", FALSE))
-    {
-      log_msg(1, "Yay! grub-MR found...");
-      sprintf(command, "grub-MR %s /tmp/mountlist.txt", boot_device); 
-      log_msg(1, "command = %s", command);
-    }
-  else
-    {
-      sprintf(command, "chroot " MNT_RESTORING " grub-install %s",boot_device);
-      log_msg(1, "WARNING - grub-MR not found; using grub-install");
-    }
-  if (offer_to_run_stabgrub && ask_me_yes_or_no("Did you change the mountlist?"))
-    /* interactive mode */
-    {
-      mvaddstr_and_log_it(g_currentY,
-              0,
-              "Modifying fstab and grub.conf, and running GRUB...                             ");
-      for(done = FALSE; !done; )
+    char *command;
+    char *boot_device;
+    char *rootdev;
+    char *rootdrive;
+    char *conffile;
+    char *tmp;
+    char *editor;
+
+    int res;
+    int done;
+
+    malloc_string(command);
+    malloc_string(boot_device);
+    malloc_string(tmp);
+    malloc_string(editor);
+    malloc_string(rootdev);
+    malloc_string(rootdrive);
+    malloc_string(conffile);
+    assert_string_is_neither_NULL_nor_zerolength(bd);
+    strcpy(editor, "vi");       // find_my_editor() );
+    strcpy(boot_device, bd);
+
+    if (!run_program_and_log_output("which grub-MR", FALSE)) {
+        log_msg(1, "Yay! grub-MR found...");
+        sprintf(command, "grub-MR %s /tmp/mountlist.txt", boot_device);
+        log_msg(1, "command = %s", command);
+    } else {
+        sprintf(command, "chroot " MNT_RESTORING " grub-install %s",
+                boot_device);
+        log_msg(1, "WARNING - grub-MR not found; using grub-install");
+    }
+    if (offer_to_run_stabgrub
+        && ask_me_yes_or_no("Did you change the mountlist?"))
+        /* interactive mode */
     {
-      popup_and_get_string("Boot device",
-                   "Please confirm/enter the boot device. If in doubt, try /dev/hda",
-                   boot_device, MAX_STR_LEN/4);
-      sprintf(command, "stabgrub-me %s", boot_device);
-      res = run_program_and_log_output(command, 1);
-      if (res)
-        {
-          popup_and_OK("GRUB installation failed. Please install manually using 'grub-install' or similar command. You are now chroot()'ed to your restored system. Please type 'exit' when you are done.");
-          newtSuspend();
-          system("chroot " MNT_RESTORING);
-          newtResume();
-          popup_and_OK("Thank you.");
-        }
-      else
-        {
-          done = TRUE;
-        }
-      popup_and_OK("You will now edit fstab and grub.conf");
-      if (!g_text_mode) { newtSuspend(); }
-      sprintf(tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
-      paranoid_system(tmp);
-      sprintf(tmp, "%s " MNT_RESTORING "/etc/grub.conf", editor);
-      paranoid_system(tmp);
-      if (!g_text_mode) { newtResume(); }
-    }
-    }
-  else
-
-    /* nuke mode */
-    {
-      mvaddstr_and_log_it(g_currentY,
-              0,
-              "Running GRUB...                                                 ");
-      iamhere(command);
-      res = run_program_and_log_output(command, 1);
-      if (res)
+        mvaddstr_and_log_it(g_currentY,
+                            0,
+                            "Modifying fstab and grub.conf, and running GRUB...                             ");
+        for (done = FALSE; !done;) {
+            popup_and_get_string("Boot device",
+                                 "Please confirm/enter the boot device. If in doubt, try /dev/hda",
+                                 boot_device, MAX_STR_LEN / 4);
+            sprintf(command, "stabgrub-me %s", boot_device);
+            res = run_program_and_log_output(command, 1);
+            if (res) {
+                popup_and_OK
+                    ("GRUB installation failed. Please install manually using 'grub-install' or similar command. You are now chroot()'ed to your restored system. Please type 'exit' when you are done.");
+                newtSuspend();
+                system("chroot " MNT_RESTORING);
+                newtResume();
+                popup_and_OK("Thank you.");
+            } else {
+                done = TRUE;
+            }
+            popup_and_OK("You will now edit fstab and grub.conf");
+            if (!g_text_mode) {
+                newtSuspend();
+            }
+            sprintf(tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
+            paranoid_system(tmp);
+            sprintf(tmp, "%s " MNT_RESTORING "/etc/grub.conf", editor);
+            paranoid_system(tmp);
+            if (!g_text_mode) {
+                newtResume();
+            }
+        }
+    } else
+        /* nuke mode */
     {
-      popup_and_OK("Because of bugs in GRUB's own installer, GRUB was not installed properly. Please install the boot loader manually now, using this chroot()'ed shell prompt. Type 'exit' when you have finished.");
-      newtSuspend();
-      system("chroot " MNT_RESTORING);
-      newtResume();
-      popup_and_OK("Thank you.");
-    }
-    }
-  if (res)
-    {
-      mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
-      log_to_screen("GRUB ran w/error(s). See /tmp/mondo-restore.log for more info.");
-      log_msg(1,"Type:-");
-      log_msg(1,"    mount-me");
-      log_msg(1,"    chroot " MNT_RESTORING);
-      log_msg(1,"    mount /boot");
-      log_msg(1,"    grub-install '(hd0)'");
-      log_msg(1,"    exit");
-      log_msg(1,"    unmount-me");
-      log_msg(1,"If you're really stuck, please e-mail the mailing list.");
-    }
-  else
-    {
-      mvaddstr_and_log_it(g_currentY++, 74, "Done.");
-    }
-  paranoid_free(rootdev);
-  paranoid_free(rootdrive);
-  paranoid_free(conffile);
-  paranoid_free(command);
-  paranoid_free(boot_device);
-  paranoid_free(tmp);
-  paranoid_free(editor);
-
-  return( res );
-}
+        mvaddstr_and_log_it(g_currentY,
+                            0,
+                            "Running GRUB...                                                 ");
+        iamhere(command);
+        res = run_program_and_log_output(command, 1);
+        if (res) {
+            popup_and_OK
+                ("Because of bugs in GRUB's own installer, GRUB was not installed properly. Please install the boot loader manually now, using this chroot()'ed shell prompt. Type 'exit' when you have finished.");
+            newtSuspend();
+            system("chroot " MNT_RESTORING);
+            newtResume();
+            popup_and_OK("Thank you.");
+        }
+    }
+    if (res) {
+        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
+        log_to_screen
+            ("GRUB ran w/error(s). See /tmp/mondo-restore.log for more info.");
+        log_msg(1, "Type:-");
+        log_msg(1, "    mount-me");
+        log_msg(1, "    chroot " MNT_RESTORING);
+        log_msg(1, "    mount /boot");
+        log_msg(1, "    grub-install '(hd0)'");
+        log_msg(1, "    exit");
+        log_msg(1, "    unmount-me");
+        log_msg(1,
+                "If you're really stuck, please e-mail the mailing list.");
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+    }
+    paranoid_free(rootdev);
+    paranoid_free(rootdrive);
+    paranoid_free(conffile);
+    paranoid_free(command);
+    paranoid_free(boot_device);
+    paranoid_free(tmp);
+    paranoid_free(editor);
+
+    return (res);
+}
+
 /**************************************************************************
  *END_RUN_GRUB                                                            *
@@ -1761 +1695 @@
  * @return 0 for success, nonzero for failure.
  */
-int 
-run_elilo(bool offer_to_run_stabelilo)
+int run_elilo(bool offer_to_run_stabelilo)
 {
   /** malloc **/
-  char *command;
-  char *tmp;
-  char *editor;
-
-  int res;
-  int done;
-
-  malloc_string(command);
-  malloc_string(tmp);
-  malloc_string(editor);
-  strcpy(editor, find_my_editor());
-  if (offer_to_run_stabelilo && ask_me_yes_or_no("Did you change the mountlist?"))
-
-    /* interactive mode */
-    {
-      mvaddstr_and_log_it(g_currentY,
-              0,
-              "Modifying fstab and elilo.conf...                             ");
-      sprintf(command,"stabelilo-me");
-      res = run_program_and_log_output(command, 3);
-      if (res)
-        {
-          popup_and_OK("You will now edit fstab and elilo.conf, to make sure they match your new mountlist.");
-          for(done = FALSE; !done;)
-            {
-              if (!g_text_mode) { newtSuspend(); }
-          sprintf(tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
-          paranoid_system(tmp);
-          sprintf(tmp, "%s " MNT_RESTORING "/etc/elilo.conf", editor);
-          paranoid_system(tmp);
-              if (!g_text_mode) { newtResume(); }
+    char *command;
+    char *tmp;
+    char *editor;
+
+    int res;
+    int done;
+
+    malloc_string(command);
+    malloc_string(tmp);
+    malloc_string(editor);
+    strcpy(editor, find_my_editor());
+    if (offer_to_run_stabelilo
+        && ask_me_yes_or_no("Did you change the mountlist?"))
+
+        /* interactive mode */
+    {
+        mvaddstr_and_log_it(g_currentY,
+                            0,
+                            "Modifying fstab and elilo.conf...                             ");
+        sprintf(command, "stabelilo-me");
+        res = run_program_and_log_output(command, 3);
+        if (res) {
+            popup_and_OK
+                ("You will now edit fstab and elilo.conf, to make sure they match your new mountlist.");
+            for (done = FALSE; !done;) {
+                if (!g_text_mode) {
+                    newtSuspend();
+                }
+                sprintf(tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
+                paranoid_system(tmp);
+                sprintf(tmp, "%s " MNT_RESTORING "/etc/elilo.conf",
+                        editor);
+                paranoid_system(tmp);
+                if (!g_text_mode) {
+                    newtResume();
+                }
 //              newtCls();
-              if (ask_me_yes_or_no("Edit them again?")) 
-        {
-          continue;
-        }
-          done = TRUE;
-            }
-    }
-      else
+                if (ask_me_yes_or_no("Edit them again?")) {
+                    continue;
+                }
+                done = TRUE;
+            }
+        } else {
+            log_to_screen("elilo.conf and fstab were modified OK");
+        }
+    } else
+        /* nuke mode */
     {
-      log_to_screen("elilo.conf and fstab were modified OK");
-    }
-    }
-  else
-
-    /* nuke mode */
-    {
-    res = TRUE;
-    }
-  paranoid_free(command);
-  paranoid_free(tmp);
-  paranoid_free(editor);
-  return(res);
-}
+        res = TRUE;
+    }
+    paranoid_free(command);
+    paranoid_free(tmp);
+    paranoid_free(editor);
+    return (res);
+}
+
 /**************************************************************************
  *END_RUN_ELILO                                                            *
@@ -1830 +1764 @@
  * @return 0 for success, nonzero for failure.
  */
-int 
-run_lilo(bool offer_to_run_stablilo)
+int run_lilo(bool offer_to_run_stablilo)
 {
   /** malloc **/
-  char *command;
-  char *tmp;
-  char *editor;
-
-  int res;
-  int done;
-  bool run_lilo_M = FALSE;
-  malloc_string(command);
-  malloc_string(tmp);
-  malloc_string(editor);
-
-  if (!run_program_and_log_output("grep \"boot.*=.*/dev/md\" " MNT_RESTORING "/etc/lilo.conf", 1))
-        { run_lilo_M = TRUE; }
-
-  strcpy(editor, find_my_editor());
-  if (offer_to_run_stablilo && ask_me_yes_or_no("Did you change the mountlist?"))
-
-    /* interactive mode */
-    {
-      mvaddstr_and_log_it(g_currentY,
-              0,
-              "Modifying fstab and lilo.conf, and running LILO...                             ");
-      sprintf(command,"stablilo-me");
-      res = run_program_and_log_output(command, 3);
-      if (res)
-        {
-          popup_and_OK("You will now edit fstab and lilo.conf, to make sure they match your new mountlist.");
-          for(done = FALSE; !done;)
-            {
-              if (!g_text_mode) { newtSuspend(); }
-          sprintf(tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
-          paranoid_system(tmp);
-          sprintf(tmp, "%s " MNT_RESTORING "/etc/lilo.conf", editor);
-          paranoid_system(tmp);
-              if (!g_text_mode) { newtResume(); }
+    char *command;
+    char *tmp;
+    char *editor;
+
+    int res;
+    int done;
+    bool run_lilo_M = FALSE;
+    malloc_string(command);
+    malloc_string(tmp);
+    malloc_string(editor);
+
+    if (!run_program_and_log_output
+        ("grep \"boot.*=.*/dev/md\" " MNT_RESTORING "/etc/lilo.conf", 1)) {
+        run_lilo_M = TRUE;
+    }
+
+    strcpy(editor, find_my_editor());
+    if (offer_to_run_stablilo
+        && ask_me_yes_or_no("Did you change the mountlist?"))
+
+        /* interactive mode */
+    {
+        mvaddstr_and_log_it(g_currentY,
+                            0,
+                            "Modifying fstab and lilo.conf, and running LILO...                             ");
+        sprintf(command, "stablilo-me");
+        res = run_program_and_log_output(command, 3);
+        if (res) {
+            popup_and_OK
+                ("You will now edit fstab and lilo.conf, to make sure they match your new mountlist.");
+            for (done = FALSE; !done;) {
+                if (!g_text_mode) {
+                    newtSuspend();
+                }
+                sprintf(tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
+                paranoid_system(tmp);
+                sprintf(tmp, "%s " MNT_RESTORING "/etc/lilo.conf", editor);
+                paranoid_system(tmp);
+                if (!g_text_mode) {
+                    newtResume();
+                }
 //              newtCls();
-              if (ask_me_yes_or_no("Edit them again?")) 
-        {
-          continue;
-        }
-              res = run_program_and_log_output("chroot " MNT_RESTORING " lilo -L", 3);
-              if (res) 
-        { 
-          res = run_program_and_log_output("chroot " MNT_RESTORING " lilo", 3); 
-        }
-              if (res)
-                {
-                  done = ask_me_yes_or_no("LILO failed. Re-edit system files?");
-                }
-              else
-            {
-              done = TRUE;
-            }
-            }
-    }
-      else
+                if (ask_me_yes_or_no("Edit them again?")) {
+                    continue;
+                }
+                res =
+                    run_program_and_log_output("chroot " MNT_RESTORING
+                                               " lilo -L", 3);
+                if (res) {
+                    res =
+                        run_program_and_log_output("chroot " MNT_RESTORING
+                                                   " lilo", 3);
+                }
+                if (res) {
+                    done =
+                        ask_me_yes_or_no
+                        ("LILO failed. Re-edit system files?");
+                } else {
+                    done = TRUE;
+                }
+            }
+        } else {
+            log_to_screen("lilo.conf and fstab were modified OK");
+        }
+    } else
+        /* nuke mode */
     {
-      log_to_screen("lilo.conf and fstab were modified OK");
-    }
-    }
-  else
-
-    /* nuke mode */
-    {
-      mvaddstr_and_log_it(g_currentY, 
-              0, 
-              "Running LILO...                                                 ");
-      res = run_program_and_log_output("chroot " MNT_RESTORING " lilo -L", 3);
-      if (res) 
-    { 
-      res = run_program_and_log_output("chroot " MNT_RESTORING " lilo", 3); 
-    }
-      if (res)
-        {
-          mvaddstr_and_log_it(g_currentY++,74,"Failed.");
-          log_to_screen("Failed to re-jig fstab and/or lilo. Edit/run manually, please.");
-        }
-      else
-    {  
-          mvaddstr_and_log_it(g_currentY++,74,"Done.");
-        }
-    }
-  if (run_lilo_M)
-    {
-      run_program_and_log_output("chroot " MNT_RESTORING " lilo -M /dev/hda", 3);
-      run_program_and_log_output("chroot " MNT_RESTORING " lilo -M /dev/sda", 3);
-    }
-  paranoid_free(command);
-  paranoid_free(tmp);
-  paranoid_free(editor);
-  return(res);
-}
+        mvaddstr_and_log_it(g_currentY,
+                            0,
+                            "Running LILO...                                                 ");
+        res =
+            run_program_and_log_output("chroot " MNT_RESTORING " lilo -L",
+                                       3);
+        if (res) {
+            res =
+                run_program_and_log_output("chroot " MNT_RESTORING " lilo",
+                                           3);
+        }
+        if (res) {
+            mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
+            log_to_screen
+                ("Failed to re-jig fstab and/or lilo. Edit/run manually, please.");
+        } else {
+            mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+        }
+    }
+    if (run_lilo_M) {
+        run_program_and_log_output("chroot " MNT_RESTORING
+                                   " lilo -M /dev/hda", 3);
+        run_program_and_log_output("chroot " MNT_RESTORING
+                                   " lilo -M /dev/sda", 3);
+    }
+    paranoid_free(command);
+    paranoid_free(tmp);
+    paranoid_free(editor);
+    return (res);
+}
+
 /**************************************************************************
  *END_RUN_LILO                                                            *
@@ -1937 +1876 @@
  * @return 0 for success, nonzero for failure.
  */
-int 
-run_raw_mbr(bool offer_to_hack_scripts, char *bd)
+int run_raw_mbr(bool offer_to_hack_scripts, char *bd)
 {
   /** malloc **/
-  char *command;
-  char *boot_device;
-  char *tmp;
-  char *editor;
-  int res;
-  int done;
-
-  malloc_string(command);
-  malloc_string(boot_device);
-  malloc_string(tmp);
-  malloc_string(editor);
-  assert_string_is_neither_NULL_nor_zerolength(bd);
-
-  strcpy( editor, find_my_editor() );
-  strcpy( boot_device, bd );
-  sprintf(command, "raw-MR %s /tmp/mountlist.txt", boot_device);
-  log_msg(2, "run_raw_mbr() --- command='%s'", command);
-
-  if (offer_to_hack_scripts && ask_me_yes_or_no("Did you change the mountlist?"))
-    /* interactive mode */
-    {
-      mvaddstr_and_log_it(g_currentY,0,"Modifying fstab and restoring MBR...                           ");
-      for(done=FALSE; !done; )
+    char *command;
+    char *boot_device;
+    char *tmp;
+    char *editor;
+    int res;
+    int done;
+
+    malloc_string(command);
+    malloc_string(boot_device);
+    malloc_string(tmp);
+    malloc_string(editor);
+    assert_string_is_neither_NULL_nor_zerolength(bd);
+
+    strcpy(editor, find_my_editor());
+    strcpy(boot_device, bd);
+    sprintf(command, "raw-MR %s /tmp/mountlist.txt", boot_device);
+    log_msg(2, "run_raw_mbr() --- command='%s'", command);
+
+    if (offer_to_hack_scripts
+        && ask_me_yes_or_no("Did you change the mountlist?"))
+        /* interactive mode */
     {
-      if (!run_program_and_log_output("which vi", FALSE))
-        {
-          popup_and_OK("You will now edit fstab");
-          if (!g_text_mode) { newtSuspend(); }
-          sprintf(tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
-          paranoid_system(tmp);
-          if (!g_text_mode) { newtResume(); }
+        mvaddstr_and_log_it(g_currentY, 0,
+                            "Modifying fstab and restoring MBR...                           ");
+        for (done = FALSE; !done;) {
+            if (!run_program_and_log_output("which vi", FALSE)) {
+                popup_and_OK("You will now edit fstab");
+                if (!g_text_mode) {
+                    newtSuspend();
+                }
+                sprintf(tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
+                paranoid_system(tmp);
+                if (!g_text_mode) {
+                    newtResume();
+                }
 //              newtCls();
-        }
-      popup_and_get_string("Boot device", "Please confirm/enter the boot device. If in doubt, try /dev/hda",boot_device, MAX_STR_LEN/4);
-      sprintf(command, "stabraw-me %s", boot_device);
-      res = run_program_and_log_output(command, 3);
-      if (res)
-        {
-          done = ask_me_yes_or_no("Modifications failed. Re-try?");
-        }
-      else
-        {
-          done = TRUE;
-        }
-    }
-    }
-  else
-    
-    /* nuke mode */
-    {
-      mvaddstr_and_log_it(g_currentY,0,"Restoring MBR...                                               ");
-      res = run_program_and_log_output(command, 3);
-    }
-  if (res)
-    {
-      mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
-      log_to_screen("MBR+fstab processed w/error(s). See /tmp/mondo-restore.log for more info.");
-    }
-  else
-    {
-      mvaddstr_and_log_it(g_currentY++, 74, "Done.");
-    }
-  paranoid_free(command);
-  paranoid_free(boot_device);
-  paranoid_free(tmp);
-  paranoid_free(editor);
-  return(res);
-}
+            }
+            popup_and_get_string("Boot device",
+                                 "Please confirm/enter the boot device. If in doubt, try /dev/hda",
+                                 boot_device, MAX_STR_LEN / 4);
+            sprintf(command, "stabraw-me %s", boot_device);
+            res = run_program_and_log_output(command, 3);
+            if (res) {
+                done = ask_me_yes_or_no("Modifications failed. Re-try?");
+            } else {
+                done = TRUE;
+            }
+        }
+    } else
+        /* nuke mode */
+    {
+        mvaddstr_and_log_it(g_currentY, 0,
+                            "Restoring MBR...                                               ");
+        res = run_program_and_log_output(command, 3);
+    }
+    if (res) {
+        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
+        log_to_screen
+            ("MBR+fstab processed w/error(s). See /tmp/mondo-restore.log for more info.");
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+    }
+    paranoid_free(command);
+    paranoid_free(boot_device);
+    paranoid_free(tmp);
+    paranoid_free(editor);
+    return (res);
+}
+
 /**************************************************************************
  *END_RUN_RAW_MBR                                                         *
@@ -2015 +1954 @@
 
 
- 
- 
+
+
 /**
  * Turn signal trapping on or off.
@@ -2022 +1961 @@
  * print a message and exit immediately.
  */
-void
-set_signals( int on )
-{
-  int signals[]= { SIGKILL, SIGPIPE, SIGTERM, SIGHUP, SIGTRAP, SIGABRT, SIGINT, SIGSTOP, 0 };
-  int i;
-  for ( i = 0; signals[i]; i++)
-    {
-      if (on)
-        {
-      signal( signals[i], terminate_daemon);
-    }
-      else
-        {
-      signal(signals[i], termination_in_progress);
-    }
-    }
+void set_signals(int on)
+{
+    int signals[] =
+        { SIGKILL, SIGPIPE, SIGTERM, SIGHUP, SIGTRAP, SIGABRT, SIGINT,
+SIGSTOP, 0 };
+    int i;
+    for (i = 0; signals[i]; i++) {
+        if (on) {
+            signal(signals[i], terminate_daemon);
+        } else {
+            signal(signals[i], termination_in_progress);
+        }
+    }
 }
 
@@ -2051 +1987 @@
  * - @c bkpinfo->disaster_recovery
  */
-void
-setup_MR_global_filenames(struct s_bkpinfo *bkpinfo)
-{
-  char *temppath;
-
-  assert(bkpinfo!=NULL);
-
-  malloc_string ( g_biggielist_txt );
-  malloc_string ( g_filelist_full );
-  malloc_string ( g_filelist_imagedevs );
-  malloc_string ( g_imagedevs_restthese );
-  malloc_string ( g_mondo_cfg_file );
-  malloc_string ( g_mountlist_fname );
-  malloc_string ( g_mondo_home );
-  malloc_string ( g_tmpfs_mountpt );
-  malloc_string ( g_isodir_device );
-  malloc_string ( g_isodir_format );
-
-  temppath = bkpinfo->tmpdir;
-
-  sprintf(g_biggielist_txt, "%s/%s", temppath, BIGGIELIST_TXT_STUB);
-  sprintf(g_filelist_full, "%s/%s", temppath, FILELIST_FULL_STUB);
-  sprintf(g_filelist_imagedevs, "%s/tmp/filelist.imagedevs", temppath);
+void setup_MR_global_filenames(struct s_bkpinfo *bkpinfo)
+{
+    char *temppath;
+
+    assert(bkpinfo != NULL);
+
+    malloc_string(g_biggielist_txt);
+    malloc_string(g_filelist_full);
+    malloc_string(g_filelist_imagedevs);
+    malloc_string(g_imagedevs_restthese);
+    malloc_string(g_mondo_cfg_file);
+    malloc_string(g_mountlist_fname);
+    malloc_string(g_mondo_home);
+    malloc_string(g_tmpfs_mountpt);
+    malloc_string(g_isodir_device);
+    malloc_string(g_isodir_format);
+
+    temppath = bkpinfo->tmpdir;
+
+    sprintf(g_biggielist_txt, "%s/%s", temppath, BIGGIELIST_TXT_STUB);
+    sprintf(g_filelist_full, "%s/%s", temppath, FILELIST_FULL_STUB);
+    sprintf(g_filelist_imagedevs, "%s/tmp/filelist.imagedevs", temppath);
 //  sprintf(g_imagedevs_pot, "%s/tmp/imagedevs.pot", temppath);
-  sprintf(g_imagedevs_restthese, "%s/tmp/imagedevs.restore-these", temppath);
-  if (bkpinfo->disaster_recovery)
-    {
-      sprintf(g_mondo_cfg_file, "/%s", MONDO_CFG_FILE_STUB);
-      sprintf(g_mountlist_fname, "/%s", MOUNTLIST_FNAME_STUB);
-    }
-  else
-    {
-      sprintf(g_mondo_cfg_file, "%s/%s", temppath, MONDO_CFG_FILE_STUB);
-      sprintf(g_mountlist_fname, "%s/%s", temppath, MOUNTLIST_FNAME_STUB);
-    }
-}
+    sprintf(g_imagedevs_restthese, "%s/tmp/imagedevs.restore-these",
+            temppath);
+    if (bkpinfo->disaster_recovery) {
+        sprintf(g_mondo_cfg_file, "/%s", MONDO_CFG_FILE_STUB);
+        sprintf(g_mountlist_fname, "/%s", MOUNTLIST_FNAME_STUB);
+    } else {
+        sprintf(g_mondo_cfg_file, "%s/%s", temppath, MONDO_CFG_FILE_STUB);
+        sprintf(g_mountlist_fname, "%s/%s", temppath,
+                MOUNTLIST_FNAME_STUB);
+    }
+}
+
 /**************************************************************************
  *END_SET_GLOBAL_FILENAME                                                 *
@@ -2098 +2033 @@
  * @param input_file The input file, a list of changed files created by a compare.
  */
-void 
-streamline_changes_file(char *output_file, char *input_file)
-{
-  FILE *fin;
-  FILE *fout;
+void streamline_changes_file(char *output_file, char *input_file)
+{
+    FILE *fin;
+    FILE *fout;
   /** malloc **/
-      char *incoming;
-
-  assert_string_is_neither_NULL_nor_zerolength(output_file);
-  assert_string_is_neither_NULL_nor_zerolength(input_file);
-  malloc_string(incoming);
-  
-      if (!(fin=fopen(input_file,"r"))) 
-      {
-      log_OS_error(input_file);
-      return;
-      }
-      if (!(fout=fopen(output_file,"w"))) 
-      {
-      fatal_error("cannot open output_file");
-      }
-      for(fgets(incoming,MAX_STR_LEN-1,fin); !feof(fin); fgets(incoming,MAX_STR_LEN-1,fin))
-      {
-      if(strncmp(incoming,"etc/adjtime",11) \
-      && strncmp(incoming,"etc/mtab",8) \
-      && strncmp(incoming,"tmp/",4) \
-      && strncmp(incoming,"boot/map",8) \
-      && !strstr(incoming,"incheckentry") \
-      && strncmp(incoming,"etc/mail/statistics",19) \
-      && strncmp(incoming,"var/",4))
-      fprintf(fout,"%s",incoming); /* don't need \n here, for some reason.. */
-      }
-  paranoid_fclose(fout);
-  paranoid_fclose(fin);
-  paranoid_free(incoming);
-}
+    char *incoming;
+
+    assert_string_is_neither_NULL_nor_zerolength(output_file);
+    assert_string_is_neither_NULL_nor_zerolength(input_file);
+    malloc_string(incoming);
+
+    if (!(fin = fopen(input_file, "r"))) {
+        log_OS_error(input_file);
+        return;
+    }
+    if (!(fout = fopen(output_file, "w"))) {
+        fatal_error("cannot open output_file");
+    }
+    for (fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin);
+         fgets(incoming, MAX_STR_LEN - 1, fin)) {
+        if (strncmp(incoming, "etc/adjtime", 11)
+            && strncmp(incoming, "etc/mtab", 8)
+            && strncmp(incoming, "tmp/", 4)
+            && strncmp(incoming, "boot/map", 8)
+            && !strstr(incoming, "incheckentry")
+            && strncmp(incoming, "etc/mail/statistics", 19)
+            && strncmp(incoming, "var/", 4))
+            fprintf(fout, "%s", incoming);  /* don't need \n here, for some reason.. */
+    }
+    paranoid_fclose(fout);
+    paranoid_fclose(fin);
+    paranoid_free(incoming);
+}
+
 /**************************************************************************
  *END_STREAMLINE_CHANGES_FILE                                             *
@@ -2146 +2079 @@
  * Prompt the user to support the Mondo project.
  */
-void
-success_message(void)
-{
-  int i;
-  /* malloc and ptr */
-  char *tmp;
-
-  malloc_string(tmp);
-  if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "restore") == NULL) {
-      if (ask_me_yes_or_no("Have you contributed to the Mondo project financially or in some other way, yet?")) {
-          log_to_screen("Thank you for supporting Mondo. It goes from strength to strength,");
-          log_to_screen("thanks to the support of users like you.");
-          }
-      else {
-          if (ask_me_yes_or_no("Are you or your company willing to consider contributing to Mondo in some way?")) {
-              popup_and_OK("To support the project which has just performed a valuable service for you, please visit http://www.mondorescue.com; click on 'Download' and then 'PayPal'.");
-              }
-          else {
-              log_to_screen("Free Software, like freedom itself, must be supported or it will be lost.");
-              log_msg(1, "To your credit, you were honest: you said no, you wouldn't be contributing");
-              log_msg(1, "to this project, ever. However, that makes you a freeloader. I bet you're");
-              log_msg(1, "the sort of person who likes to sneak into movie theatres...");
-              popup_and_OK("If you ever change your mind, you may support this product by going to http://www.mondrescue.com and clicking on 'Download', followed by 'PalPal'.");
-              }
-           }
-  }
-
+void success_message(void)
+{
+    int i;
+    /* malloc and ptr */
+    char *tmp;
+
+    malloc_string(tmp);
+    if (strstr
+        (call_program_and_get_last_line_of_output("cat /proc/cmdline"),
+         "restore") == NULL) {
+        if (ask_me_yes_or_no
+            ("Have you contributed to the Mondo project financially or in some other way, yet?"))
+        {
+            log_to_screen
+                ("Thank you for supporting Mondo. It goes from strength to strength,");
+            log_to_screen("thanks to the support of users like you.");
+        } else {
+            if (ask_me_yes_or_no
+                ("Are you or your company willing to consider contributing to Mondo in some way?"))
+            {
+                popup_and_OK
+                    ("To support the project which has just performed a valuable service for you, please visit http://www.mondorescue.com; click on 'Download' and then 'PayPal'.");
+            } else {
+                log_to_screen
+                    ("Free Software, like freedom itself, must be supported or it will be lost.");
+                log_msg(1,
+                        "To your credit, you were honest: you said no, you wouldn't be contributing");
+                log_msg(1,
+                        "to this project, ever. However, that makes you a freeloader. I bet you're");
+                log_msg(1,
+                        "the sort of person who likes to sneak into movie theatres...");
+                popup_and_OK
+                    ("If you ever change your mind, you may support this product by going to http://www.mondrescue.com and clicking on 'Download', followed by 'PalPal'.");
+            }
+        }
+    }
 #ifdef FREELOADER
-  i = (int)(random())%32;
+    i = (int) (random()) % 32;
 #else
-  i=1;
+    i = 1;
 #endif
 
-  if (i!=25)
-    {
-      strcpy(tmp,"Mondo has restored your system. Please remove the backup media and reboot.");
-    }
-  else
-    {
-      strcpy(tmp,"M0nd0 h45 r3570r3d j00r 5y573m. P13453 r3m0v3 7h3 b4ckup m3d14 4nd r3b007.");
-    }
-  if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "restore") == NULL) {
-      popup_and_OK(tmp);
-      }
-  log_to_screen(tmp);
-  paranoid_free(tmp);
-}
+    if (i != 25) {
+        strcpy(tmp,
+               "Mondo has restored your system. Please remove the backup media and reboot.");
+    } else {
+        strcpy(tmp,
+               "M0nd0 h45 r3570r3d j00r 5y573m. P13453 r3m0v3 7h3 b4ckup m3d14 4nd r3b007.");
+    }
+    if (strstr
+        (call_program_and_get_last_line_of_output("cat /proc/cmdline"),
+         "restore") == NULL) {
+        popup_and_OK(tmp);
+    }
+    log_to_screen(tmp);
+    paranoid_free(tmp);
+}
+
 /**************************************************************************
  *END_SUCCESS_MESSAGE                                                     *
@@ -2203 +2147 @@
  * @param sig The signal we're exiting due to.
  */
-void 
-terminate_daemon(int sig)
-{
-  log_to_screen("Mondorestore is terminating in response to a signal from the OS");
-  paranoid_MR_finish(254);
-}
+void terminate_daemon(int sig)
+{
+    log_to_screen
+        ("Mondorestore is terminating in response to a signal from the OS");
+    paranoid_MR_finish(254);
+}
+
 /**************************************************************************
  *END_TERMINATE_DAEMON                                                    *
@@ -2217 +2162 @@
  * Give the user twenty seconds to press Ctrl-Alt-Del before we nuke their drives.
  */
-void 
-twenty_seconds_til_yikes()
-{
-  int i;
-  /* MALLOC **/
-  char *tmp;
-
-  malloc_string(tmp);
-  if (does_file_exist("/tmp/NOPAUSE")) { return; }
-  open_progress_form("CAUTION", 
-             "Be advised: I am about to ERASE your hard disk(s)!", 
-             "You may press Ctrl+Alt+Del to abort safely.", 
-             "",
-             20);
-  for(i = 0; i < 20; i++)
-    {
-      g_current_progress = i;
-      sprintf(tmp,"You have %d seconds left to abort.", 20 - i );
-      update_progress_form( tmp );
-      sleep( 1 );
-    }
-  close_progress_form();
-  paranoid_free(tmp);
-}
+void twenty_seconds_til_yikes()
+{
+    int i;
+    /* MALLOC * */
+    char *tmp;
+
+    malloc_string(tmp);
+    if (does_file_exist("/tmp/NOPAUSE")) {
+        return;
+    }
+    open_progress_form("CAUTION",
+                       "Be advised: I am about to ERASE your hard disk(s)!",
+                       "You may press Ctrl+Alt+Del to abort safely.",
+                       "", 20);
+    for (i = 0; i < 20; i++) {
+        g_current_progress = i;
+        sprintf(tmp, "You have %d seconds left to abort.", 20 - i);
+        update_progress_form(tmp);
+        sleep(1);
+    }
+    close_progress_form();
+    paranoid_free(tmp);
+}
+
 /**************************************************************************
  *END_TWENTY_SECONDS_TIL_YIKES                                            *
@@ -2253 +2198 @@
  * @param sig The signal we're exiting due to.
  */
-void
-termination_in_progress(int sig)
-{
-  log_msg(1, "Termination in progress");
-  usleep(1000);
-  pthread_exit(0);
-}
+void termination_in_progress(int sig)
+{
+    log_msg(1, "Termination in progress");
+    usleep(1000);
+    pthread_exit(0);
+}
+
 /**************************************************************************
  *END_TERMINATION_IN_PROGRESS                                             *
@@ -2271 +2216 @@
  * @return 0 for success, nonzero for failure.
  */
-int unmount_all_devices(struct mountlist_itself *p_external_copy_of_mountlist)
-{
-  struct mountlist_itself *mountlist;
-  int retval=0,lino,res=0,i;
-  char *command;
-  char *tmp;
-
-  malloc_string(command);
-  malloc_string(tmp);
-  assert(p_external_copy_of_mountlist!=NULL);
-
-  mountlist = malloc(sizeof(struct mountlist_itself));
-  memcpy((void*)mountlist, (void*)p_external_copy_of_mountlist, sizeof(struct mountlist_itself));
-  sort_mountlist_by_mountpoint(mountlist, 0);
-
-  run_program_and_log_output("df -m", 3);
-  mvaddstr_and_log_it(g_currentY, 0, "Unmounting devices      ");
-  open_progress_form("Unmounting devices", 
-             "Unmounting all devices that were mounted," , 
-             "in preparation for the post-restoration reboot.", 
-             "", 
-             mountlist->entries);
-  chdir( "/" );
-  for(i = 0; i < 10 && run_program_and_log_output("ps wax | grep buffer | grep -v \"grep buffer\"", TRUE) == 0; i++)
-    {
-      sleep( 1 );
-      log_msg(2, "Waiting for buffer() to finish");
-    }
-
-  paranoid_system("sync");
-
-  if (run_program_and_log_output( "cp -f /tmp/mondo-restore.log " MNT_RESTORING "/tmp/", FALSE ) )
-    { 
-      log_msg(1, "Error. Failed to copy log to PC's /tmp dir. (Mounted read-only?)");
-    }
-  if (run_program_and_log_output( "cp -f /tmp/mondo-restore.log " MNT_RESTORING "/root/", FALSE ) )
-    {
-      log_msg(1, "Error. Failed to copy log to PC's /root dir. (Mounted read-only?)");
-    }
-  if (does_file_exist("/tmp/DUMBASS-GENTOO"))
-    { 
-      run_program_and_log_output("mkdir -p " MNT_RESTORING "/mnt/.boot.d", 5); 
-    }
-  for( lino = mountlist->entries-1; lino >= 0; lino-- )
-    {
-      if (!strcmp(mountlist->el[lino].mountpoint,"lvm"))
-        { 
-      continue; 
-    }
-      sprintf(tmp,"Unmounting device %s  ",mountlist->el[lino].device);
-     
-      update_progress_form(tmp);
-      if (is_this_device_mounted(mountlist->el[lino].device))
-        {
-          if (!strcmp(mountlist->el[lino].mountpoint,"swap"))
-            { 
-          sprintf(command,"swapoff %s",mountlist->el[lino].device); 
-        } else {
-        if (!strcmp (mountlist->el[lino].mountpoint, "/1"))
-            {
-            sprintf (command, "umount %s/", MNT_RESTORING);
-            log_msg (3, "Well, I know a certain kitty-kitty who'll be sleeping with Mommy tonight...");
-            }
-        else
-            { 
-            sprintf(command,"umount " MNT_RESTORING "%s",mountlist->el[lino].mountpoint);
-            }
-        }
-          log_msg(10, "The 'umount' command is '%s'", command);
-          res = run_program_and_log_output(command, 3);
-        }
-      else
-        {
-          strcat(tmp,"...not mounted anyway :-) OK");
-          res = 0;
-        }
-      g_current_progress++;
-      if (res)
-    {
-      strcat(tmp,"...Failed");
-      retval++;
-      log_to_screen(tmp);
-    }
-      else
-    {
-      log_msg(2, tmp);
-    }
-    }
-  close_progress_form();
-  if (retval) 
-    { 
-      mvaddstr_and_log_it(g_currentY++, 74, "Failed." ); 
-    }
-  else        
-    { 
-      mvaddstr_and_log_it(g_currentY++, 74, "Done."); 
-    }
-  if (retval)
-    {
-      log_to_screen("Unable to unmount some of your partitions.");
-    }
-  else
-    {
-      log_to_screen("All partitions were unmounted OK.");
-    }
-  free(mountlist);
-  paranoid_free(command);
-  paranoid_free(tmp);
-  return(retval);
-}
+int unmount_all_devices(struct mountlist_itself
+                        *p_external_copy_of_mountlist)
+{
+    struct mountlist_itself *mountlist;
+    int retval = 0, lino, res = 0, i;
+    char *command;
+    char *tmp;
+
+    malloc_string(command);
+    malloc_string(tmp);
+    assert(p_external_copy_of_mountlist != NULL);
+
+    mountlist = malloc(sizeof(struct mountlist_itself));
+    memcpy((void *) mountlist, (void *) p_external_copy_of_mountlist,
+           sizeof(struct mountlist_itself));
+    sort_mountlist_by_mountpoint(mountlist, 0);
+
+    run_program_and_log_output("df -m", 3);
+    mvaddstr_and_log_it(g_currentY, 0, "Unmounting devices      ");
+    open_progress_form("Unmounting devices",
+                       "Unmounting all devices that were mounted,",
+                       "in preparation for the post-restoration reboot.",
+                       "", mountlist->entries);
+    chdir("/");
+    for (i = 0;
+         i < 10
+         &&
+         run_program_and_log_output
+         ("ps wax | grep buffer | grep -v \"grep buffer\"", TRUE) == 0;
+         i++) {
+        sleep(1);
+        log_msg(2, "Waiting for buffer() to finish");
+    }
+
+    paranoid_system("sync");
+
+    if (run_program_and_log_output
+        ("cp -f /tmp/mondo-restore.log " MNT_RESTORING "/tmp/", FALSE)) {
+        log_msg(1,
+                "Error. Failed to copy log to PC's /tmp dir. (Mounted read-only?)");
+    }
+    if (run_program_and_log_output
+        ("cp -f /tmp/mondo-restore.log " MNT_RESTORING "/root/", FALSE)) {
+        log_msg(1,
+                "Error. Failed to copy log to PC's /root dir. (Mounted read-only?)");
+    }
+    if (does_file_exist("/tmp/DUMBASS-GENTOO")) {
+        run_program_and_log_output("mkdir -p " MNT_RESTORING
+                                   "/mnt/.boot.d", 5);
+    }
+    for (lino = mountlist->entries - 1; lino >= 0; lino--) {
+        if (!strcmp(mountlist->el[lino].mountpoint, "lvm")) {
+            continue;
+        }
+        sprintf(tmp, "Unmounting device %s  ", mountlist->el[lino].device);
+
+        update_progress_form(tmp);
+        if (is_this_device_mounted(mountlist->el[lino].device)) {
+            if (!strcmp(mountlist->el[lino].mountpoint, "swap")) {
+                sprintf(command, "swapoff %s", mountlist->el[lino].device);
+            } else {
+                if (!strcmp(mountlist->el[lino].mountpoint, "/1")) {
+                    sprintf(command, "umount %s/", MNT_RESTORING);
+                    log_msg(3,
+                            "Well, I know a certain kitty-kitty who'll be sleeping with Mommy tonight...");
+                } else {
+                    sprintf(command, "umount " MNT_RESTORING "%s",
+                            mountlist->el[lino].mountpoint);
+                }
+            }
+            log_msg(10, "The 'umount' command is '%s'", command);
+            res = run_program_and_log_output(command, 3);
+        } else {
+            strcat(tmp, "...not mounted anyway :-) OK");
+            res = 0;
+        }
+        g_current_progress++;
+        if (res) {
+            strcat(tmp, "...Failed");
+            retval++;
+            log_to_screen(tmp);
+        } else {
+            log_msg(2, tmp);
+        }
+    }
+    close_progress_form();
+    if (retval) {
+        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+    }
+    if (retval) {
+        log_to_screen("Unable to unmount some of your partitions.");
+    } else {
+        log_to_screen("All partitions were unmounted OK.");
+    }
+    free(mountlist);
+    paranoid_free(command);
+    paranoid_free(tmp);
+    return (retval);
+}
+
 /**************************************************************************
  *END_UNMOUNT_ALL_DEVICES                                                 *
@@ -2393 +2330 @@
  * @return 0 for success, nonzero for failure.
  */
-int extract_cfg_file_and_mountlist_from_tape_dev(char*dev)
-{
-  char *command;
-  int res=0;
-  // BCO: below 32KB seems to block at least on RHAS 2.1 and MDK 10.0
-  long tape_block_size=32768;
-
-  malloc_string(command);
-
-  // tar -zxvf-
-       sprintf( command,
-        "dd if=%s bs=%ld count=%ld 2> /dev/null | tar -zx %s %s %s %s %s",
-           dev,
-           tape_block_size,
-           1024L*1024*32/tape_block_size,
-                   MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB,
-           BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB,
-           "tmp/i-want-my-lvm" );
-       log_msg (2, "command = '%s'", command);
-           res = run_program_and_log_output( command, -1 );
-       if (res!=0 && does_file_exist(MONDO_CFG_FILE_STUB)) { res=0; }
-  paranoid_free(command);
-  return(res);
-}
-
- 
- 
+int extract_cfg_file_and_mountlist_from_tape_dev(char *dev)
+{
+    char *command;
+    int res = 0;
+    // BCO: below 32KB seems to block at least on RHAS 2.1 and MDK 10.0
+    long tape_block_size = 32768;
+
+    malloc_string(command);
+
+    // tar -zxvf-
+    sprintf(command,
+            "dd if=%s bs=%ld count=%ld 2> /dev/null | tar -zx %s %s %s %s %s",
+            dev,
+            tape_block_size,
+            1024L * 1024 * 32 / tape_block_size,
+            MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB,
+            BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, "tmp/i-want-my-lvm");
+    log_msg(2, "command = '%s'", command);
+    res = run_program_and_log_output(command, -1);
+    if (res != 0 && does_file_exist(MONDO_CFG_FILE_STUB)) {
+        res = 0;
+    }
+    paranoid_free(command);
+    return (res);
+}
+
+
+
 /**
  * Get the configuration file from the floppy, tape, or CD.
@@ -2428 +2366 @@
  * @return 0 for success, nonzero for failure.
  */
-int 
-get_cfg_file_from_archive( struct s_bkpinfo *bkpinfo )
-{
-   int retval = 0;
-   
+int get_cfg_file_from_archive(struct s_bkpinfo *bkpinfo)
+{
+    int retval = 0;
+
    /** malloc *****/
-   char *device;
-   char *command;
-   char *cfg_file;
-   char *mounted_cfgf_path;
-   char *tmp;
-   char *mountpt;
-   char *ramdisk_fname;
-   char *mountlist_file;
-   int res;
-   
-   bool try_plan_B;
-
-   assert(bkpinfo!=NULL);
-   malloc_string(cfg_file);
-   malloc_string(mounted_cfgf_path);
-   malloc_string(mountpt);
-   malloc_string(ramdisk_fname);
-   malloc_string(mountlist_file);
-   malloc_string(device);
-   malloc_string(command);
-   malloc_string(tmp);
-   log_msg(2, "gcffa --- starting" );
-   log_to_screen("I'm thinking...");
-   sprintf( mountpt, "%s/mount.bootdisk", bkpinfo->tmpdir );
-   device[0] = '\0';
-   chdir( bkpinfo->tmpdir );
-   strcpy( cfg_file, MONDO_CFG_FILE_STUB);
-   unlink( cfg_file ); // cfg_file[] is missing the '/' at the start, FYI, by intent
-   unlink( FILELIST_FULL_STUB );
-   unlink( BIGGIELIST_TXT_STUB );
-   unlink( "tmp/i-want-my-lvm");
-   sprintf( command, "mkdir -p %s", mountpt );
-   run_program_and_log_output( command, FALSE );
-   
+    char *device;
+    char *command;
+    char *cfg_file;
+    char *mounted_cfgf_path;
+    char *tmp;
+    char *mountpt;
+    char *ramdisk_fname;
+    char *mountlist_file;
+    int res;
+
+    bool try_plan_B;
+
+    assert(bkpinfo != NULL);
+    malloc_string(cfg_file);
+    malloc_string(mounted_cfgf_path);
+    malloc_string(mountpt);
+    malloc_string(ramdisk_fname);
+    malloc_string(mountlist_file);
+    malloc_string(device);
+    malloc_string(command);
+    malloc_string(tmp);
+    log_msg(2, "gcffa --- starting");
+    log_to_screen("I'm thinking...");
+    sprintf(mountpt, "%s/mount.bootdisk", bkpinfo->tmpdir);
+    device[0] = '\0';
+    chdir(bkpinfo->tmpdir);
+    strcpy(cfg_file, MONDO_CFG_FILE_STUB);
+    unlink(cfg_file);           // cfg_file[] is missing the '/' at the start, FYI, by intent
+    unlink(FILELIST_FULL_STUB);
+    unlink(BIGGIELIST_TXT_STUB);
+    unlink("tmp/i-want-my-lvm");
+    sprintf(command, "mkdir -p %s", mountpt);
+    run_program_and_log_output(command, FALSE);
+
 //   unlink( "tmp/mondo-restore.cfg" ); // superfluous, surely?
- 
-   sprintf( cfg_file, "%s/%s", bkpinfo->tmpdir, MONDO_CFG_FILE_STUB );
-   sprintf( mountlist_file, "%s/%s", bkpinfo->tmpdir, MOUNTLIST_FNAME_STUB );
-   //   make_hole_for_file( cfg_file );
-   //   make_hole_for_file( mountlist_file);
-   log_msg (2, "mountpt = %s; cfg_file=%s", mountpt, cfg_file );
- 
-   /* Floppy? */
-   sprintf( tmp, "mkdir -p %s", mountpt );
-   run_program_and_log_output( tmp, FALSE );
-   sprintf( tmp, "mkdir -p %s/tmp", bkpinfo->tmpdir);
-   run_program_and_log_output( tmp, FALSE);
-
-   sprintf( command, "mount /dev/fd0u1722 %s", mountpt );
-   sprintf( tmp, "(sleep 15; kill `ps ax | grep \"%s\" | cut -d' ' -f1` 2> /dev/null) &", command);
-   log_msg(1, "tmp = '%s'", tmp);
-   system(tmp);
-   res = run_program_and_log_output( command, FALSE );
-   if (res) {
-    sprintf( command, "mount /dev/fd0H1440 %s", mountpt );
-    res = run_program_and_log_output( command, FALSE );
-   }
-   if (res) {
-    try_plan_B=TRUE;
-   } else {
-        try_plan_B=TRUE;
-        log_msg(2, "Mounted floppy OK but I don't trust it because the archives might contain more up-to-date config file than the floppy does.");
+
+    sprintf(cfg_file, "%s/%s", bkpinfo->tmpdir, MONDO_CFG_FILE_STUB);
+    sprintf(mountlist_file, "%s/%s", bkpinfo->tmpdir,
+            MOUNTLIST_FNAME_STUB);
+    //   make_hole_for_file( cfg_file );
+    //   make_hole_for_file( mountlist_file);
+    log_msg(2, "mountpt = %s; cfg_file=%s", mountpt, cfg_file);
+
+    /* Floppy? */
+    sprintf(tmp, "mkdir -p %s", mountpt);
+    run_program_and_log_output(tmp, FALSE);
+    sprintf(tmp, "mkdir -p %s/tmp", bkpinfo->tmpdir);
+    run_program_and_log_output(tmp, FALSE);
+
+    sprintf(command, "mount /dev/fd0u1722 %s", mountpt);
+    sprintf(tmp,
+            "(sleep 15; kill `ps ax | grep \"%s\" | cut -d' ' -f1` 2> /dev/null) &",
+            command);
+    log_msg(1, "tmp = '%s'", tmp);
+    system(tmp);
+    res = run_program_and_log_output(command, FALSE);
+    if (res) {
+        sprintf(command, "mount /dev/fd0H1440 %s", mountpt);
+        res = run_program_and_log_output(command, FALSE);
+    }
+    if (res) {
+        try_plan_B = TRUE;
+    } else {
+        try_plan_B = TRUE;
+        log_msg(2,
+                "Mounted floppy OK but I don't trust it because the archives might contain more up-to-date config file than the floppy does.");
 // NB: If busybox does not support 'mount -o loop' then Plan A WILL NOT WORK.
-    log_msg(2, "Processing floppy (plan A?)" );
-    sprintf( ramdisk_fname, "%s/mindi.rdz", mountpt );
-    if ( !does_file_exist( ramdisk_fname ) )
-      {
-        sprintf( ramdisk_fname, "%s/initrd.img", mountpt );
-      }
-    if ( !does_file_exist( ramdisk_fname ) )
-      { 
-        log_msg(2, "Cannot find ramdisk file on mountpoint. Are you sure that's a boot disk in the drive?" );
-      }
-    if ( extract_config_file_from_ramdisk( bkpinfo, ramdisk_fname, cfg_file, mountlist_file ) )
-      {
-        log_msg(2, "Warning - failed to extract config file from ramdisk. I think this boot disk is mangled." );
-      }
-    sprintf( command, "umount %s", mountpt );
-        run_program_and_log_output(command, 5);
-    unlink(ramdisk_fname);
-       }
-   if ( !does_file_exist( cfg_file ) )
-     {
-log_msg(2, "gcffa --- we don't have cfg file yet." );
-       if ( IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type) )
-         {
-      try_plan_B = TRUE;
-    }
-        else
-          {
-           log_msg(2, "gcffa --- calling mount_cdrom now :)" );
-           if ( !mount_cdrom( bkpinfo ) )
-             {
-log_msg(2, "gcffa --- managed to mount CD; so, no need for Plan B" );
-          try_plan_B = FALSE;
-        }
-            else
-             {
-          try_plan_B = TRUE;
-        }
-      if ( what_number_cd_is_this(bkpinfo) > 1 )
-              {
-               insist_on_this_cd_number( bkpinfo, ( g_current_media_number = 1 ) );
-              }
-          }
-       if ( try_plan_B )
-          {
-           log_msg(2, "gcffa --- OK, switching to Plan B" );
-           chdir( bkpinfo->tmpdir );
-           run_program_and_log_output ( "mkdir -p tmp", FALSE );
-
-       if (strlen(bkpinfo->media_device) ==0 )
-         {
-           strcpy(bkpinfo->media_device, "/dev/st0");
-           log_msg(2,"media_device is blank; assuming %s");
-         }
-           strcpy(tmp, bkpinfo->media_device);
-           if (extract_cfg_file_and_mountlist_from_tape_dev(bkpinfo->media_device))
-         {
-           strcpy(bkpinfo->media_device, "/dev/st0");
-               if (extract_cfg_file_and_mountlist_from_tape_dev(bkpinfo->media_device))
-             {
-               strcpy(bkpinfo->media_device, "/dev/osst0");
-                   if (extract_cfg_file_and_mountlist_from_tape_dev(bkpinfo->media_device))
-             {
-               strcpy(bkpinfo->media_device, "/dev/ht0");
-                       if (extract_cfg_file_and_mountlist_from_tape_dev(bkpinfo->media_device))
-                         {
-               log_msg(3, "I tried lots of devices but none worked.");
-               strcpy(bkpinfo->media_device, tmp);
-                         }
-                     }
-             }
-             }
-
-           if ( !does_file_exist( "tmp/mondo-restore.cfg") )
-             {
-          log_to_screen ( "Cannot find config info on tape/CD/floppy");
-              return(1);
-        }
-          }
-      else
-        {
-log_msg(2, "gcffa --- looking at mounted CD for mindi-boot.2880.img" );
-          sprintf( command, "mount "MNT_CDROM"/images/mindi-boot.2880.img -o loop %s", mountpt );
-          sprintf( mounted_cfgf_path, "%s/%s", mountpt, cfg_file );
-          if (!does_file_exist(mounted_cfgf_path))
-            {
-              log_msg(2,"gcffa --- Plan C, a.k.a. untarring some file from all.tar.gz" );
-              sprintf( command,
-               "tar -zxvf "MNT_CDROM"/images/all.tar.gz %s %s %s %s %s",
-                MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, "tmp/i-want-my-lvm"
-               ); // add -b TAPE_BLOCK_SIZE if you _really_ think it's necessary
-              run_program_and_log_output( command, TRUE );
-              if ( !does_file_exist( MONDO_CFG_FILE_STUB ) )
-                {
-          fatal_error( "Please reinsert the disk/CD and try again." );
-        }
-            }
-        }
-    }
-  if ( does_file_exist( MONDO_CFG_FILE_STUB) )
-    {
-      log_msg(1, "gcffa --- great! We've got the config file" );
-      sprintf(tmp, "%s/%s", call_program_and_get_last_line_of_output("pwd"), MONDO_CFG_FILE_STUB);
-      sprintf( command, "cp -f %s %s", tmp, cfg_file);
-      iamhere(command);
-      if (strcmp(tmp, cfg_file) && run_program_and_log_output( command, 1 ))
-        { log_msg(1,"... but an error occurred when I tried to move it to %s", cfg_file); }
-      else
-        { log_msg(1,"... and I moved it successfully to %s", cfg_file); }
-      sprintf(command, "cp -f %s/%s %s", call_program_and_get_last_line_of_output("pwd"), MOUNTLIST_FNAME_STUB, mountlist_file);
-      iamhere(command);
-      if (strcmp(tmp, cfg_file) && run_program_and_log_output( command, 1 ))
-        { log_msg(1,"Failed to get mountlist"); }
-      else
-        {
-      log_msg(1,"Got mountlist too");
-      sprintf(command, "cp -f %s %s", mountlist_file, g_mountlist_fname);
-      if (run_program_and_log_output(command, 1))
-        { log_msg(1, "Failed to copy mountlist to /tmp"); }
-      else
-        {
-          log_msg(1, "Copied mountlist to /tmp as well OK"); 
-          sprintf(command, "cp -f tmp/i-want-my-lvm /tmp/");
-          run_program_and_log_output(command, 1);
+        log_msg(2, "Processing floppy (plan A?)");
+        sprintf(ramdisk_fname, "%s/mindi.rdz", mountpt);
+        if (!does_file_exist(ramdisk_fname)) {
+            sprintf(ramdisk_fname, "%s/initrd.img", mountpt);
+        }
+        if (!does_file_exist(ramdisk_fname)) {
+            log_msg(2,
+                    "Cannot find ramdisk file on mountpoint. Are you sure that's a boot disk in the drive?");
+        }
+        if (extract_config_file_from_ramdisk
+            (bkpinfo, ramdisk_fname, cfg_file, mountlist_file)) {
+            log_msg(2,
+                    "Warning - failed to extract config file from ramdisk. I think this boot disk is mangled.");
+        }
+        sprintf(command, "umount %s", mountpt);
+        run_program_and_log_output(command, 5);
+        unlink(ramdisk_fname);
+    }
+    if (!does_file_exist(cfg_file)) {
+        log_msg(2, "gcffa --- we don't have cfg file yet.");
+        if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
+            try_plan_B = TRUE;
+        } else {
+            log_msg(2, "gcffa --- calling mount_cdrom now :)");
+            if (!mount_cdrom(bkpinfo)) {
+                log_msg(2,
+                        "gcffa --- managed to mount CD; so, no need for Plan B");
+                try_plan_B = FALSE;
+            } else {
+                try_plan_B = TRUE;
+            }
+            if (what_number_cd_is_this(bkpinfo) > 1) {
+                insist_on_this_cd_number(bkpinfo,
+                                         (g_current_media_number = 1));
+            }
+        }
+        if (try_plan_B) {
+            log_msg(2, "gcffa --- OK, switching to Plan B");
+            chdir(bkpinfo->tmpdir);
+            run_program_and_log_output("mkdir -p tmp", FALSE);
+
+            if (strlen(bkpinfo->media_device) == 0) {
+                strcpy(bkpinfo->media_device, "/dev/st0");
+                log_msg(2, "media_device is blank; assuming %s");
+            }
+            strcpy(tmp, bkpinfo->media_device);
+            if (extract_cfg_file_and_mountlist_from_tape_dev
+                (bkpinfo->media_device)) {
+                strcpy(bkpinfo->media_device, "/dev/st0");
+                if (extract_cfg_file_and_mountlist_from_tape_dev
+                    (bkpinfo->media_device)) {
+                    strcpy(bkpinfo->media_device, "/dev/osst0");
+                    if (extract_cfg_file_and_mountlist_from_tape_dev
+                        (bkpinfo->media_device)) {
+                        strcpy(bkpinfo->media_device, "/dev/ht0");
+                        if (extract_cfg_file_and_mountlist_from_tape_dev
+                            (bkpinfo->media_device)) {
+                            log_msg(3,
+                                    "I tried lots of devices but none worked.");
+                            strcpy(bkpinfo->media_device, tmp);
+                        }
+                    }
+                }
+            }
+
+            if (!does_file_exist("tmp/mondo-restore.cfg")) {
+                log_to_screen("Cannot find config info on tape/CD/floppy");
+                return (1);
+            }
+        } else {
+            log_msg(2,
+                    "gcffa --- looking at mounted CD for mindi-boot.2880.img");
+            sprintf(command,
+                    "mount " MNT_CDROM
+                    "/images/mindi-boot.2880.img -o loop %s", mountpt);
+            sprintf(mounted_cfgf_path, "%s/%s", mountpt, cfg_file);
+            if (!does_file_exist(mounted_cfgf_path)) {
+                log_msg(2,
+                        "gcffa --- Plan C, a.k.a. untarring some file from all.tar.gz");
+                sprintf(command, "tar -zxvf " MNT_CDROM "/images/all.tar.gz %s %s %s %s %s", MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, "tmp/i-want-my-lvm");  // add -b TAPE_BLOCK_SIZE if you _really_ think it's necessary
+                run_program_and_log_output(command, TRUE);
+                if (!does_file_exist(MONDO_CFG_FILE_STUB)) {
+                    fatal_error
+                        ("Please reinsert the disk/CD and try again.");
+                }
+            }
+        }
+    }
+    if (does_file_exist(MONDO_CFG_FILE_STUB)) {
+        log_msg(1, "gcffa --- great! We've got the config file");
+        sprintf(tmp, "%s/%s",
+                call_program_and_get_last_line_of_output("pwd"),
+                MONDO_CFG_FILE_STUB);
+        sprintf(command, "cp -f %s %s", tmp, cfg_file);
+        iamhere(command);
+        if (strcmp(tmp, cfg_file)
+            && run_program_and_log_output(command, 1)) {
+            log_msg(1,
+                    "... but an error occurred when I tried to move it to %s",
+                    cfg_file);
+        } else {
+            log_msg(1, "... and I moved it successfully to %s", cfg_file);
+        }
+        sprintf(command, "cp -f %s/%s %s",
+                call_program_and_get_last_line_of_output("pwd"),
+                MOUNTLIST_FNAME_STUB, mountlist_file);
+        iamhere(command);
+        if (strcmp(tmp, cfg_file)
+            && run_program_and_log_output(command, 1)) {
+            log_msg(1, "Failed to get mountlist");
+        } else {
+            log_msg(1, "Got mountlist too");
+            sprintf(command, "cp -f %s %s", mountlist_file,
+                    g_mountlist_fname);
+            if (run_program_and_log_output(command, 1)) {
+                log_msg(1, "Failed to copy mountlist to /tmp");
+            } else {
+                log_msg(1, "Copied mountlist to /tmp as well OK");
+                sprintf(command, "cp -f tmp/i-want-my-lvm /tmp/");
+                run_program_and_log_output(command, 1);
 /*        sprintf(command, "grep \" lvm \" %s", g_mountlist_fname);
           if (!run_program_and_log_output(command, 5) && !does_file_exist("/tmp/i-want-my-lvm"))
@@ -2639 +2577 @@
         }
 */
-        }
-        }
-    }
-  run_program_and_log_output( "umount "MNT_CDROM, FALSE );
-  if ( !does_file_exist( cfg_file ) )
-    {
-      iamhere(cfg_file);
-      log_msg(1, "%s not found", cfg_file);
-      log_to_screen("Oh dear. Unable to recover configuration file from boot disk");
-      return(1);
-    }
-
-  log_to_screen( "Recovered mondo-restore.cfg" );
-  if (!does_file_exist( MOUNTLIST_FNAME_STUB ))
-    { log_to_screen( "...but not mountlist.txt - a pity, really..."); }
+            }
+        }
+    }
+    run_program_and_log_output("umount " MNT_CDROM, FALSE);
+    if (!does_file_exist(cfg_file)) {
+        iamhere(cfg_file);
+        log_msg(1, "%s not found", cfg_file);
+        log_to_screen
+            ("Oh dear. Unable to recover configuration file from boot disk");
+        return (1);
+    }
+
+    log_to_screen("Recovered mondo-restore.cfg");
+    if (!does_file_exist(MOUNTLIST_FNAME_STUB)) {
+        log_to_screen("...but not mountlist.txt - a pity, really...");
+    }
 /* start SAH */
-  else
-    {
-      sprintf(command, "cp -f %s %s/%s", MOUNTLIST_FNAME_STUB, bkpinfo->tmpdir, MOUNTLIST_FNAME_STUB);
-      run_program_and_log_output(command,FALSE);
-    }
+    else {
+        sprintf(command, "cp -f %s %s/%s", MOUNTLIST_FNAME_STUB,
+                bkpinfo->tmpdir, MOUNTLIST_FNAME_STUB);
+        run_program_and_log_output(command, FALSE);
+    }
 /*--commented out by SAH
   sprintf( command, "cp -f %s %s/%s", cfg_file, bkpinfo->tmpdir, MONDO_CFG_FILE_STUB );
@@ -2668 +2607 @@
 /* end SAH */
 
-  sprintf( command, "cp -f %s /%s", cfg_file, MONDO_CFG_FILE_STUB );
-  run_program_and_log_output( command, FALSE );
-  sprintf( command, "cp -f %s /%s", mountlist_file, MOUNTLIST_FNAME_STUB );
-  run_program_and_log_output( command, FALSE );
-  sprintf( command, "cp -f etc/raidtab /etc/");
-  run_program_and_log_output( command, FALSE );
-  sprintf( command, "cp -f tmp/i-want-my-lvm /tmp/");
-  run_program_and_log_output( command, FALSE );
-  g_backup_media_type = bkpinfo->backup_media_type;
-  paranoid_free(device);
-  paranoid_free(command);
-  paranoid_free(tmp);
-  paranoid_free(cfg_file);
-  paranoid_free(mounted_cfgf_path);
-  paranoid_free(mountpt);
-  paranoid_free(ramdisk_fname);
-  paranoid_free(mountlist_file);
-  return( retval );
+    sprintf(command, "cp -f %s /%s", cfg_file, MONDO_CFG_FILE_STUB);
+    run_program_and_log_output(command, FALSE);
+    sprintf(command, "cp -f %s /%s", mountlist_file, MOUNTLIST_FNAME_STUB);
+    run_program_and_log_output(command, FALSE);
+    sprintf(command, "cp -f etc/raidtab /etc/");
+    run_program_and_log_output(command, FALSE);
+    sprintf(command, "cp -f tmp/i-want-my-lvm /tmp/");
+    run_program_and_log_output(command, FALSE);
+    g_backup_media_type = bkpinfo->backup_media_type;
+    paranoid_free(device);
+    paranoid_free(command);
+    paranoid_free(tmp);
+    paranoid_free(cfg_file);
+    paranoid_free(mounted_cfgf_path);
+    paranoid_free(mountpt);
+    paranoid_free(ramdisk_fname);
+    paranoid_free(mountlist_file);
+    return (retval);
 }
 
@@ -2706 +2645 @@
  ***************************************************************************/
 
- 
- 
-void wait_until_software_raids_are_prepped(char*mdstat_file, int wait_for_percentage)
-{
-  struct s_mdstat *mdstat;
-  int unfinished_mdstat_devices=9999, i;
-  char *screen_message;
-  
-  malloc_string(screen_message);
-  mdstat = malloc(sizeof(struct s_mdstat));
-
-  assert(wait_for_percentage <= 100);
-  iamhere("Help, my boat is sync'ing. (Get it? Urp! Urp!)");
-  while(unfinished_mdstat_devices > 0)
-    {
-      if (read_mdstat(mdstat, mdstat_file))
-        { log_to_screen("Sorry, cannot read %s", mdstat_file); return; }
-      for(unfinished_mdstat_devices=i=0; i<mdstat->entries; i++)
-        {
-          if (mdstat->el[i].progress < wait_for_percentage)
-            {
-          unfinished_mdstat_devices++;
-          sprintf(screen_message, "Sync'ing /dev/md%d", mdstat->el[i].md);
-          open_evalcall_form(screen_message);
-          if (mdstat->el[i].progress == -1) // delayed while another partition inits
-            {
-          continue;
-        }
-          while(mdstat->el[i].progress < wait_for_percentage)
-            {
-          update_evalcall_form(mdstat->el[i].progress);
-          sleep(2);
-          if (read_mdstat(mdstat, mdstat_file)) {break;}
-        }
-          close_evalcall_form();
-        }
-        }
-    }
-  paranoid_free(screen_message);
-  paranoid_free(mdstat);
-}
-
-
+
+
+void wait_until_software_raids_are_prepped(char *mdstat_file,
+                                           int wait_for_percentage)
+{
+    struct s_mdstat *mdstat;
+    int unfinished_mdstat_devices = 9999, i;
+    char *screen_message;
+
+    malloc_string(screen_message);
+    mdstat = malloc(sizeof(struct s_mdstat));
+
+    assert(wait_for_percentage <= 100);
+    iamhere("Help, my boat is sync'ing. (Get it? Urp! Urp!)");
+    while (unfinished_mdstat_devices > 0) {
+        if (read_mdstat(mdstat, mdstat_file)) {
+            log_to_screen("Sorry, cannot read %s", mdstat_file);
+            return;
+        }
+        for (unfinished_mdstat_devices = i = 0; i < mdstat->entries; i++) {
+            if (mdstat->el[i].progress < wait_for_percentage) {
+                unfinished_mdstat_devices++;
+                sprintf(screen_message, "Sync'ing /dev/md%d",
+                        mdstat->el[i].md);
+                open_evalcall_form(screen_message);
+                if (mdstat->el[i].progress == -1)   // delayed while another partition inits
+                {
+                    continue;
+                }
+                while (mdstat->el[i].progress < wait_for_percentage) {
+                    update_evalcall_form(mdstat->el[i].progress);
+                    sleep(2);
+                    if (read_mdstat(mdstat, mdstat_file)) {
+                        break;
+                    }
+                }
+                close_evalcall_form();
+            }
+        }
+    }
+    paranoid_free(screen_message);
+    paranoid_free(mdstat);
+}

branches/2.05/mondo/mondo/mondorestore/mondo-rstr-tools.h

@@ -4 +4 @@
 
 void free_global_filenames();
-void get_cfg_file_from_archive_or_bust(struct s_bkpinfo*);
-bool is_file_in_list(char*, char*, char*); /* needle, haystack, preamble */
+void get_cfg_file_from_archive_or_bust(struct s_bkpinfo *);
+bool is_file_in_list(char *, char *, char *);   /* needle, haystack, preamble */
 int iso_fiddly_bits(struct s_bkpinfo *bkpinfo, bool nuke_me_please);
 void kill_petris(void);
-int modify_rclocal_one_time( char *path );
+int modify_rclocal_one_time(char *path);
 int mount_cdrom(struct s_bkpinfo *bkpinfo);
-int mount_device(char*,char*,char*,bool);
-int mount_all_devices(struct mountlist_itself*, bool);
+int mount_device(char *, char *, char *, bool);
+int mount_all_devices(struct mountlist_itself *, bool);
 void protect_against_braindead_sysadmins(void);
-int read_cfg_file_into_bkpinfo( char* cfg_file, struct s_bkpinfo *bkpinfo);
+int read_cfg_file_into_bkpinfo(char *cfg_file, struct s_bkpinfo *bkpinfo);
 struct s_node *process_filelist_and_biggielist(struct s_bkpinfo *);
-int backup_crucial_file(char *path_root, char*filename);
+int backup_crucial_file(char *path_root, char *filename);
 
 int run_boot_loader(bool);
-int run_grub(bool, char*);
+int run_grub(bool, char *);
 int run_lilo(bool);
 int run_elilo(bool);
 int run_raw_mbr(bool offer_to_hack_scripts, char *bd);
 char *find_my_editor(void);
-void streamline_changes_file(char*,char*);
-void  set_signals( int on );
+void streamline_changes_file(char *, char *);
+void set_signals(int on);
 void setup_global_filenames(struct s_bkpinfo *bkpinfo);
 //void setup_signals(int);
 void success_message(void);
 void twenty_seconds_til_yikes(void);
-int run_raw_mbr(bool offer_to_hack_scripts, char*bd);
+int run_raw_mbr(bool offer_to_hack_scripts, char *bd);
 void terminate_daemon(int);
 void termination_in_progress(int);
-int unmount_all_devices(struct mountlist_itself*);
+int unmount_all_devices(struct mountlist_itself *);
 int get_cfg_file_from_archive(struct s_bkpinfo *bkpinfo);
-void ask_about_these_imagedevs( char *infname, char *outfname );
-
+void ask_about_these_imagedevs(char *infname, char *outfname);

branches/2.05/mondo/mondo/mondorestore/mondoprep.h

@@ -5 +5 @@
     copyright            : (C) 2002 by Stan Benoit
     email                : troff@nakedsoul.org
-    cvsid                : $Id: mondoprep.h,v 1.4 2004/06/16 10:38:29 hugo Exp $
+    cvsid                : $Id$
  ***************************************************************************/
 
@@ -23 +23 @@
 extern int g_currentY, g_current_cd_number;
 extern char *g_tape_device;
-extern void finish (int);
-extern void setup_newt_stuff (void);
-extern char which_restore_mode (void);
-extern bool ask_me_yes_or_no (char *);
-extern long get_phys_size_of_drive (char *);
+extern void finish(int);
+extern void setup_newt_stuff(void);
+extern char which_restore_mode(void);
+extern bool ask_me_yes_or_no(char *);
+extern long get_phys_size_of_drive(char *);
 //extern void log_to_screen (char *);
-extern void update_progress_form (char *);
-extern void open_progress_form (char *, char *, char *, char *, long);
-extern void close_progress_form (void);
-extern void popup_and_OK (char *);
-extern bool popup_and_get_string (char *, char *, char *, int);
-extern long get_time (void);
-extern bool is_this_device_mounted (char *);
-extern int does_partition_exist (const char *device, int partno);
-extern int strcmp_inc_numbers (char *, char *);
-extern long count_lines_in_file (char *);
-extern long long length_of_file (char *);
-extern long noof_lines_that_match_wildcard (char *, char *);
+extern void update_progress_form(char *);
+extern void open_progress_form(char *, char *, char *, char *, long);
+extern void close_progress_form(void);
+extern void popup_and_OK(char *);
+extern bool popup_and_get_string(char *, char *, char *, int);
+extern long get_time(void);
+extern bool is_this_device_mounted(char *);
+extern int does_partition_exist(const char *device, int partno);
+extern int strcmp_inc_numbers(char *, char *);
+extern long count_lines_in_file(char *);
+extern long long length_of_file(char *);
+extern long noof_lines_that_match_wildcard(char *, char *);
 //extern char *slice_fname (long, long, bool, char *);
-extern char *last_line_of_file (char *);
-extern void log_file_end_to_screen (char *, char *);
-extern int zero_out_a_device (char *);
-extern void mvaddstr_and_log_it (int, int, char *);
-extern bool does_file_exist (char *);
+extern char *last_line_of_file(char *);
+extern void log_file_end_to_screen(char *, char *);
+extern int zero_out_a_device(char *);
+extern void mvaddstr_and_log_it(int, int, char *);
+extern bool does_file_exist(char *);
 
 
 /** locals **********************************************************/
-int extrapolate_mountlist_to_include_raid_partitions (struct mountlist_itself
-                              *,
-                              struct mountlist_itself
-                              *);
-bool mountlist_contains_raid_devices (struct mountlist_itself *);
-int start_raid_device (char *);
-int stop_raid_device (char *);
-int start_all_raid_devices (struct mountlist_itself *);
-int stop_all_raid_devices (struct mountlist_itself *);
-int format_everything (struct mountlist_itself *, bool);
-int partition_device (FILE*,const char *, int, int, const char *, long long);
-int partition_device_with_parted (FILE*,const char *, int, int, const char *, long long);
-int partition_device_with_fdisk (FILE*,const char *, int, int, const char *, long long);
-int format_device (char *, char *);
-int partition_drive (struct mountlist_itself *, char *);
-int partition_everything (struct mountlist_itself *);
-int do_my_funky_lvm_stuff (bool, bool);
-int which_format_command_do_i_need (char *, char *);
-int make_dummy_partitions (FILE*, char *, int);
-int make_list_of_drives (struct mountlist_itself *,
-             char drivelist[ARBITRARY_MAXIMUM][MAX_STR_LEN]);
-int set_partition_type (FILE*,const char *, int, const char *, long long);
-void resize_drive_proportionately_to_suit_new_drives (struct mountlist_itself
-                              *mountlist,
-                              char *drive_name);
-void resize_mountlist_proportionately_to_suit_new_drives (struct
-                              mountlist_itself
-                              *mountlist);
+int extrapolate_mountlist_to_include_raid_partitions(struct mountlist_itself
+                                                     *, struct mountlist_itself
+                                                     *);
+bool mountlist_contains_raid_devices(struct mountlist_itself *);
+int start_raid_device(char *);
+int stop_raid_device(char *);
+int start_all_raid_devices(struct mountlist_itself *);
+int stop_all_raid_devices(struct mountlist_itself *);
+int format_everything(struct mountlist_itself *, bool);
+int partition_device(FILE *, const char *, int, int, const char *,
+                     long long);
+int partition_device_with_parted(FILE *, const char *, int, int,
+                                 const char *, long long);
+int partition_device_with_fdisk(FILE *, const char *, int, int,
+                                const char *, long long);
+int format_device(char *, char *);
+int partition_drive(struct mountlist_itself *, char *);
+int partition_everything(struct mountlist_itself *);
+int do_my_funky_lvm_stuff(bool, bool);
+int which_format_command_do_i_need(char *, char *);
+int make_dummy_partitions(FILE *, char *, int);
+int make_list_of_drives(struct mountlist_itself *,
+                        char drivelist[ARBITRARY_MAXIMUM][MAX_STR_LEN]);
+int set_partition_type(FILE *, const char *, int, const char *, long long);
+void resize_drive_proportionately_to_suit_new_drives(struct mountlist_itself
+                                                     *mountlist,
+                                                     char *drive_name);
+void resize_mountlist_proportionately_to_suit_new_drives(struct
+                                                         mountlist_itself
+                                                         *mountlist);
 
 
-char *
-truncate_to_drive_name (char *partition);
-void create_mountlist_for_drive(struct mountlist_itself *mountlist, char *drive_name, struct mountlist_reference *drivemntlist);
-
+char *truncate_to_drive_name(char *partition);
+void create_mountlist_for_drive(struct mountlist_itself *mountlist,
+                                char *drive_name,
+                                struct mountlist_reference *drivemntlist);

branches/2.05/mondo/mondo/mondorestore/mr-externs.h

@@ -1 +1 @@
 /*
- * $Id: mr-externs.h,v 1.3 2004/06/10 15:29:13 hugo Exp $
+ * $Id$
  *
  * mondo-restore.c's externs
@@ -6 +6 @@
  */
 
-#define SIZE 730000 * 1024                        /*  Size for ISO's stops -1 */
+#define SIZE 730000 * 1024      /*  Size for ISO's stops -1 */
 #define BIGGIELIST MNT_CDROM"/archives/biggielist.txt"
 #define ARCHIVES_PATH MNT_CDROM"/archives"
@@ -14 +14 @@
 #endif
 
-extern bool ask_me_yes_or_no(char*);
-extern char* calc_checksum_of_file(char*);
-extern int closein_tape(struct s_bkpinfo*);
+extern bool ask_me_yes_or_no(char *);
+extern char *calc_checksum_of_file(char *);
+extern int closein_tape(struct s_bkpinfo *);
 extern void close_evalcall_form(void);
-extern char *call_program_and_get_last_line_of_output(char*);
+extern char *call_program_and_get_last_line_of_output(char *);
 extern void close_progress_form(void);
-extern long count_lines_in_file(char*);
-extern bool does_file_exist(char*);
-extern int does_partition_exist(const char*device, int partno);
+extern long count_lines_in_file(char *);
+extern bool does_file_exist(char *);
+extern int does_partition_exist(const char *device, int partno);
 extern int do_my_funky_lvm_stuff(bool, bool);
 extern int edit_filelist(struct s_node *);
-extern int edit_mountlist(char* mountlist_fname, struct mountlist_itself*, struct raidlist_itself*);
-extern int format_everything(struct mountlist_itself*, bool);
-extern int format_device(char*,char*);
+extern int edit_mountlist(char *mountlist_fname, struct mountlist_itself *,
+                          struct raidlist_itself *);
+extern int format_everything(struct mountlist_itself *, bool);
+extern int format_device(char *, char *);
 extern void finish(int);
-extern void free_filelist(struct s_node*);
+extern void free_filelist(struct s_node *);
 extern long get_time(void);
-extern bool get_isodir_info(char*,char*,char*,bool);
-extern void fatal_error(char*);
-extern void initialize_raid_record(struct raid_device_record*);
-extern bool is_this_device_mounted(char*);
-extern long long length_of_file(char*);
-extern char *last_line_of_file(char*);
-extern struct s_node *load_filelist(char*);
+extern bool get_isodir_info(char *, char *, char *, bool);
+extern void fatal_error(char *);
+extern void initialize_raid_record(struct raid_device_record *);
+extern bool is_this_device_mounted(char *);
+extern long long length_of_file(char *);
+extern char *last_line_of_file(char *);
+extern struct s_node *load_filelist(char *);
 extern void log_tape_pos(void);
-extern void initialize_raidrec(struct raid_device_record*);
-extern void log_file_end_to_screen(char*,char*);
-extern void log_to_screen (const char *fmt, ...);
+extern void initialize_raidrec(struct raid_device_record *);
+extern void log_file_end_to_screen(char *, char *);
+extern void log_to_screen(const char *fmt, ...);
 extern void mvaddstr_and_log_it(int, int, char *);
-extern int make_dummy_partitions(char*,int);
-extern int make_hole_for_file(char*);
-extern int make_list_of_drives(struct mountlist_itself*, struct list_of_disks*);
-extern bool mountlist_contains_raid_devices(struct mountlist_itself*);
-extern void open_evalcall_form(char*);
-extern void open_progress_form(char*,char*,char*,char*,long);
+extern int make_dummy_partitions(char *, int);
+extern int make_hole_for_file(char *);
+extern int make_list_of_drives(struct mountlist_itself *,
+                               struct list_of_disks *);
+extern bool mountlist_contains_raid_devices(struct mountlist_itself *);
+extern void open_evalcall_form(char *);
+extern void open_progress_form(char *, char *, char *, char *, long);
 extern int openin_cdstream(struct s_bkpinfo *);
 extern int openin_tape(struct s_bkpinfo *);
-extern int partition_device(char*,int,int,char*,long);
-extern int partition_device_with_fdisk(char*,int,int,char*,long);
-extern int partition_device_with_parted(char*,int,int,char*,long);
-extern int partition_drive(struct mountlist_itself*, char*);
-extern int partition_everything(struct mountlist_itself*);
-extern void popup_and_OK(char*);
-extern bool popup_and_get_string(char*,char*,char*, int);
+extern int partition_device(char *, int, int, char *, long);
+extern int partition_device_with_fdisk(char *, int, int, char *, long);
+extern int partition_device_with_parted(char *, int, int, char *, long);
+extern int partition_drive(struct mountlist_itself *, char *);
+extern int partition_everything(struct mountlist_itself *);
+extern void popup_and_OK(char *);
+extern bool popup_and_get_string(char *, char *, char *, int);
 extern void setup_newt_stuff(void);
-extern void reset_bkpinfo(struct s_bkpinfo*);
-extern int read_cfg_var(char*, char*, char*);
-extern int read_file_from_stream_to_file(struct s_bkpinfo*, char*, long long);
-extern int read_file_from_stream_to_stream(struct s_bkpinfo*, FILE*, long long);
-extern int read_file_from_stream_FULL(struct s_bkpinfo*, char*, FILE*, long long);
-extern int read_header_block_from_stream(long long *, char*, int *);
-extern void save_filelist(struct s_node*, char*);
-extern void strip_spaces(char*);
-extern int strcmp_inc_numbers(char*,char*);
-extern char *slice_fname(long,long,char*,char*);
-extern int stop_raid_device(char*);
-extern int stop_all_raid_devices(struct mountlist_itself*);
+extern void reset_bkpinfo(struct s_bkpinfo *);
+extern int read_cfg_var(char *, char *, char *);
+extern int read_file_from_stream_to_file(struct s_bkpinfo *, char *,
+                                         long long);
+extern int read_file_from_stream_to_stream(struct s_bkpinfo *, FILE *,
+                                           long long);
+extern int read_file_from_stream_FULL(struct s_bkpinfo *, char *, FILE *,
+                                      long long);
+extern int read_header_block_from_stream(long long *, char *, int *);
+extern void save_filelist(struct s_node *, char *);
+extern void strip_spaces(char *);
+extern int strcmp_inc_numbers(char *, char *);
+extern char *slice_fname(long, long, char *, char *);
+extern int stop_raid_device(char *);
+extern int stop_all_raid_devices(struct mountlist_itself *);
 extern void update_evalcall_form(int);
-extern void update_progress_form(char*);
-extern int verify_tape_backups(struct s_bkpinfo*);
+extern void update_progress_form(char *);
+extern int verify_tape_backups(struct s_bkpinfo *);
 extern char which_restore_mode(void);
-extern int which_format_command_do_i_need(char*,char*);
-extern int write_cfg_var(char*,char*,char*);
-extern void wrong_marker(int,int);
-extern void resize_drive_proportionately_to_suit_new_drives(struct mountlist_itself *mountlist, char*drive_name);
-extern void resize_mountlist_proportionately_to_suit_new_drives(struct mountlist_itself *mountlist);
-extern int get_cfg_file_from_archive(struct s_bkpinfo*);
+extern int which_format_command_do_i_need(char *, char *);
+extern int write_cfg_var(char *, char *, char *);
+extern void wrong_marker(int, int);
+extern void resize_drive_proportionately_to_suit_new_drives(struct
+                                                            mountlist_itself
+                                                            *mountlist,
+                                                            char
+                                                            *drive_name);
+extern void resize_mountlist_proportionately_to_suit_new_drives(struct
+                                                                mountlist_itself
+                                                                *mountlist);
+extern int get_cfg_file_from_archive(struct s_bkpinfo *);
 
 
@@ -87 +98 @@
  * Externals   yummmy!!!                                                  *
  **************************************************************************/
-extern long   g_maximum_progress;
-extern long   g_current_progress;
-extern long   g_start_time;
-extern int    g_currentY;
-extern int    g_current_media_number;  /* set to 1 in mondo-tools.c (tape)*/
+extern long g_maximum_progress;
+extern long g_current_progress;
+extern long g_start_time;
+extern int g_currentY;
+extern int g_current_media_number;  /* set to 1 in mondo-tools.c (tape) */
 extern long long g_tape_posK;
 extern FILE *g_tape_stream;
@@ -97 +108 @@
 extern bool g_text_mode;
 extern bool g_restoring_live_from_cd;
-extern int fput_string_one_char_at_a_time(FILE*, char*);
+extern int fput_string_one_char_at_a_time(FILE *, char *);
 
 
@@ -104 +115 @@
 
 extern int
-evaluate_mountlist (struct mountlist_itself *mountlist, char *flaws_str_A,
-            char *flaws_str_B, char *flaws_str_C);
+evaluate_mountlist(struct mountlist_itself *mountlist, char *flaws_str_A,
+                   char *flaws_str_B, char *flaws_str_C);