Changeset 1140 in MondoRescue for branches

Timestamp:

Feb 12, 2007, 2:05:43 AM (17 years ago)

Author:

Bruno Cornec

Message:

Try to fix some valgrind reports (note that this version still doesn't work)

Location:

branches/stable/mondo/src

Files:

• common/libmondo-files.c (modified) (1 diff)
• common/libmondo-fork.c (modified) (1 diff)
• common/libmondo-string.c (modified) (2 diffs)
• common/libmondo-tools.c (modified) (2 diffs)
• mondoarchive/main.c (modified) (3 diffs)
• test/test-mem.c (modified) (2 diffs)
• test/test-string.c (modified) (1 diff)

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

@@ -1093 +1093 @@
             ("NFS mount doesn't have a colon in it, e.g. 192.168.1.4:/home/nfs");
     }
-    *(p++) = '\0';
+    *p = '\0';
+    p++;
     strcpy(nfs_server_ipaddr, tmp);
     mr_free(tmp);

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

@@ -235 +235 @@
     fin = fopen("/tmp/mondo-run-prog-thing.tmp", "r");
     if (fin) {
-        for (mr_getline(&incoming, &n, fin); !feof(fin);
-             mr_getline(&incoming, &n, fin)) {
+        for (mr_getline(&incoming, &n, fin); !feof(fin); mr_getline(&incoming, &n, fin)) {
             /* patch by Heiko Schlittermann */
             p = incoming;

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

@@ -771 +771 @@
     p = tmp;
     while (*p != '\0') {
-        in_out[i] = *(p++);
+        in_out[i] = *p;
+        p++;
         in_out[i + 1] = '\0';
         if (in_out[i] < 32 && i > 0) {
@@ -797 +798 @@
     in_out[i] = '\0';
     mr_free(tmp);
-/*  for(i=strlen(in_out); i>0 && in_out[i-1]<=32; i--) {in_out[i-1]='\0';} */
 }
 

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

@@ -893 +893 @@
     /*@ buffers ************ */
     char tmp[MAX_STR_LEN];
-    //  char command[MAX_STR_LEN];
 
     /*@ int's *************** */
@@ -900 +899 @@
 
 
-    mvaddstr_and_log_it(g_currentY, 0,
-                        "Checking sanity of your Linux distribution");
+    mvaddstr_and_log_it(g_currentY, 0, "Checking sanity of your Linux distribution");
 #ifndef __FreeBSD__
     if (system("which mkfs.vfat &> /dev/null")

branches/stable/mondo/src/mondoarchive/main.c

@@ -216 +216 @@
     }
 
+    /* BERLIOS: Hardcoded to be improved */
+    unlink(MONDO_CACHE"/mindi.conf");
+    unlink(MONDO_CACHE"/mondorestore.cfg");
+
     /* Configure the bkpinfo structure, global file paths, etc. */
     g_main_pid = getpid();
@@ -227 +231 @@
     welcome_to_mondoarchive();
     distro_specific_kludges_at_start_of_mondoarchive();
-    sprintf(g_erase_tmpdir_and_scratchdir, "rm -Rf %s %s", bkpinfo->tmpdir,
-            bkpinfo->scratchdir);
     g_kernel_version = get_kernel_version();
 
@@ -327 +329 @@
             ("Pre-param initialization phase failed. Please review the error messages above, make the specified changes, then try again. Exiting...");
     }
-
-/* Process command line, if there is one. If not, ask user for info. */
+    sprintf(g_erase_tmpdir_and_scratchdir, "rm -Rf %s %s", bkpinfo->tmpdir,
+            bkpinfo->scratchdir);
+
+    /* Process command line, if there is one. If not, ask user for info. */
     if (argc == 1) {
         g_text_mode = FALSE;

branches/stable/mondo/src/test/test-mem.c

@@ -16 +16 @@
 int main(void)
 {
-    char* str = NULL;
+    char *str = NULL;
     FILE *fd = NULL;
     size_t n = 0;
@@ -37 +37 @@
     mr_getline(&str,&n,fd);
     printf("2nd Result: %s",str);
+    mr_getline(&str,&n,fd);
+    strcpy(str,"another line\n");
+    printf("3rd Result: %s",str);
     mr_free(str);
 

branches/stable/mondo/src/test/test-string.c

@@ -20 +20 @@
     char *string = NULL;
 
-    mr_asprintf(&string, "%s", "md0 : active raid10 hda1[0] hda12[3] hda6[2] hda5[1]\n");
+    mr_asprintf(&string, "md0 : active raid10 hda1[0] hda12[3] hda6[2] hda5[1]\n");
     fprintf(stdout, "string=|%s|\n", string);
-    token = mr_strtok(string, delims, &lastpos);
-    while (lastpos > 0) {
+    while ((token = mr_strtok(string, delims, &lastpos))) {
         fprintf(stdout, "token=|%s|, lastpos=%d\n", token, lastpos);
         mr_free(token);
-        token = mr_strtok(string, delims, &lastpos);
     }
     mr_free(string);