Changeset 2331 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-files.c

Timestamp:

Aug 18, 2009, 3:25:29 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3342@localhost: bruno | 2009-08-14 00:46:51 +0200

• Another round of strcpy suppressions
• find_home_of_exe() now allocates memory which has to be freed by the caller
• Supress useless sz_last_suffix()
• mr_getline now has the same interface as the other mr_mem functions
• valgrind and compiler warnings fixes

File:

• branches/2.2.10/mondo/src/common/libmondo-files.c (modified) (20 diffs)

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

@@ -317 +317 @@
  * @return The full path to the executable, or "" if it does not exist, or NULL if @c file could not be found.
  * @note The returned string points to static storage that will be overwritten with each call.
- * @bug The checks with @c file and @c dirname seem pointless. If @c incoming is "", then you're calling
+ * @bug The checks with @c file and @c dirname seem pointless. If @c output is "", then you're calling
  * <tt>dirname 2\>/dev/null</tt> or <tt>file 2\>/dev/null | cut -d':' -f1 2\>/dev/null</tt>, which basically amounts
  * to nothing.
@@ -324 +324 @@
 {
     /*@ buffers ********************* */
-    static char output[MAX_STR_LEN];
-    char *incoming;
+    char *output = NULL;
     char *command = NULL;
 
-    malloc_string(incoming);
-    incoming[0] = '\0';
     /*@******************************* */
 
     assert_string_is_neither_NULL_nor_zerolength(fname);
     mr_asprintf(command, "which %s 2> /dev/null", fname);
-    strcpy(incoming, call_program_and_get_last_line_of_output(command));
-    mr_free(command);
-    if (incoming[0] == '\0') {
+    mr_asprintf(output, "%s", call_program_and_get_last_line_of_output(command));
+    mr_free(command);
+    if (output[0] == '\0') {
         if (system("which file > /dev/null 2> /dev/null")) {
-            paranoid_free(incoming);
-            output[0] = '\0';
+            mr_free(output);
             return (NULL);      // forget it :)
         }
-        mr_asprintf(command, "file %s 2> /dev/null | cut -d':' -f1 2> /dev/null", incoming);
-        strcpy(incoming, call_program_and_get_last_line_of_output(command));
+        mr_asprintf(command, "file %s 2> /dev/null | cut -d':' -f1 2> /dev/null", output);
+        mr_free(output);
+        mr_asprintf(output, "%s", call_program_and_get_last_line_of_output(command));
         mr_free(command);
     }
-    if (incoming[0] == '\0')    // yes, it is == '\0' twice, not once :)
-    {
-        mr_asprintf(command, "dirname %s 2> /dev/null", incoming);
-        strcpy(incoming, call_program_and_get_last_line_of_output(command));
+    if (output[0] == '\0') {
+        mr_asprintf(command, "dirname %s 2> /dev/null", output);
+        mr_free(output);
+        mr_asprintf(output, "%s", call_program_and_get_last_line_of_output(command));
         mr_free(command);
     }
-    strcpy(output, incoming);
+
     if (output[0] != '\0' && does_file_exist(output)) {
-        log_msg(4, "find_home_of_exe () --- Found %s at %s", fname,
-                incoming);
+        log_msg(4, "find_home_of_exe () --- Found %s at %s", fname, output);
     } else {
-        output[0] = '\0';
+        mr_free(output);
         log_msg(4, "find_home_of_exe() --- Could not find %s", fname);
     }
-    paranoid_free(incoming);
-    if (!output[0]) {
-        return (NULL);
-    } else {
-        return (output);
-    }
+    return (output);
 }
 
@@ -427 +418 @@
 
     /*@ buffers ***************************************************** */
-    char lastline[MAX_STR_LEN];
+    char *lastline = NULL;
     char *command = NULL;
     /*@ pointers **************************************************** */
@@ -440 +431 @@
     if (i < 0) {
         mr_asprintf(command, "tail -n3 %s | grep -Fi \"%c\" | tail -n1 | awk '{print $0;}'", filename, '%');
-        strcpy(lastline, call_program_and_get_last_line_of_output(command));
+        mr_asprintf(lastline, "%s", call_program_and_get_last_line_of_output(command));
         mr_free(command);
         if (!lastline[0]) {
+            mr_free(lastline);
             return (0);
         }
     } else {
-        strcpy(lastline, err_log_lines[i]);
+        mr_asprintf(lastline, "%s", err_log_lines[i]);
     }
 
@@ -454 +446 @@
     }
     if (!p) {
+        mr_free(lastline);
         return (0);
     }
@@ -461 +454 @@
         p++;
     }
+    mr_free(lastline);
+
     i = atoi(p);
-
     return (i);
 }
@@ -550 +544 @@
     char stub_fname[1000];
     char curr_fname[1000];
-    char curr_cksum[1000];
+    char *curr_cksum = NULL;
     char *tmp = NULL;
 
