Changeset 2211 in MondoRescue for branches/2.2.9/mondo/src/mondorestore/mondo-rstr-compare.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/mondorestore/mondo-rstr-compare.c (modified) (15 diffs)

branches/2.2.9/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -1 +1 @@
 /***************************************************************************
-       mondo-compare.c  -  compares mondoarchive data
-                             -------------------
-    begin                : Fri Apr 25 2003
-    copyright            : (C) 2000 by Hugo Rabson
-    email                : Hugo Rabson <hugorabson@msn.com>
     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                                      *
- ***************************************************************************
-.
-
-
-
-10/21/2003
-- changed "/mnt/cdrom" to MNT_CDROM
-
-10/18
-- don't say unknown compressor if no compressor at all
-
-09/17
-- cleaned up logging & conversion-to-changed.txt
-- cleaned up compare_mode()
-
-09/16
-- fixed bad malloc(),free() pairs in compare_a_biggiefile()
-
-09/14
-- compare_mode() --- a couple of strings were the wrong way round,
-  e.g. changed.txt and changed.files
-
-05/05
-- exclude /dev/ * from list of changed files
-
-04/30
-- added textonly mode
-
-04/27
-- improved compare_mode() to allow for ISO/cd/crazy people
-
-04/25
-- first incarnation
-*/
-
-
 #include <pthread.h>
 #include "my-stuff.h"
+#include "mr_mem.h"
 #include "../common/mondostructures.h"
 #include "../common/libmondo.h"
@@ -97 +46 @@
     char *original_cksum_ptr;
     char *bigfile_fname_ptr;
-    char *tmp_ptr;
+    char *tmp_ptr = NULL;
     char *command_ptr;
 
@@ -117 +66 @@
     malloc_string(bigfile_fname_ptr);
     malloc_string(command_ptr);
-    malloc_string(tmp_ptr);
 
   /*********************************************************************
@@ -126 +74 @@
     memset(original_cksum_ptr, '\0', sizeof(original_cksum));
     memset(bigfile_fname_ptr, '\0', sizeof(bigfile_fname));
-    memset(tmp_ptr, '\0', sizeof(tmp));
     memset(command_ptr, '\0', sizeof(command));
   /** end **/
@@ -134 +81 @@
             insist_on_this_cd_number((++g_current_media_number));
         } else {
-            sprintf(tmp_ptr,
+            mr_asprintf(&tmp_ptr,
                     "No CD's left. No biggiefiles left. No prob, Bob.");
             log_msg(2, tmp_ptr);
+            paranoid_free(tmp_ptr);
             return (0);
         }
     }
     if (!(fin = fopen(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""), "r"))) {
-        sprintf(tmp_ptr,
+        mr_asprintf(&tmp_ptr,
                 "Cannot open bigfile %ld (%s)'s info file",
                 bigfileno + 1, bigfile_fname_ptr);
         log_to_screen(tmp_ptr);
+        paranoid_free(tmp_ptr);
         return (1);
     }
@@ -156 +105 @@
     log_msg(2, "biggiestruct.checksum = %s", biggiestruct.checksum);
 
-    sprintf(tmp_ptr, "Comparing %s", bigfile_fname_ptr);
-
     if (!g_text_mode) {
+        mr_asprintf(&tmp_ptr, "Comparing %s", bigfile_fname_ptr);
         newtDrawRootText(0, 22, tmp_ptr);
+        paranoid_free(tmp_ptr);
         newtRefresh();
     }
@@ -173 +122 @@
     }
     log_msg(2, command_ptr);
-    sprintf(tmp_ptr, "cat /tmp/errors >> %s 2> /dev/null", MONDO_LOGFILE);
+    mr_asprintf(&tmp_ptr, "cat /tmp/errors >> %s 2> /dev/null", MONDO_LOGFILE);
     paranoid_system(tmp_ptr);
+    paranoid_free(tmp_ptr);
+
     if (system(command_ptr)) {
         log_OS_error("Warning - command failed");
@@ -197 +148 @@
         }
     }
-    sprintf(tmp_ptr, "bigfile #%ld ('%s') ", bigfileno + 1,
+    mr_asprintf(&tmp_ptr, "bigfile #%ld ('%s') ", bigfileno + 1,
             bigfile_fname_ptr);
     if (!strcmp(checksum_ptr, original_cksum_ptr) != 0) {
-        strcat(tmp_ptr, " ... OK");
-    } else {
-        strcat(tmp_ptr, "... changed");
+        mr_strcat(tmp_ptr, " ... OK");
+    } else {
+        mr_strcat(tmp_ptr, "... changed");
         retval++;
     }
     log_msg(1, tmp_ptr);
+    paranoid_free(tmp_ptr);
+
     if (retval) {
         if (!(fout = fopen(MONDO_CACHE"/changed.txt", "a"))) {
@@ -222 +175 @@
     paranoid_free(command_ptr);
     paranoid_free(command);
-    paranoid_free(tmp_ptr);
     paranoid_free(tmp);
 
@@ -302 +254 @@
 
   /***  needs malloc *********/
-    char *command, *tmp, *filelist_name, *logfile, *archiver_exe,
+    char *command, *tmp, *filelist_name, *logfile,
         *compressor_exe;
+    char *archiver_exe = NULL;
 
     malloc_string(command);
@@ -309 +262 @@
     malloc_string(filelist_name);
     malloc_string(logfile);
-    malloc_string(archiver_exe);
     malloc_string(compressor_exe);
 
@@ -331 +283 @@
 
     if (use_star) {
-        strcpy(archiver_exe, "star");
-    } else {
-        strcpy(archiver_exe, "afio");
+        mr_asprintf(&archiver_exe, "star");
+    } else {
+        mr_asprintf(&archiver_exe, "afio");
     }
 
@@ -344 +296 @@
         {
             if (!strcmp(compressor_exe, "bzip2")) {
-                strcat(archiver_exe, " -bz");
+                mr_strcat(archiver_exe, " -bz");
             } else {
                 fatal_error
@@ -373 +325 @@
                 BUFSIZE, compressor_exe, tarball_fname, logfile, logfile);
     }
+    paranoid_free(archiver_exe);
+
 #undef BUFSIZE
 
@@ -405 +359 @@
     paranoid_free(filelist_name);
     paranoid_free(logfile);
-    paranoid_free(archiver_exe);
     paranoid_free(compressor_exe);
     return (retval);