Changeset 2357 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-devices.c

Timestamp:

Aug 29, 2009, 3:22:10 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Some more fgets => mr_getline transformations
• XWIN define is gone

File:

• branches/2.2.10/mondo/src/common/libmondo-devices.c (modified) (2 diffs)

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

@@ -2185 +2185 @@
         mr_asprintf(tmp, "mount | grep iso9660 | awk '{print $3;}'");
         mr_asprintf(mountdev, "%s%s", call_program_and_get_last_line_of_output(tmp), "/archives/THIS-CD-NUMBER");
-        cd_number = atoi(last_line_of_file(mountdev));
+        mr_free(tmp);
+
+        tmp = last_line_of_file(mountdev);
+        cd_number = atoi(tmp);
+        mr_free(tmp);
         mr_free(mountdev);
-        mr_free(tmp);
-
         return (cd_number);
     }
@@ -2210 +2212 @@
     mr_free(mountdev);
 
-    cd_number = atoi(last_line_of_file(MNT_CDROM "/archives/THIS-CD-NUMBER"));
+    tmp = last_line_of_file(MNT_CDROM "/archives/THIS-CD-NUMBER");
+    cd_number = atoi(tmp);
+    mr_free(tmp);
     return (cd_number);
 }