Changeset 2340 in MondoRescue for branches/2.2.10/mondo/src

Timestamp:

Aug 21, 2009, 1:53:49 AM (16 years ago)

Author:

Bruno Cornec

Message:

• New compiler flogs introduce for memory check
• Other dyn. allocation added replacing static ones
• Option -Y is added for LZMA support

Location:

branches/2.2.10/mondo/src

Files:

• common/libmondo-filelist.c (modified) (19 diffs)
• common/newt-specific.c (modified) (4 diffs)
• include/my-stuff.h (modified) (1 diff)
• mondoarchive/mondoarchive.c (modified) (5 diffs)
• mondoarchive/mondoarchive.h (modified) (1 diff)

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

@@ -211 +211 @@
     char *outfname = NULL;
     char *biggie_fname = NULL;
-    char *incoming;
+    char *incoming = NULL;
     char *tmp = NULL;
 
@@ -257 +257 @@
         return (curr_set_no + 1);
     }
-    incoming = malloc(MAX_STR_LEN * 2);
-
-    (void) fgets(incoming, MAX_STR_LEN * 2 - 1, fin);
+
+    mr_getline(incoming, fin);
     while (!feof(fin)) {
         lino++;
@@ -266 +265 @@
             i = 0;
         }
+        /* Now that we dyn. alloc is truncating needed ?
         if (i > MAX_STR_LEN - 1) {
             incoming[MAX_STR_LEN - 30] = '\0';
@@ -271 +271 @@
             err++;
         }
+        */
         if (incoming[i] < 32) {
             incoming[i] = '\0';
@@ -299 +300 @@
                     mr_free(outfname);
                     mr_free(biggie_fname);
-                    paranoid_free(incoming);
+                    mr_free(incoming);
                     return (curr_set_no + 1);
                 }
@@ -305 +306 @@
             }
         }
-        (void) fgets(incoming, MAX_STR_LEN * 2 - 1, fin);
-    }
-    paranoid_free(incoming);
+        mr_free(incoming);
+        mr_getline(incoming, fin);
+    }
+    mr_free(incoming);
+
     paranoid_fclose(fin);
     paranoid_fclose(fout);
@@ -1332 +1335 @@
  * @bug Return value should be @c void.
  */
-int open_and_list_dir(char *dir1, char *sth, FILE * fout,
-                      time_t time_of_last_full_backup)
-{
+int open_and_list_dir(char *dir1, char *sth, FILE * fout, time_t time_of_last_full_backup) {
+
     const char delims[] = " ";
 
@@ -1341 +1343 @@
     struct stat statbuf;
     char *new;
-    char *tmp;
+    char *tmp = NULL;
     char *dir = NULL;
     static int percentage = 0;
-    char *skip_these;
-    char *new_with_spaces;
+    char *skip_these = NULL;
+    char *new_with_spaces = NULL;
     char *strtmp;
     char *token;
-    char *find_excludes;
-    static char *name_of_evalcall_form;
+    char *find_excludes = NULL;
+    char *name_of_evalcall_form = NULL;
+    char *find_skeleton_marker = NULL;
     int i;
     int lastpos = 0;
@@ -1356 +1359 @@
     static int counter = 0;
     static int uberctr = 0;
-    static char *find_skeleton_marker;
-    static long skeleton_lino = 0;
-    static time_t last_time = 0;
+    static long skeleton_lino = 0L;
+    static time_t last_time = (time_t)0;
     time_t this_time;
 
@@ -1371 +1373 @@
 
     if (!depth) {
-        malloc_string(name_of_evalcall_form);
-        malloc_string(find_skeleton_marker);
         mr_asprintf(find_excludes, " ");
         if (sth != NULL) {
@@ -1397 +1397 @@
         mr_free(tmp);
 
-        sprintf(name_of_evalcall_form, "Making catalog of %s", dir);
+        mr_asprintf(name_of_evalcall_form, "Making catalog of %s", dir);
         open_evalcall_form(name_of_evalcall_form);
-        find_skeleton_marker[0] = '\0';
+        mr_free(name_of_evalcall_form);
+
         skeleton_lino = 1;
         log_msg(5, "entries = %ld", g_skeleton_entries);
@@ -1405 +1406 @@
     } else  // update evalcall form if appropriate
     {
-        sprintf(find_skeleton_marker,
-                "grep -Fv '%s' %s > %s.new 2> /dev/null", dir,
-                g_skeleton_filelist, g_skeleton_filelist);
+        mr_asprintf(find_skeleton_marker, "grep -Fv '%s' %s > %s.new 2> /dev/null", dir, g_skeleton_filelist, g_skeleton_filelist);
         if (!system(find_skeleton_marker)) {
             percentage = (int) (skeleton_lino * 100 / g_skeleton_entries);
             skeleton_lino++;
-            sprintf(find_skeleton_marker, "mv -f %s.new %s",
-                    g_skeleton_filelist, g_skeleton_filelist);
-            run_program_and_log_output(find_skeleton_marker, 8);
+            mr_free(find_skeleton_marker);
+
+            mr_asprintf(find_skeleton_marker, "mv -f %s.new %s", g_skeleton_filelist, g_skeleton_filelist);
+            (void)system(find_skeleton_marker);
             time(&this_time);
             if (this_time != last_time) {
@@ -1427 +1427 @@
             }
         }
+        mr_free(find_skeleton_marker);
     }
 
@@ -1453 +1454 @@
                 mr_asprintf(new,"%s%s",dir,dit->d_name);
             }
-            paranoid_free(new_with_spaces);
+            mr_free(new_with_spaces);
             mr_asprintf(new_with_spaces, " %s ", new);
             if (strstr(skip_these, new_with_spaces)) {
@@ -1463 +1464 @@
                     if (!S_ISLNK(statbuf.st_mode)
                         && S_ISDIR(statbuf.st_mode)) {
-                        open_and_list_dir(new, skip_these, fout,
-                                          time_of_last_full_backup);
+                        open_and_list_dir(new, skip_these, fout, time_of_last_full_backup);
                     } else {
-                        if (time_of_last_full_backup == 0
-                            || time_of_last_full_backup <
-                            statbuf.st_ctime) {
+                        if (time_of_last_full_backup == 0 || time_of_last_full_backup < statbuf.st_ctime) {
                             fprintf(fout, "%s\n", new);
                             if ((counter++) > 128) {
                                 counter = 0;
                                 uberctr++;
+#ifndef _XWIN
                                 mr_asprintf(tmp, " %c ", special_dot_char(uberctr));
-#ifndef _XWIN
                                 if (!g_text_mode) {
                                     newtDrawRootText(77, g_noof_rows - 3, tmp);
                                     newtRefresh();
                                 }
+                                mr_free(tmp);
 #endif
-                                mr_free(tmp);
                             }
                         }
@@ -1486 +1484 @@
                 }
             }
-            paranoid_free(new);
-        }
-    }
-    paranoid_free(new_with_spaces);
-    paranoid_free(skip_these);
+            mr_free(new);
+        }
+    }
+    mr_free(new_with_spaces);
+    mr_free(skip_these);
     mr_free(dir);
 
