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

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

@@ -348 +348 @@
     char *searchstr = NULL;
     char *tmp;
+    char *p;
 
     /*@ ints ******************************************************* */
@@ -383 +384 @@
     (void) build_partition_name(searchstr, drive, partno);
     strcat(searchstr, " ");
-    for (res = 0; !res && fgets(incoming, MAX_STR_LEN - 1, fin);) {
+    for (res = 0; !res && (p = fgets(incoming, MAX_STR_LEN - 1, fin));) {
         if (strstr(incoming, searchstr)) {
             res = 1;
@@ -677 +678 @@
         return (1);
     }
-    for ((void)fgets(tmp, MAX_STR_LEN, fin); !feof(fin);
-         (void)fgets(tmp, MAX_STR_LEN, fin)) {
+    for (tmp1 = fgets(tmp, MAX_STR_LEN, fin); !feof(fin) && (tmp1 != NULL);
+         tmp1 = fgets(tmp, MAX_STR_LEN, fin)) {
         p = strchr(tmp, '\'');
         if (p) {
@@ -711 +712 @@
             log_msg(4, "Cannot run 2nd command - non-fatal, fortunately");
         } else {
-            for ((void)fgets(tmp, MAX_STR_LEN, fin); !feof(fin);
-                 (void)fgets(tmp, MAX_STR_LEN, fin)) {
+            for (tmp1 = fgets(tmp, MAX_STR_LEN, fin); !feof(fin) && (tmp1 != NULL);
+                 tmp1 = fgets(tmp, MAX_STR_LEN, fin)) {
                 log_msg(5, "--> '%s'", tmp);
                 if (tmp[0] != ' ' && tmp[1] != ' ') {
@@ -915 +916 @@
     }
 
-    sprintf(tmp, "%s", call_program_and_get_last_line_of_output
-            ("dvdrecord -scanbus 2> /dev/null | grep \)\ \' | grep -n '' | grep -E '[D|C][V|D]' | cut -d':' -f1")
-        );
+    sprintf(tmp, "%s", call_program_and_get_last_line_of_output("dvdrecord -scanbus 2> /dev/null | grep -E '\)\ \'' | grep -n '' | grep -E '[D|C][V|D]' | cut -d':' -f1"));
     log_msg(5, "tmp = '%s'", tmp);
     if (!tmp[0])
@@ -959 +958 @@
 #if linux
     unsigned long long s = 0;
-    int fileid, cylinders = 0, cylindersleft = 0;
+    int fileid, cylinders = 0;
     int cylindersize = 0;
     int gotgeo = 0;
@@ -1008 +1007 @@
             if (ioctl(fileid, HDIO_GETGEO, &hdgeo) != -1) {
                 if (hdgeo.cylinders && hdgeo.heads && hdgeo.sectors) {
-                    cylindersleft = cylinders = hdgeo.cylinders;
                     cylindersize = hdgeo.heads * hdgeo.sectors / 2;
                     outvalA = cylindersize * cylinders / 1024;
@@ -1056 +1054 @@
     char *command;
     char *format_sz;
+    char *p;
 
     FILE *pin;
@@ -1081 +1080 @@
     } else {
         strcpy(good_formats, " ");
-        (void) fgets(good_formats + 1, MAX_STR_LEN - 1, pin);
-        if (pclose(pin)) {
+        p = fgets(good_formats + 1, MAX_STR_LEN - 1, pin);
+        if (pclose(pin) && (p != NULL)) {
             log_OS_error("Cannot pclose good formats");
         }
@@ -1153 +1152 @@
         return(FALSE);
     }
-    for ((void)fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin);
-         (void)fgets(incoming, MAX_STR_LEN - 1, fin)) {
+    for (tmp = fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin) && (tmp != NULL);
+         tmp = fgets(incoming, MAX_STR_LEN - 1, fin)) {
         if (strstr(incoming, device_with_space) //> incoming
             || strstr(incoming, device_with_tab))   // > incoming)
@@ -2525 +2524 @@
         if (bkpinfo->disaster_recovery) {
             sprintf(command ,"umount %s/isodir 2> /dev/null", bkpinfo->tmpdir);
-            (void)system(command);
+            paranoid_system(command);
         }
         strcpy(tmp1, bkpinfo->netfs_proto);
@@ -2981 +2980 @@
     /* Before changing remove old ones if any */
     if (bkpinfo->scratchdir) {
-        chdir("/tmp");
+        if (chdir("/tmp")) {
+            // FIXME
+        }
         mr_asprintf(&tmp1, "rm -Rf %s", bkpinfo->scratchdir);
         paranoid_system(tmp1);
@@ -3190 +3191 @@
     char *list_drives_cmd = NULL;
     char *current_drive;
+    char *tmp;
 
     /*@ pointers *************************************************** */
@@ -3219 +3221 @@
     mr_free(list_drives_cmd);
 
-    for ((void)fgets(current_drive, MAX_STR_LEN, pdrives); !feof(pdrives);
-         (void)fgets(current_drive, MAX_STR_LEN, pdrives)) {
+    for (tmp = fgets(current_drive, MAX_STR_LEN, pdrives); !feof(pdrives) && (tmp != NULL);
+         tmp = fgets(current_drive, MAX_STR_LEN, pdrives)) {
         strip_spaces(current_drive);
         log_it("looking at drive %s's MBR", current_drive);
@@ -3261 +3263 @@
         mr_free(list_drives_cmd);
 
-        for ((void)fgets(current_drive, MAX_STR_LEN, pdrives); !feof(pdrives);
-            (void)fgets(current_drive, MAX_STR_LEN, pdrives)) {
+        for (tmp = fgets(current_drive, MAX_STR_LEN, pdrives); !feof(pdrives) && (tmp != NULL);
+            tmp = fgets(current_drive, MAX_STR_LEN, pdrives)) {
             strip_spaces(current_drive);
             log_it("looking at partition %s's BR", current_drive);