Changeset 116 in MondoRescue

Timestamp:

Nov 8, 2005, 11:54:46 PM (18 years ago)

Author:

bcornec

Message:

merge -r103:115 of branch 2.04_berlios (andree patches)

Location:

branches/2.05

Files:

• mindi/rootfs/sbin/init (modified) (1 diff)
• mindi/rootfs/sbin/install-additional-tools (modified) (1 diff)
• mondo/mondo/common/libmondo-files.c (modified) (32 diffs)
• mondo/mondo/mondoarchive/mondo-cli.c (modified) (15 diffs)
• mondo/mondo/mondoarchive/mondoarchive.8 (modified) (4 diffs)
• mondo/mondo/mondorestore/mondorestore.8 (modified) (3 diffs)

branches/2.05/mindi/rootfs/sbin/init

@@ -622 +622 @@
 #    HandleCDROMorFloppies
 #el
-if [ "`cat /tmp/mondo-restore.cfg | grep "tape"`" ] || [ "`cat /tmp/mondo-restore.cfg | grep udev`" ] ; then
+if [ "`cat /tmp/mondo-restore.cfg | grep "tape "`" ] || [ "`cat /tmp/mondo-restore.cfg | grep udev`" ] ; then
     HandleTape
 else

branches/2.05/mindi/rootfs/sbin/install-additional-tools

@@ -111 +111 @@
 # Was disabled in mid-March 2002 (?). Dunno why. Re-enabled July 11th, 2002.
 for path in /sbin /bin /usr/bin /usr/sbin /lib /usr/lib /lib/* /usr/lib/* ; do
-    mkdir -p $path
+    [ ! -e "$path" ] && mkdir -p "$path"
     for i in `ls $mountdir/$path 2> /dev/null` ; do
     rm -f $path/$i 2> /dev/null

branches/2.05/mondo/mondo/common/libmondo-files.c

@@ -1 +1 @@
 /* libmondo-files.c                                  file manipulation
-   $Id: libmondo-files.c,v 1.5 2004/06/10 15:29:12 hugo Exp $
+   $Id$
 .
 
@@ -97 +97 @@
 
 /*@unused@*/
-//static char cvsid[] = "$Id: libmondo-files.c,v 1.5 2004/06/10 15:29:12 hugo Exp $";
+//static char cvsid[] = "$Id$";
 
 extern char err_log_lines[NOOF_ERR_LINES][MAX_STR_LEN];
@@ -114 +114 @@
  * @note The returned string points to static storage that will be overwritten with each call.
  */
