Changeset 1135 in MondoRescue

Timestamp:

Feb 11, 2007, 12:37:42 PM (18 years ago)

Author:

Bruno Cornec

Message:

mr_file has to use mr_msg_int
merges trunk content of libmondo-archive.c

Location:

branches/stable/mondo/src

Files:

• common/libmondo-archive.c (modified) (7 diffs)
• lib/mr_file.c (modified) (4 diffs)

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

@@ -1115 +1115 @@
         mr_msg(4, "%s[%d:%d] - archiving %d...", FORTY_SPACES, getpid(),
                 this_thread_no, archiving_set_no);
-        res =
-            archive_this_fileset(bkpinfo, archiving_filelist_fname,
+        res = archive_this_fileset(bkpinfo, archiving_filelist_fname,
                                  archiving_afioball_fname,
                                  archiving_set_no);
@@ -1486 +1485 @@
     char *storing_filelist_fname;
     char *storing_afioball_fname;
-    char *tmp;
+    char *tmp = NULL;
     char *media_usage_comment;
     pthread_t archival_thread[ARCH_THREADS];
@@ -1501 +1500 @@
     mr_msg(8, "here");
     assert(bkpinfo != NULL);
-    tmp = mr_malloc(MAX_STR_LEN * 2);
+    /* BERLIOS: To be removed */
     malloc_string(result_str);
     malloc_string(curr_xattr_list_fname);
@@ -1523 +1522 @@
     *p_last_set_archived = -1;
     *p_next_set_to_archive = 0;
-    sprintf(tmp, "%s/archives/filelist.full", bkpinfo->scratchdir);
     log_to_screen("Archiving regular files");
     mr_msg(5, "Go, Shorty. It's your birthday.");
@@ -1641 +1639 @@
             update_progress_form(media_usage_comment);
             if (res) {
-                sprintf(tmp,
-                        "Failed to add archive %ld's files to CD dir\n",
-                        storing_set_no);
+                mr_asprintf(&tmp,
+                         "Failed to add archive %ld's files to CD dir\n",
+                         storing_set_no);
                 log_to_screen(tmp);
+                mr_free(tmp);
                 fatal_error
                     ("Is your hard disk full? If not, please send the author the logfile.");
@@ -1654 +1653 @@
     close_progress_form();
 
-    sprintf(tmp, "Your regular files have been archived ");
     mr_msg(2, "Joining background threads to foreground thread");
     for (i = 0; i < noof_threads; i++) {
@@ -1663 +1661 @@
     mr_msg(2, "Done.");
     if (retval) {
-        strcat(tmp, "(with errors).");
-    } else {
-        strcat(tmp, "successfully.");
+        mr_asprintf(&tmp,
+                 "Your regular files have been archived (with errors).");
+    } else {
+        mr_asprintf(&tmp,
+                 "Your regular files have been archived successfully");
     }
     log_to_screen(tmp);
+    mr_free(tmp);
     mr_free(transfer_block);
     mr_free(result_str);

branches/stable/mondo/src/lib/mr_file.c

@@ -23 +23 @@
 
     if ((fd = fopen(path, mode)) == NULL) {
-        mr_msg(1,line,file,"Unable to open %s",path);
+        mr_msg_int(1,line,file,"Unable to open %s",path);
         mr_exit(-1,"Exiting");
     }
@@ -34 +34 @@
 
     if (fd == NULL) {
-        mr_msg(1,line,file,"fd is NULL.\nShould NOT happen.");
+        mr_msg_int(1,line,file,"fd is NULL.\nShould NOT happen.");
         mr_exit(-1,"Exiting");
     }
     va_start(args,fmt);
     if (vfprintf(fd, fmt, args) < 0) {
-        mr_msg(1,line,file,"Unable to print to fd");
+        mr_msg_int(1,line,file,"Unable to print to fd");
         mr_exit(-1,"Exiting");
     }
@@ -48 +48 @@
 
     if (**fd == NULL) {
-        mr_msg(1,line,file,"fd is NULL.\nShould NOT happen.");
+        mr_msg_int(1,line,file,"fd is NULL.\nShould NOT happen.");
         mr_exit(-1,"Exiting");
     }
     if (*fd == NULL) {
-        mr_msg(1,line,file,"File descriptor is NULL.\nShould NOT happen.");
+        mr_msg_int(1,line,file,"File descriptor is NULL.\nShould NOT happen.");
         mr_exit(-1,"Exiting");
     }
     if (fclose(*fd) < 0) {
-        mr_msg(1,line,file,"Unable to close File Descriptor");
+        mr_msg_int(1,line,file,"Unable to close File Descriptor");
     }
     *fd = NULL;
@@ -64 +64 @@
 
     if (mkdir(pathname,mode) != 0) {
-        mr_msg(1,line,file,"Unable to create directory %s",pathname);
+        mr_msg_int(1,line,file,"Unable to create directory %s",pathname);
         mr_exit(-1,"Exiting");
     }