Changeset 1274 in MondoRescue

Timestamp:

Mar 27, 2007, 12:41:17 AM (17 years ago)

Author:

Bruno Cornec

Message:

• Fix mkchangelog.pl compilation error
• Various Valgrind fixes

Location:

branches/2.2.2

Files:

• mondo/src/common/libmondo-archive.c (modified) (1 diff)
• mondo/src/common/libmondo-tools.c (modified) (1 diff)
• mondo/src/common/newt-specific.c (modified) (1 diff)
• mondo/src/mondoarchive/main.c (modified) (1 diff)
• tools/mkchangelog.pl (modified) (1 diff)

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

@@ -3486 +3486 @@
 
     (void) fwrite((void *) &biggiestruct, 1, sizeof(biggiestruct), fout);
-    paranoid_fclose(fout);
+    fclose(fout);
     length = totallength / optimal_set_size / 1024;
     log_msg(1, "Opening in %s; slicing it and writing to CD/tape",

branches/2.2.2/mondo/src/common/libmondo-tools.c

@@ -1266 +1266 @@
         value[0] = '\0';
         return (1);
-    } else if (strstr(value, "/dev/") && strstr(value, "t0")
+    } else if (value != NULL) && (strstr(value, "/dev/") && strstr(value, "t0")
                && !strcmp(label, "media-dev")) {
         log_msg(2, "FYI, I shan't read new value for %s - already got %s",

branches/2.2.2/mondo/src/common/newt-specific.c

@@ -557 +557 @@
                     (void) fgets(err_log_lines[i], MAX_NEWT_COMMENT_LEN,
                                  fin);
+                    /* Commented to make valgrind happy and avoid crash
                     strip_spaces(err_log_lines[i]);
+                    */
                     if (!strncmp(err_log_lines[i], "root:", 5)) {
                         strcpy(tmp, err_log_lines[i] + 6);

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

@@ -323 +323 @@
     welcome_to_mondoarchive();
     distro_specific_kludges_at_start_of_mondoarchive();
-    sprintf(g_erase_tmpdir_and_scratchdir, "rm -Rf %s %s", bkpinfo->tmpdir,
-            bkpinfo->scratchdir);
     g_kernel_version = get_kernel_version();
 

branches/2.2.2/tools/mkchangelog.pl

@@ -120 +120 @@
             print OUTPUT "  * $tmp";
         }
-        else if ($dtype eq "rpm") {
+        elsif ($dtype eq "rpm") {
             print OUTPUT "$tmp";
         }