Changeset 2330 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-archive.c

Timestamp:

Aug 18, 2009, 3:20:49 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3341@localhost: bruno | 2009-08-13 22:36:24 +0200

• Replacement of some strcpy
• Change allocation done in resolve_softlinks_to_get_to_actual_device_file(), where_is_root_mounted(), bkptype_to_string(), which_boot_loader()

File:

• branches/2.2.10/mondo/src/common/libmondo-archive.c (modified) (8 diffs)

branches/2.2.10/mondo/src/common/libmondo-archive.c

@@ -2559 +2559 @@
  * @return 0 (there was an OK CD in the drive) or 1 (there wasn't).
  */
-int interrogate_disk_currently_in_cdrw_drive(char *cdrw_dev,
-                                             bool keep_looping)
-{
+int interrogate_disk_currently_in_cdrw_drive(char *cdrw_dev, bool keep_looping) {
     int res = 0;
     char *bkp = NULL;
@@ -2823 +2821 @@
     /*@ buffers ************************************************** */
     char *tmp = NULL;
-    char *checksum_line, *command;
+    char *checksum_line = NULL;
+    char *command;
     char *tempblock;
     char *curr_slice_fname_uncompressed = NULL;
@@ -2859 +2858 @@
     assert(bkpinfo != NULL);
     assert_string_is_neither_NULL_nor_zerolength(biggie_filename);
-    malloc_string(checksum_line);
 
     biggiestruct.for_backward_compatibility = '\n';
@@ -2877 +2875 @@
     if (ntfsprog_fifo) {
         file_to_openin = ntfsprog_fifo;
-        strcpy(checksum_line, "IGNORE");
-        log_msg(2,
-                "Not calculating checksum for %s: it would take too long",
-                biggie_filename);
+        mr_asprintf(checksum_line, "IGNORE");
+        log_msg(2, "Not calculating checksum for %s: it would take too long", biggie_filename);
         if ( !find_home_of_exe("ntfsresize")) {
             fatal_error("ntfsresize not found");
@@ -2904 +2900 @@
         }
         mr_free(command);
-        (void) fgets(checksum_line, MAX_STR_LEN, fin);
+        mr_getline(checksum_line, fin);
         pclose(fin);
         totallength = length_of_file (biggie_filename);
@@ -2918 +2914 @@
     }
     strcpy(biggiestruct.checksum, checksum_line);
+    mr_free(checksum_line);
 
     mr_asprintf(tmp, "%s", slice_fname(biggie_file_number, 0, bkpinfo->tmpdir, ""));
@@ -2940 +2937 @@
         log_to_screen("Cannot archive bigfile '%s': not found", biggie_filename);
 
-        paranoid_free(checksum_line);
         mr_free(suffix);
         return (1);
@@ -3074 +3070 @@
     mr_free(tmp);
 
-    paranoid_free(checksum_line);
     return (retval);
 }