-char *
-calc_checksum_of_file (char *filename)
-{
-    /*@ buffers ******************************************************/
-  static char output[MAX_STR_LEN];
-  char command[MAX_STR_LEN*2];
-  char tmp[MAX_STR_LEN];
-
-    /*@ pointers *****************************************************/
-  char *p;
-  FILE *fin;
-
-    /*@ initialize pointers ******************************************/
-
-  p = output;
-
-    /*@***************************************************************/
-
-  assert_string_is_neither_NULL_nor_zerolength(filename);
-  if (does_file_exist (filename))
-    {
-      sprintf (command, "md5sum \"%s\"", filename);
-      fin = popen (command, "r");
-      if (fin)
-    {
-      (void) fgets (output, MAX_STR_LEN, fin);
-      p = strchr (output, ' ');
-      paranoid_pclose (fin);
-    }
-    }
-  else
-    {
-      sprintf (tmp, "File '%s' not found; cannot calc checksum", filename);
-      log_it (tmp);
-    }
-  if (p)
-    {
-      *p = '\0';
-    }
-  return (output);
+char *calc_checksum_of_file(char *filename)
+{
+    /*@ buffers ***************************************************** */
+    static char output[MAX_STR_LEN];
+    char command[MAX_STR_LEN * 2];
+    char tmp[MAX_STR_LEN];
+
+    /*@ pointers **************************************************** */
+    char *p;
+    FILE *fin;
+
+    /*@ initialize pointers ***************************************** */
+
+    p = output;
+
+    /*@************************************************************** */
+
+    assert_string_is_neither_NULL_nor_zerolength(filename);
+    if (does_file_exist(filename)) {
+        sprintf(command, "md5sum \"%s\"", filename);
+        fin = popen(command, "r");
+        if (fin) {
+            (void) fgets(output, MAX_STR_LEN, fin);
+            p = strchr(output, ' ');
+            paranoid_pclose(fin);
+        }
+    } else {
+        sprintf(tmp, "File '%s' not found; cannot calc checksum",
+                filename);
+        log_it(tmp);
+    }
+    if (p) {
+        *p = '\0';
+    }
+    return (output);
 }
 
@@ -164 +159 @@
  * @note The returned string points to static storage that will be overwritten with each call.
  */
-char *
-calc_file_ugly_minichecksum (char *curr_fname)
-{
-
-    /*@ buffers ******************************************************/
-  static char curr_cksum[1000];
-
-    /*@ pointers *****************************************************/
-
-    /*@ structures ***************************************************/
-  struct stat buf;
-
-  /*@ initialize data ****************************************************/
-  curr_cksum[0] = '\0';
-
-    /*@***************************************************************/
-
-  assert_string_is_neither_NULL_nor_zerolength(curr_fname);
-  if (lstat (curr_fname, &buf))
-    {
-      return (curr_cksum); // empty
-    }
-
-  sprintf (curr_cksum, "%ld-%ld-%ld", (long) (buf.st_size),
-       (long) (buf.st_mtime), (long) (buf.st_ctime));
-  return (curr_cksum);
+char *calc_file_ugly_minichecksum(char *curr_fname)
+{
+
+    /*@ buffers ***************************************************** */
+    static char curr_cksum[1000];
+
+    /*@ pointers **************************************************** */
+
+    /*@ structures ************************************************** */
+    struct stat buf;
+
+    /*@ initialize data *************************************************** */
+    curr_cksum[0] = '\0';
+
+    /*@************************************************************** */
+
+    assert_string_is_neither_NULL_nor_zerolength(curr_fname);
+    if (lstat(curr_fname, &buf)) {
+        return (curr_cksum);    // empty
+    }
+
+    sprintf(curr_cksum, "%ld-%ld-%ld", (long) (buf.st_size),
+            (long) (buf.st_mtime), (long) (buf.st_ctime));
+    return (curr_cksum);
 }
 
@@ -200 +193 @@
  * @bug This function uses the shell and "wc -l"; it should probably be rewritten in C.
  */
-long
-count_lines_in_file (char *filename)
-{
-
-    /*@ buffers ******************************************************/
-  char command[MAX_STR_LEN*2];
-  char incoming[MAX_STR_LEN];
-  char tmp[MAX_STR_LEN];
-
-    /*@ long *********************************************************/
-  long noof_lines = -1L;
-
-    /*@ pointers *****************************************************/
-  FILE *fin;
-
-  /*@ initialize [0] to null *********************************************/
-  incoming[0] = '\0';
-
-  assert_string_is_neither_NULL_nor_zerolength(filename);
-  if (!does_file_exist (filename))
-    {
-      sprintf (tmp,
-           "%s does not exist, so I cannot found the number of lines in it",
-           filename);
-      log_it (tmp);
-      return (0);
-    }
-  sprintf (command, "cat %s | wc -l", filename);
-  if (!does_file_exist(filename)) { return(-1); }
-  fin = popen (command, "r");
-  if (fin)
-    {
-      if (feof (fin))
-    {
-      noof_lines = 0;
-    }
-      else
-    {
-      (void) fgets (incoming, MAX_STR_LEN - 1, fin);
-      while (strlen (incoming) > 0
-         && incoming[strlen (incoming) - 1] < 32)
-        {
-          incoming[strlen (incoming) - 1] = '\0';
-        }
-      noof_lines = atol (incoming);
-    }
-      paranoid_pclose (fin);
-    }
-  return (noof_lines);
+long count_lines_in_file(char *filename)
+{
+
+    /*@ buffers ***************************************************** */
+    char command[MAX_STR_LEN * 2];
+    char incoming[MAX_STR_LEN];
+    char tmp[MAX_STR_LEN];
+
+    /*@ long ******************************************************** */
+    long noof_lines = -1L;
+
+    /*@ pointers **************************************************** */
+    FILE *fin;
+
+    /*@ initialize [0] to null ******************************************** */
+    incoming[0] = '\0';
+
+    assert_string_is_neither_NULL_nor_zerolength(filename);
+    if (!does_file_exist(filename)) {
+        sprintf(tmp,
+                "%s does not exist, so I cannot found the number of lines in it",
+                filename);
+        log_it(tmp);
+        return (0);
+    }
+    sprintf(command, "cat %s | wc -l", filename);
+    if (!does_file_exist(filename)) {
+        return (-1);
+    }
+    fin = popen(command, "r");
+    if (fin) {
+        if (feof(fin)) {
+            noof_lines = 0;
+        } else {
+            (void) fgets(incoming, MAX_STR_LEN - 1, fin);
+            while (strlen(incoming) > 0
+                   && incoming[strlen(incoming) - 1] < 32) {
+                incoming[strlen(incoming) - 1] = '\0';
+            }
+            noof_lines = atol(incoming);
+        }
+        paranoid_pclose(fin);
+    }
+    return (noof_lines);
 }
 
@@ -257 +245 @@
  * @return TRUE if it exists, FALSE otherwise.
  */
-bool
-does_file_exist (char *filename)
-{
-
-    /*@ structures ***************************************************/
-  struct stat buf;
-
-    /*@***************************************************************/
-
-  assert(filename!=NULL);
-  //  assert_string_is_neither_NULL_nor_zerolength(filename);
-  if (lstat (filename, &buf))
-    {
-      log_msg(20, "%s does not exist", filename);
-      return (FALSE);
-    }
-  else
-    {
-      log_msg(20, "%s exists", filename);
-      return (TRUE);
-    }
+bool does_file_exist(char *filename)
+{
+
+    /*@ structures ************************************************** */
+    struct stat buf;
+
+    /*@************************************************************** */
+
+    assert(filename != NULL);
+    //  assert_string_is_neither_NULL_nor_zerolength(filename);
+    if (lstat(filename, &buf)) {
+        log_msg(20, "%s does not exist", filename);
+        return (FALSE);
+    } else {
+        log_msg(20, "%s exists", filename);
+        return (TRUE);
+    }
 }
 
@@ -292 +276 @@
  * while the modification is in progress.
  */
-void
-exclude_nonexistent_files (char *inout)
-{
-  char infname[MAX_STR_LEN];
-  char outfname[MAX_STR_LEN];
-  char tmp[MAX_STR_LEN];
-  char incoming[MAX_STR_LEN];
-
-    /*@ int **********************************************************/
-  int i;
-
-    /*@ pointers *****************************************************/
-  FILE *fin, *fout;
-
-
- /*@ end vars ************************************************************/
-
-  assert_string_is_neither_NULL_nor_zerolength(inout);
-  sprintf (infname, "%s.in", inout);
-  sprintf (outfname, "%s", inout);
-  sprintf (tmp, "cp -f %s %s", inout, infname);
-  run_program_and_log_output (tmp, FALSE);
-  if (!(fin = fopen (infname, "r"))) { log_OS_error("Unable to openin infname"); return; }
-  if (!(fout = fopen (outfname, "w"))){log_OS_error("Unable to openout outfname"); return; }
-  for (fgets (incoming, MAX_STR_LEN, fin); !feof (fin);
-       fgets (incoming, MAX_STR_LEN, fin))
-    {
-      i = strlen (incoming) - 1;
-      if (i >= 0 && incoming[i] < 32)
-    {
-      incoming[i] = '\0';
-    }
-      if (does_file_exist (incoming))
-    {
-      fprintf (fout, "%s\n", incoming);
-    }
-      else
-    {
-      sprintf (tmp, "Excluding '%s'-nonexistent\n", incoming);
-      log_it (tmp);
-    }
-    }
-  paranoid_fclose (fout);
-  paranoid_fclose (fin);
-  unlink (infname);
+void exclude_nonexistent_files(char *inout)
+{
+    char infname[MAX_STR_LEN];
+    char outfname[MAX_STR_LEN];
+    char tmp[MAX_STR_LEN];
+    char incoming[MAX_STR_LEN];
+
+    /*@ int ********************************************************* */
+    int i;
+
+    /*@ pointers **************************************************** */
+    FILE *fin, *fout;
+
+
+    /*@ end vars *********************************************************** */
+
+    assert_string_is_neither_NULL_nor_zerolength(inout);
+    sprintf(infname, "%s.in", inout);
+    sprintf(outfname, "%s", inout);
+    sprintf(tmp, "cp -f %s %s", inout, infname);
+    run_program_and_log_output(tmp, FALSE);
+    if (!(fin = fopen(infname, "r"))) {
+        log_OS_error("Unable to openin infname");
+        return;
+    }
+    if (!(fout = fopen(outfname, "w"))) {
+        log_OS_error("Unable to openout outfname");
+        return;
+    }
+    for (fgets(incoming, MAX_STR_LEN, fin); !feof(fin);
+         fgets(incoming, MAX_STR_LEN, fin)) {
+        i = strlen(incoming) - 1;
+        if (i >= 0 && incoming[i] < 32) {
+            incoming[i] = '\0';
+        }
+        if (does_file_exist(incoming)) {
+            fprintf(fout, "%s\n", incoming);
+        } else {
+            sprintf(tmp, "Excluding '%s'-nonexistent\n", incoming);
+            log_it(tmp);
+        }
+    }
+    paranoid_fclose(fout);
+    paranoid_fclose(fin);
+    unlink(infname);
 }
 
@@ -354 +338 @@
  * @return 0 for success, 1 for failure.
  */
-int figure_out_kernel_path_interactively_if_necessary(char*kernel)
-{
-  char tmp[MAX_STR_LEN];
-
-      if (!kernel[0])
-        { strcpy(kernel, call_program_and_get_last_line_of_output("mindi --findkernel 2> /dev/null")); }
-      log_it("Calling Mindi with kernel path of '%s'", kernel);
-      while(!kernel[0])
-        {
-          if (!ask_me_yes_or_no("Kernel not found or invalid. Choose another?"))
-            { return(1); }
-          if (!popup_and_get_string("Kernel path", "What is the full path and filename of your kernel, please?", kernel, MAX_STR_LEN/4))
-            { fatal_error("Kernel not found. Please specify with the '-k' flag."); }
-          sprintf(tmp, "User says kernel is at %s", kernel);
-          log_it(tmp);
-        }
-      return(0);
+int figure_out_kernel_path_interactively_if_necessary(char *kernel)
+{
+    char tmp[MAX_STR_LEN];
+
+    if (!kernel[0]) {
+        strcpy(kernel,
+               call_program_and_get_last_line_of_output
+               ("mindi --findkernel 2> /dev/null"));
+    }
+    log_it("Calling Mindi with kernel path of '%s'", kernel);
+    while (!kernel[0]) {
+        if (!ask_me_yes_or_no
+            ("Kernel not found or invalid. Choose another?")) {
+            return (1);
+        }
+        if (!popup_and_get_string
+            ("Kernel path",
+             "What is the full path and filename of your kernel, please?",
+             kernel, MAX_STR_LEN / 4)) {
+            fatal_error
+                ("Kernel not found. Please specify with the '-k' flag.");
+        }
+        sprintf(tmp, "User says kernel is at %s", kernel);
+        log_it(tmp);
+    }
+    return (0);
 }
 
@@ -387 +380 @@
  * to nothing.
  */
-char *
-find_home_of_exe (char *fname)
-{
-    /*@ buffers **********************/
-  static char output[MAX_STR_LEN];
-  char *incoming;
-  char *command;
-
-  malloc_string(incoming);
-  malloc_string(command);
-  incoming[0] = '\0';
- /*@********************************/
-
-  assert_string_is_neither_NULL_nor_zerolength(fname);
-  sprintf (command, "which %s 2> /dev/null", fname);
-  strcpy (incoming, call_program_and_get_last_line_of_output (command));
-  if (incoming[0] == '\0')
-    {
-      if (system("which file > /dev/null 2> /dev/null"))
+char *find_home_of_exe(char *fname)
+{
+    /*@ buffers ********************* */
+    static char output[MAX_STR_LEN];
+    char *incoming;
+    char *command;
+
+    malloc_string(incoming);
+    malloc_string(command);
+    incoming[0] = '\0';
+    /*@******************************* */
+
+    assert_string_is_neither_NULL_nor_zerolength(fname);
+    sprintf(command, "which %s 2> /dev/null", fname);
+    strcpy(incoming, call_program_and_get_last_line_of_output(command));
+    if (incoming[0] == '\0') {
+        if (system("which file > /dev/null 2> /dev/null")) {
+            paranoid_free(incoming);
+            paranoid_free(command);
+            output[0] = '\0';
+            return (NULL);      // forget it :)
+        }
+        sprintf(command,
+                "file %s 2> /dev/null | cut -d':' -f1 2> /dev/null",
+                incoming);
+        strcpy(incoming,
+               call_program_and_get_last_line_of_output(command));
+    }
+    if (incoming[0] == '\0')    // yes, it is == '\0' twice, not once :)
     {
-      paranoid_free(incoming);
-      paranoid_free(command);
-      output[0] = '\0'; return(NULL); // forget it :)
-    }
-      sprintf (command, "file %s 2> /dev/null | cut -d':' -f1 2> /dev/null", incoming);
-      strcpy (incoming, call_program_and_get_last_line_of_output (command));
-    }
-  if (incoming[0] == '\0') // yes, it is == '\0' twice, not once :)
-    {
-      sprintf (command, "dirname %s 2> /dev/null", incoming);
-      strcpy (incoming, call_program_and_get_last_line_of_output (command));
-    }
-  strcpy (output, incoming);
-  if (output[0] != '\0' && does_file_exist(output))
-    { log_msg(4, "find_home_of_exe () --- Found %s at %s", fname, incoming); }
-  else
-    { output[0]='\0'; log_msg(4, "find_home_of_exe() --- Could not find %s", fname); }
-  paranoid_free(incoming);
-  paranoid_free(command);
-  if (!output[0]) { return(NULL); } else { return (output); }
+        sprintf(command, "dirname %s 2> /dev/null", incoming);
+        strcpy(incoming,
+               call_program_and_get_last_line_of_output(command));
+    }
+    strcpy(output, incoming);
+    if (output[0] != '\0' && does_file_exist(output)) {
+        log_msg(4, "find_home_of_exe () --- Found %s at %s", fname,
+                incoming);
+    } else {
+        output[0] = '\0';
+        log_msg(4, "find_home_of_exe() --- Could not find %s", fname);
+    }
+    paranoid_free(incoming);
+    paranoid_free(command);
+    if (!output[0]) {
+        return (NULL);
+    } else {
+        return (output);
+    }
 }
 
@@ -442 +444 @@
  * @return The number found, or 0 if none.
  */
-int
-get_trackno_from_logfile (char *logfile)
-{
-
-    /*@ pointers **********************************************************/
-  FILE *fin;
-
-    /*@ int ***************************************************************/
-  int trackno   = 0;
-  size_t len    = 0;
-
-    /*@ buffer *************************************************************/
-  char datablock[32701];
-
-  assert_string_is_neither_NULL_nor_zerolength(logfile);
-  if (!(fin = fopen (logfile, "r"))) { log_OS_error("Unable to open logfile"); fatal_error("Unable to open logfile to read trackno"); }
-  len = fread (datablock, 1, 32700, fin);
-  paranoid_fclose (fin);
-  if (len <= 0)
-    {
-      return (0);
-    }
-  for (; len > 0 && !isdigit (datablock[len - 1]); len--);
-  datablock[len--] = '\0';
-  for (; len > 0 && isdigit (datablock[len - 1]); len--);
-  trackno = atoi (datablock + len);
-  /*
-     sprintf(tmp,"datablock=%s; trackno=%d",datablock+len, trackno);
-     log_it(tmp);
-   */
-  return (trackno);
+int get_trackno_from_logfile(char *logfile)
+{
+
+    /*@ pointers ********************************************************* */
+    FILE *fin;
+
+    /*@ int ************************************************************** */
+    int trackno = 0;
+    size_t len = 0;
+
+    /*@ buffer ************************************************************ */
+    char datablock[32701];
+
+    assert_string_is_neither_NULL_nor_zerolength(logfile);
+    if (!(fin = fopen(logfile, "r"))) {
+        log_OS_error("Unable to open logfile");
+        fatal_error("Unable to open logfile to read trackno");
+    }
+    len = fread(datablock, 1, 32700, fin);
+    paranoid_fclose(fin);
+    if (len <= 0) {
+        return (0);
+    }
+    for (; len > 0 && !isdigit(datablock[len - 1]); len--);
+    datablock[len--] = '\0';
+    for (; len > 0 && isdigit(datablock[len - 1]); len--);
+    trackno = atoi(datablock + len);
+    /*
+       sprintf(tmp,"datablock=%s; trackno=%d",datablock+len, trackno);
+       log_it(tmp);
+     */
+    return (trackno);
 }
 
@@ -487 +490 @@
  * @return The percentage found, or 0 for error.
  */
-int
-grab_percentage_from_last_line_of_file (char *filename)
-{
-
-    /*@ buffers ******************************************************/
-  char tmp[MAX_STR_LEN];
-  char lastline[MAX_STR_LEN];
-  char command[MAX_STR_LEN];
-    /*@ pointers *****************************************************/
-  char *p;
-
-    /*@ int's ********************************************************/
-  int i;
-
-  for(i=NOOF_ERR_LINES-1; i>=0 && !strstr(err_log_lines[i], "% Done") && !strstr(err_log_lines[i], "% done"); i--);
-  if (i<0)
-    {
-      sprintf(command, "tail -n3 %s | fgrep -i \"%c\" | tail -n1 | awk '{print $0;}'", filename, '%');
-      strcpy(lastline, call_program_and_get_last_line_of_output(command));
-      if (!lastline[0])
-    {
-      return(0);
-    }
-    }
-  else
-    {
-      strcpy(lastline, err_log_lines[i]);
-    }
-
-  p = strrchr(lastline, '%');
-  if (p) { *p='\0'; }
+int grab_percentage_from_last_line_of_file(char *filename)
+{
+
+    /*@ buffers ***************************************************** */
+    char tmp[MAX_STR_LEN];
+    char lastline[MAX_STR_LEN];
+    char command[MAX_STR_LEN];
+    /*@ pointers **************************************************** */
+    char *p;
+
+    /*@ int's ******************************************************* */
+    int i;
+
+    for (i = NOOF_ERR_LINES - 1;
+         i >= 0 && !strstr(err_log_lines[i], "% Done")
+         && !strstr(err_log_lines[i], "% done"); i--);
+    if (i < 0) {
+        sprintf(command,
+                "tail -n3 %s | fgrep -i \"%c\" | tail -n1 | awk '{print $0;}'",
+                filename, '%');
+        strcpy(lastline,
+               call_program_and_get_last_line_of_output(command));
+        if (!lastline[0]) {
+            return (0);
+        }
+    } else {
+        strcpy(lastline, err_log_lines[i]);
+    }
+
+    p = strrchr(lastline, '%');
+    if (p) {
+        *p = '\0';
+    }
 //  log_msg(2, "lastline='%s', ", p, lastline);
-  if (!p)
-    {
-      return (0);
-    }
-  *p = '\0';
-  for (p --; *p != ' ' && p != lastline; p--);
-  if (p != lastline)
-    {
-      p++;
-    }
-  i = atoi (p);
-
-     sprintf(tmp,"'%s' --> %d",p,i);
+    if (!p) {
+        return (0);
+    }
+    *p = '\0';
+    for (p--; *p != ' ' && p != lastline; p--);
+    if (p != lastline) {
+        p++;
+    }
+    i = atoi(p);
+
+    sprintf(tmp, "'%s' --> %d", p, i);
 //     log_to_screen(tmp);
 
-  return (i);
+    return (i);
 }
 
@@ -547 +550 @@
  * @note The returned string points to static storage that will be overwritten with each call.
  */
-char *
-last_line_of_file (char *filename)
-{
-    /*@ buffers ******************************************************/
-  static char output[MAX_STR_LEN];
-  static char command[MAX_STR_LEN*2];
-  static char tmp[MAX_STR_LEN];
-
-    /*@ pointers *****************************************************/
-  FILE *fin;
-
-    /*@ end vars *****************************************************/
-
-  if (!does_file_exist (filename))
-    {
-      sprintf (tmp, "Tring to get last line of nonexistent file (%s)",
-           filename);
-      log_it (tmp);
-      output[0] = '\0';
-      return (output);
-    }
-  sprintf (command, "cat %s | tail -n1", filename);
-  fin = popen (command, "r");
-  (void) fgets (output, MAX_STR_LEN, fin);
-  paranoid_pclose (fin);
-  while (strlen (output) > 0 && output[strlen (output) - 1] < 32)
-    {
-      output[strlen (output) - 1] = '\0';
-    }
-  return (output);
+char *last_line_of_file(char *filename)
+{
+    /*@ buffers ***************************************************** */
+    static char output[MAX_STR_LEN];
+    static char command[MAX_STR_LEN * 2];
+    static char tmp[MAX_STR_LEN];
+
+    /*@ pointers **************************************************** */
+    FILE *fin;
+
+    /*@ end vars **************************************************** */
+
+    if (!does_file_exist(filename)) {
+        sprintf(tmp, "Tring to get last line of nonexistent file (%s)",
+                filename);
+        log_it(tmp);
+        output[0] = '\0';
+        return (output);
+    }
+    sprintf(command, "cat %s | tail -n1", filename);
+    fin = popen(command, "r");
+    (void) fgets(output, MAX_STR_LEN, fin);
+    paranoid_pclose(fin);
+    while (strlen(output) > 0 && output[strlen(output) - 1] < 32) {
+        output[strlen(output) - 1] = '\0';
+    }
+    return (output);
 }
 
@@ -584 +584 @@
  * @return The length of the file, or -1 for error.
  */
-long long
-length_of_file (char *filename)
-{
-    /*@ pointers ****************************************************/
-  FILE *fin;
-
-    /*@ long long **************************************************/
-  long long length;
-
-  fin = fopen (filename, "r");
-  if (!fin)
-    {
-      log_it("filename=%s", filename);
-      log_OS_error("Unable to openin filename");
-      return (-1);
-    }
-  fseek (fin, 0, SEEK_END);
-  length = ftell (fin);
-  paranoid_fclose (fin);
-  return (length);
+long long length_of_file(char *filename)
+{
+    /*@ pointers *************************************************** */
+    FILE *fin;
+
+    /*@ long long ************************************************* */
+    long long length;
+
+    fin = fopen(filename, "r");
+    if (!fin) {
+        log_it("filename=%s", filename);
+        log_OS_error("Unable to openin filename");
+        return (-1);
+    }
+    fseek(fin, 0, SEEK_END);
+    length = ftell(fin);
+    paranoid_fclose(fin);
+    return (length);
 }
 
@@ -613 +611 @@
  */
 int
-make_checksum_list_file (char *filelist, char *cksumlist, char *comppath)
-{
-    /*@ pointers *****************************************************/
-  FILE *fin;
-  FILE *fout;
-
-    /*@ int   ********************************************************/
-  int percentage;
-  int i;
-  int counter = 0;
-
-    /*@ buffer *******************************************************/
-  char stub_fname[1000];
-  char curr_fname[1000];
-  char curr_cksum[1000];
-  char tmp[1000];
-
-        /*@ long [long] **************************************************/
-  long long filelist_length;
-  long curr_pos;
-  long start_time;
-  long current_time;
-  long time_taken;
-  long time_remaining;
-
-    /*@ end vars ****************************************************/
-
-  start_time = get_time ();
-  filelist_length = length_of_file (filelist);
-  sprintf (tmp, "filelist = %s; cksumlist = %s", filelist, cksumlist);
-  log_it (tmp);
-  fin = fopen (filelist, "r");
-  if (fin == NULL)
-    {
-      log_OS_error ("Unable to fopen-in filelist");
-      log_to_screen ("Can't open filelist");
-      return (1);
-    }
-  fout = fopen (cksumlist, "w");
-  if (fout == NULL)
-    {
-      log_OS_error ("Unable to openout cksumlist");
-      paranoid_fclose (fin);
-      log_to_screen ("Can't open checksum list");
-      return (1);
-    }
-  for (fgets (stub_fname, 999, fin); !feof (fin);
-       fgets (stub_fname, 999, fin))
-    {
-      if (stub_fname[(i = strlen (stub_fname) - 1)] < 32)
-    {
-      stub_fname[i] = '\0';
-    }
-      sprintf (tmp, "%s%s", comppath, stub_fname);
-      strcpy (curr_fname, tmp + 1);
-      strcpy (curr_cksum, calc_file_ugly_minichecksum (curr_fname));
-      fprintf (fout, "%s\t%s\n", curr_fname, curr_cksum);
-      if (counter++ > 12)
-    {
-      current_time = get_time ();
-      counter = 0;
-      curr_fname[37] = '\0';
-      curr_pos = ftell (fin) / 1024;
-      percentage = (int) (curr_pos * 100 / filelist_length);
-      time_taken = current_time - start_time;
-      if (percentage == 0)
-        {
-          /*              printf("%0d%% done      \r",percentage); */
-        }
-      else
-        {
-          time_remaining =
-        time_taken * 100 / (long) (percentage) - time_taken;
-          sprintf (tmp,
-               "%02d%% done   %02d:%02d taken   %02d:%02d remaining  %-37s\r",
-               percentage, (int) (time_taken / 60),
-               (int) (time_taken % 60), (int) (time_remaining / 60),
-               (int) (time_remaining % 60), curr_fname);
-          log_to_screen (tmp);
-        }
-      sync ();
-    }
-    }
-  paranoid_fclose (fout);
-  paranoid_fclose (fin);
-  log_it ("Done.");
-  return (0);
+make_checksum_list_file(char *filelist, char *cksumlist, char *comppath)
+{
+    /*@ pointers **************************************************** */
+    FILE *fin;
+    FILE *fout;
+
+    /*@ int   ******************************************************* */
+    int percentage;
+    int i;
+    int counter = 0;
+
+    /*@ buffer ****************************************************** */
+    char stub_fname[1000];
+    char curr_fname[1000];
+    char curr_cksum[1000];
+    char tmp[1000];
+
+    /*@ long [long] ************************************************* */
+    long long filelist_length;
+    long curr_pos;
+    long start_time;
+    long current_time;
+    long time_taken;
+    long time_remaining;
+
+    /*@ end vars *************************************************** */
+
+    start_time = get_time();
+    filelist_length = length_of_file(filelist);
+    sprintf(tmp, "filelist = %s; cksumlist = %s", filelist, cksumlist);
+    log_it(tmp);
+    fin = fopen(filelist, "r");
+    if (fin == NULL) {
+        log_OS_error("Unable to fopen-in filelist");
+        log_to_screen("Can't open filelist");
+        return (1);
+    }
+    fout = fopen(cksumlist, "w");
+    if (fout == NULL) {
+        log_OS_error("Unable to openout cksumlist");
+        paranoid_fclose(fin);
+        log_to_screen("Can't open checksum list");
+        return (1);
+    }
+    for (fgets(stub_fname, 999, fin); !feof(fin);
+         fgets(stub_fname, 999, fin)) {
+        if (stub_fname[(i = strlen(stub_fname) - 1)] < 32) {
+            stub_fname[i] = '\0';
+        }
+        sprintf(tmp, "%s%s", comppath, stub_fname);
+        strcpy(curr_fname, tmp + 1);
+        strcpy(curr_cksum, calc_file_ugly_minichecksum(curr_fname));
+        fprintf(fout, "%s\t%s\n", curr_fname, curr_cksum);
+        if (counter++ > 12) {
+            current_time = get_time();
+            counter = 0;
+            curr_fname[37] = '\0';
+            curr_pos = ftell(fin) / 1024;
+            percentage = (int) (curr_pos * 100 / filelist_length);
+            time_taken = current_time - start_time;
+            if (percentage == 0) {
+                /*              printf("%0d%% done      \r",percentage); */
+            } else {
+                time_remaining =
+                    time_taken * 100 / (long) (percentage) - time_taken;
+                sprintf(tmp,
+                        "%02d%% done   %02d:%02d taken   %02d:%02d remaining  %-37s\r",
+                        percentage, (int) (time_taken / 60),
+                        (int) (time_taken % 60),
+                        (int) (time_remaining / 60),
+                        (int) (time_remaining % 60), curr_fname);
+                log_to_screen(tmp);
+            }
+            sync();
+        }
+    }
+    paranoid_fclose(fout);
+    paranoid_fclose(fin);
+    log_it("Done.");
+    return (0);
 }
 
@@ -708 +699 @@
  * @return The return value of @c mkdir.
  */
-int make_hole_for_dir (char*outdir_fname)
-{
-  char tmp[MAX_STR_LEN*2];
-  int res=0;
-
-  assert_string_is_neither_NULL_nor_zerolength(outdir_fname);
-  sprintf(tmp, "mkdir -p %s", outdir_fname);
-  res = system(tmp);
-  return(res);
+int make_hole_for_dir(char *outdir_fname)
+{
+    char tmp[MAX_STR_LEN * 2];
+    int res = 0;
+
+    assert_string_is_neither_NULL_nor_zerolength(outdir_fname);
+    sprintf(tmp, "mkdir -p %s", outdir_fname);
+    res = system(tmp);
+    return (res);
 }
 
@@ -726 +717 @@
  * @bug Return value unnecessary.
  */
-int
-make_hole_for_file (char *outfile_fname)
-{
-    /*@ buffer *******************************************************/
-  char command[MAX_STR_LEN*2];
-
-    /*@ int  *********************************************************/
-  int res = 0;
-
-    /*@ end vars ****************************************************/
-
-  assert_string_is_neither_NULL_nor_zerolength(outfile_fname);
-  assert(!strstr(outfile_fname, MNT_CDROM));
-  assert(!strstr(outfile_fname, "/dev/cdrom"));
-  sprintf (command, "mkdir -p \"%s\" 2> /dev/null", outfile_fname);
-  res += system (command);
-  sprintf (command, "rmdir \"%s\" 2> /dev/null", outfile_fname);
-  res += system (command);
-      sprintf (command, "rm -f \"%s\" 2> /dev/null", outfile_fname);
-  res += system (command);
-  unlink (outfile_fname);
-  return (0);
+int make_hole_for_file(char *outfile_fname)
+{
+    /*@ buffer ****************************************************** */
+    char command[MAX_STR_LEN * 2];
+
+    /*@ int  ******************************************************** */
+    int res = 0;
+
+    /*@ end vars *************************************************** */
+
+    assert_string_is_neither_NULL_nor_zerolength(outfile_fname);
+    assert(!strstr(outfile_fname, MNT_CDROM));
+    assert(!strstr(outfile_fname, "/dev/cdrom"));
+    sprintf(command, "mkdir -p \"%s\" 2> /dev/null", outfile_fname);
+    res += system(command);
+    sprintf(command, "rmdir \"%s\" 2> /dev/null", outfile_fname);
+    res += system(command);
+    sprintf(command, "rm -f \"%s\" 2> /dev/null", outfile_fname);
+    res += system(command);
+    unlink(outfile_fname);
+    return (0);
 }
 
@@ -759 +749 @@
  * @return The number of lines matched.
  */
-long
-noof_lines_that_match_wildcard (char *filelist_fname, char *wildcard)
-{
-    /*@ long ********************************************************/
-  long matches = 0;
-
-    /*@ pointers ****************************************************/
-  FILE *fin;
-
-    /*@ buffers *****************************************************/
-  char incoming[MAX_STR_LEN];
-
-    /*@ end vars ****************************************************/
-
-
-  fin = fopen (filelist_fname, "r");
-
-  if (!fin)
-    {
-      log_OS_error("Unable to openin filelist_fname");
-      return (0);
-    }
-  (void) fgets (incoming, MAX_STR_LEN - 1, fin);
-  while (!feof (fin))
-    {
-      if (strstr (incoming, wildcard))
-    {
-      matches++;
-    }
-      (void) fgets (incoming, MAX_STR_LEN - 1, fin);
-    }
-  paranoid_fclose (fin);
-  return (matches);
+long noof_lines_that_match_wildcard(char *filelist_fname, char *wildcard)
+{
+    /*@ long ******************************************************* */
+    long matches = 0;
+
+    /*@ pointers *************************************************** */
+    FILE *fin;
+
+    /*@ buffers **************************************************** */
+    char incoming[MAX_STR_LEN];
+
+    /*@ end vars *************************************************** */
+
+
+    fin = fopen(filelist_fname, "r");
+
+    if (!fin) {
+        log_OS_error("Unable to openin filelist_fname");
+        return (0);
+    }
+    (void) fgets(incoming, MAX_STR_LEN - 1, fin);
+    while (!feof(fin)) {
+        if (strstr(incoming, wildcard)) {
+            matches++;
+        }
+        (void) fgets(incoming, MAX_STR_LEN - 1, fin);
+    }
+    paranoid_fclose(fin);
+    return (matches);
 }
 
@@ -804 +790 @@
  * @note This function does not provide support against multiple instances, unless you check for that yourself.
  */
-void register_pid(pid_t pid, char*name_str)
-{
-  char tmp[MAX_STR_LEN+1], lockfile_fname[MAX_STR_LEN+1];
-  int res;
-  FILE*fin;
-
-  sprintf(lockfile_fname, "/var/run/monitas-%s.pid", name_str);
-  if (!pid)
-    {
-      log_it("Unregistering PID");
-      if (unlink(lockfile_fname)) { log_it( "Error unregistering PID"); }
-      return;
-    }
-  if (does_file_exist(lockfile_fname))
-    {
-      tmp[0]='\0';
-      if ((fin=fopen(lockfile_fname,"r"))) { (void) fgets(tmp, MAX_STR_LEN, fin); paranoid_fclose(fin); }
-      else { log_OS_error("Unable to openin lockfile_fname"); }
-      pid = (pid_t) atol(tmp);
-      sprintf(tmp, "ps %ld > /dev/null 2> /dev/null", (long int)pid);
-      res = system(tmp);
-      if (!res)
-        {
-          log_it ("I believe the daemon is already running. If it isn't, please delete %s and try again.", lockfile_fname);
-        }
-    }
-  sprintf(tmp, "echo %ld > %s 2> /dev/null", (long int)getpid(), lockfile_fname);
-  if (system(tmp)) { fatal_error( "Cannot register PID"); }
+void register_pid(pid_t pid, char *name_str)
+{
+    char tmp[MAX_STR_LEN + 1], lockfile_fname[MAX_STR_LEN + 1];
+    int res;
+    FILE *fin;
+
+    sprintf(lockfile_fname, "/var/run/monitas-%s.pid", name_str);
+    if (!pid) {
+        log_it("Unregistering PID");
+        if (unlink(lockfile_fname)) {
+            log_it("Error unregistering PID");
+        }
+        return;
+    }
+    if (does_file_exist(lockfile_fname)) {
+        tmp[0] = '\0';
+        if ((fin = fopen(lockfile_fname, "r"))) {
+            (void) fgets(tmp, MAX_STR_LEN, fin);
+            paranoid_fclose(fin);
+        } else {
+            log_OS_error("Unable to openin lockfile_fname");
+        }
+        pid = (pid_t) atol(tmp);
+        sprintf(tmp, "ps %ld > /dev/null 2> /dev/null", (long int) pid);
+        res = system(tmp);
+        if (!res) {
+            log_it
+                ("I believe the daemon is already running. If it isn't, please delete %s and try again.",
+                 lockfile_fname);
+        }
+    }
+    sprintf(tmp, "echo %ld > %s 2> /dev/null", (long int) getpid(),
+            lockfile_fname);
+    if (system(tmp)) {
+        fatal_error("Cannot register PID");
+    }
 }
 
@@ -842 +836 @@
  * @return The size of the partition in KB.
  */
-long size_of_partition_in_mountlist_K(char*tmpdir, char*dev)
-{
-    char command[MAX_STR_LEN];
-    char mountlist[MAX_STR_LEN];
-    char sz_res[MAX_STR_LEN];
-    long file_len_K;
-            
-    sprintf(mountlist, "%s/mountlist.txt", tmpdir);
-    sprintf (command,
-       "cat %s/mountlist.txt | grep \"%s \" | head -n1 | awk '{print $4;}'",
-      tmpdir, dev);
-    log_it (command);
-    strcpy (sz_res, call_program_and_get_last_line_of_output (command));
-    file_len_K = atol (sz_res);
-    log_msg(4, "%s --> %s --> %ld", command, sz_res, file_len_K);
-    return(file_len_K);
+long size_of_partition_in_mountlist_K(char *tmpdir, char *dev)
+{
+    char command[MAX_STR_LEN];
+    char mountlist[MAX_STR_LEN];
+    char sz_res[MAX_STR_LEN];
+    long file_len_K;
+
+    sprintf(mountlist, "%s/mountlist.txt", tmpdir);
+    sprintf(command,
+            "cat %s/mountlist.txt | grep \"%s \" | head -n1 | awk '{print $4;}'",
+            tmpdir, dev);
+    log_it(command);
+    strcpy(sz_res, call_program_and_get_last_line_of_output(command));
+    file_len_K = atol(sz_res);
+    log_msg(4, "%s --> %s --> %ld", command, sz_res, file_len_K);
+    return (file_len_K);
 }
 
@@ -865 +859 @@
  * @return The total size of all biggiefiles in KB.
  */
-long
-size_of_all_biggiefiles_K (struct s_bkpinfo *bkpinfo)
-{
-    /*@ buffers ******************************************************/
-  char *fname;
-  char *biggielist;
-  char *comment;
-
-    /*@ long *********************************************************/
-  long scratchL = 0;
-  long file_len_K;
-
-    /*@ pointers ****************************************************/
-  FILE *fin=NULL;
-
-    /*@ end vars ****************************************************/
-
-  malloc_string(fname);
-  malloc_string(biggielist);
-  malloc_string(comment);
-  log_it ("Calculating size of all biggiefiles (in total)");
-  sprintf (biggielist, "%s/biggielist.txt", bkpinfo->tmpdir);
-  log_it("biggielist = %s", biggielist);
-  if (!(fin = fopen (biggielist, "r")))
-    {
-      log_OS_error
-    ("Cannot open biggielist. OK, so estimate is based on filesets only.");
-    }
-  else
-    {
-      log_msg(4, "Reading it...");
-      for (fgets (fname, MAX_STR_LEN, fin); !feof (fin);
-       fgets (fname, MAX_STR_LEN, fin))
-    {
-      if (fname[strlen(fname)-1]<=32) { fname[strlen(fname)-1]='\0'; }
-      if (0 == strncmp (fname, "/dev/", 5))
-        {
-          file_len_K = get_phys_size_of_drive(fname)*1024L;
-        }
-      else
-        {
-          file_len_K = (long) (length_of_file (fname) / 1024);
-        }
-          if (file_len_K > 0)
-        {
-          scratchL += file_len_K;
-          log_msg(4, "%s --> %ld K", fname, file_len_K);
-        }
-      sprintf (comment, "After adding %s, scratchL+%ld now equals %ld",
-           fname, file_len_K, scratchL);
-      log_msg(4, comment);
-          if (feof(fin)) { break; }
-    }
-    }
-  log_it ("Closing...");
-  paranoid_fclose (fin);
-  log_it ("Finished calculating total size of all biggiefiles");
-  paranoid_free(fname);
-  paranoid_free(biggielist);
-  paranoid_free(comment);
-  return (scratchL);
+long size_of_all_biggiefiles_K(struct s_bkpinfo *bkpinfo)
+{
+    /*@ buffers ***************************************************** */
+    char *fname;
+    char *biggielist;
+    char *comment;
+
+    /*@ long ******************************************************** */
+    long scratchL = 0;
+    long file_len_K;
+
+    /*@ pointers *************************************************** */
+    FILE *fin = NULL;
+
+    /*@ end vars *************************************************** */
+
+    malloc_string(fname);
+    malloc_string(biggielist);
+    malloc_string(comment);
+    log_it("Calculating size of all biggiefiles (in total)");
+    sprintf(biggielist, "%s/biggielist.txt", bkpinfo->tmpdir);
+    log_it("biggielist = %s", biggielist);
+    if (!(fin = fopen(biggielist, "r"))) {
+        log_OS_error
+            ("Cannot open biggielist. OK, so estimate is based on filesets only.");
+    } else {
+        log_msg(4, "Reading it...");
+        for (fgets(fname, MAX_STR_LEN, fin); !feof(fin);
+             fgets(fname, MAX_STR_LEN, fin)) {
+            if (fname[strlen(fname) - 1] <= 32) {
+                fname[strlen(fname) - 1] = '\0';
+            }
+            if (0 == strncmp(fname, "/dev/", 5)) {
+                file_len_K = get_phys_size_of_drive(fname) * 1024L;
+            } else {
+                file_len_K = (long) (length_of_file(fname) / 1024);
+            }
+            if (file_len_K > 0) {
+                scratchL += file_len_K;
+                log_msg(4, "%s --> %ld K", fname, file_len_K);
+            }
+            sprintf(comment,
+                    "After adding %s, scratchL+%ld now equals %ld", fname,
+                    file_len_K, scratchL);
+            log_msg(4, comment);
+            if (feof(fin)) {
+                break;
+            }
+        }
+    }
+    log_it("Closing...");
+    paranoid_fclose(fin);
+    log_it("Finished calculating total size of all biggiefiles");
+    paranoid_free(fname);
+    paranoid_free(biggielist);
+    paranoid_free(comment);
+    return (scratchL);
 }
 
@@ -934 +924 @@
  * @return The amount of space occupied in KB.
  */
-long long
-space_occupied_by_cd (char *mountpt)
-{
-    /*@ buffer *******************************************************/
-  char tmp[MAX_STR_LEN];
-  char command[MAX_STR_LEN*2];
-  long long llres;
-    /*@ pointers *****************************************************/
-  char *p;
-  FILE *fin;
-
-    /*@ end vars ****************************************************/
-
-  sprintf (command, "du -sk %s", mountpt);
-  fin = popen (command, "r");
-  (void) fgets (tmp, MAX_STR_LEN, fin);
-  paranoid_pclose (fin);
-  p = strchr (tmp, '\t');
-  if (p)
-    {
-      *p = '\0';
-    }
-  for(p=tmp,llres=0; *p!='\0'; p++)
-    {
-      llres*=10;
-      llres+=(int)(*p - '0');
-    }
-  return (llres);
+long long space_occupied_by_cd(char *mountpt)
+{
+    /*@ buffer ****************************************************** */
+    char tmp[MAX_STR_LEN];
+    char command[MAX_STR_LEN * 2];
+    long long llres;
+    /*@ pointers **************************************************** */
+    char *p;
+    FILE *fin;
+
+    /*@ end vars *************************************************** */
+
+    sprintf(command, "du -sk %s", mountpt);
+    fin = popen(command, "r");
+    (void) fgets(tmp, MAX_STR_LEN, fin);
+    paranoid_pclose(fin);
+    p = strchr(tmp, '\t');
+    if (p) {
+        *p = '\0';
+    }
+    for (p = tmp, llres = 0; *p != '\0'; p++) {
+        llres *= 10;
+        llres += (int) (*p - '0');
+    }
+    return (llres);
 }
 
@@ -972 +959 @@
  * @ingroup utilityGroup
  */
-unsigned int
-updcrc (unsigned int crc, unsigned int c)
-{
-  unsigned int tmp;
-  tmp = (crc >> 8) ^ c;
-  crc = (crc << 8) ^ crctttab[tmp & 255];
-  return crc;
+unsigned int updcrc(unsigned int crc, unsigned int c)
+{
+    unsigned int tmp;
+    tmp = (crc >> 8) ^ c;
+    crc = (crc << 8) ^ crctttab[tmp & 255];
+    return crc;
 }
 
@@ -988 +974 @@
  * @ingroup utilityGroup
  */
-unsigned int
-updcrcr (unsigned int crc, unsigned int c)
-{
-  unsigned int tmp;
-  tmp = crc ^ c;
-  crc = (crc >> 8) ^ crc16tab[tmp & 0xff];
-  return crc;
+unsigned int updcrcr(unsigned int crc, unsigned int c)
+{
+    unsigned int tmp;
+    tmp = crc ^ c;
+    crc = (crc >> 8) ^ crc16tab[tmp & 0xff];
+    return crc;
 }
 
@@ -1006 +991 @@
  * @return 0 if it's found, nonzero if not.
  */
-int
-whine_if_not_found (char *fname)
-{
-    /*@ buffers ****/
-  char command[MAX_STR_LEN*2];
-  char errorstr[MAX_STR_LEN];
-
-
-  sprintf (command, "which %s > /dev/null 2> /dev/null", fname);
-  sprintf (errorstr, "Please install '%s'. I cannot find it on your system.",
-       fname);
-  if (system (command))
-    {
-      log_to_screen (errorstr);
-      log_to_screen
-    ("There may be hyperlink at http://www.mondorescue.com which");
-      log_to_screen ("will take you to the relevant (missing) package.");
-      return (1);
-    }
-  else
-    {
-      return (0);
-    }
+int whine_if_not_found(char *fname)
+{
+    /*@ buffers *** */
+    char command[MAX_STR_LEN * 2];
+    char errorstr[MAX_STR_LEN];
+
+
+    sprintf(command, "which %s > /dev/null 2> /dev/null", fname);
+    sprintf(errorstr,
+            "Please install '%s'. I cannot find it on your system.",
+            fname);
+    if (system(command)) {
+        log_to_screen(errorstr);
+        log_to_screen
+            ("There may be hyperlink at http://www.mondorescue.com which");
+        log_to_screen("will take you to the relevant (missing) package.");
+        return (1);
+    } else {
+        return (0);
+    }
 }
 
@@ -1043 +1025 @@
  * @return 0 for success, 1 for failure.
  */
-int
-write_one_liner_data_file (char *fname, char *contents)
-{
-    /*@ pointers ****************************************************/
-  FILE *fout;
-  int res=0;
-
-    /*@ end vars ****************************************************/
-
-  assert_string_is_neither_NULL_nor_zerolength(fname);
-  if (!contents) { log_it("%d: Warning - writing NULL to %s", __LINE__, fname); }
-  if (!(fout = fopen (fname, "w")))
-    {
-      log_it("fname=%s");
-      log_OS_error("Unable to openout fname");
-      return (1);
-    }
-  fprintf (fout, "%s\n", contents);
-  paranoid_fclose (fout);
-  return (res);
+int write_one_liner_data_file(char *fname, char *contents)
+{
+    /*@ pointers *************************************************** */
+    FILE *fout;
+    int res = 0;
+
+    /*@ end vars *************************************************** */
+
+    assert_string_is_neither_NULL_nor_zerolength(fname);
+    if (!contents) {
+        log_it("%d: Warning - writing NULL to %s", __LINE__, fname);
+    }
+    if (!(fout = fopen(fname, "w"))) {
+        log_it("fname=%s");
+        log_OS_error("Unable to openout fname");
+        return (1);
+    }
+    fprintf(fout, "%s\n", contents);
+    paranoid_fclose(fout);
+    return (res);
 }
 
@@ -1073 +1055 @@
  * @return 0 for success, nonzero for failure.
  */
-int
-read_one_liner_data_file (char *fname, char *contents)
-{
-    /*@ pointers ****************************************************/
-  FILE *fin;
-  int res=0;
-  int i;
-
-    /*@ end vars ****************************************************/
-
-  assert_string_is_neither_NULL_nor_zerolength(fname);
-  if (!contents) { log_it("%d: Warning - reading NULL from %s", __LINE__, fname); }
-  if (!(fin = fopen (fname, "r")))
-    {
-      log_it("fname=%s", fname);
-      log_OS_error("Unable to openin fname");
-      return (1);
-    }
-  fscanf (fin, "%s\n", contents);
-  i = strlen(contents);
-  if (i>0 && contents[i-1] < 32) { contents[i-1] = '\0'; }
-  paranoid_fclose (fin);
-  return (res);
+int read_one_liner_data_file(char *fname, char *contents)
+{
+    /*@ pointers *************************************************** */
+    FILE *fin;
+    int res = 0;
+    int i;
+
+    /*@ end vars *************************************************** */
+
+    assert_string_is_neither_NULL_nor_zerolength(fname);
+    if (!contents) {
+        log_it("%d: Warning - reading NULL from %s", __LINE__, fname);
+    }
+    if (!(fin = fopen(fname, "r"))) {
+        log_it("fname=%s", fname);
+        log_OS_error("Unable to openin fname");
+        return (1);
+    }
+    fscanf(fin, "%s\n", contents);
+    i = strlen(contents);
+    if (i > 0 && contents[i - 1] < 32) {
+        contents[i - 1] = '\0';
+    }
+    paranoid_fclose(fin);
+    return (res);
 }
 
@@ -1116 +1100 @@
  * - @c bkpinfo->tmpdir
  */
-void
-copy_mondo_and_mindi_stuff_to_scratchdir (struct s_bkpinfo *bkpinfo)
-{
-    /*@ Char buffers ***/
-  char command[MAX_STR_LEN*2];
-  char tmp[MAX_STR_LEN];
-  char old_pwd[MAX_STR_LEN];
-
-  mvaddstr_and_log_it (g_currentY, 0,
-               "Copying Mondo's core files to the scratch directory");
-
-  log_msg(4, "g_mondo_home='%s'", g_mondo_home);
-  if (strlen(g_mondo_home)<2)
-    { find_and_store_mondoarchives_home(g_mondo_home); }
-  sprintf (command, CP_BIN " --parents -pRdf %s %s", g_mondo_home,
-       bkpinfo->scratchdir);
-
-  log_msg(4, "command = %s", command);
-  if (run_program_and_log_output (command, 1))
-    {
-      fatal_error ("Failed to copy Mondo's stuff to scratchdir");
-    }
-
-  sprintf(tmp, "%s/payload.tgz", g_mondo_home);
-  if (does_file_exist(tmp))
-    {
-      log_it("Untarring payload %s to scratchdir %s", tmp, bkpinfo->scratchdir);
-      (void) getcwd (old_pwd, MAX_STR_LEN -1);
-      chdir (bkpinfo->scratchdir);
-      sprintf(command, "tar -zxvf %s", tmp);
-      if (run_program_and_log_output(command, FALSE))
-        { fatal_error ("Failed to untar payload"); }
-      chdir (old_pwd);
-    }
-
-  sprintf (command, "cp -f %s/LAST-FILELIST-NUMBER %s", bkpinfo->tmpdir,
-       bkpinfo->scratchdir);
-
-  if (run_program_and_log_output (command, FALSE))
-    {
-      fatal_error ("Failed to copy LAST-FILELIST-NUMBER to scratchdir");
-    }
-
-  strcpy (tmp,
-      call_program_and_get_last_line_of_output ("which mondorestore"));
-  if (!tmp[0]) { fatal_error("'which mondorestore' returned null. Where's your mondorestore? `which` can't find it. That's odd. Did you install mondorestore?"); }
-  sprintf (command, "cp -f %s %s", tmp, bkpinfo->tmpdir);
-  if (run_program_and_log_output (command, FALSE))
-    {
-      fatal_error ("Failed to copy mondorestore to tmpdir");
-    }
-
-  sprintf (command, "hostname > %s/HOSTNAME", bkpinfo->scratchdir);
-  paranoid_system (command);
-
-  if (bkpinfo->postnuke_tarball[0])
-    {
-      sprintf (command, "cp -f %s %s/post-nuke.tgz", bkpinfo->postnuke_tarball, bkpinfo->tmpdir);
-      if (run_program_and_log_output (command, FALSE))
-        { fatal_error("Unable to copy post-nuke tarball to tmpdir"); }
-    }
-
-
-  mvaddstr_and_log_it (g_currentY++, 74, "Done.");
+void copy_mondo_and_mindi_stuff_to_scratchdir(struct s_bkpinfo *bkpinfo)
+{
+    /*@ Char buffers ** */
+    char command[MAX_STR_LEN * 2];
+    char tmp[MAX_STR_LEN];
+    char old_pwd[MAX_STR_LEN];
+
+    mvaddstr_and_log_it(g_currentY, 0,
+                        "Copying Mondo's core files to the scratch directory");
+
+    log_msg(4, "g_mondo_home='%s'", g_mondo_home);
+    if (strlen(g_mondo_home) < 2) {
+        find_and_store_mondoarchives_home(g_mondo_home);
+    }
+    sprintf(command, CP_BIN " --parents -pRdf %s %s", g_mondo_home,
+            bkpinfo->scratchdir);
+
+    log_msg(4, "command = %s", command);
+    if (run_program_and_log_output(command, 1)) {
+        fatal_error("Failed to copy Mondo's stuff to scratchdir");
+    }
+
+    sprintf(tmp, "%s/payload.tgz", g_mondo_home);
+    if (does_file_exist(tmp)) {
+        log_it("Untarring payload %s to scratchdir %s", tmp,
+               bkpinfo->scratchdir);
+        (void) getcwd(old_pwd, MAX_STR_LEN - 1);
+        chdir(bkpinfo->scratchdir);
+        sprintf(command, "tar -zxvf %s", tmp);
+        if (run_program_and_log_output(command, FALSE)) {
+            fatal_error("Failed to untar payload");
+        }
+        chdir(old_pwd);
+    }
+
+    sprintf(command, "cp -f %s/LAST-FILELIST-NUMBER %s", bkpinfo->tmpdir,
+            bkpinfo->scratchdir);
+
+    if (run_program_and_log_output(command, FALSE)) {
+        fatal_error("Failed to copy LAST-FILELIST-NUMBER to scratchdir");
+    }
+
+    strcpy(tmp,
+           call_program_and_get_last_line_of_output("which mondorestore"));
+    if (!tmp[0]) {
+        fatal_error
+            ("'which mondorestore' returned null. Where's your mondorestore? `which` can't find it. That's odd. Did you install mondorestore?");
+    }
+    sprintf(command, "cp -f %s %s", tmp, bkpinfo->tmpdir);
+    if (run_program_and_log_output(command, FALSE)) {
+        fatal_error("Failed to copy mondorestore to tmpdir");
+    }
+
+    sprintf(command, "hostname > %s/HOSTNAME", bkpinfo->scratchdir);
+    paranoid_system(command);
+
+    if (bkpinfo->postnuke_tarball[0]) {
+        sprintf(command, "cp -f %s %s/post-nuke.tgz",
+                bkpinfo->postnuke_tarball, bkpinfo->tmpdir);
+        if (run_program_and_log_output(command, FALSE)) {
+            fatal_error("Unable to copy post-nuke tarball to tmpdir");
+        }
+    }
+
+
+    mvaddstr_and_log_it(g_currentY++, 74, "Done.");
 }
 
@@ -1194 +1180 @@
  * - @c tmpdir
  */
-void
-store_nfs_config (struct s_bkpinfo *bkpinfo)
-{
-
-    /*@ buffers *********/
-  char outfile[MAX_STR_LEN];
-  char nfs_dev[MAX_STR_LEN];
-  char nfs_mount[MAX_STR_LEN];
-  char nfs_client_ipaddr[MAX_STR_LEN];
-  char nfs_server_ipaddr[MAX_STR_LEN];
-  char tmp[MAX_STR_LEN];
-  char command[MAX_STR_LEN*2];
-
-    /*@ pointers ******/
-  char *p;
-  FILE *fout;
-
-
-
-  log_it ("Storing NFS configuration");
-  strcpy (tmp, bkpinfo->nfs_mount);
-  p = strchr (tmp, ':');
-  if (!p)
-    {
-      fatal_error
-    ("NFS mount doesn't have a colon in it, e.g. 192.168.1.4:/home/nfs");
-    }
-  *(p++) = '\0';
-  strcpy (nfs_server_ipaddr, tmp);
-  strcpy (nfs_mount, p);
-  sprintf (command,
-       "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\n' | head -n1 | cut -d' ' -f1");
-  strcpy (nfs_dev, call_program_and_get_last_line_of_output (command));
-  sprintf (command,
-       "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f7 | cut -d':' -f2");
-  strcpy (nfs_client_ipaddr,
-      call_program_and_get_last_line_of_output (command));
-  sprintf (tmp, "nfs_client_ipaddr=%s; nfs_server_ipaddr=%s; nfs_mount=%s",
-       nfs_client_ipaddr, nfs_server_ipaddr, nfs_mount);
-  if (strlen (nfs_dev) < 2)
-    {
-      fatal_error
-    ("Unable to find ethN (eth0, eth1, ...) adapter via NFS mount you specified.");
-    }
-  sprintf (outfile, "%s/start-nfs", bkpinfo->tmpdir);
-  sprintf (tmp, "outfile = %s", outfile);
-  log_it (tmp);
-  if (!(fout = fopen (outfile, "w")))
-    {
-      fatal_error ("Cannot store NFS config");
-    }
-  fprintf (fout, "ifconfig lo 127.0.0.1  # config loopback\n");
-  fprintf (fout, "ifconfig %s %s; # config client\n", nfs_dev,
-       nfs_client_ipaddr);
-  fprintf (fout, "ping -c1 %s; # ping server\n", nfs_server_ipaddr);
-  fprintf (fout, "mount -t nfs -o nolock %s /tmp/isodir\n", bkpinfo->nfs_mount);
-  fprintf (fout, "exit 0\n");
-  paranoid_fclose (fout);
-  chmod (outfile, 0777);
-  make_hole_for_dir( "/var/cache/mondo-archive");
+void store_nfs_config(struct s_bkpinfo *bkpinfo)
+{
+
+    /*@ buffers ******** */
+    char outfile[MAX_STR_LEN];
+    char nfs_dev[MAX_STR_LEN];
+    char nfs_mount[MAX_STR_LEN];
+    char nfs_client_ipaddr[MAX_STR_LEN];
+    char nfs_server_ipaddr[MAX_STR_LEN];
+    char tmp[MAX_STR_LEN];
+    char command[MAX_STR_LEN * 2];
+
+    /*@ pointers ***** */
+    char *p;
+    FILE *fout;
+
+
+
+    log_it("Storing NFS configuration");
+    strcpy(tmp, bkpinfo->nfs_mount);
+    p = strchr(tmp, ':');
+    if (!p) {
+        fatal_error
+            ("NFS mount doesn't have a colon in it, e.g. 192.168.1.4:/home/nfs");
+    }
+    *(p++) = '\0';
+    strcpy(nfs_server_ipaddr, tmp);
+    strcpy(nfs_mount, p);
+    sprintf(command,
+            "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\n' | head -n1 | cut -d' ' -f1");
+    strcpy(nfs_dev, call_program_and_get_last_line_of_output(command));
+    sprintf(command,
+            "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f7 | cut -d':' -f2");
+    strcpy(nfs_client_ipaddr,
+           call_program_and_get_last_line_of_output(command));
+    sprintf(tmp,
+            "nfs_client_ipaddr=%s; nfs_server_ipaddr=%s; nfs_mount=%s",
+            nfs_client_ipaddr, nfs_server_ipaddr, nfs_mount);
+    if (strlen(nfs_dev) < 2) {
+        fatal_error
+            ("Unable to find ethN (eth0, eth1, ...) adapter via NFS mount you specified.");
+    }
+    sprintf(outfile, "%s/start-nfs", bkpinfo->tmpdir);
+    sprintf(tmp, "outfile = %s", outfile);
+    log_it(tmp);
+    if (!(fout = fopen(outfile, "w"))) {
+        fatal_error("Cannot store NFS config");
+    }
+    fprintf(fout, "ifconfig lo 127.0.0.1  # config loopback\n");
+    fprintf(fout, "ifconfig %s %s; # config client\n", nfs_dev,
+            nfs_client_ipaddr);
+    fprintf(fout, "ping -c 1 %s; # ping server\n", nfs_server_ipaddr);
+    fprintf(fout, "mount -t nfs -o nolock %s /tmp/isodir\n",
+            bkpinfo->nfs_mount);
+    fprintf(fout, "exit 0\n");
+    paranoid_fclose(fout);
+    chmod(outfile, 0777);
+    make_hole_for_dir("/var/cache/mondo-archive");
 
 //  paranoid_system ("mkdir -p /var/cache/mondo-archive 2> /dev/null");
 
-  sprintf (tmp, "cp -f %s /var/cache/mondo-archive", outfile);
-  run_program_and_log_output(tmp, FALSE);
-
-  sprintf (tmp, "%s/NFS-DEV", bkpinfo->tmpdir);
-  write_one_liner_data_file (tmp, nfs_dev);
-
-  sprintf (tmp, "%s/NFS-CLIENT-IPADDR", bkpinfo->tmpdir);
-  write_one_liner_data_file (tmp, nfs_client_ipaddr);
-  sprintf (tmp, "%s/NFS-SERVER-IPADDR", bkpinfo->tmpdir);
-  write_one_liner_data_file (tmp, nfs_server_ipaddr);
-  sprintf (tmp, "%s/NFS-SERVER-MOUNT", bkpinfo->tmpdir);
-  write_one_liner_data_file (tmp, bkpinfo->nfs_mount);
-  sprintf (tmp, "%s/NFS-SERVER-PATH", bkpinfo->tmpdir);
-  write_one_liner_data_file (tmp, bkpinfo->nfs_remote_dir);
-  log_it ("Finished storing NFS configuration");
+    sprintf(tmp, "cp -f %s /var/cache/mondo-archive", outfile);
+    run_program_and_log_output(tmp, FALSE);
+
+    sprintf(tmp, "%s/NFS-DEV", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, nfs_dev);
+
+    sprintf(tmp, "%s/NFS-CLIENT-IPADDR", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, nfs_client_ipaddr);
+    sprintf(tmp, "%s/NFS-SERVER-IPADDR", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, nfs_server_ipaddr);
+    sprintf(tmp, "%s/NFS-SERVER-MOUNT", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, bkpinfo->nfs_mount);
+    sprintf(tmp, "%s/NFS-SERVER-PATH", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, bkpinfo->nfs_remote_dir);
+    log_it("Finished storing NFS configuration");
 }
 
@@ -1296 +1280 @@
  */
 void
-estimate_noof_media_required (struct s_bkpinfo *bkpinfo, long noof_sets)
-{
-    /*@ buffers ****************/
-  char tmp[MAX_STR_LEN];
-
-    /*@ long long **************/
-  long long scratchLL;
-
-  if (bkpinfo->media_size[1]<=0 || bkpinfo->backup_media_type == nfs)
-    {
-      log_to_screen("Number of media required: UNKNOWN");
-      return;
-    }
-
-  log_it ("Estimating number of media required...");
-  scratchLL = (long long)(noof_sets) * (long long)(bkpinfo->optimal_set_size)
-    + (long long)(size_of_all_biggiefiles_K (bkpinfo));
-  scratchLL = (scratchLL / 1024) / bkpinfo->media_size[1];
-  scratchLL++;
-  if (bkpinfo->use_lzo)
-    {
-      scratchLL = (scratchLL * 2) / 3;
-    }
-  else
-    {
-      scratchLL = scratchLL / 2;
-    }
-  if (!scratchLL)
-    {
-      scratchLL++;
-    }
-  if (scratchLL <= 1)
-    {
-      sprintf (tmp,
-           "Your backup will probably occupy a single CD/tape/ISO. Maybe two.");
-    }
-  else if (scratchLL > 4)
-    {
-      sprintf(tmp, "Your backup will occupy one meeeeellion media! (maybe %s)", 
-           number_to_text ((int) (scratchLL + 1)));
-    }
-  else
-    {
-      sprintf (tmp, "Your backup will occupy approximately %s media.",
-           number_to_text ((int) (scratchLL + 1)));
-    }
-  if (!bkpinfo->image_devs[0] && (scratchLL<50))
-    {
-      log_to_screen (tmp);
-    }
+estimate_noof_media_required(struct s_bkpinfo *bkpinfo, long noof_sets)
+{
+    /*@ buffers *************** */
+    char tmp[MAX_STR_LEN];
+
+    /*@ long long ************* */
+    long long scratchLL;
+
+    if (bkpinfo->media_size[1] <= 0 || bkpinfo->backup_media_type == nfs) {
+        log_to_screen("Number of media required: UNKNOWN");
+        return;
+    }
+
+    log_it("Estimating number of media required...");
+    scratchLL =
+        (long long) (noof_sets) * (long long) (bkpinfo->optimal_set_size)
+        + (long long) (size_of_all_biggiefiles_K(bkpinfo));
+    scratchLL = (scratchLL / 1024) / bkpinfo->media_size[1];
+    scratchLL++;
+    if (bkpinfo->use_lzo) {
+        scratchLL = (scratchLL * 2) / 3;
+    } else {
+        scratchLL = scratchLL / 2;
+    }
+    if (!scratchLL) {
+        scratchLL++;
+    }
+    if (scratchLL <= 1) {
+        sprintf(tmp,
+                "Your backup will probably occupy a single CD/tape/ISO. Maybe two.");
+    } else if (scratchLL > 4) {
+        sprintf(tmp,
+                "Your backup will occupy one meeeeellion media! (maybe %s)",
+                number_to_text((int) (scratchLL + 1)));
+    } else {
+        sprintf(tmp, "Your backup will occupy approximately %s media.",
+                number_to_text((int) (scratchLL + 1)));
+    }
+    if (!bkpinfo->image_devs[0] && (scratchLL < 50)) {
+        log_to_screen(tmp);
+    }
 }
 
@@ -1356 +1331 @@
  * @note The returned string points to static storage that will be overwritten with each call.
  */
-char*sz_last_suffix(char*instr)
-{
-  static char outstr[MAX_STR_LEN];
-  char *p;
-
-  p = strrchr(instr,'.');
-  if (!p)
-    {
-      outstr[0]='\0';
-    }
-  else
-    {
-      strcpy(outstr, p);
-    }
-  return(outstr);
+char *sz_last_suffix(char *instr)
+{
+    static char outstr[MAX_STR_LEN];
+    char *p;
+
+    p = strrchr(instr, '.');
+    if (!p) {
+        outstr[0] = '\0';
+    } else {
+        strcpy(outstr, p);
+    }
+    return (outstr);
 }
 
@@ -1380 +1352 @@
  * @return TRUE if it's compressed, FALSE if not.
  */
-bool is_this_file_compressed(char*filename)
-{
-  char do_not_compress_these[MAX_STR_LEN];
-  char tmp[MAX_STR_LEN];
-  char *p;
-
-  sprintf(tmp, "%s/do-not-compress-these", g_mondo_home);
-  if (!does_file_exist(tmp)) { return(FALSE); }
-  strcpy(do_not_compress_these, last_line_of_file(tmp));
-  for(p=do_not_compress_these; p!=NULL; p++)
-    {
-      strcpy(tmp, p);
-      if (strchr(tmp, ' ')) { *(strchr(tmp, ' ')) ='\0'; }
-      if (!strcmp(sz_last_suffix(filename), tmp))
-    { /*printf("MATCH\n");*/ return(TRUE); }
-      if (!(p = strchr(p, ' '))) { break; }
-    }
-  return(FALSE);
-}
-
-
-
-int mode_of_file(char*fname)
-{
-  struct stat buf;
-
-  if (lstat(fname, &buf))
-    { return(-1); } // error
-  else
-    { return(buf.st_mode); }
+bool is_this_file_compressed(char *filename)
+{
+    char do_not_compress_these[MAX_STR_LEN];
+    char tmp[MAX_STR_LEN];
+    char *p;
+
+    sprintf(tmp, "%s/do-not-compress-these", g_mondo_home);
+    if (!does_file_exist(tmp)) {
+        return (FALSE);
+    }
+    strcpy(do_not_compress_these, last_line_of_file(tmp));
+    for (p = do_not_compress_these; p != NULL; p++) {
+        strcpy(tmp, p);
+        if (strchr(tmp, ' ')) {
+            *(strchr(tmp, ' ')) = '\0';
+        }
+        if (!strcmp(sz_last_suffix(filename), tmp)) {   /*printf("MATCH\n"); */
+            return (TRUE);
+        }
+        if (!(p = strchr(p, ' '))) {
+            break;
+        }
+    }
+    return (FALSE);
+}
+
+
+
+int mode_of_file(char *fname)
+{
+    struct stat buf;
+
+    if (lstat(fname, &buf)) {
+        return (-1);
+    }                           // error
+    else {
+        return (buf.st_mode);
+    }
 }
 
@@ -1420 +1400 @@
  * @return 0 for success, 1 for failure.
  */
-int make_grub_install_scriptlet(char*outfile)
-{
-  FILE*fout;
-  char *tmp;
-  int retval=0;
-
-  malloc_string(tmp);
-  if ((fout = fopen( outfile, "w")))
-    {
-      fprintf(fout, "#!/bin/sh\n\nmount /boot > /dev/null 2> /dev/null\ngrub-install $@\nres=$?\nsync;sync;sync\nexit $res\n");
-      paranoid_fclose(fout);
-      log_msg(2, "Created %s", outfile);
-      sprintf(tmp, "chmod +x %s", outfile);
-      paranoid_system(tmp);
-      retval=0;
-        }
-  else
-        {
-      retval=1;
-    }
-  paranoid_free(tmp);
-  return(retval);
+int make_grub_install_scriptlet(char *outfile)
+{
+    FILE *fout;
+    char *tmp;
+    int retval = 0;
+
+    malloc_string(tmp);
+    if ((fout = fopen(outfile, "w"))) {
+        fprintf(fout,
+                "#!/bin/sh\n\nmount /boot > /dev/null 2> /dev/null\ngrub-install $@\nres=$?\nsync;sync;sync\nexit $res\n");
+        paranoid_fclose(fout);
+        log_msg(2, "Created %s", outfile);
+        sprintf(tmp, "chmod +x %s", outfile);
+        paranoid_system(tmp);
+        retval = 0;
+    } else {
+        retval = 1;
+    }
+    paranoid_free(tmp);
+    return (retval);
 }
 

branches/2.05/mondo/mondo/mondoarchive/mondo-cli.c

@@ -7 +7 @@
 edited by            : by Stan Benoit 4/2002
 email                : troff@nakedsoul.org
-cvsid                : $Id: mondo-cli.c,v 1.11 2004/06/21 20:20:36 hugo Exp $
+cvsid                : $Id$
  ***************************************************************************/
 
@@ -175 +175 @@
 
 
-//static char cvsid[] = "$Id: mondo-cli.c,v 1.11 2004/06/21 20:20:36 hugo Exp $";
+//static char cvsid[] = "$Id$";
 
 extern int g_loglevel;
 extern bool g_text_mode;
-extern bool g_skip_floppies; ///< Whether to skip the creation of boot disks
-extern char g_startdir[MAX_STR_LEN]; ///< ????? @bug ?????
+extern bool g_skip_floppies;    ///< Whether to skip the creation of boot disks
+extern char g_startdir[MAX_STR_LEN];    ///< ????? @bug ?????
 extern char g_erase_tmpdir_and_scratchdir[MAX_STR_LEN];
 extern char g_tmpfs_mountpt[MAX_STR_LEN];
@@ -195 +195 @@
 
 /*@ bool******** **************************************************/
-bool g_debugging = FALSE; ///< ????? @bug ????? @ingroup globalGroup
-bool g_running_live = FALSE; ///< ????? @bug ????? @ingroup globalGroup
+bool g_debugging = FALSE;       ///< ????? @bug ????? @ingroup globalGroup
+bool g_running_live = FALSE;    ///< ????? @bug ????? @ingroup globalGroup
 extern bool g_cd_recovery;
 
@@ -220 +220 @@
 
 
-extern char*resolve_softlinks_to_get_to_actual_device_file(char*);
+extern char *resolve_softlinks_to_get_to_actual_device_file(char *);
 
 
@@ -236 +236 @@
  */
 int
-handle_incoming_parameters (int argc, char *argv[], struct s_bkpinfo *bkpinfo)
+handle_incoming_parameters(int argc, char *argv[],
+                           struct s_bkpinfo *bkpinfo)
 {
-    /*@ int ****/
-  int res = 0;
-  int retval = 0;
-  int i = 0, j;
-
-    /*@ buffers ****************/
-  char *tmp;
-  char flag_val[128][MAX_STR_LEN];
-  bool flag_set[128];
-
-  malloc_string(tmp);
-  sensibly_set_tmpdir_and_scratchdir(bkpinfo);
-  for (i = 0; i < 128; i++)
-    {
-      flag_val[i][0] = '\0';
-      flag_set[i] = FALSE;
-    }
-  //  strcpy (bkpinfo->tmpdir, "/root/images/mondo");
-  //  strcpy (bkpinfo->scratchdir, "/home");
-  for(j=1; j<=MAX_NOOF_MEDIA; j++) {bkpinfo->media_size[j] = 650;}  /* default */
-  res = retrieve_switches_from_command_line (argc, argv, flag_val, flag_set);
-  retval += res;
-  if (!retval)
-    {
-      res = process_switches (bkpinfo, flag_val, flag_set);
-      retval += res;
-    }
+    /*@ int *** */
+    int res = 0;
+    int retval = 0;
+    int i = 0, j;
+
+    /*@ buffers *************** */
+    char *tmp;
+    char flag_val[128][MAX_STR_LEN];
+    bool flag_set[128];
+
+    malloc_string(tmp);
+    sensibly_set_tmpdir_and_scratchdir(bkpinfo);
+    for (i = 0; i < 128; i++) {
+        flag_val[i][0] = '\0';
+        flag_set[i] = FALSE;
+    }
+    //  strcpy (bkpinfo->tmpdir, "/root/images/mondo");
+    //  strcpy (bkpinfo->scratchdir, "/home");
+    for (j = 1; j <= MAX_NOOF_MEDIA; j++) {
+        bkpinfo->media_size[j] = 650;
+    }                           /* default */
+    res =
+        retrieve_switches_from_command_line(argc, argv, flag_val,
+                                            flag_set);
+    retval += res;
+    if (!retval) {
+        res = process_switches(bkpinfo, flag_val, flag_set);
+        retval += res;
+    }
 /*
   if (!retval)
     {
 */
-      log_msg (3, "Switches:-");
-      for (i = 0; i < 128; i++)
-    {
-      if (flag_set[i])
-        {
-          sprintf (tmp, "-%c %s", i, flag_val[i]);
-          log_msg (3, tmp);
-        }
+    log_msg(3, "Switches:-");
+    for (i = 0; i < 128; i++) {
+        if (flag_set[i]) {
+            sprintf(tmp, "-%c %s", i, flag_val[i]);
+            log_msg(3, tmp);
+        }
     }
 //    }
-  sprintf (tmp, "rm -Rf %s/tmp.mondo.*", bkpinfo->tmpdir);
-  paranoid_system (tmp);
-  sprintf (tmp, "rm -Rf %s/mondo.scratch.*", bkpinfo->scratchdir);
-  paranoid_system (tmp);
-  sprintf (bkpinfo->tmpdir + strlen (bkpinfo->tmpdir), "/tmp.mondo.%ld",
-       random () % 32767);
-  sprintf (bkpinfo->scratchdir + strlen (bkpinfo->scratchdir),
-       "/mondo.scratch.%ld", random () % 32767);
-  sprintf (tmp, "mkdir -p %s/tmpfs", bkpinfo->tmpdir);
-  paranoid_system (tmp);
-  sprintf (tmp, "mkdir -p %s", bkpinfo->scratchdir);
-  paranoid_system (tmp);
-  if (bkpinfo->nfs_mount[0] != '\0')
-    {
-      store_nfs_config (bkpinfo);
-    }
-  paranoid_free(tmp);
-  return (retval);
+    sprintf(tmp, "rm -Rf %s/tmp.mondo.*", bkpinfo->tmpdir);
+    paranoid_system(tmp);
+    sprintf(tmp, "rm -Rf %s/mondo.scratch.*", bkpinfo->scratchdir);
+    paranoid_system(tmp);
+    sprintf(bkpinfo->tmpdir + strlen(bkpinfo->tmpdir), "/tmp.mondo.%ld",
+            random() % 32767);
+    sprintf(bkpinfo->scratchdir + strlen(bkpinfo->scratchdir),
+            "/mondo.scratch.%ld", random() % 32767);
+    sprintf(tmp, "mkdir -p %s/tmpfs", bkpinfo->tmpdir);
+    paranoid_system(tmp);
+    sprintf(tmp, "mkdir -p %s", bkpinfo->scratchdir);
+    paranoid_system(tmp);
+    if (bkpinfo->nfs_mount[0] != '\0') {
+        store_nfs_config(bkpinfo);
+    }
+    paranoid_free(tmp);
+    return (retval);
 }
 
@@ -311 +311 @@
 int process_the_s_switch(struct s_bkpinfo *bkpinfo, char *value)
 {
-      int j;
-      char tmp[MAX_STR_LEN], *p, comment[MAX_STR_LEN];
-
-  assert(bkpinfo!=NULL);
-  assert(value!=NULL);
-
-      bkpinfo->media_size[0] = -1; /* dummy value */
-      for(j=1, p=value; j<MAX_NOOF_MEDIA && strchr(p,','); j++, p=strchr(p,',')+1)
-    {
-      strncpy(tmp, p, MAX_STR_LEN);
-      *(strchr(tmp,',')) = '\0';
-      bkpinfo->media_size[j] = friendly_sizestr_to_sizelong (tmp);
-          sprintf(comment, "media_size[%d] = %ld", j, bkpinfo->media_size[j]);
-          log_msg(3, comment);
-    }
-      for(; j<=MAX_NOOF_MEDIA; j++)
-    {
-      bkpinfo->media_size[j] = friendly_sizestr_to_sizelong (p);
+    int j;
+    char tmp[MAX_STR_LEN], *p, comment[MAX_STR_LEN];
+
+    assert(bkpinfo != NULL);
+    assert(value != NULL);
+
+    bkpinfo->media_size[0] = -1;    /* dummy value */
+    for (j = 1, p = value; j < MAX_NOOF_MEDIA && strchr(p, ',');
+         j++, p = strchr(p, ',') + 1) {
+        strncpy(tmp, p, MAX_STR_LEN);
+        *(strchr(tmp, ',')) = '\0';
+        bkpinfo->media_size[j] = friendly_sizestr_to_sizelong(tmp);
+        sprintf(comment, "media_size[%d] = %ld", j,
+                bkpinfo->media_size[j]);
+        log_msg(3, comment);
+    }
+    for (; j <= MAX_NOOF_MEDIA; j++) {
+        bkpinfo->media_size[j] = friendly_sizestr_to_sizelong(p);
     }
 //      bkpinfo->media_size[0] = bkpinfo->media_size[MAX_NOOF_MEDIA];
-      for(j=1; j<=MAX_NOOF_MEDIA; j++)
-        {
-          if (bkpinfo->media_size[j]<=0) { log_msg(1, "You gave media #%d an invalid size\n", j); return(-1); }
-        }
-      return(0);
+    for (j = 1; j <= MAX_NOOF_MEDIA; j++) {
+        if (bkpinfo->media_size[j] <= 0) {
+            log_msg(1, "You gave media #%d an invalid size\n", j);
+            return (-1);
+        }
+    }
+    return (0);
 }
 
@@ -351 +353 @@
  */
 int
-process_switches (struct s_bkpinfo *bkpinfo, char flag_val[128][MAX_STR_LEN],
-          bool flag_set[128])
+process_switches(struct s_bkpinfo *bkpinfo,
+                 char flag_val[128][MAX_STR_LEN], bool flag_set[128])
 {
 
-    /*@ ints ****/
-  int i = 0;
-  int retval = 0;
-  int percent = 0;
-
-    /*@ buffers ***/
-  char *tmp;
-  char *psz;
-
-  long itbs;
-
-  malloc_string(tmp);
-  malloc_string(psz);
-
-  assert(bkpinfo!=NULL);
-  assert(flag_val!=NULL);
-  assert(flag_set!=NULL);
-
-  bkpinfo->internal_tape_block_size = DEFAULT_INTERNAL_TAPE_BLOCK_SIZE;
+    /*@ ints *** */
+    int i = 0;
+    int retval = 0;
+    int percent = 0;
+
+    /*@ buffers ** */
+    char *tmp;
+    char *psz;
+
+    long itbs;
+
+    malloc_string(tmp);
+    malloc_string(psz);
+
+    assert(bkpinfo != NULL);
+    assert(flag_val != NULL);
+    assert(flag_set != NULL);
+
+    bkpinfo->internal_tape_block_size = DEFAULT_INTERNAL_TAPE_BLOCK_SIZE;
 
 /* compulsory */
-  i =
-    flag_set['c'] + flag_set['i'] + flag_set['n'] +
-    flag_set['t'] + flag_set['u'] + flag_set['r'] +
-    flag_set['w'] + flag_set['C'];
-  if (i == 0)
-    {
-      retval++;
-      log_to_screen( "You must specify the media type\n");
-    }
-  if (i > 1)
-    {
-      retval++;
-      log_to_screen( "Please specify only one media type\n");
-    }
-  if (flag_set['K'])
-    {
-      g_loglevel = atoi(flag_val['K']);
-      if (g_loglevel < 3) { g_loglevel = 3; }
-    }
-  if (flag_set['L'] && flag_set['0'])
-    {
-      retval++;
-      log_to_screen( "You cannot have 'no compression' _and_ LZOP.\n");
-    }
-  bkpinfo->backup_data = flag_set['O'];
-  bkpinfo->verify_data = flag_set['V'];
-  if (flag_set['I'] && !bkpinfo->backup_data)
-    {
-      log_to_screen ("-I switch is ignored if just verifying");
-    }
-  if (flag_set['E'] && !bkpinfo->backup_data)
-    {
-      log_to_screen ("-E switch is ignored if just verifying");
-    }
-
-  if (!find_home_of_exe("afio"))
-    {
-      if (find_home_of_exe("star"))
+    i = flag_set['c'] + flag_set['i'] + flag_set['n'] +
+        flag_set['t'] + flag_set['u'] + flag_set['r'] +
+        flag_set['w'] + flag_set['C'];
+    if (i == 0) {
+        retval++;
+        log_to_screen("You must specify the media type\n");
+    }
+    if (i > 1) {
+        retval++;
+        log_to_screen("Please specify only one media type\n");
+    }
+    if (flag_set['K']) {
+        g_loglevel = atoi(flag_val['K']);
+        if (g_loglevel < 3) {
+            g_loglevel = 3;
+        }
+    }
+    if (flag_set['L'] && flag_set['0']) {
+        retval++;
+        log_to_screen("You cannot have 'no compression' _and_ LZOP.\n");
+    }
+    bkpinfo->backup_data = flag_set['O'];
+    bkpinfo->verify_data = flag_set['V'];
+    if (flag_set['I'] && !bkpinfo->backup_data) {
+        log_to_screen("-I switch is ignored if just verifying");
+    }
+    if (flag_set['E'] && !bkpinfo->backup_data) {
+        log_to_screen("-E switch is ignored if just verifying");
+    }
+
+    if (!find_home_of_exe("afio")) {
+        if (find_home_of_exe("star")) {
+            flag_set['R'] = TRUE;
+            log_msg(1, "Using star instead of afio");
+        } else {
+            fatal_error
+                ("Neither afio nor star is installed. Please install at least one.");
+        }
+    }
+
+    if (flag_set['R']) {
+        bkpinfo->use_star = TRUE;
+        if (flag_set['L']) {
+            fatal_error("You may not use star and lzop at the same time.");
+        }
+        if (!find_home_of_exe("star")) {
+            fatal_error
+                ("Please install 'star' RPM or tarball if you are going to use -R. Thanks.");
+        }
+    }
+    if (flag_set['W']) {
+        bkpinfo->nonbootable_backup = TRUE;
+        log_to_screen("Warning - you have opted for non-bootable backup");
+        if (flag_set['f'] || flag_set['l']) {
+            log_to_screen
+                ("You don't need to specify bootloader or bootdevice");
+        }
+    }
+    if (flag_set['t'] && flag_set['H']) {
+        fatal_error
+            ("Sorry, you may not nuke w/o warning from tape. Drop -H, please.");
+    }
+    if (flag_set['I']) {
+        if (!strcmp(bkpinfo->include_paths, "/")) {
+            log_msg(2, "'/' is pleonastic.");
+            bkpinfo->include_paths[0] = '\0';
+        }
+        if (bkpinfo->include_paths[0]) {
+            strcat(bkpinfo->include_paths, " ");
+        }
+        strncpy(bkpinfo->include_paths + strlen(bkpinfo->include_paths),
+                flag_val['I'],
+                MAX_STR_LEN - strlen(bkpinfo->include_paths));
+        log_msg(1, "include_paths is now '%s'", bkpinfo->include_paths);
+        if (bkpinfo->include_paths[0] == '-') {
+            retval++;
+            log_to_screen("Please supply a sensible value with '-I'\n");
+        }
+    }
+
+    if (g_kernel_version >= 2.6 && !flag_set['d']
+        && (flag_set['c'] || flag_set['w'])) {
+        fatal_error
+            ("If you are using the 2.6.x kernel, please specify the CD-R(W) device.");
+    }
+
+
+    if (flag_set['J']) {
+        if (flag_set['I']) {
+            retval++;
+            log_to_screen
+                ("Please do not use -J in combination with -I. If you want to make a list of files to backup, that's fine, use -J <filename> but please don't muddy the waters by combining -J with -I. Thanks. :-)");
+        }
+        bkpinfo->make_filelist = FALSE;
+        strcpy(bkpinfo->include_paths, flag_val['J']);
+    }
+    if (flag_set['c'] || flag_set['w'] || flag_set['C'] || flag_set['r']) {
+        if (!flag_set['r'] && g_kernel_version <= 2.5
+            && strstr(flag_val['d'], "/dev/")) {
+            fatal_error
+                ("Please don't give a /dev entry. Give a SCSI node for the parameter of the -d flag.");
+        }
+        if (flag_set['r'] && g_kernel_version <= 2.5
+            && !strstr(flag_val['d'], "/dev/")) {
+            fatal_error
+                ("Please give a /dev entry, not a SCSI node, as the parameter of the -d flag.");
+        }
+        if (g_kernel_version >= 2.6 && !strstr(flag_val['d'], "/dev/")) {
+            log_to_screen
+                ("Linus says 2.6 has a broken ide-scsi module. Proceed at your own risk...");
+        }
+
+        if (system("which cdrecord > /dev/null 2> /dev/null")
+            && system("which dvdrecord > /dev/null 2> /dev/null")) {
+            fatal_error
+                ("Please install dvdrecord/cdrecord and try again.");
+        }
+        if (flag_set['C']) {
+            bkpinfo->cdrw_speed = atoi(flag_val['C']);
+            if (bkpinfo->cdrw_speed < 1) {
+                fatal_error
+                    ("You specified a silly speed for a CD-R[W] drive");
+            }
+            if (!flag_set['L']) {
+                log_to_screen
+                    ("You must use -L with -C. Therefore I am setting it for you.");
+                flag_set['L'] = 1;
+                flag_val['L'][0] = '\0';
+            }
+        } else {
+            log_msg(3, "flag_val['c'] = %s", flag_val['c']);
+            log_msg(3, "flag_val['w'] = %s", flag_val['w']);
+//    log_msg(3, "flag_set['r'] = %i", flag_set['r'] );
+            if (flag_set['c']) {
+                bkpinfo->cdrw_speed = atoi(flag_val['c']);
+            } else if (flag_set['w']) {
+                bkpinfo->cdrw_speed = atoi(flag_val['w']);
+            } else if (flag_set['r']) {
+                bkpinfo->cdrw_speed = 1;    /*atoi(flag_val['r']); */
+            }
+
+            if (bkpinfo->cdrw_speed < 1) {
+                fatal_error
+                    ("You specified a silly speed for a CD-R[W] drive");
+            }
+        }
+    }
+    if (flag_set['t'] && !flag_set['d']) {
+        log_it("Hmm! No tape drive specified. Let's see what we can do.");
+        if (find_tape_device_and_size(flag_val['d'], tmp)) {
+            fatal_error
+                ("Tape device not specified. I couldn't find it either.");
+        }
+        flag_set['d'] = TRUE;
+        sprintf(tmp,
+                "You didn't specify a tape streamer device. I'm assuming %s",
+                flag_val['d']);
+        log_to_screen(tmp);
+        percent = 0;
+    }
+
+    if (flag_set['r'])          // DVD
     {
-      flag_set['R'] = TRUE;
-      log_msg(1, "Using star instead of afio");
-    }
-      else
-    {
-      fatal_error("Neither afio nor star is installed. Please install at least one.");
-    }
-    }
-
-  if (flag_set['R'])
-    {
-      bkpinfo->use_star = TRUE;
-      if (flag_set['L'])
-        { fatal_error ("You may not use star and lzop at the same time."); }
-      if (!find_home_of_exe("star"))
-        { fatal_error ("Please install 'star' RPM or tarball if you are going to use -R. Thanks."); }
-    }
-  if (flag_set['W'])
-    {
-      bkpinfo->nonbootable_backup = TRUE;
-      log_to_screen ("Warning - you have opted for non-bootable backup");
-      if (flag_set['f'] || flag_set['l'])
-        {
-          log_to_screen ("You don't need to specify bootloader or bootdevice");
-        }
-    }
-  if (flag_set['t'] && flag_set['H'])
-    { fatal_error("Sorry, you may not nuke w/o warning from tape. Drop -H, please."); }
-  if (flag_set['I'])
-    {
-      if (!strcmp(bkpinfo->include_paths, "/"))
-    {
-      log_msg(2, "'/' is pleonastic.");
-      bkpinfo->include_paths[0] = '\0';
-    }
-      if (bkpinfo->include_paths[0])
-        { strcat(bkpinfo->include_paths," "); }
-      strncpy (bkpinfo->include_paths+strlen(bkpinfo->include_paths), flag_val['I'], MAX_STR_LEN - strlen(bkpinfo->include_paths));
-      log_msg(1, "include_paths is now '%s'", bkpinfo->include_paths);
-      if (bkpinfo->include_paths[0] == '-')
-    {
-      retval++;
-      log_to_screen( "Please supply a sensible value with '-I'\n");
-    }
-    }
-   
-  if (g_kernel_version >= 2.6 && !flag_set['d'] && (flag_set['c'] || flag_set['w']))
-    {
-      fatal_error("If you are using the 2.6.x kernel, please specify the CD-R(W) device.");
-    }
-
-
-  if (flag_set['J'])
-    {
-      if (flag_set['I'])
-    {
-      retval++;
-      log_to_screen( "Please do not use -J in combination with -I. If you want to make a list of files to backup, that's fine, use -J <filename> but please don't muddy the waters by combining -J with -I. Thanks. :-)");
-    }
-      bkpinfo->make_filelist = FALSE;
-      strcpy(bkpinfo->include_paths, flag_val['J']);
-    }
-  if (flag_set['c'] || flag_set['w'] || flag_set['C'] || flag_set['r'])
-    {
-      if (!flag_set['r'] && g_kernel_version <= 2.5 && strstr(flag_val['d'], "/dev/"))
-        { fatal_error("Please don't give a /dev entry. Give a SCSI node for the parameter of the -d flag."); }
-      if (flag_set['r'] && g_kernel_version <= 2.5 && !strstr(flag_val['d'], "/dev/"))
-        { fatal_error("Please give a /dev entry, not a SCSI node, as the parameter of the -d flag."); }
-      if (g_kernel_version >= 2.6 && !strstr(flag_val['d'], "/dev/"))
-    { log_to_screen("Linus says 2.6 has a broken ide-scsi module. Proceed at your own risk..."); }
-
-      if (system ("which cdrecord > /dev/null 2> /dev/null") && system("which dvdrecord > /dev/null 2> /dev/null"))
-    {
-      fatal_error ("Please install dvdrecord/cdrecord and try again.");
-    }
-      if (flag_set['C'])
-    {
-      bkpinfo->cdrw_speed = 2;
-      if (!flag_set['L'])
-        {
-        log_to_screen ("You must use -L with -C. Therefore I am setting it for you.");
-        flag_set['L'] = 1;
-        flag_val['L'][0] = '\0';
-        }
-    }
-      else
-    {
-      log_msg(3, "flag_val['c'] = %s", flag_val['c'] );
-      log_msg(3, "flag_val['w'] = %s", flag_val['w'] );
-//    log_msg(3, "flag_set['r'] = %i", flag_set['r'] );
-      if (flag_set['c']) { bkpinfo->cdrw_speed = atoi(flag_val['c']); }
-      else
-      if (flag_set['w']) { bkpinfo->cdrw_speed = atoi(flag_val['w']); }
-      else
-      if (flag_set['r']) { bkpinfo->cdrw_speed = 1; /*atoi(flag_val['r']);*/ }
-
-      if (bkpinfo->cdrw_speed < 1)
-        {
-          fatal_error ("You specified a silly speed for a CD-R[W] drive");
-        }
-    }
-    }
-  if (flag_set['t'] && !flag_set['d'])
-    {
-      log_it("Hmm! No tape drive specified. Let's see what we can do.");
-      if (find_tape_device_and_size(flag_val['d'], tmp))
-        { fatal_error("Tape device not specified. I couldn't find it either."); }
-      flag_set['d'] = TRUE;
-      sprintf(tmp, "You didn't specify a tape streamer device. I'm assuming %s", flag_val['d']);
-      log_to_screen(tmp);
-      percent = 0;
-    }
-
-  if (flag_set['r']) // DVD
-    {
-      if (flag_set['m'])
-    { fatal_error("Manual CD tray (-m) not yet supported in conjunction w/ DVD drives. Drop -m."); }
-      if (!flag_set['d'])
-        {
-          if (!find_dvd_device(flag_val['d'], FALSE))
-        {
-          flag_set['d'] = TRUE;
-          log_to_screen("I guess DVD drive is at %s", flag_val['d']);
-        }
-    }
-      if (!find_home_of_exe("growisofs"))
-        { fatal_error("Please install growisofs (probably part of dvd+rw-tools). If you want DVD support, you need it."); }
-      if (!find_home_of_exe("dvd+rw-format"))
-        { fatal_error("Please install dvd+rw-format (probably part of dvd+rw-tools). If you want DVD support, you need it."); }
-      if (strchr(flag_val['d'], ','))
-        { fatal_error("Please don't give a SCSI node. Give a _device_, preferably a /dev entry, for the parameter of the -d flag."); }
-      if (!flag_set['s'])
-        {
-        sprintf (flag_val['s'], "%d", DEFAULT_DVD_DISK_SIZE); // 4.7 salesman's GB = 4.482 real GB = 4582 MB
-        strcat ( flag_val['s'], "m");
-        log_to_screen ("You did not specify a size (-s) for DVD. I'm guessing %s.", flag_val['s']);
-        flag_set['s'] = 1;
-    }
+        if (flag_set['m']) {
+            fatal_error
+                ("Manual CD tray (-m) not yet supported in conjunction w/ DVD drives. Drop -m.");
+        }
+        if (!flag_set['d']) {
+            if (!find_dvd_device(flag_val['d'], FALSE)) {
+                flag_set['d'] = TRUE;
+                log_to_screen("I guess DVD drive is at %s", flag_val['d']);
+            }
+        }
+        if (!find_home_of_exe("growisofs")) {
+            fatal_error
+                ("Please install growisofs (probably part of dvd+rw-tools). If you want DVD support, you need it.");
+        }
+        if (!find_home_of_exe("dvd+rw-format")) {
+            fatal_error
+                ("Please install dvd+rw-format (probably part of dvd+rw-tools). If you want DVD support, you need it.");
+        }
+        if (strchr(flag_val['d'], ',')) {
+            fatal_error
+                ("Please don't give a SCSI node. Give a _device_, preferably a /dev entry, for the parameter of the -d flag.");
+        }
+        if (!flag_set['s']) {
+            sprintf(flag_val['s'], "%d", DEFAULT_DVD_DISK_SIZE);    // 4.7 salesman's GB = 4.482 real GB = 4582 MB
+            strcat(flag_val['s'], "m");
+            log_to_screen
+                ("You did not specify a size (-s) for DVD. I'm guessing %s.",
+                 flag_val['s']);
+            flag_set['s'] = 1;
+        }
 /*
       if (flag_set['Z']) {
@@ -558 +576 @@
       }
 */
-    }
-
-  if (flag_set['t'] || flag_set['u'])
-    {               /* tape size */
-      if (strchr(flag_val['d'], ','))
-        { fatal_error("Please don't give a SCSI node. Give a _device_, preferably a /dev entry, for the parameter of the -d flag."); }
-      if (flag_set['O'])
+    }
+
+    if (flag_set['t'] || flag_set['u']) {   /* tape size */
+        if (strchr(flag_val['d'], ',')) {
+            fatal_error
+                ("Please don't give a SCSI node. Give a _device_, preferably a /dev entry, for the parameter of the -d flag.");
+        }
+        if (flag_set['O']) {
+            if (flag_set['s']) {
+                if (flag_set['t']) {
+                    fatal_error
+                        ("For the moment, please don't specify a tape size. Mondo should handle end-of-tape gracefully anyway.");
+                }
+                if (process_the_s_switch(bkpinfo, flag_val['s'])) {
+                    fatal_error("Bad -s switch");
+                }
+            } else if (flag_set['u'] || flag_set['t']) {
+                for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
+                    bkpinfo->media_size[i] = 0;
+                }
+            } else {
+                retval++;
+                log_to_screen("Tape size not specified.\n");
+            }
+        }
+    } else {                    /* CD size */
+        if (flag_set['s']) {
+            if (process_the_s_switch(bkpinfo, flag_val['s'])) {
+                fatal_error("Bad -s switch");
+            }
+        }
+        if (flag_set['w']) {
+            bkpinfo->wipe_media_first = TRUE;
+        }                       /* CD-RW */
+    }
+    if (flag_set['n']) {
+        strncpy(bkpinfo->nfs_mount, flag_val['n'], MAX_STR_LEN);
+        if (!flag_set['d']) {
+            strncpy(bkpinfo->nfs_remote_dir, "/", MAX_STR_LEN);
+        }
+        sprintf(tmp, "mount | grep -x \"%s .*\" | cut -d' ' -f3",
+                bkpinfo->nfs_mount);
+        strncpy(bkpinfo->isodir,
+                call_program_and_get_last_line_of_output(tmp),
+                MAX_STR_LEN / 4);
+        if (strlen(bkpinfo->isodir) < 3) {
+            retval++;
+            log_to_screen("NFS share is not mounted. Please mount it.\n");
+        }
+        log_msg(3, "mount = %s", bkpinfo->nfs_mount);
+        log_msg(3, "isodir= %s", bkpinfo->isodir);
+    }
+    if (flag_set['c']) {
+        bkpinfo->backup_media_type = cdr;
+    }
+    if (flag_set['C']) {
+        bkpinfo->backup_media_type = cdstream;
+    }
+    if (flag_set['i']) {
+        bkpinfo->backup_media_type = iso;
+    }
+    if (flag_set['n']) {
+        bkpinfo->backup_media_type = nfs;
+    }
+    if (flag_set['r']) {
+        bkpinfo->backup_media_type = dvd;
+    }
+    if (flag_set['t']) {
+        bkpinfo->backup_media_type = tape;
+    }
+    if (flag_set['u']) {
+        bkpinfo->backup_media_type = udev;
+    }
+    if (flag_set['w']) {
+        bkpinfo->backup_media_type = cdrw;
+    }
+
+/* optional, popular */
+    if (flag_set['g']) {
+        g_text_mode = FALSE;
+    }
+    if (flag_set['E']) {
+        if (bkpinfo->exclude_paths[0]) {
+            strcat(bkpinfo->exclude_paths, " ");
+        }
+        strncpy(bkpinfo->exclude_paths + strlen(bkpinfo->exclude_paths),
+                flag_val['E'],
+                MAX_STR_LEN - strlen(bkpinfo->exclude_paths));
+    }
+    if (flag_set['e']) {
+        bkpinfo->please_dont_eject = TRUE;
+    }
+    if (flag_set['N'])          // exclude NFS mounts & devices
     {
-      if (flag_set['s'])
-        {
-              if (flag_set['t']) { fatal_error("For the moment, please don't specify a tape size. Mondo should handle end-of-tape gracefully anyway."); }
-              if (process_the_s_switch(bkpinfo, flag_val['s'])) {fatal_error("Bad -s switch");}
-            }
-      else if (flag_set['u'] || flag_set['t'])
-            {
-          for(i=0; i<=MAX_NOOF_MEDIA; i++) { bkpinfo->media_size[i] = 0; }
-        }
-      else
-        {
-          retval++;
-          log_to_screen( "Tape size not specified.\n");
-        }
-    }
-    }
-  else
-    {               /* CD size */
-      if (flag_set['s'])
-    {
-          if (process_the_s_switch(bkpinfo, flag_val['s'])) {fatal_error("Bad -s switch");}
-    }
-      if (flag_set['w'])
-    {
-      bkpinfo->wipe_media_first = TRUE;
-    }           /* CD-RW */
-    }
-  if (flag_set['n'])
-    {
-      strncpy (bkpinfo->nfs_mount, flag_val['n'], MAX_STR_LEN);
-      if (!flag_set['d'])
-    {
-      strncpy (bkpinfo->nfs_remote_dir, "/", MAX_STR_LEN);
-    }
-      sprintf (tmp, "mount | grep -x \"%s .*\" | cut -d' ' -f3",
-           bkpinfo->nfs_mount);
-      strncpy (bkpinfo->isodir,
-          call_program_and_get_last_line_of_output (tmp), MAX_STR_LEN/4);
-      if (strlen (bkpinfo->isodir) < 3)
-    {
-      retval++;
-      log_to_screen( "NFS share is not mounted. Please mount it.\n");
-    }
-      log_msg(3, "mount = %s", bkpinfo->nfs_mount);
-      log_msg(3, "isodir= %s", bkpinfo->isodir);
-    }      
-  if (flag_set['c']) { bkpinfo->backup_media_type = cdr; }
-  if (flag_set['C']) { bkpinfo->backup_media_type = cdstream; }
-  if (flag_set['i']) { bkpinfo->backup_media_type = iso; }
-  if (flag_set['n']) { bkpinfo->backup_media_type = nfs; }
-  if (flag_set['r']) { bkpinfo->backup_media_type = dvd; }
-  if (flag_set['t']) { bkpinfo->backup_media_type = tape; }
-  if (flag_set['u']) { bkpinfo->backup_media_type = udev; }
-  if (flag_set['w']) { bkpinfo->backup_media_type = cdrw; }
-
-/* optional, popular */
-  if (flag_set['g'])
-    {
-      g_text_mode = FALSE;
-    }
-  if (flag_set['E'])
-    {
-      if (bkpinfo->exclude_paths[0])
-        { strcat(bkpinfo->exclude_paths," "); }
-      strncpy (bkpinfo->exclude_paths+strlen(bkpinfo->exclude_paths), flag_val['E'], MAX_STR_LEN - strlen(bkpinfo->exclude_paths));
-    }
-  if (flag_set['e'])
-    {
-      bkpinfo->please_dont_eject = TRUE;
-    }
-  if (flag_set['N']) // exclude NFS mounts & devices
-    {
 //      strncpy(psz, list_of_NFS_devices_and_mounts(), MAX_STR_LEN);
-      strncpy(psz, list_of_NFS_mounts_only(), MAX_STR_LEN);
-      if (bkpinfo->exclude_paths[0]) { strncat(bkpinfo->exclude_paths, " ", MAX_STR_LEN); }
-      strncat(bkpinfo->exclude_paths, psz, MAX_STR_LEN);
-      log_msg(3, "-N means we're now excluding %s", bkpinfo->exclude_paths);
-    }
-  if (strlen(bkpinfo->exclude_paths) >= MAX_STR_LEN)
-    {
-      fatal_error("Your '-E' parameter is too long. Please use '-J'. (See manual.)");
-    }
-  if (flag_set['b'])
-    {
-      strcpy(psz, flag_val['b']);
-      log_msg(1, "psz = '%s'", psz);
-      if (psz[strlen(psz)-1] == 'k')
-    { psz[strlen(psz)-1] = '\0'; itbs = atol(psz) * 1024L; }
-      else
-    { itbs = atol(psz); }
-      log_msg(1, "'%s' --> %ld", flag_val['b'], itbs);
-      log_msg(1, "Internal tape block size is now %ld bytes", itbs);
-      if (itbs%512!=0 || itbs < 256 || itbs > 1024L*1024)
-    { fatal_error("Are you nuts? Silly, your internal tape block size is. Abort, I shall."); }
-      bkpinfo->internal_tape_block_size = itbs;
-    }
-  if (flag_set['D'])
-    {
-      bkpinfo->differential = 1;
+        strncpy(psz, list_of_NFS_mounts_only(), MAX_STR_LEN);
+        if (bkpinfo->exclude_paths[0]) {
+            strncat(bkpinfo->exclude_paths, " ", MAX_STR_LEN);
+        }
+        strncat(bkpinfo->exclude_paths, psz, MAX_STR_LEN);
+        log_msg(3, "-N means we're now excluding %s",
+                bkpinfo->exclude_paths);
+    }
+    if (strlen(bkpinfo->exclude_paths) >= MAX_STR_LEN) {
+        fatal_error
+            ("Your '-E' parameter is too long. Please use '-J'. (See manual.)");
+    }
+    if (flag_set['b']) {
+        strcpy(psz, flag_val['b']);
+        log_msg(1, "psz = '%s'", psz);
+        if (psz[strlen(psz) - 1] == 'k') {
+            psz[strlen(psz) - 1] = '\0';
+            itbs = atol(psz) * 1024L;
+        } else {
+            itbs = atol(psz);
+        }
+        log_msg(1, "'%s' --> %ld", flag_val['b'], itbs);
+        log_msg(1, "Internal tape block size is now %ld bytes", itbs);
+        if (itbs % 512 != 0 || itbs < 256 || itbs > 1024L * 1024) {
+            fatal_error
+                ("Are you nuts? Silly, your internal tape block size is. Abort, I shall.");
+        }
+        bkpinfo->internal_tape_block_size = itbs;
+    }
+    if (flag_set['D']) {
+        bkpinfo->differential = 1;
 //      bkpinfo->differential = atoi (flag_val['D']);
-      if ((bkpinfo->differential < 1) || (bkpinfo->differential > 9))
-    {
-        fatal_error ("The D option should be between 1 and 9 inclusive");
-    }
-    }
-  if (flag_set['x'])
-    {
-      strncpy (bkpinfo->image_devs, flag_val['x'], MAX_STR_LEN/4);
-      if (run_program_and_log_output("which partimagehack", 2))
-        { fatal_error("Please install partimagehack RPM/tarball."); }
-    }
-  if (flag_set['m'])
-    {
-      bkpinfo->manual_cd_tray = TRUE;
-    }
-  if (flag_set['k'])
-    {
-      strncpy (bkpinfo->kernel_path, flag_val['k'], MAX_STR_LEN);
-      if (!strcmp (bkpinfo->kernel_path, "failsafe"))
-    {
-      strcpy (bkpinfo->kernel_path, "FAILSAFE");
-    }
-      if (strcmp (bkpinfo->kernel_path, "FAILSAFE")
-      && !does_file_exist (bkpinfo->kernel_path))
-    {
-      retval++;
-      sprintf(tmp,
-           "You specified kernel '%s', which does not exist\n",
-           bkpinfo->kernel_path);
-          log_to_screen(tmp);
-    }
-    }
-if (flag_set['p'])
-    {
-      strncpy (bkpinfo->prefix, flag_val['p'], MAX_STR_LEN/4);
-    }
-
-
-  if (flag_set['d'])
-    {               /* backup directory (if ISO/NFS) */
-      if (flag_set['i'])
-    {
-      strncpy (bkpinfo->isodir, flag_val['d'], MAX_STR_LEN/4);
-          sprintf(tmp, "ls -l %s", bkpinfo->isodir);
-          if (run_program_and_log_output(tmp, FALSE)) { fatal_error("output folder does not exist - please create it"); }
-    }
-      else if (flag_set['n'])
-    {
-      strncpy (bkpinfo->nfs_remote_dir, flag_val['d'], MAX_STR_LEN);
-    }
-      else          /* backup device (if tape/CD-R/CD-RW) */
-    {
-      strncpy (bkpinfo->media_device, flag_val['d'], MAX_STR_LEN/4);
-    }
-    }
-
-  if (flag_set['n'])
-    {
-      sprintf (tmp, "echo hi > %s/%s/.dummy.txt", bkpinfo->isodir, bkpinfo->nfs_remote_dir);
-      if (run_program_and_log_output (tmp, FALSE))
-    {
-      retval++;
-      sprintf (tmp, "Are you sure directory '%s' exists in remote dir '%s'?\nIf so, do you have rights to write to it?\n",
-           bkpinfo->nfs_remote_dir, bkpinfo->nfs_mount);
-          log_to_screen (tmp);
-    }
-    }
-
-  if (!flag_set['d'] && (flag_set['c'] || flag_set['w'] || flag_set['C']))
-    {
-      if (g_kernel_version >= 2.6)
-        {
-      if (popup_and_get_string("Device", "Please specify the device", bkpinfo->media_device, MAX_STR_LEN/4))
-            {
-          retval ++;
-          log_to_screen("User opted to cancel.");
-        }
-    }
-      else if (find_cdrw_device (bkpinfo->media_device))
-    {
-      retval++;
-      log_to_screen(
-           "Tried and failed to find CD-R[W] drive automatically.\n");
-    }
-      else
-    {
-      flag_set['d'] = TRUE;
-      strncpy (flag_val['d'], bkpinfo->media_device, MAX_STR_LEN/4);
-    }
-    }
-
-  if (!flag_set['d'] && !flag_set['n'] && !flag_set['C'])
-    {
-      retval++;
-      log_to_screen( "Please specify the backup device/directory.\n");
-      fatal_error("You didn't use -d to specify the backup device/directory.");
-    }
+        if ((bkpinfo->differential < 1) || (bkpinfo->differential > 9)) {
+            fatal_error
+                ("The D option should be between 1 and 9 inclusive");
+        }
+    }
+    if (flag_set['x']) {
+        strncpy(bkpinfo->image_devs, flag_val['x'], MAX_STR_LEN / 4);
+        if (run_program_and_log_output("which partimagehack", 2)) {
+            fatal_error("Please install partimagehack RPM/tarball.");
+        }
+    }
+    if (flag_set['m']) {
+        bkpinfo->manual_cd_tray = TRUE;
+    }
+    if (flag_set['k']) {
+        strncpy(bkpinfo->kernel_path, flag_val['k'], MAX_STR_LEN);
+        if (!strcmp(bkpinfo->kernel_path, "failsafe")) {
+            strcpy(bkpinfo->kernel_path, "FAILSAFE");
+        }
+        if (strcmp(bkpinfo->kernel_path, "FAILSAFE")
+            && !does_file_exist(bkpinfo->kernel_path)) {
+            retval++;
+            sprintf(tmp,
+                    "You specified kernel '%s', which does not exist\n",
+                    bkpinfo->kernel_path);
+            log_to_screen(tmp);
+        }
+    }
+    if (flag_set['p']) {
+        strncpy(bkpinfo->prefix, flag_val['p'], MAX_STR_LEN / 4);
+    }
+
+
+    if (flag_set['d']) {        /* backup directory (if ISO/NFS) */
+        if (flag_set['i']) {
+            strncpy(bkpinfo->isodir, flag_val['d'], MAX_STR_LEN / 4);
+            sprintf(tmp, "ls -l %s", bkpinfo->isodir);
+            if (run_program_and_log_output(tmp, FALSE)) {
+                fatal_error
+                    ("output folder does not exist - please create it");
+            }
+        } else if (flag_set['n']) {
+            strncpy(bkpinfo->nfs_remote_dir, flag_val['d'], MAX_STR_LEN);
+        } else {                /* backup device (if tape/CD-R/CD-RW) */
+
+            strncpy(bkpinfo->media_device, flag_val['d'], MAX_STR_LEN / 4);
+        }
+    }
+
+    if (flag_set['n']) {
+        sprintf(tmp, "echo hi > %s/%s/.dummy.txt", bkpinfo->isodir,
+                bkpinfo->nfs_remote_dir);
+        if (run_program_and_log_output(tmp, FALSE)) {
+            retval++;
+            sprintf(tmp,
+                    "Are you sure directory '%s' exists in remote dir '%s'?\nIf so, do you have rights to write to it?\n",
+                    bkpinfo->nfs_remote_dir, bkpinfo->nfs_mount);
+            log_to_screen(tmp);
+        }
+    }
+
+    if (!flag_set['d']
+        && (flag_set['c'] || flag_set['w'] || flag_set['C'])) {
+        if (g_kernel_version >= 2.6) {
+            if (popup_and_get_string
+                ("Device", "Please specify the device",
+                 bkpinfo->media_device, MAX_STR_LEN / 4)) {
+                retval++;
+                log_to_screen("User opted to cancel.");
+            }
+        } else if (find_cdrw_device(bkpinfo->media_device)) {
+            retval++;
+            log_to_screen
+                ("Tried and failed to find CD-R[W] drive automatically.\n");
+        } else {
+            flag_set['d'] = TRUE;
+            strncpy(flag_val['d'], bkpinfo->media_device, MAX_STR_LEN / 4);
+        }
+    }
+
+    if (!flag_set['d'] && !flag_set['n'] && !flag_set['C']) {
+        retval++;
+        log_to_screen("Please specify the backup device/directory.\n");
+        fatal_error
+            ("You didn't use -d to specify the backup device/directory.");
+    }
 /* optional, obscure */
-  for (i = '0'; i <= '9'; i++)
-    {
-      if (flag_set[i])
-    {
-      bkpinfo->compression_level = i - '0';
-    }           /* not '\0' but '0' */
-    }
-  if (flag_set['S'])
-    {
-      sprintf (bkpinfo->scratchdir, "%s/mondo.scratch.%ld", flag_val['S'],
-           random () % 32768);
-    }
-  if (flag_set['T'])
-    {
-      sprintf (bkpinfo->tmpdir, "%s/tmp.mondo.%ld", flag_val['T'],
-           random () % 32768);
-      sprintf(tmp, "touch %s/.foo.dat", flag_val['T']);
-      if (run_program_and_log_output(tmp, 1))
-        {
-      retval++;
-      log_to_screen( "Please specify a tempdir which I can write to. :)");
-      fatal_error("I cannot write to the tempdir you specified.");
-    }
-      sprintf(tmp, "ln -sf %s/.foo.dat %s/.bar.dat", flag_val['T'], flag_val['T']);
-      if (run_program_and_log_output(tmp, 1))
-        {
-      retval++;
-      log_to_screen("Please don't specify a SAMBA or VFAT or NFS tmpdir.");
-      fatal_error("I cannot write to the tempdir you specified.");
-    }      
-    }
-  if (flag_set['A'])
-    {
-      strncpy (bkpinfo->call_after_iso, flag_val['A'], MAX_STR_LEN);
-    }
-  if (flag_set['B'])
-    {
-      strncpy (bkpinfo->call_before_iso, flag_val['B'], MAX_STR_LEN);
-    }
-  if (flag_set['F'])
-    {
-      g_skip_floppies = TRUE;
-    }
-  if (flag_set['H'])
-    {
-      g_cd_recovery = TRUE;
-    }
-  if (flag_set['l'])
-    {
+    for (i = '0'; i <= '9'; i++) {
+        if (flag_set[i]) {
+            bkpinfo->compression_level = i - '0';
+        }                       /* not '\0' but '0' */
+    }
+    if (flag_set['S']) {
+        sprintf(bkpinfo->scratchdir, "%s/mondo.scratch.%ld", flag_val['S'],
+                random() % 32768);
+    }
+    if (flag_set['T']) {
+        sprintf(bkpinfo->tmpdir, "%s/tmp.mondo.%ld", flag_val['T'],
+                random() % 32768);
+        sprintf(tmp, "touch %s/.foo.dat", flag_val['T']);
+        if (run_program_and_log_output(tmp, 1)) {
+            retval++;
+            log_to_screen
+                ("Please specify a tempdir which I can write to. :)");
+            fatal_error("I cannot write to the tempdir you specified.");
+        }
+        sprintf(tmp, "ln -sf %s/.foo.dat %s/.bar.dat", flag_val['T'],
+                flag_val['T']);
+        if (run_program_and_log_output(tmp, 1)) {
+            retval++;
+            log_to_screen
+                ("Please don't specify a SAMBA or VFAT or NFS tmpdir.");
+            fatal_error("I cannot write to the tempdir you specified.");
+        }
+    }
+    if (flag_set['A']) {
+        strncpy(bkpinfo->call_after_iso, flag_val['A'], MAX_STR_LEN);
+    }
+    if (flag_set['B']) {
+        strncpy(bkpinfo->call_before_iso, flag_val['B'], MAX_STR_LEN);
+    }
+    if (flag_set['F']) {
+        g_skip_floppies = TRUE;
+    }
+    if (flag_set['H']) {
+        g_cd_recovery = TRUE;
+    }
+    if (flag_set['l']) {
 #ifdef __FreeBSD__
 #  define BOOT_LOADER_CHARS "GLBMR"
@@ -822 +840 @@
 #  endif
 #endif
-      if (!strchr(BOOT_LOADER_CHARS, (bkpinfo->boot_loader = flag_val['l'][0])))
-    {
-      log_msg(1, "%c? WTF is %c? I need G, L, E or R.", bkpinfo->boot_loader, bkpinfo->boot_loader);
-      fatal_error("Please specify GRUB, LILO, ELILO  or RAW with the -l switch"); 
-    }
+        if (!strchr
+            (BOOT_LOADER_CHARS,
+             (bkpinfo->boot_loader = flag_val['l'][0]))) {
+            log_msg(1, "%c? WTF is %c? I need G, L, E or R.",
+                    bkpinfo->boot_loader, bkpinfo->boot_loader);
+            fatal_error
+                ("Please specify GRUB, LILO, ELILO  or RAW with the -l switch");
+        }
 #undef BOOT_LOADER_CHARS
-    }
-  if (flag_set['f'])
-    {
-      strncpy (bkpinfo->boot_device, resolve_softlinks_to_get_to_actual_device_file(flag_val['f']), MAX_STR_LEN/4);
-    }
-  if (flag_set['P'])
-    {
-      strncpy (bkpinfo->postnuke_tarball, flag_val['P'], MAX_STR_LEN);
-    }
-  if (flag_set['Q'])
-    {
-      i = which_boot_loader(tmp);
-      log_msg(3, "boot loader is %c, residing at %s", i, tmp);
-      printf("boot loader is %c, residing at %s\n", i, tmp);
-      finish(0);
-    }
-  if (flag_set['L'])
-    {
-      bkpinfo->use_lzo = TRUE;
-      if (run_program_and_log_output ("which lzop", FALSE))
-    {
-      retval++;
-      log_to_screen(
-           "Please install LZOP. You can't use '-L' until you do.\n");
-    }
-    }
-
-  if (!flag_set['o'] && !run_program_and_log_output("cat /etc/issue.net | grep -i suse | grep 64", TRUE))
-    {
-      bkpinfo->make_cd_use_lilo = TRUE;
-      log_to_screen("Forcing you to use LILO. SuSE 9.0 (64-bit) has a broken mkfs.vfat binary.");
-    }
-  if (flag_set['o'])
-    {
-      bkpinfo->make_cd_use_lilo = TRUE;
-    }
+    }
+    if (flag_set['f']) {
+        strncpy(bkpinfo->boot_device,
+                resolve_softlinks_to_get_to_actual_device_file(flag_val
+                                                               ['f']),
+                MAX_STR_LEN / 4);
+    }
+    if (flag_set['P']) {
+        strncpy(bkpinfo->postnuke_tarball, flag_val['P'], MAX_STR_LEN);
+    }
+    if (flag_set['Q']) {
+        i = which_boot_loader(tmp);
+        log_msg(3, "boot loader is %c, residing at %s", i, tmp);
+        printf("boot loader is %c, residing at %s\n", i, tmp);
+        finish(0);
+    }
+    if (flag_set['L']) {
+        bkpinfo->use_lzo = TRUE;
+        if (run_program_and_log_output("which lzop", FALSE)) {
+            retval++;
+            log_to_screen
+                ("Please install LZOP. You can't use '-L' until you do.\n");
+        }
+    }
+
+    if (!flag_set['o']
+        &&
+        !run_program_and_log_output
+        ("cat /etc/issue.net | grep -i suse | grep 64", TRUE)) {
+        bkpinfo->make_cd_use_lilo = TRUE;
+        log_to_screen
+            ("Forcing you to use LILO. SuSE 9.0 (64-bit) has a broken mkfs.vfat binary.");
+    }
+    if (flag_set['o']) {
+        bkpinfo->make_cd_use_lilo = TRUE;
+    }
 #ifndef __FreeBSD__
-  else
-    {
-      if (!is_this_a_valid_disk_format("vfat"))
-        { 
-      bkpinfo->make_cd_use_lilo = TRUE;
-      log_to_screen( "Your kernel appears not to support vfat filesystems. I am therefore");
-      log_to_screen( "using LILO instead of SYSLINUX as the CD/floppy's boot loader.");
-        }
-      if (run_program_and_log_output("which mkfs.vfat", FALSE))
-        {
-      bkpinfo->make_cd_use_lilo = TRUE;
+    else {
+        if (!is_this_a_valid_disk_format("vfat")) {
+            bkpinfo->make_cd_use_lilo = TRUE;
+            log_to_screen
+                ("Your kernel appears not to support vfat filesystems. I am therefore");
+            log_to_screen
+                ("using LILO instead of SYSLINUX as the CD/floppy's boot loader.");
+        }
+        if (run_program_and_log_output("which mkfs.vfat", FALSE)) {
+            bkpinfo->make_cd_use_lilo = TRUE;
 #ifdef __IA32__
-      log_to_screen( "Your filesystem is missing 'mkfs.vfat', so I cannot use SYSLINUX as");
-      log_to_screen( "your boot loader. I shall therefore use LILO instead.");
+            log_to_screen
+                ("Your filesystem is missing 'mkfs.vfat', so I cannot use SYSLINUX as");
+            log_to_screen
+                ("your boot loader. I shall therefore use LILO instead.");
 #endif
 #ifdef __IA64__
-      log_to_screen( "Your filesystem is missing 'mkfs.vfat', so I cannot prepare the EFI");
-      log_to_screen( "environment correctly. Please install it.");
-      fatal_error("Aborting");
+            log_to_screen
+                ("Your filesystem is missing 'mkfs.vfat', so I cannot prepare the EFI");
+            log_to_screen("environment correctly. Please install it.");
+            fatal_error("Aborting");
 #endif
-    }
+        }
 #ifdef __IA64__
-      /* We force ELILO usage on IA64 */
-      bkpinfo->make_cd_use_lilo = TRUE;
+        /* We force ELILO usage on IA64 */
+        bkpinfo->make_cd_use_lilo = TRUE;
 #endif
-    }
+    }
 #endif
 
-  if (bkpinfo->make_cd_use_lilo && !does_file_exist("/boot/boot.b"))
-    {
-      paranoid_system("touch /boot/boot.b");
-    }
-
-  i = flag_set['O'] + flag_set['V'];
-  if (i == 0)
-    {
-      retval++;
-      log_to_screen( "Specify backup (-O), verify (-V) or both (-OV).\n");
-    }
+    if (bkpinfo->make_cd_use_lilo && !does_file_exist("/boot/boot.b")) {
+        paranoid_system("touch /boot/boot.b");
+    }
+
+    i = flag_set['O'] + flag_set['V'];
+    if (i == 0) {
+        retval++;
+        log_to_screen("Specify backup (-O), verify (-V) or both (-OV).\n");
+    }
 
 /* and finally... */
 
-  paranoid_free(tmp);
-  paranoid_free(psz);  
-  return (retval);
+    paranoid_free(tmp);
+    paranoid_free(psz);
+    return (retval);
 }
 
@@ -926 +947 @@
  */
 int
-retrieve_switches_from_command_line (int argc, char *argv[],
-                     char flag_val[128][MAX_STR_LEN],
-                     bool flag_set[128])
+retrieve_switches_from_command_line(int argc, char *argv[],
+                                    char flag_val[128][MAX_STR_LEN],
+                                    bool flag_set[128])
 {
-    /*@ ints ***/
-  int opt = 0;
-  char tmp[MAX_STR_LEN];
-  int i = 0;
-  int len;
-
-    /*@ bools ****/
-  bool bad_switches = FALSE;
-
-  assert(flag_val!=NULL);
-  assert(flag_set!=NULL);
-
-  for (i = 0; i < 128; i++)
-    {
-      flag_val[i][0] = '\0';
-      flag_set[i] = FALSE;
-    }
-  while ((opt =
-      getopt (argc, argv,
-          "0123456789A:B:CDE:FHI:J:K:LNOP:QRS:T:VWb:c:d:ef:gik:l:mn:op:rs:tuw:x:")) !=
-     -1)
-    {
-      if (opt == '?')
-    {
-      bad_switches = TRUE;
-      /*log_it("Invalid option: %c\n",optopt); */
-    }
-      else
-    {
-      if (flag_set[optopt])
-        {
-          bad_switches = TRUE;
-          sprintf(tmp, "Switch -%c previously defined as %s\n", opt,
-               flag_val[i]);
-              log_to_screen(tmp);
-        }
-      else
-        {
-          flag_set[opt] = TRUE;
-          if (optarg)
-        {
-                  len = strlen(optarg);
-                  if (optarg[0] != '/' && optarg[len-1] == '/')
-                    {
-                      optarg[--len] = '\0'; 
-              log_to_screen("Warning - param '%s' should not have trailing slash!", optarg);
-            }
-                  if (opt=='d')
-                    {
-                      if (strchr(flag_val[opt], '/') && flag_val[opt][0]!='/')
-                        {
-                          sprintf(tmp, "-%c flag --- must be absolute path --- '%s' isn't absolute", opt, flag_val[opt]);
-                          log_to_screen(tmp);
-                          bad_switches = TRUE;
-                        }
-            }
-          strcpy(flag_val[opt], optarg);
-        }
-        }
-    }
-    }
-  for (i = optind; i < argc; i++)
-    {
-      bad_switches = TRUE;
-      sprintf(tmp, "Invalid arg -- %s\n", argv[i]);
-      log_to_screen(tmp);
-    }
-  return (bad_switches);
+    /*@ ints ** */
+    int opt = 0;
+    char tmp[MAX_STR_LEN];
+    int i = 0;
+    int len;
+
+    /*@ bools *** */
+    bool bad_switches = FALSE;
+
+    assert(flag_val != NULL);
+    assert(flag_set != NULL);
+
+    for (i = 0; i < 128; i++) {
+        flag_val[i][0] = '\0';
+        flag_set[i] = FALSE;
+    }
+    while ((opt =
+            getopt(argc, argv,
+                   "0123456789A:B:C:DE:FHI:J:K:LNOP:QRS:T:VWb:c:d:ef:gik:l:mn:op:rs:tuw:x:"))
+           != -1) {
+        if (opt == '?') {
+            bad_switches = TRUE;
+            /*log_it("Invalid option: %c\n",optopt); */
+        } else {
+            if (flag_set[optopt]) {
+                bad_switches = TRUE;
+                sprintf(tmp, "Switch -%c previously defined as %s\n", opt,
+                        flag_val[i]);
+                log_to_screen(tmp);
+            } else {
+                flag_set[opt] = TRUE;
+                if (optarg) {
+                    len = strlen(optarg);
+                    if (optarg[0] != '/' && optarg[len - 1] == '/') {
+                        optarg[--len] = '\0';
+                        log_to_screen
+                            ("Warning - param '%s' should not have trailing slash!",
+                             optarg);
+                    }
+                    if (opt == 'd') {
+                        if (strchr(flag_val[opt], '/')
+                            && flag_val[opt][0] != '/') {
+                            sprintf(tmp,
+                                    "-%c flag --- must be absolute path --- '%s' isn't absolute",
+                                    opt, flag_val[opt]);
+                            log_to_screen(tmp);
+                            bad_switches = TRUE;
+                        }
+                    }
+                    strcpy(flag_val[opt], optarg);
+                }
+            }
+        }
+    }
+    for (i = optind; i < argc; i++) {
+        bad_switches = TRUE;
+        sprintf(tmp, "Invalid arg -- %s\n", argv[i]);
+        log_to_screen(tmp);
+    }
+    return (bad_switches);
 }
 
@@ -1006 +1019 @@
  * Print a not-so-helpful help message and exit.
  */
-void
-help_screen ()
+void help_screen()
 {
-  log_msg(1,  "Type 'man mondo-archive' for more information\n");
-  exit (1);
+    log_msg(1, "Type 'man mondo-archive' for more information\n");
+    exit(1);
 }
 
@@ -1020 +1032 @@
 void terminate_daemon(int sig)
 {
-  char tmp[64];
-  char tmp2 [MAX_STR_LEN];
-  //  char command[512];
-  //  pid_t pid;
-
-  switch(sig)
-    {
+    char tmp[64];
+    char tmp2[MAX_STR_LEN];
+    //  char command[512];
+    //  pid_t pid;
+
+    switch (sig) {
     case SIGINT:
         sprintf(tmp, "SIGINT");
@@ -1033 +1044 @@
     case SIGKILL:
         sprintf(tmp, "SIGKILL");
-        strcpy(tmp2, "I seriously have no clue how this signal even got to me. Something's wrong with your system.");
+        strcpy(tmp2,
+               "I seriously have no clue how this signal even got to me. Something's wrong with your system.");
         break;
     case SIGTERM:
         sprintf(tmp, "SIGTERM");
-        strcpy (tmp2, "Got terminate signal");
+        strcpy(tmp2, "Got terminate signal");
         break;
     case SIGHUP:
         sprintf(tmp, "SIGHUP");
-        strcpy (tmp2, "Hangup on line");
+        strcpy(tmp2, "Hangup on line");
         break;
     case SIGSEGV:
         sprintf(tmp, "SIGSEGV");
-        strcpy (tmp2, "Internal programming error. Please send a backtrace as well as your log.");
+        strcpy(tmp2,
+               "Internal programming error. Please send a backtrace as well as your log.");
         break;
     case SIGPIPE:
         sprintf(tmp, "SIGPIPE");
-        strcpy (tmp2, "Pipe was broken");
+        strcpy(tmp2, "Pipe was broken");
         break;
-    case SIGABRT:
-    sprintf (tmp, "SIGABRT");
-    sprintf (tmp2, "Abort - probably failed assertion. I'm sleeping for a few seconds so you can read the message.");
-    break;
+    case SIGABRT:
+        sprintf(tmp, "SIGABRT");
+        sprintf(tmp2,
+                "Abort - probably failed assertion. I'm sleeping for a few seconds so you can read the message.");
+        break;
     default:
         sprintf(tmp, "(Unknown)");
-    }
-
-  strcat(tmp, " signal received from OS");
-  log_to_screen(tmp);
-  log_to_screen (tmp2);
-  if (sig == SIGABRT) {
-      sleep (10);
-  }
-  kill_buffer();
-  fatal_error("Mondoarchive is terminating in response to a signal from the OS");
-  finish(254); // just in case
+    }
+
+    strcat(tmp, " signal received from OS");
+    log_to_screen(tmp);
+    log_to_screen(tmp2);
+    if (sig == SIGABRT) {
+        sleep(10);
+    }
+    kill_buffer();
+    fatal_error
+        ("Mondoarchive is terminating in response to a signal from the OS");
+    finish(254);                // just in case
 }
 
@@ -1079 +1094 @@
 void set_signals(int on)
 {
-  int signals[]= { SIGTERM, SIGHUP, SIGTRAP, SIGABRT, SIGINT, SIGKILL, SIGSTOP, 0 };
-  int i;
-  
-  signal(SIGPIPE, sigpipe_occurred);
-  for (i=0; signals[i]; i++)
-    {
-      if (on)
-        { signal(signals[i], terminate_daemon); }
-      else
-        { signal(signals[i], termination_in_progress); }
-    }
+    int signals[] =
+        { SIGTERM, SIGHUP, SIGTRAP, SIGABRT, SIGINT, SIGKILL, SIGSTOP, 0 };
+    int i;
+
+    signal(SIGPIPE, sigpipe_occurred);
+    for (i = 0; signals[i]; i++) {
+        if (on) {
+            signal(signals[i], terminate_daemon);
+        } else {
+            signal(signals[i], termination_in_progress);
+        }
+    }
 }
 
@@ -1101 +1117 @@
 void termination_in_progress(int sig)
 {
-  log_msg(1, "Termination in progress");
-  usleep(1000);
-  pthread_exit(0);
+    log_msg(1, "Termination in progress");
+    usleep(1000);
+    pthread_exit(0);
 }
 

branches/2.05/mondo/mondo/mondoarchive/mondoarchive.8

@@ -69 +69 @@
 .BI "-r "
 Use DVD drive as backup device and its disks as backup media. Growisofs decides
-on the best speed for your drive.
+on the best speed for your drive. Note that calling mondoarchive
+.B using sudo when writing to DVDs will fail
+because growisofs does not support this - see the growisofs manpage for
+details.
 
 .TP
@@ -321 +324 @@
 A link to Mondo's HTML-based manual (by Mikael Hultgren, Cafeole, Randy Delphs,
 Stan Benoit, and me) may be found at
-.I http://www.microwerks.net/~hugo/docs/docs.html
+.I http://www.mondorescue.org/docs/docs.html
 - or in 
 .I /usr/share/doc/mondo-x.xx
@@ -403 +406 @@
 .SH AUTHORS
 Hugo Rabson (coding)
-.I "hugorabson@msn.comt"
+.I "hugo.rabson@mondorescue.org"
 .br
 Jesse Keating (packaging)
@@ -414 +417 @@
 .I "mikael_hultgren@gmx.net"
 .br
-See mailing list at http://www.mondorescue.com for technical support.
+See mailing list at http://www.mondorescue.org for technical support.
 .

branches/2.05/mondo/mondo/mondorestore/mondorestore.8

@@ -34 +34 @@
 A link to Mondo's HTML-based manual (by Mikael Hultgren, Cafeole, Randy Delphs,
 Stan Benoit, and me) may be found at
-.I http://www.microwerks.net/~hugo/docs/docs.html
+.I http://www.mondorescue.org/docs/docs.html
 - or in 
 .I /usr/share/doc/mondo-x.xx
@@ -51 +51 @@
 .SH AUTHORS
 Hugo Rabson (coding)
-.I "hugorabson@msn.comt"
+.I "hugo.rabson@mondorescue.org"
 .br
 Jesse Keating (packaging)
@@ -62 +62 @@
 .I "mikael_hultgren@gmx.net"
 .br
-See mailing list at http://www.mondorescue.com for technical support.
+See mailing list at http://www.mondorescue.org for technical support.
 .