Changeset 171 in MondoRescue for trunk/mondo/mondo/mondoarchive

Timestamp:

Dec 8, 2005, 5:20:29 PM (18 years ago)

Author:

bcornec

Message:

memory management continues:

• mondoarchive handled completely
• bkpinfo, begining of dyn. alloc.
• lot of changes around memory everywhere

=> even if it compiles, i'm pretty sure it doesn't work yet (even not tried)

Location:

trunk/mondo/mondo/mondoarchive

Files:

• main.c (modified) (21 diffs)
• mondo-cli-EXT.h (modified) (1 diff)
• mondo-cli.c (modified) (34 diffs)
• mondo-cli.h (modified) (1 diff)

trunk/mondo/mondo/mondoarchive/main.c

@@ -1 @@
-/***************************************************************************
-                          main.c  -  description
-                             -------------------
-    begin                : Fri Apr 19 16:40:35 EDT 2002
-    copyright            : (C) 2002 by Stan Benoit
-    email                : troff@nakedsoul.org
-    cvsid                : $Id$
- ***************************************************************************/
-
-/***************************************************************************
+/*
+ * $Id$
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15 +7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
- ***************************************************************************/
-
-/** change log ****** MONDO-DEVEL
-
-
-12/10
-- disable stopping/starting of autofs
-
-10/01
-- update g_erase_tmpdir_and_scratchdir to delete user-specified tmpdir, scratchdir
-
-06/19
-- added AUX_VER
-
-06/14/2004
-- use mondorescue.iso, not mindi.iso
-
-02/10/2004
-- tell users where BusyBox's sources are
-
-11/14/2003
-- cleaned up logging at end#
-
-10/23
-- don't try to test-read tape ... That's already
-  handled by post_param_configuration()
-  
-10/19
-- if your PATH var is too long, abort
-
-09/23
-- added some comments
-- malloc/free global strings in new subroutines - malloc_libmondo_global_strings()
-  and free_libmondo_global_strings() - which are in libmondo-tools.c
-- better magicdev support
-
-
-09/16
-- delete /var/log/partimagehack-debug.log at start of main()
-
-09/15
-- added askbootloader
-
-09/09
-- if your tape is weird, I'll pause between backup and verify
-- fixed silly bug in main() - re: say_at_end
-
-01/01 - 08/31
-- call 'dmesg -n1' at start, to shut the kernel logger up
-- moved g_erase_tmpdir_and_scratchdir to common/newt-specific.c
-- added 'don't panic' msg to start of logfile
-- added 'nice(20)' to main()
-- added lots of assert()'s and log_OS_error()'s
-- clean-up (Hugo)
-- make post_param_configuration() setup g_erase_tmpdir_and_scratchdir
-- if --version then print & exit quickly
-- re-run g_erase_tmpdir_and_scratchdir via system() at very end
-
-Year: 2002
-- if user goes root with 'su' instead of 'su -' then
-  workaround it by setting PATH correctly
-- wipe mondoarchive.log at very beginning
-- cleaned up code
-- if changed.files.N exists then copy to changes.files for display
-- run_program_and_log_output() now takes boolean operator to specify
-  whether it will log its activities in the event of _success_
-- added popup list of changed files
-- removed 'beta-quality' warnings
-- if kernel not found and mondo in graphics mode then popup and ask
-  for kernel path+filename
-- fixed tmp[] 'too small' bug
-- unmount and eject CD at end of verify cycle
-- moved interactively_obtain...() to libmondo-stream.c
-- wrote stuff to autodetect tape+cdrw+etc.
-- renamed from main.c to mondo-archive.c
-- fore+after warnings that this code is beta-quality
-- abort if running from ramdisk
-- remount floppy at end & unmount at start if Mandrake
-- took out #debug stuff
-- add 2> /dev/null to 'find' command
-- add support for bkpinfo->nonbootable_backup
-- add main function begin comment and debug conditional
-  compilation - Stan Benoit
-- add debug statements to build a run tree. Stan Benoit
-**** end change log **********/
-
-
-/**
- * @file
+ ***************************************************************************
  * The main file for mondoarchive.
  */
@@ -111 +15 @@
 #include <pthread.h>
 #endif
