Changeset 2241 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-cli.c

Timestamp:

Jun 29, 2009, 7:19:14 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3144@localhost: bruno | 2009-06-26 12:18:08 +0200

• Remove mr_string.c|.h useless and in de=uplication with mr_str.c|.h
• Solve with valgrind's help some memroy leak (harmless mostly)
• Solve a seg fault at end, when unallocating a bkpinfo member after the strcuture disallocation !
• after mr_strtok, memory ssociated with the token needs to be free
• Adds a new function free_newt_stuff to free newt related allocated memory
• Do not exit if mr_free is unsuccessful, and only warn when debug > 8

File:

• branches/2.2.9/mondo/src/common/libmondo-cli.c (modified) (11 diffs)

branches/2.2.9/mondo/src/common/libmondo-cli.c

@@ -13 +13 @@
 #include "my-stuff.h"
 #include "mr_mem.h"
-#include "mr_string.h"
+#include "mr_str.h"
 #include "mondostructures.h"
 #include "libmondo-cli-EXT.h"
@@ -297 +297 @@
             log_msg (4, "Could not get the list of mounted file systems");
             paranoid_free(mounted_file_system);
+            mr_free(token);
             return (1);
         }
-        log_msg (5, "token: %s", token);
+        if (token) {
+            log_msg (5, "token: %s", token);
+        }
         while (token != NULL) {
             log_msg (5, "token: %s", token);
@@ -307 +310 @@
             add_mounted_fs_struct(DSFptr);
             strcpy(DSFptr->device, token);
+            mr_free(token);
             if ((token = strtok(NULL, token_chars)) == NULL) {
                 log_msg (5, "Ran out of entries on the mounted file systems list");
                 paranoid_free(mounted_file_system);
+                mr_free(token);
                 return (1);
             }
             log_msg (5, "token: %s", token);
             strcpy(DSFptr->mount_point, token);
+            mr_free(token);
             token = strtok(NULL, token_chars); 
         }
@@ -410 +416 @@
         log_msg (5, "Found partition: %s", token);
         strcpy(partitions[i++], token);
+        mr_free(token);
     }
     paranoid_free(partition_list);
@@ -507 +514 @@
                             log_msg (4, "Can't find mount point %s in mounted file systems list", token);
                             paranoid_free(tmp);
+                            mr_free(token);
                             return (1);
                         }
                         DSFptr->check = 1;
+                        mr_free(token);
                     }
                     /********
@@ -535 +544 @@
                                 log_msg (4, "Can't find device %s in mounted file systems list", token);
                                 paranoid_free(tmp);
+                                mr_free(token);
                                 return (1);
                             }
@@ -540 +550 @@
                         }
                     }
+                    mr_free(token);
                     paranoid_free(mount_list);
                 } else {
@@ -588 +599 @@
                     log_msg (4, "Can't find device %s in mounted file systems list", token);
                     paranoid_free(tmp);
+                    mr_free(token);
                     return (1);
                 }
@@ -593 +605 @@
                 break;
             }
+            mr_free(token);
         }
         paranoid_free(tmp);
@@ -806 +819 @@
                 break; 
             }
+            mr_free(token);
         }
         log_msg(1, "include_paths is now '%s'", bkpinfo->include_paths);
@@ -1137 +1151 @@
                 break;
             }
+            mr_free(token);
         }
         log_msg(1, "exclude_paths is now '%s'", bkpinfo->exclude_paths);