Changeset 783 in MondoRescue for trunk/mondo/mondo/common/libmondo-files.c

Timestamp:

Aug 31, 2006, 5:09:20 PM (18 years ago)

Author:

Bruno Cornec

Message:

• Massive rewrite continues for memory management.
• main structure should now have all parameters allocated dynamically
• new lib libmr.a + dir + build process reviewed to support it.
• new include subdir to host external definitions of the new lib
• code now compiles. Still one remaining link issues for mondorestore. This should allow for some tests soon.

(goal is to separate completely reviewed code and functions and provide clean interfaces)

File:

• trunk/mondo/mondo/common/libmondo-files.c (modified) (8 diffs)

trunk/mondo/mondo/common/libmondo-files.c

@@ -25 +25 @@
 
 extern int g_currentY;
+extern int g_noof_log_lines;
 extern char *g_mondo_home;
 
@@ -77 +78 @@
     }
     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 ***************************************************** */
-    char *curr_cksum;
-
-    /*@ pointers **************************************************** */
-
-    /*@ structures ************************************************** */
-    struct stat buf;
-
-    /*@************************************************************** */
-
-    assert_string_is_neither_NULL_nor_zerolength(curr_fname);
-    if (lstat(curr_fname, &buf)) {
-        asprintf(&curr_cksum, "");
-    } else {
-        asprintf(&curr_cksum, "%ld-%ld-%ld", (long) (buf.st_size),
-            (long) (buf.st_mtime), (long) (buf.st_ctime));
-    }
-    return (curr_cksum);
 }
 
@@ -275 +245 @@
     if (kernel == NULL) {
         kernel = call_program_and_get_last_line_of_output
-               ("mindi --findkernel 2> /dev/null"));
+               ("mindi --findkernel 2> /dev/null");
     }
     // If we didn't get anything back, check whether mindi raised a fatal error
@@ -481 +451 @@
         log_it(tmp);
         paranoid_free(tmp);
-        asprintf(&output, "");
-
-        return (output);
+        return (NULL);
     }
     asprintf(&command, "tail -n1 %s", filename);
@@ -1033 +1001 @@
     paranoid_free(command);
 
-    if (bkpinfo->postnuke_tarball[0]) {
+    if (bkpinfo->postnuke_tarball) {
         asprintf(&command, "cp -f %s %s/post-nuke.tgz",
                 bkpinfo->postnuke_tarball, bkpinfo->tmpdir);
@@ -1187 +1155 @@
 {
     /*@ buffers *************** */
-    char *tmp;
+    char *tmp = NULL;
 
     /*@ long long ************* */
@@ -1214 +1182 @@
         asprintf(&tmp,
                 _("Your backup will probably occupy a single %s. Maybe two."),
-                media_descriptor_string(bkpinfo->backup_media_type));
+                bkpinfo->backup_media_string);
     } else {
         asprintf(&tmp, _("Your backup will occupy approximately %s media."),
                 number_to_text((int) (scratchLL + 1)));
     }
-    if (!bkpinfo->image_devs[0] && (scratchLL < 50)) {
+    if (!bkpinfo->image_devs && (scratchLL < 50)) {
         log_to_screen(tmp);
     }
@@ -1235 +1203 @@
 bool is_this_file_compressed(char *filename)
 {
-    char *do_not_compress_these;
-    char *tmp;
-    char *p;
+    char *do_not_compress_these = NULL;
+    char *tmp = NULL;
+    char *p = NULL;
 
     asprintf(&tmp, "%s/do-not-compress-these", g_mondo_home);