Changeset 171 in MondoRescue for trunk/mondo/mondo/mondoarchive/main.c

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)

File:

• trunk/mondo/mondo/mondoarchive/main.c (modified) (21 diffs)

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);