Changeset 3060 in MondoRescue for branches/3.0/mondo/src/common/libmondo-archive.c

Timestamp:

Nov 10, 2012, 5:05:37 AM (11 years ago)

Author:

Bruno Cornec

Message:

r5035@localhost: bruno | 2012-11-09 03:17:01 +0100

• Fix a compilation error and most compilation warnings

File:

• branches/3.0/mondo/src/common/libmondo-archive.c (modified) (19 diffs)

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

@@ -1023 +1023 @@
     char *curr_acl_list_fname;
 
-    struct s_bkpinfo *bkpinfo_bis;
     char *tmp;
     int res = 0, retval = 0;
@@ -1041 +1040 @@
     p_next_set_to_archive = (int *) (inbuf + 8);
     p_list_of_fileset_flags = (char *) (inbuf + 12);
-    bkpinfo_bis = (struct s_bkpinfo *) (inbuf + BKPINFO_LOC_OFFSET);
 
     sprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ,
@@ -1597 +1595 @@
 
     log_msg(2, "make_usb_fs --- scratchdir=%s", bkpinfo->scratchdir);
-    (void) getcwd(old_pwd, MAX_STR_LEN - 1);
+    tmp1 = getcwd(old_pwd, MAX_STR_LEN - 1);
     mr_asprintf(&tmp, "chmod 700 %s", bkpinfo->scratchdir);
     run_program_and_log_output(tmp, FALSE);
     paranoid_free(tmp);
-    (void)chdir(bkpinfo->scratchdir);
+    if (chdir(bkpinfo->scratchdir)) {
+        // FIXME
+    }
 
     mds = media_descriptor_string(bkpinfo->backup_media_type);
@@ -1660 +1660 @@
     }
 
-    (void)chdir(old_pwd);
+    if (chdir(old_pwd)) {
+        // FIXME
+    }
     if (retval) {
         log_msg(1, "WARNING - make_usb_fs returned an error");
@@ -1734 +1736 @@
     log_msg(2, "make_iso_fs --- scratchdir=%s --- destfile=%s",
             bkpinfo->scratchdir, destfile);
-    (void) getcwd(old_pwd, MAX_STR_LEN - 1);
+    tmp2 = getcwd(old_pwd, MAX_STR_LEN - 1);
     sprintf(tmp, "chmod 700 %s", bkpinfo->scratchdir);
     run_program_and_log_output(tmp, FALSE);
-    chdir(bkpinfo->scratchdir);
+    if (chdir(bkpinfo->scratchdir)) {
+        // FIXME
+    }
 
     if (bkpinfo->call_before_iso[0] != '\0') {
@@ -1796 +1800 @@
                 /* reset error counter before trying to blank DVD */
                 retval -= res;
-                (void)system("sync");
+                paranoid_system("sync");
                 pause_for_N_seconds(5, "Letting DVD drive settle");
 
@@ -1984 +1988 @@
     }
 
-    chdir(old_pwd);
+    if (chdir(old_pwd)) {
+        // FIXME
+    }
     if (retval) {
         log_msg(1, "WARNING - make_iso_fs returned an error");
@@ -2040 +2046 @@
     FILE *fin;
     char *p;
+    char *q;
 
     /*@ buffers ******************************************** */
@@ -2090 +2097 @@
 
     malloc_string(bigfile_fname);
-    for (fgets(bigfile_fname, MAX_STR_LEN, fin); !feof(fin);
-         fgets(bigfile_fname, MAX_STR_LEN, fin), biggie_file_number++) {
+    for (q = fgets(bigfile_fname, MAX_STR_LEN, fin); !feof(fin) && (q != NULL);
+         q = fgets(bigfile_fname, MAX_STR_LEN, fin), biggie_file_number++) {
         use_ntfsprog = FALSE;
         if (bigfile_fname[strlen(bigfile_fname) - 1] < 32) {
@@ -2621 +2628 @@
     /*@ long long ****************************************************** */
     off_t length_of_incoming_file = (off_t)0;
-    t_archtype type;
     va_list ap;
 
@@ -2643 +2649 @@
         write_header_block_to_stream(length_of_incoming_file, curr_file,
                                      start_chr);
-        if (strstr(curr_file, ".afio.") || strstr(curr_file, ".star.")) {
-            type = fileset;
-        } else if (strstr(curr_file, "slice")) {
-            type = biggieslice;
-        } else {
-            type = other;
-        }
         res = write_file_to_stream_from_file(curr_file);
         retval += res;
@@ -2977 +2976 @@
     off_t totalread = (off_t)0;
     off_t totallength = (off_t)0;
-    off_t length;
 
     /*@ int ******************************************************** */
@@ -3036 +3034 @@
         }
         mr_free(command);
-        (void) fgets(checksum_line, MAX_STR_LEN, fin);
+        tmp = fgets(checksum_line, MAX_STR_LEN, fin);
         pclose(fin);
         totallength = length_of_file (biggie_filename);
@@ -3061 +3059 @@
     paranoid_free(tmp);
 
-    (void) fwrite((void *) &biggiestruct, 1, sizeof(biggiestruct), fout);
+    res = fwrite((void *) &biggiestruct, 1, sizeof(biggiestruct), fout);
     if (fout != NULL) {
         paranoid_fclose(fout);
     }
-    length = totallength / optimal_set_size / 1024;
     log_msg(1, "Opening in %s; slicing it and writing to CD/tape",
             file_to_openin);
@@ -3110 +3107 @@
                 if (blksize > 0) {
                     totalread = totalread + blksize;
-                    (void) fwrite(tempblock, 1, blksize, fout);
+                    res = fwrite(tempblock, 1, blksize, fout);
                 } else {
                     break;
@@ -3417 +3414 @@
                 ("Please reboot from the 1st %s in Compare Mode, as a precaution.", mds);
             mr_free(mds);
-            chdir("/");
+            if (chdir("/")) {
+                // FIXME
+            }
             log_it("Before calling verification of image()");
             if (bkpinfo->backup_media_type == usb) {
@@ -3497 +3496 @@
     assert(bkpinfo != NULL);
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        chdir("/");
+        if (chdir("/")) {
+            // FIXME
+        }
         mvaddstr_and_log_it(g_currentY, 0,
                             "Verifying archives against live filesystem");
@@ -3518 +3519 @@
             find_cdrom_device(bkpinfo->media_device, FALSE);    // replace 0,0,0 with /dev/cdrom
         }
-        chdir("/");
+        if (chdir("/")) {
+            // FIXME
+        }
         for (cdno = 1; cdno < 99 && bkpinfo->verify_data; cdno++) {
             if (cdno != g_current_media_number) {
@@ -3541 +3544 @@
         }
         mr_asprintf(&tmp, "grep 'afio: ' %s | sed 's/afio: //' | grep -vE '^/dev/.*$' >> %s/changed.files", MONDO_LOGFILE, MONDO_CACHE);
-        (void)system(tmp);
+        res = system(tmp);
         mr_free(tmp);
 
         mr_asprintf(&tmp, "grep 'star: ' %s | sed 's/star: //' | grep -vE '^/dev/.*$' >> %s/changed.files", MONDO_LOGFILE, MONDO_CACHE);
-        (void)system(tmp);
+        res = system(tmp);
         mr_free(tmp);
         run_program_and_log_output("umount " MNT_CDROM, FALSE);