-//#include <config.h>
-//#include "../../config.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -141 +43 @@
 extern char *g_tmpfs_mountpt;
 extern char *g_erase_tmpdir_and_scratchdir;
-extern char *g_cdrw_drive_is_here;
-static char *g_cdrom_drive_is_here = NULL;
-static char *g_dvd_drive_is_here = NULL;
 extern double g_kernel_version;
 
@@ -211 +110 @@
         ("umount `mount | grep shm | grep mondo | cut -d' ' -f3`", 2);
     unmount_supermounts_if_necessary(); // for Mandrake users whose CD-ROMs are supermounted
-    //  stop_autofs_if_necessary(); // for Xandros users
     mount_boot_if_necessary();  // for Gentoo users with non-mounted /boot partitions
     clean_up_KDE_desktop_if_necessary();    // delete various misc ~/.* files that get in the way
 }
-
 
 
@@ -223 +120 @@
 void distro_specific_kludges_at_end_of_mondoarchive()
 {
-//  char tmp[500];
     log_msg(2, "Restarting magicdev if necessary");
     sync();
     restart_magicdev_if_necessary();    // for RH+Gnome users
 
-    log_msg(2, "Restarting autofs if necessary");
-    sync();
-    //  restart_autofs_if_necessary(); // for Xandros users
-
     log_msg(2, "Restarting supermounts if necessary");
     sync();
@@ -239 +131 @@
     sync();
     unmount_boot_if_necessary();    // for Gentoo users
-
-//  log_msg( 2, "Cleaning up KDE desktop");
-//  clean_up_KDE_desktop_if_necessary();
 }
-
-
-/*-----------------------------------------------------------*/
-
 
 
@@ -257 +142 @@
     struct s_bkpinfo *bkpinfo;
     char *tmp;
-    int res, retval;
-    char *say_at_end;
+    int res = 0;
+    int retval = 0;
+    char *say_at_end = NULL;
 
 /* Make sure I'm root; abort if not */
@@ -277 +163 @@
 
     malloc_libmondo_global_strings();
-    malloc_string(tmp);
-    malloc_string(say_at_end);
-
-    res = 0;
-    retval = 0;
+
     diffs = 0;
-    say_at_end[0] = '\0';
     unlink("/var/log/partimagehack-debug.log");
     printf("Initializing...\n");
@@ -292 +173 @@
 
 /* make sure PATH environmental variable allows access to mkfs, fdisk, etc. */
-    strncpy(tmp, getenv("PATH"), MAX_STR_LEN - 1);
-    tmp[MAX_STR_LEN - 1] = '\0';
-    if (strlen(tmp) >= MAX_STR_LEN - 33) {
-        fatal_error
-            ("Your PATH environmental variable is too long. Please shorten it.");
-    }
-    strcat(tmp, ":/sbin:/usr/sbin:/usr/local/sbin");
+    asprintf(&tmp, "/sbin:/usr/sbin:%s:/usr/local/sbin", getenv("PATH"));
     setenv("PATH", tmp, 1);
+    paranoid_free(tmp);
 
 /* Add the ARCH environment variable for ia64 purposes */
-    strncpy(tmp, get_architecture(), MAX_STR_LEN - 1);
-    tmp[MAX_STR_LEN - 1] = '\0';
-    setenv("ARCH", tmp, 1);
+    setenv("ARCH", get_architecture(), 1);
 
     unlink(MONDO_LOGFILE);
@@ -339 +213 @@
     if (argc == 4 && !strcmp(argv[1], "setfattr")) {
         g_loglevel = 10;
-//      chdir("/tmp");
         g_text_mode = TRUE;
         setup_newt_stuff();
@@ -351 +224 @@
         turn_wildcard_chars_into_literal_chars(tmp, argv[2]);
         printf("in=%s; out=%s\n", argv[2], tmp);
+        paranoid_free(tmp);
         finish(1);
     }
