Changeset 1173 in MondoRescue for branches/stable/mondo/src/common/libmondo-files.c

Timestamp:

Feb 16, 2007, 12:25:24 PM (17 years ago)

Author:

Bruno Cornec

Message:

merges from trunk for memory management for libmondo-mountlist.c mainly

File:

• branches/stable/mondo/src/common/libmondo-files.c (modified) (8 diffs)

branches/stable/mondo/src/common/libmondo-files.c

@@ -83 +83 @@
     return (output);
 }
-
-
-/**
- * Get a not-quite-unique representation of some of the file's @c stat properties.
- * The returned string has the form <tt>size-mtime-ctime</tt>.
- * @param curr_fname The file to generate the "checksum" for.
- * @return The "checksum".
- * @note The returned string points to static storage that will be overwritten with each call.
- */
-char *calc_file_ugly_minichecksum(char *curr_fname)
-{
-
-    /*@ buffers ***************************************************** */
-    static char curr_cksum[1000];
-
-    /*@ pointers **************************************************** */
-
-    /*@ structures ************************************************** */
-    struct stat buf;
-
-    /*@ initialize data *************************************************** */
-    curr_cksum[0] = '\0';
-
-    /*@************************************************************** */
-
-    assert_string_is_neither_NULL_nor_zerolength(curr_fname);
-    if (lstat(curr_fname, &buf)) {
-        return (curr_cksum);    // empty
-    }
-
-    sprintf(curr_cksum, "%ld-%ld-%ld", (long) (buf.st_size),
-            (long) (buf.st_mtime), (long) (buf.st_ctime));
-    return (curr_cksum);
-}
-
 
 
@@ -699 +664 @@
     long file_len_K = 0L;
 
-    malloc_string(sz_res);
     mr_asprintf(&command,
             "grep '%s ' %s/mountlist.txt | head -n1 | awk '{print $4;}'",
             dev, tmpdir);
     log_it(command);
-    strcpy(sz_res, call_program_and_get_last_line_of_output(command));
+    mr_asprintf(&sz_res, call_program_and_get_last_line_of_output(command));
     file_len_K = atol(sz_res);
     mr_msg(4, "%s --> %s --> %ld", command, sz_res, file_len_K);
@@ -982 +946 @@
     /*@ Char buffers ** */
     char *command = NULL;
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
     char old_pwd[MAX_STR_LEN];
 
@@ -1008 +972 @@
     mr_free(command);
 
-    sprintf(tmp, "%s/payload.tgz", g_mondo_home);
+    mr_asprintf(&tmp, "%s/payload.tgz", g_mondo_home);
     if (does_file_exist(tmp)) {
         log_it("Untarring payload %s to scratchdir %s", tmp,
@@ -1021 +985 @@
         chdir(old_pwd);
     }
+    mr_free(tmp);
 
     mr_asprintf(&command, "cp -f %s/LAST-FILELIST-NUMBER %s", bkpinfo->tmpdir,
             bkpinfo->scratchdir);
-
     if (run_program_and_log_output(command, FALSE)) {
         fatal_error("Failed to copy LAST-FILELIST-NUMBER to scratchdir");
@@ -1030 +994 @@
     mr_free(command);
 
-    strcpy(tmp,call_program_and_get_last_line_of_output("which mondorestore"));
+    mr_asprintf(&tmp,call_program_and_get_last_line_of_output("which mondorestore"));
     if (!tmp) {
         fatal_error
@@ -1036 +1000 @@
     }
     mr_asprintf(&command, "cp -f %s %s", tmp, bkpinfo->tmpdir);
+    mr_free(tmp);
+
     if (run_program_and_log_output(command, FALSE)) {
         fatal_error("Failed to copy mondorestore to tmpdir");
@@ -1267 +1233 @@
             *(strchr(tmp, ' ')) = '\0';
         }
-        if (!strcmp(strrchr(filename,'.'), tmp)) {
+        if (!strcmp(strrchr(filename, '.'), tmp)) {
             mr_free(do_not_compress_these);
             mr_free(tmp);