Changeset 3076 in MondoRescue

Timestamp:

Nov 24, 2012, 8:23:58 PM (12 years ago)

Author:

Bruno Cornec

Message:

• Avoids again some additional warnings at compilation level

File:

• branches/3.0/mondo/src/mondorestore/mondo-rstr-tools.c (modified) (16 diffs)

branches/3.0/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -119 +119 @@
 char *incoming_ptr;
 char *question_ptr;
+char *q;
 
 char incoming[MAX_STR_LEN] = "\0";
@@ -128 +129 @@
 incoming_ptr = malloc(sizeof(incoming));
 if (incoming_ptr == NULL) {
-fprintf(stderr, "Out of Memory\n");
-exit(EXIT_FAILURE);
+    fprintf(stderr, "Out of Memory\n");
+    exit(EXIT_FAILURE);
 }
 
 question_ptr = malloc(sizeof(question));
 if (question_ptr == NULL) {
-fprintf(stderr, "Out of Memory\n");
-exit(EXIT_FAILURE);
+    fprintf(stderr, "Out of Memory\n");
+    exit(EXIT_FAILURE);
 }
 
@@ -144 +145 @@
 
 if (!(fin = fopen(infname, "r"))) {
-fatal_error("Cannot openin infname");
+    fatal_error("Cannot openin infname");
 }
 if (!(fout = fopen(outfname, "w"))) {
-fatal_error("Cannot openin outfname");
-}
-for (fgets(incoming_ptr, MAX_STR_LEN, fin);
- !feof(fin); fgets(incoming_ptr, MAX_STR_LEN, fin)) {
-strip_spaces(incoming_ptr);
-
-if (incoming[0] == '\0') {
-    continue;
-}
-
-sprintf(question_ptr,
-        "Should I restore the image of %s ?", incoming_ptr);
-
-if (ask_me_yes_or_no(question_ptr)) {
-    fprintf(fout, "%s\n", incoming_ptr);
-}
+    fatal_error("Cannot openin outfname");
+}
+for (q = fgets(incoming_ptr, MAX_STR_LEN, fin); !feof(fin) && (q != NULL); q = fgets(incoming_ptr, MAX_STR_LEN, fin)) {
+    strip_spaces(incoming_ptr);
+
+    if (incoming[0] == '\0') {
+        continue;
+    }
+
+    sprintf(question_ptr, "Should I restore the image of %s ?", incoming_ptr);
+
+    if (ask_me_yes_or_no(question_ptr)) {
+        fprintf(fout, "%s\n", incoming_ptr);
+    }
 }
 
@@ -1005 +1004 @@
 char *command;
 char *tmp;
+char *q;
 int res = 0;
 pid_t pid;
@@ -1028 +1028 @@
 } else {
     getcwd(tmp, MAX_STR_LEN);
-    chdir(bkpinfo->tmpdir);
+    if (chdir(bkpinfo->tmpdir)) {
+        // FIXME
+    }
     log_msg(1, "chdir(%s)", bkpinfo->tmpdir);
     log_to_screen("Extracting filelist and biggielist from media...");
@@ -1128 +1130 @@
     }
 
-    chdir(tmp);
+    if (chdir(tmp)) {
+        // FIXME
+    }
 
     if (!does_file_exist(g_biggielist_txt)) {
@@ -1171 +1175 @@
     unlink(g_filelist_full);
     if (g_text_mode) {
-        printf("Restore which directory? --> ");
-        fgets(tmp, sizeof(tmp), stdin);
+        q = NULL;
+        while (q == NULL) {
+            printf("Restore which directory? --> ");
+            q = fgets(tmp, sizeof(tmp), stdin);
+        }
         toggle_path_selection(filelist, tmp, TRUE);
         if (strlen(tmp) == 0) {
@@ -1255 +1262 @@
             newtSuspend();
         }
-        (void)system("chroot " MNT_RESTORING);
+        paranoid_system("chroot " MNT_RESTORING);
         if (!g_text_mode) {
             newtResume();
@@ -1312 +1319 @@
     log_msg(2, tmp);
     paranoid_free(tmp);
-    system("sync");
+    paranoid_system("sync");
 
     offer_to_make_initrd();
@@ -1489 +1496 @@
                         ("GRUB installation failed. Please fix the conf files so that a manual install using 'grub-install' or similar command works. You are now chroot()'ed to your restored system. Please type 'exit' when you are done.");
                     newtSuspend();
-                    system("chroot " MNT_RESTORING);
+                    paranoid_system("chroot " MNT_RESTORING);
                     newtResume();
                     popup_and_OK("Thank you.");
@@ -1512 +1519 @@
                 ("Because of bugs in GRUB's own installer, GRUB was not installed properly. Please install the boot loader manually now, using this chroot()'ed shell prompt. Type 'exit' when you have finished.");
             newtSuspend();
-            system("chroot " MNT_RESTORING);
+            paranoid_system("chroot " MNT_RESTORING);
             newtResume();
             popup_and_OK("Thank you.");
@@ -1872 +1879 @@
   /** malloc **/
     char *incoming;
+    char *q;
 
     assert_string_is_neither_NULL_nor_zerolength(output_file);
@@ -1884 +1892 @@
         fatal_error("cannot open output_file");
     }
-    for (fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin);
-         fgets(incoming, MAX_STR_LEN - 1, fin)) {
+    for (q = fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin) && (q != NULL);
+         q = fgets(incoming, MAX_STR_LEN - 1, fin)) {
         if (strncmp(incoming, "etc/adjtime", 11)
             && strncmp(incoming, "etc/mtab", 8)
@@ -1964 +1972 @@
                        "in preparation for the post-restoration reboot.",
                        "", mountlist->entries);
-    chdir("/");
+    if (chdir("/")) {
+        // FIXME
+    }
     for (i = 0;
          i < 10
@@ -2153 +2163 @@
     sprintf(mountpt, "%s/mount.bootdisk", bkpinfo->tmpdir);
     device[0] = '\0';
-    chdir(bkpinfo->tmpdir);
+    if (chdir(bkpinfo->tmpdir)) {
+        // FIXME
+    }
     strcpy(cfg_file, MONDO_CFG_FILE_STUB);
     unlink(cfg_file);           // cfg_file[] is missing the '/' at the start, FYI, by intent
@@ -2186 +2198 @@
         if (try_plan_B) {
             log_msg(2, "gcffa --- OK, switching to Plan B");
-            chdir(bkpinfo->tmpdir);
+            if (chdir(bkpinfo->tmpdir)) {
+                // FIXME
+            }
             run_program_and_log_output("mkdir -p tmp", FALSE);