@@ -1501 +1499 @@
     if (!depth) {
         close_evalcall_form();
-        paranoid_free(name_of_evalcall_form);
-        paranoid_free(find_skeleton_marker);
         unlink(g_skeleton_filelist);
         log_msg(5, "g_skeleton_entries = %ld", g_skeleton_entries);
@@ -1596 +1592 @@
                                   ("date +%s"));
     } else if (lstat(sz_datefile, &statbuf)) {
-        log_msg(2,
-                "Warning - unable to find date of previous backup. Full backup instead.");
+        log_msg(2, "Warning - unable to find date of previous backup. Full backup instead.");
         differential = 0;
         time_of_last_full_backup = 0;
@@ -1608 +1603 @@
 // use user-specified filelist (if specified)
     if (userdef_filelist) {
-        log_msg(1,
-                "Using the user-specified filelist - %s - instead of calculating one",
-                userdef_filelist);
+        log_msg(1, "Using the user-specified filelist - %s - instead of calculating one", userdef_filelist);
         mr_asprintf(command, "cp -f %s %s", userdef_filelist, sz_filelist);
         if (run_program_and_log_output(command, 3)) {

branches/2.2.10/mondo/src/common/newt-specific.c

@@ -378 +378 @@
  * @note This function never returns.
  */
-    void
-     finish(int signal) {
+    void finish(int signal) {
+
         char *command = NULL;
 
@@ -393 +393 @@
             mr_free(command);
         }
-        if (!g_text_mode) {
-            log_msg(1, "Calling newtFinished()");
-            newtFinished();
-        }
-        printf("Execution run ended; result=%d\n", signal);
-        printf("Type 'less %s' to see the output log\n", MONDO_LOGFILE);
         if (bkpinfo->tmpdir) {
             log_msg(8,"tempdir is %s",bkpinfo->tmpdir);
@@ -421 +415 @@
         free_libmondo_global_strings();
         free_newt_stuff();
+        if (!g_text_mode) {
+            log_msg(1, "Calling newtFinished()");
+            newtFinished();
+        }
+        printf("Execution run ended; result=%d\n", signal);
+        printf("Type 'less %s' to see the output log\n", MONDO_LOGFILE);
         exit(signal);
     }
-
-
-
 
 
@@ -998 +995 @@
                 mr_free(taskprogress);
             } else {
-                newtScaleSet(g_isoform_scale,
-                             (unsigned long long) percentage);
+                newtScaleSet(g_isoform_scale, (unsigned long long) percentage);
                 if (g_isoform_pcline) {
                     newtLabelSetText(g_isoform_pcline, pcline_str);

branches/2.2.10/mondo/src/include/my-stuff.h

@@ -8 +8 @@
 // Extra info for ACLs and SELINUX users
 #define STAR_ACL_SZ "-xfflags -acl"
-//#define STAR_ACL_SZ "-xfflags"
-//#define STAR_ACL_SZ ""
-// Enable the first line and disable the second if you are a Fedora Core 2 user
 
 /**

branches/2.2.10/mondo/src/mondoarchive/mondoarchive.c

@@ -36 +36 @@
 extern t_bkptype g_backup_media_type;
 extern int g_loglevel;
+extern char *g_magicdev_command;
 
 /**
@@ -71 +72 @@
     char *tmp = NULL;
 
-    log_msg(0, "Mondo Archive v%s --- http://www.mondorescue.org",
-            PACKAGE_VERSION);
+    log_msg(0, "Mondo Archive v%s --- http://www.mondorescue.org", PACKAGE_VERSION);
     log_msg(0, "running %s binaries", get_architecture());
     tmp = get_uname_m();
     log_msg(0, "running on %s architecture", tmp);
     mr_free(tmp);
-    log_msg(0,
-            "-----------------------------------------------------------");
-    log_msg(0,
-            "NB: Mondo logs almost everything, so don't panic if you see");
-    log_msg(0,
-            "some error messages.  Please read them carefully before you");
-    log_msg(0,
-            "decide to break out in a cold sweat.    Despite (or perhaps");
-    log_msg(0,
-            "because of) the wealth of messages. some users are inclined");
-    log_msg(0,
-            "to stop reading this log. If Mondo stopped for some reason,");
-    log_msg(0,
-            "chances are it's detailed here.  More than likely there's a");
-    log_msg(0,
-            "message at the very end of this log that will tell you what");
-    log_msg(0,
-            "is wrong. Please read it!                          -Devteam");
-    log_msg(0,
-            "-----------------------------------------------------------");
+    log_msg(0, "-----------------------------------------------------------");
+    log_msg(0, "NB: Mondo logs almost everything, so don't panic if you see");
+    log_msg(0, "some error messages.  Please read them carefully before you");
+    log_msg(0, "decide to break out in a cold sweat.    Despite (or perhaps");
+    log_msg(0, "because of) the wealth of messages. some users are inclined");
+    log_msg(0, "to stop reading this log. If Mondo stopped for some reason,");
+    log_msg(0, "chances are it's detailed here.  More than likely there's a");
+    log_msg(0, "message at the very end of this log that will tell you what");
+    log_msg(0, "is wrong. Please read it!                          -Devteam");
+    log_msg(0, "-----------------------------------------------------------");
 
     log_msg(0, "Zero...");
@@ -107 +97 @@
     log_msg(7, "Seven...");
     log_msg(8, "Eight...");
-    printf("See %s for details of backup run.\n", MONDO_LOGFILE);
 }
 
-
-extern char *g_magicdev_command;
 
 /**
@@ -174 +161 @@
     printf("Initializing...\n");
 
-    bkpinfo = (struct s_bkpinfo *)mr_malloc(sizeof(struct s_bkpinfo));
     init_bkpinfo();
 
@@ -316 +302 @@
 
     if (pre_param_configuration()) {
-        fatal_error
-            ("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. */
+        fatal_error("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. */
     if (argc == 1) {
         res = interactively_obtain_media_parameters_from_user(TRUE);    /* yes, archiving */
         if (res) {
-            fatal_error
-                ("Syntax error. Please review the parameters you have supplied and try again.");
+            fatal_error("Syntax error. Please review the parameters you have supplied and try again.");
         }
     } else {
         res = handle_incoming_parameters(argc, argv);
         if (res) {
-            printf
-                ("Errors were detected in the command line you supplied.\n");
+            printf("Errors were detected in the command line you supplied.\n");
             printf("Please review the log file - %s\n", MONDO_LOGFILE );
             log_msg(1, "Mondoarchive will now exit.");

branches/2.2.10/mondo/src/mondoarchive/mondoarchive.h

@@ -9 +9 @@
  */
 char *MONDO_LOGFILE = "/var/log/mondoarchive.log";
-char *MONDO_OPTIONS = "0123456789A:B:C:DE:GHI:J:K:LNOP:QRS:T:UVWb:c:d:ef:gik:l:mn:op:rs:tuw:x:z";
+char *MONDO_OPTIONS = "0123456789A:B:C:DE:GHI:J:K:LNOP:QRS:T:UVWYb:c:d:ef:gik:l:mn:op:rs:tuw:x:z";
 
 /* No restriction on ps options */