Changeset 1080 in MondoRescue for branches/stable/mondo/src/mondoarchive

Timestamp:

Jan 28, 2007, 7:04:41 PM (17 years ago)

Author:

Bruno Cornec

Message:

• Fix mindi install messages (reported by Andree Leidenfrost)
• remove paranoid_free/free for mr_free
• mr_asprintf used everywhere
• mr_malloc used everywhere

Location:

branches/stable/mondo/src/mondoarchive

Files:

• main.c (modified) (3 diffs)
• mondo-cli.c (modified) (9 diffs)

branches/stable/mondo/src/mondoarchive/main.c

@@ -1 +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$
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-/** 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 **********/
+* $Id$
+*/
 
 
@@ -286 +188 @@
     say_at_end[0] = '\0';
     printf("Initializing...\n");
-    if (!(bkpinfo = malloc(sizeof(struct s_bkpinfo)))) {
-        fatal_error("Cannot malloc bkpinfo");
-    }
+    bkpinfo = mr_malloc(sizeof(struct s_bkpinfo));
 
     /* initialize log file with time stamp */
@@ -538 +438 @@
     system(g_erase_tmpdir_and_scratchdir);
     free_libmondo_global_strings();
-    paranoid_free(say_at_end);
-    paranoid_free(tmp);
-    paranoid_free(bkpinfo);
+    mr_free(say_at_end);
+    mr_free(tmp);
+    mr_free(bkpinfo);
 
     unlink("/tmp/filelist.full");

branches/stable/mondo/src/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
-
-
+$Id$
 *******************************************************************/
 
@@ -166 +15 @@
 #include "mondo-cli-EXT.h"
 #include "../common/libmondo.h"
+#include "mr_mem.h"
 
 //static char cvsid[] = "$Id$";
@@ -282 +132 @@
         store_nfs_config(bkpinfo);
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (retval);
 }
@@ -440 +290 @@
             strcat(bkpinfo->include_paths, " ");
         }
-        asprintf(&tmp1, flag_val['I']);
+        mr_asprintf(&tmp1, flag_val['I']);
         p = tmp1;
         q = tmp1;
@@ -462 +312 @@
             }
         }
-        paranoid_free(tmp1);
+        mr_free(tmp1);
 
         strncpy(bkpinfo->include_paths + strlen(bkpinfo->include_paths),
@@ -684 +534 @@
     if (flag_set['z']) {
         if (find_home_of_exe("getfattr")) {
-            asprintf(&g_getfattr,"getfattr");
+            mr_asprintf(&g_getfattr,"getfattr");
         }
         if (find_home_of_exe("getfacl")) {
-            asprintf(&g_getfacl,"getfacl");
+            mr_asprintf(&g_getfacl,"getfacl");
         }
     }
@@ -700 +550 @@
             strcat(bkpinfo->exclude_paths, " ");
         }
-        asprintf(&tmp1, flag_val['E']);
+        mr_asprintf(&tmp1, flag_val['E']);
         p = tmp1;
         q = tmp1;
@@ -728 +578 @@
             }
         }
-        paranoid_free(tmp1);
+        mr_free(tmp1);
 
         strncpy(bkpinfo->exclude_paths + strlen(bkpinfo->exclude_paths),
@@ -1005 +855 @@
 /* and finally... */
 
-    paranoid_free(tmp);
-    paranoid_free(psz);
+    mr_free(tmp);
+    mr_free(psz);
     return (retval);
 }