Changeset 3060 in MondoRescue for branches/3.0/mondo/src/common/newt-specific.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/newt-specific.c (modified) (19 diffs)

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

@@ -123 +123 @@
         /*@ buffers ********************************************************** */
         int i;
+        char *p;
 
          assert_string_is_neither_NULL_nor_zerolength(prompt);
@@ -132 +133 @@
 
             while (1) {
-                system("sync");
+                paranoid_system("sync");
                 printf
                     ("---promptdialogYN---1--- %s\n---promptdialogYN---Q--- [yes] [no] ---\n--> ",
                      prompt);
-                (void) fgets(tmp, MAX_NEWT_COMMENT_LEN, stdin);
+                p= fgets(tmp, MAX_NEWT_COMMENT_LEN, stdin);
+                if (!p) {
+                    //FIXME
+                }
                 if (tmp[strlen(tmp) - 1] == '\n')
                     tmp[strlen(tmp) - 1] = '\0';
@@ -151 +155 @@
                     return (FALSE);
                 } else {
-                    system("sync");
+                    paranoid_system("sync");
                     printf
                         ("Please enter either YES or NO (or yes or no, or y or n, or...)\n");
@@ -172 +176 @@
         /*@ buffer *********************************************************** */
         char *tmp;
+        char *p;
         int i;
 
@@ -177 +182 @@
         assert_string_is_neither_NULL_nor_zerolength(prompt);
         if (g_text_mode) {
-            system("sync");
+            paranoid_system("sync");
             printf
                 ("---promptdialogOKC---1--- %s\n---promptdialogOKC---Q--- [OK] [Cancel] ---\n--> ",
                  prompt);
-            (void) fgets(tmp, MAX_NEWT_COMMENT_LEN, stdin);
+            p = fgets(tmp, MAX_NEWT_COMMENT_LEN, stdin);
+            if (!p) {
+                // FIXME
+            }
             if (tmp[strlen(tmp) - 1] == '\n')
                 tmp[strlen(tmp) - 1] = '\0';
@@ -347 +355 @@
         */
 
-        chdir("/");
+        if (chdir("/")) {
+            // FIXME
+        }
         if (g_selfmounted_isodir) {
             sprintf(command, "umount -d %s", g_selfmounted_isodir);
@@ -406 +416 @@
 
         /*  Before removing dir, make sure we're out of them */
-        chdir("/tmp");
+        if (chdir("/tmp")) {
+            // FIXME
+        }
         run_program_and_log_output("umount -d " MNT_CDROM, FALSE);
         if (g_selfmounted_isodir) {
@@ -432 +444 @@
                 log_msg(8,"erasing tempdir %s",bkpinfo->tmpdir);
                 mr_asprintf(&command, "rm -Rf %s", bkpinfo->tmpdir);
-                system(command);
+                paranoid_system(command);
                 mr_free(command);
             }
@@ -441 +453 @@
                 log_msg(8,"erasing scratchdir %s",bkpinfo->scratchdir);
                 mr_asprintf(&command, "rm -Rf %s", bkpinfo->scratchdir);
-                system(command);
+                paranoid_system(command);
                 mr_free(command);
             }
@@ -475 +487 @@
         char *command = NULL;
         char *tmp = NULL;
+        char *p = NULL;
 
         /*@ pointers ********************************************************* */
@@ -502 +515 @@
                 for (err_log_lines[i][0] = '\0';
                      strlen(err_log_lines[i]) < 2 && !feof(fin);) {
-                    (void) fgets(err_log_lines[i], MAX_NEWT_COMMENT_LEN,
-                                 fin);
+                    p = fgets(err_log_lines[i], MAX_NEWT_COMMENT_LEN, fin);
+                    if (!p) {
+                        // FIXME
+                    }
                     /* Commented to make valgrind happy and avoid crash
                     strip_spaces(err_log_lines[i]);
@@ -774 +789 @@
         /*@ buffers ********************************************************** */
         char *blurb;
+        char *p;
         char *original_contents;
 
@@ -786 +802 @@
                 ("---promptstring---1--- %s\n---promptstring---2--- %s\n---promptstring---Q---\n-->  ",
                  title, b);
-            (void) fgets(output, maxsize, stdin);
+            p = fgets(output, maxsize, stdin);
+            if (!p) {
+                // FIXME
+            }
             if (output[strlen(output) - 1] == '\n')
                 output[strlen(output) - 1] = '\0';
@@ -843 +862 @@
         /*@ buffers *********************************************************** */
         char *prompt;
+        char *q;
 
         /*@ newt ************************************************************** */
@@ -865 +885 @@
                                           || strcmp(prompt, button2));) {
                 printf("--> ");
-                (void) fgets(prompt, MAX_NEWT_COMMENT_LEN, stdin);
+                q = fgets(prompt, MAX_NEWT_COMMENT_LEN, stdin);
+                if (!q) {
+                    // FIXME
+                }
             }
             if (!strcmp(prompt, button1)) {
@@ -1276 +1299 @@
 "netfs", "iso", NULL };
         char *outstr;
+        char *p;
         t_bkptype backup_type;
         int i;
@@ -1301 +1325 @@
                 }
                 printf(")\n--> ");
-                (void) fgets(outstr, MAX_NEWT_COMMENT_LEN, stdin);
+                p = fgets(outstr, MAX_NEWT_COMMENT_LEN, stdin);
+                if (!p) {
+                    // FIXME
+                }
                 strip_spaces(outstr);
                 for (i = 0; possible_responses[i]; i++) {
@@ -1484 +1511 @@
         bool done;
         char *tmp;
+        char *p;
         char *tmp1 = NULL;
         FILE *fin, *fout;
@@ -1513 +1541 @@
                 break;
             }
-            (void) fgets(tmp, MAX_NEWT_COMMENT_LEN, fin);
+            p = fgets(tmp, MAX_NEWT_COMMENT_LEN, fin);
+            if (!p) {
+                // FIXME
+            }
             i = (int) strlen(tmp);
             if (i < 2) {