@@ -589 +583 @@
         mr_free(tmp);
 
-        strcpy(curr_cksum, calc_file_ugly_minichecksum(curr_fname));
+        mr_asprintf(curr_cksum, "%s", calc_file_ugly_minichecksum(curr_fname));
         fprintf(fout, "%s\t%s\n", curr_fname, curr_cksum);
+        mr_free(curr_cksum);
+
         if (counter++ > 12) {
             current_time = get_time();
@@ -719 +715 @@
     char *command = NULL;
     char *mountlist = NULL;
-    char sz_res[MAX_STR_LEN];
+    char *sz_res = NULL;
     long file_len_K;
 
@@ -727 +723 @@
 
     log_it(command);
-    strcpy(sz_res, call_program_and_get_last_line_of_output(command));
+    mr_asprintf(sz_res, "%s", call_program_and_get_last_line_of_output(command));
     file_len_K = atol(sz_res);
     log_msg(4, "%s --> %s --> %ld", command, sz_res, file_len_K);
+    mr_free(sz_res);
     mr_free(command);
 
@@ -745 +742 @@
     char *fname;
     char *biggielist = NULL;
-    char *comment = NULL;
     char *tmp = NULL;
     char *command = NULL;
@@ -752 +748 @@
     long scratchL = 0;
     long file_len_K;
-
-    int res = 0;
 
     /*@ pointers *************************************************** */
@@ -778 +772 @@
             if (0 == strncmp(fname, "/dev/", 5)) {
                 if (is_dev_an_NTFS_dev(fname)) {
-                    if ( !find_home_of_exe("ntfsresize")) {
+                    tmp = find_home_of_exe("ntfsresize");
+                    if (!tmp) {
+                        mr_free(tmp);
                         fatal_error("ntfsresize not found");
                     }
+                    mr_free(tmp);
+
                     mr_asprintf(command, "ntfsresize --force --info %s|grep '^You might resize at '|cut -d' ' -f5", fname);
                     log_it("command = %s", command);
@@ -1005 +1003 @@
     /*@ Char buffers ** */
     char *command = NULL;
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
     int res = 0;
 
-    mvaddstr_and_log_it(g_currentY, 0,
-                        "Copying Mondo's core files to the scratch directory");
+    mvaddstr_and_log_it(g_currentY, 0, "Copying Mondo's core files to the scratch directory");
 
     log_msg(4, "g_mondo_home='%s'", g_mondo_home);
@@ -1033 +1030 @@
     }
 
-    strcpy(tmp,
-           call_program_and_get_last_line_of_output("which mondorestore"));
+    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("which mondorestore"));
     if (!tmp[0]) {
-        fatal_error
-            ("'which mondorestore' returned null. Where's your mondorestore? `which` can't find it. That's odd. Did you install mondorestore?");
+        mr_free(tmp);
+        fatal_error("'which mondorestore' returned null. Where's your mondorestore? `which` can't find it. That's odd. Did you install mondorestore?");
     }
     mr_asprintf(command, "cp -f %s %s", tmp, bkpinfo->tmpdir);
+    mr_free(tmp);
+
     res = run_program_and_log_output(command, FALSE);
     mr_free(command);
@@ -1270 +1268 @@
 
 /**
- * Get the last suffix of @p instr.
- * If @p instr was "httpd.log.gz", we would return "gz".
- * @param instr The filename to get the suffix of.
- * @return The suffix (without a dot), or "" if none.
- * @note The returned string points to static storage that will be overwritten with each call.
- */
-char *sz_last_suffix(char *instr)
-{
-    static char outstr[MAX_STR_LEN];
-    char *p;
-
-    p = strrchr(instr, '.');
-    if (!p) {
-        outstr[0] = '\0';
-    } else {
-        strcpy(outstr, p);
-    }
-    return (outstr);
-}
-
-
-/**
  * Determine whether a file is compressed. This is done
  * by reading through the "do-not-compress-these" file distributed with Mondo.
@@ -1299 +1275 @@
 bool is_this_file_compressed(char *filename)
 {
-    char do_not_compress_these[MAX_STR_LEN];
+    char *do_not_compress_these = NULL;
     char *tmp = NULL;
     char *p;
@@ -1315 +1291 @@
     }
     /* BERLIOS: This is just plain WRONG !! */
-    strcpy(do_not_compress_these,last_line_of_file(tmp));
+    mr_asprintf(do_not_compress_these, "%s", last_line_of_file(tmp));
     mr_free(tmp);
 
@@ -1325 +1301 @@
         if (!strcmp(q, tmp)) {
             mr_free(tmp);
+            mr_free(do_not_compress_these);
             return (TRUE);
         }
@@ -1332 +1309 @@
         mr_free(tmp);
     }
+    mr_free(do_not_compress_these);
     return (FALSE);
 }