@@ -368 +242 @@
     if (argc == 4 && !strcmp(argv[1], "setfacl")) {
         g_loglevel = 10;
-//      chdir("/tmp");
         g_text_mode = TRUE;
         setup_newt_stuff();
@@ -378 +251 @@
         g_text_mode = TRUE;
         setup_newt_stuff();
-        if (find_cdrw_device(tmp)) {
+        if ((tmp = find_cdrw_device()) == NULL) {
             printf("Failed to find CDR-RW drive\n");
         } else {
             printf("CD-RW is at %s\n", tmp);
         }
-        tmp[0] = '\0';
-        if (find_cdrom_device(tmp, atoi(argv[2]))) {
+        paranoid_free(tmp);
+
+        if ((tmp = find_cdrom_device(FALSE)) == NULL) {
             printf("Failed to find CD-ROM drive\n");
         } else {
             printf("CD-ROM is at %s\n", tmp);
         }
+        paranoid_free(tmp);
         finish(0);
     }
@@ -396 +271 @@
         g_text_mode = TRUE;
         setup_newt_stuff();
-        if (find_dvd_device(tmp, atoi(argv[2]))) {
+        if ((tmp = find_dvd_device()) == NULL) {
             printf("Failed to find DVD drive\n");
         } else {
             printf("DVD is at %s\n", tmp);
         }
+        paranoid_free(tmp);
         finish(0);
     }
@@ -451 +327 @@
     log_to_screen
         ("BusyBox's sources are available from http://www.busybox.net");
-    sprintf(g_erase_tmpdir_and_scratchdir, "rm -Rf %s %s", bkpinfo->tmpdir,
-            bkpinfo->scratchdir);
 
     /* If we're meant to backup then backup */
     if (bkpinfo->backup_data) {
-/*
-      log_to_screen("INFERNAL PORPOISES");
-      res = archive_this_fileset_with_star(bkpinfo, "/tmp/filelist.0", "/tmp/0.star.bz2", 0);
-      log_to_screen("atfws returned %d", res);
-      finish(0);
-*/
         res = backup_data(bkpinfo);
         retval += res;
         if (res) {
-            strcat(say_at_end,
+            asprintf(&say_at_end,
                    "Data archived. Please check the logs, just as a precaution. ");
         } else {
-            strcat(say_at_end, "Data archived OK. ");
+            asprintf(&say_at_end, "Data archived OK. ");
         }
     }
@@ -476 +344 @@
         res = verify_data(bkpinfo);
         if (res < 0) {
-            sprintf(tmp, "%d difference%c found.", -res,
+            asprintf(&say_at_end, "%d difference%c found.", -res,
                     (-res != 1) ? 's' : ' ');
-            strcat(say_at_end, tmp);
-            log_to_screen(tmp);
             res = 0;
         }
@@ -485 +351 @@
     }
 
-/* Offer to write floppy disk images to physical disks */
+    /* Offer to write floppy disk images to physical disks */
     if (bkpinfo->backup_data && !g_skip_floppies) {
         res = offer_to_write_boot_floppies_to_physical_disks(bkpinfo);
         retval += res;
-//      res = offer_to_write_boot_ISO_to_physical_CD(bkpinfo);
-//      retval += res;
-    }
-
-/* Report result of entire operation (success? errors?) */
-    if (!retval) {
+    }
+
+    /* Report result of entire operation (success? errors?) */
+    if (retval == 0) {
         mvaddstr_and_log_it(g_currentY++, 0,
                             "Backup and/or verify ran to completion. Everything appears to be fine.");
@@ -523 +387 @@
     }
     log_to_screen(say_at_end);
-    sprintf(tmp, "umount %s/tmpfs", bkpinfo->tmpdir);
+    paranoid_free(say_at_end);
+
+    asprintf(&tmp, "umount %s/tmpfs", bkpinfo->tmpdir);
     run_program_and_log_output(tmp, TRUE);
+    paranoid_free(tmp);
+
+    sprintf(g_erase_tmpdir_and_scratchdir, "rm -Rf %s %s", bkpinfo->tmpdir,
+            bkpinfo->scratchdir);
     run_program_and_log_output(g_erase_tmpdir_and_scratchdir, TRUE);
 
@@ -531 +401 @@
     system("rm -f /var/cache/mondo-archive/last-backup.aborted");
     system("rm -Rf /tmp.mondo.* /mondo.scratch.*");
-    if (!retval) {
+    if (retval == 0) {
         printf("Mondoarchive ran OK.\n");
     } else {
@@ -542 +412 @@
     system(g_erase_tmpdir_and_scratchdir);
     free_libmondo_global_strings();
-    paranoid_free(say_at_end);
-    paranoid_free(tmp);
     paranoid_free(bkpinfo);
 
     unlink("/tmp/filelist.full");
     unlink("/tmp/filelist.full.gz");
-
-    if (!g_cdrom_drive_is_here) {
-        log_msg(10, "FYI, g_cdrom_drive_is_here was never used");
-    }
-    if (!g_dvd_drive_is_here) {
-        log_msg(10, "FYI, g_dvd_drive_is_here was never used");
-    }
 
     run_program_and_log_output("date", 1);

trunk/mondo/mondo/mondoarchive/mondo-cli-EXT.h

@@ -5 +5 @@
 extern int process_the_s_switch(struct s_bkpinfo *bkpinfo, char *value);
 extern int process_switches(struct s_bkpinfo *bkpinfo,
-                            char flag_val[128][MAX_STR_LEN],
+                            char *flag_val[128],
                             bool flag_set[128]);
 extern int retrieve_switches_from_command_line(int argc, char *argv[],
                                                char
-                                               flag_val[128][MAX_STR_LEN],
+                                               *flag_val[128],
                                                bool flag_set[128]);
 extern void help_screen();

trunk/mondo/mondo/mondoarchive/mondo-cli.c

@@ -1 +1 @@
 /***************************************************************************
-mondo-cli.c
--------------------
-begin                : Fri Apr 19 16:40:35 EDT 2002
-copyright        : (C) 2002 Mondo  Hugo Rabson
-email                : Hugo Rabson <hugorabson@msn.com>
-edited by            : by Stan Benoit 4/2002
-email                : troff@nakedsoul.org
-cvsid                : $Id$
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-/***************************************************************************
-UPDATE LOG
-
-
-08/04
-- if user specifies a dumb -T value, abort
-
-07/22
-- handle -Q sensibly (don't abort if only -Q supplied)
-
-07/17
-- better checking of NFS dir's validity
-
-06/19
-- added AUX_VER
-
-04/17
-- added '-b' support
-04/03
-- added star support
-
-02/06
-- fixed "Please give /dev entry" error msg
-
-01/20/2004
-- added 2.6.x-kernel "device = /dev/...." support to param reader
-- better handling of SCSI and /dev entries
-- touch /boot/boot.b if necessary
-
-09/26/2003
-- typo in command-line handling of 'r'
-
-09/25
-- added DVD write support
-
-09/24
-- if tape backup (-t) but user doesn't specify tape drive then
-  make an educated guess using find_tape_device_and_size()
-
-09/18
-- insist on partimagehack being present if -x found
-
-09/16
-- added support for multiple -I's and -E's in call to mondoarchive
-- the '-D' flag doesn't take a value now
-
-07/14
-- fatal error if -E too short
-
-05/14
-- if 'n' and user doesn't have rights to write to output dir
-  then error out
-
-05/05
-- added Joshua Oreman's FreeBSD patches
-
-05/04
-- added Herman Kuster's multi-level bkp patch
-
-05/02
-- write errors to screen, not just to log
-
-04/25
-- added lots of assert()'s and log_OS_error()'s
-
-04/21
-- line 570 --- resolve boot device if softlink
-
-04/08
-- changed a bunch of fprintf(stderr,...)'s to log_it()'s
-- fixed final / removal in retrieve_switches_from_command_line()
-
-04/04
-- added -e
-
-03/15
-- reject relative paths if -d flag (Alessandro Polverini)
-
-01/02/2003
-- added -J flag (to let user specify incoming filelist)
-
-12/13/2002
-- various strcpy() calls replaced with strncpy() calls
-
-12/10
-- added g_loglevel
-
-11/25
-- line 614 --- if commmand-line param ends in '/' then drop that '/'
-
-11/19
-- rewrote finish() to kill processes more softly
-- if user calls with '-l RAW' then 
-
-09/01 - 09/30
-- added -N to let user exclude all NFS-related mounts and devices
-- run_program_and_log_output() now takes boolean operator to specify
-  whether it will log its activities in the event of _success_
-
-08/01 - 08/31
-- if no device specified when backing up to tape streamer then assume /dev/st0
-- abort if tape user specifies tape size (just for testing porpoises)
-- tape users no longer need to specify tape size
-- added some comments
-- added bkpinfo->backup_media_type
-- renamed from mondo-archive.c to mondo-cli.c
-
-07/01 - 07/31
-- better check for mkfs.vfat
-- more sanity-checking for -d flag
-- if isodir does not exist then abort
-- removed "the rest are..." comment from log
-- do not permit '-H' and '-t' in the same command line
-- if not '-o' then insist on vfat-friendly kernel
-
-06/01 - 06/30
-- added signal-trapping
-- added '-W' (won't make bootable CD or floppies) flag
-- added missing 'j++' to -s switch's code
-- expanded -s switch
-- added -u switch
-- if dvdrecord exists and cdrecord doesn't then use
-  dvdrecord instead of cdrecord
-
-04/01 - 04/30
-- if CD-ROM is supermounted then unmount, run, and remount
-- replace MONDO_VERSION #define with VERSION from ../config.h
-- if CD-ROM is mounted at start then abort
-- improved homedir-locating code
-- improved "backup will occupy N CD's" calculation a bit
-- added -m (manual CD tray) flag
-
-
-*******************************************************************/
-
-/**
- * @file
+ * $Id$
+ * 
  * Functions for handling command-line arguments passed to mondoarchive.
  */
@@ -180 +26 @@
 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];
 extern bool g_sigpipe;
@@ -245 +90 @@
     /*@ buffers *************** */
     char *tmp;
-    char flag_val[128][MAX_STR_LEN];
+    char *flag_val[128];
     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_val[i] = NULL;
         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;
@@ -275 +118 @@
     for (i = 0; i < 128; i++) {
         if (flag_set[i]) {
-            sprintf(tmp, "-%c %s", i, flag_val[i]);
+            asprintf(&tmp, "-%c %s", i, flag_val[i]);
             log_msg(3, tmp);
+            paranoid_free(tmp);
         }
     }
 //    }
-    sprintf(tmp, "rm -Rf %s/tmp.mondo.*", bkpinfo->tmpdir);
+    asprintf(&tmp, "rm -Rf %s/tmp.mondo.*", bkpinfo->tmpdir);
     paranoid_system(tmp);
-    sprintf(tmp, "rm -Rf %s/mondo.scratch.*", bkpinfo->scratchdir);
+    paranoid_free(tmp);
+
+    asprintf(&tmp, "rm -Rf %s/mondo.scratch.*", bkpinfo->scratchdir);
     paranoid_system(tmp);
+    paranoid_free(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);
+
+    asprintf(&tmp, "mkdir -p %s/tmpfs", bkpinfo->tmpdir);
     paranoid_system(tmp);
-    sprintf(tmp, "mkdir -p %s", bkpinfo->scratchdir);
+    paranoid_free(tmp);
+
+    asprintf(&tmp, "mkdir -p %s", bkpinfo->scratchdir);
     paranoid_system(tmp);
+    paranoid_free(tmp);
+
     if (bkpinfo->nfs_mount[0] != '\0') {
         store_nfs_config(bkpinfo);
     }
-    paranoid_free(tmp);
     return (retval);
 }
-
-
 
 
@@ -312 +162 @@
 {
     int j;
-    char tmp[MAX_STR_LEN], *p, comment[MAX_STR_LEN];
+    char *tmp;
+    char *p;
+    char *q;
+    char *comment;
 
     assert(bkpinfo != NULL);
@@ -320 +173 @@
     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';
+        asprintf(&tmp, p);
+        q = strchr(tmp, ',');
+        if (q != NULL) {
+            *q = '\0';
+        }
         bkpinfo->media_size[j] = friendly_sizestr_to_sizelong(tmp);
-        sprintf(comment, "media_size[%d] = %ld", j,
+        paranoid_free(tmp);
+
+        asprintf(&comment, "media_size[%d] = %ld", j,
                 bkpinfo->media_size[j]);
         log_msg(3, comment);
+        paranoid_free(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) {
@@ -339 +197 @@
     return (0);
 }
-
 
 
@@ -354 +211 @@
 int
 process_switches(struct s_bkpinfo *bkpinfo,
-                 char flag_val[128][MAX_STR_LEN], bool flag_set[128])
+                 char *flag_val[128], bool flag_set[128])
 {
 
@@ -364 +221 @@
     /*@ buffers ** */
     char *tmp;
+    char *tmp2;
     char *psz;
 
@@ -374 +232 @@
     bkpinfo->internal_tape_block_size = DEFAULT_INTERNAL_TAPE_BLOCK_SIZE;
 
-/* compulsory */
+    /* compulsory */
     i = flag_set['c'] + flag_set['i'] + flag_set['n'] +
         flag_set['t'] + flag_set['u'] + flag_set['r'] +
@@ -502 +360 @@
                     ("You must use -L with -C. Therefore I am setting it for you.");
                 flag_set['L'] = 1;
-                flag_val['L'][0] = '\0';
+                flag_val['L'] = NULL;
             }
         } 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']);
@@ -546 +403 @@
         }
         if (!flag_set['d']) {
-            if (!find_dvd_device(flag_val['d'], FALSE)) {
+            if ((flag_val['d'] = find_dvd_device()) != NULL) {
                 flag_set['d'] = TRUE;
                 log_to_screen("I guess DVD drive is at %s", flag_val['d']);
@@ -564 +421 @@
         }
         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");
+            asprintf(&flag_val['s'], "%dm", DEFAULT_DVD_DISK_SIZE); // 4.7 salesman's GB = 4.482 real GB = 4582 MB
             log_to_screen
                 ("You did not specify a size (-s) for DVD. I'm guessing %s.",
@@ -571 +427 @@
             flag_set['s'] = 1;
         }
-/*
-      if (flag_set['Z']) {
-      bkpinfo->blank_dvd_first = TRUE;
-      }
-*/
     }
 
@@ -612 +463 @@
     }
     if (flag_set['n']) {
-        strncpy(bkpinfo->nfs_mount, flag_val['n'], MAX_STR_LEN);
+        asprintf(&tmp, flag_val['n']);
+        bkpinfo->nfs_mount = tmp;
         if (!flag_set['d']) {
-            strncpy(bkpinfo->nfs_remote_dir, "/", MAX_STR_LEN);
+            asprintf(&tmp, "/");
+            bkpinfo->nfs_remote_dir = tmp;
         }
         asprintf(&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);
+        asprintf(&tmp2, call_program_and_get_last_line_of_output(tmp));
+        bkpinfo->isodir = tmp2;
         paranoid_free(tmp);
 
@@ -714 +566 @@
     }
     if (flag_set['x']) {
-        strncpy(bkpinfo->image_devs, flag_val['x'], MAX_STR_LEN / 4);
+        asprintf(&tmp, flag_val['x']);
+        bkpinfo->image_devs = tmp;
         if (run_program_and_log_output("which partimagehack", 2)) {
             fatal_error("Please install partimagehack RPM/tarball.");
@@ -723 +576 @@
     }
     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++;
-            asprintf(&tmp,
+        if (strcasecmp(flag_val['k'], "FAILSAFE")) {
+            asprintf(&tmp, "FAILSAFE");
+            bkpinfo->kernel_path = tmp;
+
+            if (!does_file_exist(bkpinfo->kernel_path)) {
+                retval++;
+                asprintf(&tmp,
                     "You specified kernel '%s', which does not exist\n",
                     bkpinfo->kernel_path);
-            log_to_screen(tmp);
-            paranoid_free(tmp);
+                log_to_screen(tmp);
+                paranoid_free(tmp);
+            }
+        } else {
+            asprintf(&tmp, flag_val['k']);
+            bkpinfo->kernel_path = tmp;
         }
     }
     if (flag_set['p']) {
-        strncpy(bkpinfo->prefix, flag_val['p'], MAX_STR_LEN / 4);
+        asprintf(&tmp, bkpinfo->prefix);
+        bkpinfo->prefix = tmp;
     }
 
@@ -744 +601 @@
     if (flag_set['d']) {        /* backup directory (if ISO/NFS) */
         if (flag_set['i']) {
-            strncpy(bkpinfo->isodir, flag_val['d'], MAX_STR_LEN / 4);
+            asprintf(&tmp, flag_val['d']);
+            bkpinfo->isodir = tmp;
             asprintf(&tmp, "ls -l %s", bkpinfo->isodir);
             if (run_program_and_log_output(tmp, FALSE)) {
@@ -752 +610 @@
             paranoid_free(tmp);
         } else if (flag_set['n']) {
-            strncpy(bkpinfo->nfs_remote_dir, flag_val['d'], MAX_STR_LEN);
+            asprintf(&tmp, flag_val['d']);
+            bkpinfo->nfs_remote_dir = tmp;
         } else {                /* backup device (if tape/CD-R/CD-RW) */
 
-            strncpy(bkpinfo->media_device, flag_val['d'], MAX_STR_LEN / 4);
+            paranoid_alloc(bkpinfo->media_device, flag_val['d']);
         }
     }
@@ -782 +641 @@
                 log_to_screen("User opted to cancel.");
             }
-        } else if (find_cdrw_device(bkpinfo->media_device)) {
+        } else if ((tmp = find_cdrw_device()) ==  NULL) {
+            paranoid_free(bkpinfo->media_device);
+            bkpinfo->media_device = tmp;
             retval++;
             log_to_screen
@@ -788 +649 @@
         } else {
             flag_set['d'] = TRUE;
-            strncpy(flag_val['d'], bkpinfo->media_device, MAX_STR_LEN / 4);
+            asprintf(&flag_val['d'], bkpinfo->media_device);
         }
     }
@@ -805 +666 @@
     }
     if (flag_set['S']) {
-        sprintf(bkpinfo->scratchdir, "%s/mondo.scratch.%ld", flag_val['S'],
+        asprintf(&tmp, "%s/mondo.scratch.%ld", flag_val['S'],
                 random() % 32768);
+        bkpinfo->scratchdir = tmp;
     }
     if (flag_set['T']) {
-        sprintf(bkpinfo->tmpdir, "%s/tmp.mondo.%ld", flag_val['T'],
+        asprintf(&tmp, "%s/tmp.mondo.%ld", flag_val['T'],
                 random() % 32768);
+        bkpinfo->tmpdir = tmp;
         asprintf(&tmp, "touch %s/.foo.dat", flag_val['T']);
         if (run_program_and_log_output(tmp, 1)) {
@@ -831 +694 @@
     }
     if (flag_set['A']) {
-        strncpy(bkpinfo->call_after_iso, flag_val['A'], MAX_STR_LEN);
+        asprintf(&tmp, flag_val['A']);
+        bkpinfo->call_after_iso = tmp;
     }
     if (flag_set['B']) {
-        strncpy(bkpinfo->call_before_iso, flag_val['B'], MAX_STR_LEN);
+        asprintf(&tmp, flag_val['B']);
+        bkpinfo->call_before_iso = tmp;
     }
     if (flag_set['F']) {
@@ -864 +729 @@
     if (flag_set['f']) {
         tmp = resolve_softlinks_to_get_to_actual_device_file(flag_val['f']);
-        strncpy(bkpinfo->boot_device, tmp,
-                MAX_STR_LEN / 4);
+        bkpinfo->boot_device = tmp;
     }
     if (flag_set['Q']) {
@@ -880 +744 @@
 
     if (flag_set['P']) {
-        strncpy(bkpinfo->postnuke_tarball, flag_val['P'], MAX_STR_LEN);
+        asprintf(&tmp, flag_val['P']);
+        bkpinfo->postnuke_tarball = tmp;
     }
     if (flag_set['L']) {
@@ -894 +759 @@
         &&
         !run_program_and_log_output
-        ("cat /etc/issue.net | grep -i suse | grep 64", TRUE)) {
+        ("grep -i suse /etc/issue.net | grep 64", TRUE)) {
         bkpinfo->make_cd_use_lilo = TRUE;
         log_to_screen
@@ -963 +828 @@
 int
 retrieve_switches_from_command_line(int argc, char *argv[],
-                                    char flag_val[128][MAX_STR_LEN],
+                                    char *flag_val[128],
                                     bool flag_set[128])
 {
     /*@ ints ** */
     int opt = 0;
-    char tmp[MAX_STR_LEN];
+    char *tmp;
     int i = 0;
     int len;
@@ -979 +844 @@
 
     for (i = 0; i < 128; i++) {
-        flag_val[i][0] = '\0';
+        flag_val[i] = NULL;
         flag_set[i] = FALSE;
     }
@@ -992 +857 @@
             if (flag_set[optopt]) {
                 bad_switches = TRUE;
-                sprintf(tmp, "Switch -%c previously defined as %s\n", opt,
+                asprintf(&tmp, "Switch -%c previously defined as %s\n", opt,
                         flag_val[i]);
                 log_to_screen(tmp);
+                paranoid_free(tmp);
             } else {
                 flag_set[opt] = TRUE;
@@ -1008 +874 @@
                         if (strchr(flag_val[opt], '/')
                             && flag_val[opt][0] != '/') {
-                            sprintf(tmp,
+                            asprintf(&tmp,
                                     "-%c flag --- must be absolute path --- '%s' isn't absolute",
                                     opt, flag_val[opt]);
                             log_to_screen(tmp);
+                            paranoid_free(tmp);
                             bad_switches = TRUE;
                         }
                     }
-                    strcpy(flag_val[opt], optarg);
+                    asprintf(&flag_val[opt], optarg);
                 }
             }
@@ -1022 +889 @@
     for (i = optind; i < argc; i++) {
         bad_switches = TRUE;
-        sprintf(tmp, "Invalid arg -- %s\n", argv[i]);
+        asprintf(&tmp, "Invalid arg -- %s\n", argv[i]);
         log_to_screen(tmp);
+        paranoid_free(tmp);
     }
     return (bad_switches);
@@ -1047 +915 @@
 void terminate_daemon(int sig)
 {
-    char tmp[64];
-    char tmp2[MAX_STR_LEN];
-    //  char command[512];
-    //  pid_t pid;
+    char *tmp;
+    char *tmp2;
 
     switch (sig) {
     case SIGINT:
-        sprintf(tmp, "SIGINT");
-        strcpy(tmp2, "You interrupted me :-)");
+        asprintf(&tmp, "SIGINT signal received from OS");
+        asprintf(&tmp2, "You interrupted me :-)");
         break;
     case SIGKILL:
-        sprintf(tmp, "SIGKILL");
-        strcpy(tmp2,
+        asprintf(&tmp, "SIGKILL signal received from OS");
+        asprintf(&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");
+        asprintf(&tmp, "SIGTERM signal received from OS");
+        asprintf(&tmp2, "Got terminate signal");
         break;
     case SIGHUP:
-        sprintf(tmp, "SIGHUP");
-        strcpy(tmp2, "Hangup on line");
+        asprintf(&tmp, "SIGHUP signal received from OS");
+        asprintf(&tmp2, "Hangup on line");
         break;
     case SIGSEGV:
-        sprintf(tmp, "SIGSEGV");
-        strcpy(tmp2,
+        asprintf(&tmp, "SIGSEGV signal received from OS");
+        asprintf(&tmp2,
                "Internal programming error. Please send a backtrace as well as your log.");
         break;
     case SIGPIPE:
-        sprintf(tmp, "SIGPIPE");
-        strcpy(tmp2, "Pipe was broken");
+        asprintf(&tmp, "SIGPIPE signal received from OS");
+        asprintf(&tmp2, "Pipe was broken");
         break;
     case SIGABRT:
-        sprintf(tmp, "SIGABRT");
-        sprintf(tmp2,
+        asprintf(&tmp, "SIGABRT signal received from OS");
+        asprintf(&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");
+        asprintf(&tmp, "(Unknown)");
+        asprintf(&tmp2, "(Unknown)");
+    }
+
     log_to_screen(tmp);
     log_to_screen(tmp2);
+    paranoid_free(tmp);
+    paranoid_free(tmp2);
     if (sig == SIGABRT) {
         sleep(10);
@@ -1099 +967 @@
     finish(254);                // just in case
 }
-
-
 
 
@@ -1122 +988 @@
     }
 }
-
-
 
 

trunk/mondo/mondo/mondoarchive/mondo-cli.h

@@ -7 +7 @@
 int process_the_s_switch(struct s_bkpinfo *bkpinfo, char *value);
 int process_switches(struct s_bkpinfo *bkpinfo,
-                     char flag_val[128][MAX_STR_LEN], bool flag_set[128]);
+                     char *flag_val[128], bool flag_set[128]);
 int retrieve_switches_from_command_line(int argc, char *argv[],
-                                        char flag_val[128][MAX_STR_LEN],
+                                        char *flag_val[128],
                                         bool flag_set[128]);
 void help_screen();