Changeset 2211 in MondoRescue for branches/2.2.9/mondo/src/mondoarchive

Timestamp:

Jun 3, 2009, 7:10:19 PM (16 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

Location:

branches/2.2.9/mondo/src/mondoarchive

Files:

• Makefile.am (modified) (1 diff)
• mondoarchive.c (modified) (10 diffs)

branches/2.2.9/mondo/src/mondoarchive/Makefile.am

@@ -11 +11 @@
 sbin_PROGRAMS        = mondoarchive
 mondoarchive_SOURCES = mondoarchive.c
-mondoarchive_LDADD   = ${top_builddir}/src/common/libmondo.a
+mondoarchive_LDADD   = ${top_builddir}/src/common/libmondo.a ${top_builddir}/src/lib/libmr.a

branches/2.2.9/mondo/src/mondoarchive/mondoarchive.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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-/**
- * @file
- * The main file for mondoarchive.
- */
+$Id$
+* The main file for mondoarchive.
+*/
 
 /************************* #include statements *************************/
@@ -27 +9 @@
 #include <stdlib.h>
 #include "my-stuff.h"
+#include "mr_mem.h"
 #include "../common/mondostructures.h"
 #include "../common/libmondo.h"
@@ -70 +53 @@
 /* Reference to global bkpinfo */
 struct s_bkpinfo *bkpinfo;
+
+/* No cleanup for the moment */
+void (*mr_cleanup)(void) = NULL;
 
 /* To be coded */
@@ -183 +169 @@
     char *tmp1 = NULL;
     int res, retval;
-    char *say_at_end;
+    char *say_at_end = NULL;
 
 /* Make sure I'm root; abort if not */
@@ -211 +197 @@
     diffs = 0;
     malloc_string(tmp);
-    malloc_string(say_at_end);
-    say_at_end[0] = '\0';
     malloc_libmondo_global_strings();
 
@@ -220 +204 @@
 
     /* make sure PATH environmental variable allows access to mkfs, fdisk, etc. */
-    asprintf(&tmp1,"%s:/sbin:/usr/sbin:/usr/local/sbin",getenv("PATH"));
+    mr_asprintf(&tmp1,"%s:/sbin:/usr/sbin:/usr/local/sbin",getenv("PATH"));
     setenv("PATH", tmp1, 1);
     paranoid_free(tmp1);
 
     /* Add the ARCH environment variable for ia64 purposes */
-    asprintf(&tmp1,"%s",get_architecture());
+    mr_asprintf(&tmp1,"%s",get_architecture());
     setenv("ARCH", tmp1, 1);
     paranoid_free(tmp1);
@@ -378 +362 @@
         retval += res;
         if (res) {
-            strcat(say_at_end,
+            mr_asprintf(&say_at_end,
                    "Data archived. Please check the logs, just as a precaution. ");
         } else {
-            strcat(say_at_end, "Data archived OK. ");
+            mr_asprintf(&say_at_end, "Data archived OK. ");
         }
     }
@@ -391 +375 @@
             sprintf(tmp, "%d difference%c found.", -res,
                     (-res != 1) ? 's' : ' ');
-            strcat(say_at_end, tmp);
+            mr_asprintf(&say_at_end, tmp);
             log_to_screen(tmp);
             res = 0;
@@ -424 +408 @@
         unlink(MONDO_CACHE"/changed.files");
     }
-    log_to_screen(say_at_end);
+    if (say_at_end != NULL) {
+        log_to_screen(say_at_end);
+        paranoid_free(say_at_end);
+    }
     sprintf(tmp, "umount %s/tmpfs", bkpinfo->tmpdir);
     run_program_and_log_output(tmp, TRUE);
@@ -445 +432 @@
 
     free_libmondo_global_strings();
-    paranoid_free(say_at_end);