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

Timestamp:

Feb 14, 2007, 1:13:49 PM (17 years ago)

Author:

Bruno Cornec

Message:

Update trunk with the latest feedback from stable (obtained with meld) - First pass

File:

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

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

@@ -45 +45 @@
     /*@ buffers ***************************************************** */
     static char *output = NULL;
-    char *command;
-    char *tmp;
+
+    char *command = NULL;
+    char *tmp = NULL;
     size_t n = 0;
 
@@ -94 +95 @@
 
     /*@ buffers ***************************************************** */
-    char *command;
+    char *command = NULL;
     char *incoming = NULL;
-    char *tmp;
+    char *tmp = NULL;
 
     /*@ long ******************************************************** */
@@ -207 +208 @@
     if (!(fout = fopen(outfname, "w"))) {
         log_OS_error("Unable to openout outfname");
+        mr_free(infname);
         mr_free(outfname);
         return;
@@ -600 +602 @@
 void register_pid(pid_t pid, char *name_str)
 {
-    char *tmp;
-    char *lockfile_fname;
+    char *tmp = NULL;
+    char *lockfile_fname = NULL;
     int res;
     size_t n = 0;
@@ -754 +756 @@
 }
 
-
 /**
  * Determine the amount of space (in KB) occupied by a mounted CD.
@@ -942 +943 @@
 {
     /*@ Char buffers ** */
-    char *command;
+    char *command = NULL;
     char *tmp;
     char old_pwd[MAX_STR_LEN];
@@ -964 +965 @@
     mr_free(command);
 
-    mr_asprintf(&tmp, "%s/payload.tgz", g_mondo_home);
-
     /* i18n */
     mr_asprintf(&command, CP_BIN " --parents /usr/share/locale/*/LC_MESSAGES/mondo.mo %s",bkpinfo->scratchdir);
@@ -972 +971 @@
     mr_free(command);
 
+    mr_asprintf(&tmp, "%s/payload.tgz", g_mondo_home);
     if (does_file_exist(tmp)) {
         log_it("Untarring payload %s to scratchdir %s", tmp,
@@ -1114 +1114 @@
                 "ifconfig %s | awk '{print $5}' | head -n1", nfs_dev);
         mac_addr = call_program_and_get_last_line_of_output(command);
+        mr_free(command);
+
         mr_asprintf(&command,
-                "ifconfig | grep -E '%s' | grep -v '%s' | head -n1  | cut -d' ' -f1", mac_addr);
+                "ifconfig | grep -E '%s' | grep -v '%s' | head -n1  | cut -d' ' -f1", mac_addr, nfs_dev);
         mr_free(nfs_dev);
         nfs_dev = call_program_and_get_last_line_of_output(command);
@@ -1125 +1127 @@
 
     mr_free(nfs_dev);
-    mr_free(tmp);
-
     fd1 = mr_fopen(MONDORESTORECFG, "a");
     mr_fprintf(fd1, "nfs-dev %s\n", nfs_dev);
@@ -1266 +1266 @@
 int make_grub_install_scriptlet(char *outfile)
 {
-    FILE *fout;
-    char *tmp;
+    FILE *fout = NULL;
+    char *tmp = NULL;
     int retval = 0;