Changeset 2211 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-verify.c

Timestamp:

Jun 3, 2009, 7:10:19 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3089@localhost: bruno | 2009-05-18 06:41:05 +0200

• move call to asprintf to call to mr_asprintf (suppress a compiler warning)
• remove all the most obvious bad call to strcat and replace by mr_strcat as appropriate

File:

• branches/2.2.9/mondo/src/common/libmondo-verify.c (modified) (8 diffs)

branches/2.2.9/mondo/src/common/libmondo-verify.c

@@ -1 +1 @@
 /***************************************************************************
-libmondo-verify.c  -  description
------------------
-
-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$
+$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.                                   *
- *                                                                         *
- ***************************************************************************/
-/* mondo-verify
-
-
-07/07
-- added star verify support
-
-04/04/2004
-- added star support
-
-10/23/2003
-- changed "ISO #n" to "<media descriptor> #n"
-
-10/01
-- working on biggiefile verification (CDs)
-
-09/16
-- fixed bug in CD biggie verif'n
-
-09/15
-- state explicitly that we do not verify disk images
-
-09/13
-- working on verify_all_slices_on_CD()
-
-09/01
-- write list of changed biggiefiles (streaming only) to changed.files
-
-05/05
-- exclude /dev/ * from list of changed files
-- add Joshua Oreman's FreeBSD patches
-
-04/24/2003
-- added lots of assert()'s and log_OS_error()'s
-
-09/01 - 09/30/2002
-- run_program_and_log_output() now takes boolean operator to specify
-  whether it will log its activities in the event of _success_
-- eject_device() added
-- cleaned up 'changed file' feedback a little bit
-
-08/01 - 08/31
-- make sure to prefix bkpinfo->restore_path to local biggiefile fname when
-  comparing it to the archived copy of biggiefile; otherwise, biggiefile
-  not found & checksum missing & so on
-- exclude "incheckentry xwait()" from changed.files
-- cleaned up some log_it() calls
-
-07/01 - 07/31
-- renamed libmondo-verify.c
-- say 'bigfile' not 'biggiefile'
-- exclude /dev/ * from changed.files
-
-01/01 - 06/30
-- remove /tmp/changed.files.* dead files
-- don't pclose() tape after calling closein_tape(): the latter does it already
-- fixed bug in verify_cd_image()'s CD-mounting code
-- don't write to screen "old cksum.. curr cksum.."
-- changed the gawks to awks for the benefit of Debian
-- handles files >2GB in size
-- fixed bug in /tmp/changed.files-generator
-- re-enabled a lot of CD-verification code
-- afioballs are saved in %s/tmpfs/ now (%s=tmpdir)
-- changed some labels to make them more user-friendly
-- don't chdir() anywhere before verifying stuff
-- changed files are now detected by verify_tape_backup() and listed in
-  /tmp/changed.files
-- replaced &> with > .. 2>
-- still implementing improved tape support
-
-
-Started late Dec, 2001
-
------------------------------------------------------------------------------
-*/
 
 
@@ -101 +10 @@
 
 #include "my-stuff.h"
+#include "mr_mem.h"
 #include "mondostructures.h"
 #include "libmondo-verify.h"
@@ -419 +329 @@
                             bkpinfo->restore_path,
                             biggiestruct.filename);
-                asprintf(&tmp, "echo \"%s/%s not found\" >> %s/biggies.changed",
+                mr_asprintf(&tmp, "echo \"%s/%s not found\" >> %s/biggies.changed",
                             bkpinfo->restore_path,
                             biggiestruct.filename,
@@ -1070 +980 @@
     assert(bkpinfo != NULL);
 
-    asprintf(&fname, "%s1", bkpinfo->media_device);
+    mr_asprintf(&fname, "%s1", bkpinfo->media_device);
     if (is_this_device_mounted(fname)) {
         log_msg(1, "USB device mounted. Remounting it at the right place");
-        asprintf(&tmp, "umount %s", fname);
+        mr_asprintf(&tmp, "umount %s", fname);
         run_program_and_log_output(tmp, FALSE);
         paranoid_free(tmp);
@@ -1080 +990 @@
 
     log_msg(1, "Mounting USB device.");
-    asprintf(&mountpoint, "%s/usb", bkpinfo->tmpdir);
-    asprintf(&tmp, "mkdir -p %s", mountpoint);
+    mr_asprintf(&mountpoint, "%s/usb", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "mkdir -p %s", mountpoint);
     run_program_and_log_output(tmp, FALSE);
     paranoid_free(tmp);
     /* Mindi always create one single parition on the USB dev */
-    asprintf(&tmp, "mount %s1 %s", bkpinfo->media_device, mountpoint);
+    mr_asprintf(&tmp, "mount %s1 %s", bkpinfo->media_device, mountpoint);
     ret = run_program_and_log_output(tmp, FALSE);
     paranoid_free(tmp);
@@ -1095 +1005 @@
     sync();
     log_msg(2, "OK, I've mounted the USB Disk/Key\n");
-    asprintf(&tmp, "%s/archives/NOT-THE-LAST", mountpoint);
+    mr_asprintf(&tmp, "%s/archives/NOT-THE-LAST", mountpoint);
     if (!does_file_exist(tmp)) {
         log_msg
@@ -1112 +1022 @@
     verify_all_slices_on_CD(mountpoint);
 
-    asprintf(&tmp1, "umount %s", mountpoint);
+    mr_asprintf(&tmp1, "umount %s", mountpoint);
 #ifdef __FreeBSD__
     ret += system(tmp1);
@@ -1121 +1031 @@
 #endif
     {
-        asprintf(&tmp, "%s failed; unable to unmount USB device\n", tmp1);
+        mr_asprintf(&tmp, "%s failed; unable to unmount USB device\n", tmp1);
         log_to_screen(tmp);
         paranoid_free(tmp);