Changeset 3291 in MondoRescue for branches/3.2
- Timestamp:
- May 27, 2014, 5:53:12 PM (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.2/mondo/src/common/libmondo-devices.c
r3288 r3291 1015 1015 char *command = NULL; 1016 1016 char *format_sz = NULL; 1017 char *p ;1017 char *p = NULL; 1018 1018 1019 1019 FILE *pin; 1020 1020 int retval; 1021 malloc_string(good_formats);1022 1021 1023 1022 assert_string_is_neither_NULL_nor_zerolength(format); … … 1038 1037 retval = 0; 1039 1038 } else { 1040 strcpy(good_formats, " "); 1041 p = fgets(good_formats + 1, MAX_STR_LEN - 1, pin); 1042 if (pclose(pin) && (p != NULL)) { 1043 log_OS_error("Cannot pclose good formats"); 1044 } 1045 strip_spaces(good_formats); 1046 strcat(good_formats, " swap lvm raid ntfs-3g ntfs 7 "); // " ntfs 7 " -- um, cheating much? :) 1039 mr_getline(p, pin); 1040 mr_asprintf(good_formats, " %s",p); 1041 (void)pclose(pin); 1042 mr_strip_spaces(good_formats); 1043 mr_strcat(good_formats, " swap lvm raid ntfs-3g ntfs 7 "); // " ntfs 7 " -- um, cheating much? :) 1047 1044 if (strstr(good_formats, format_sz)) { 1048 1045 retval = 1; … … 1051 1048 } 1052 1049 } 1053 paranoid_free(good_formats);1050 mr_free(good_formats); 1054 1051 mr_free(format_sz); 1055 1052
Note:
See TracChangeset
for help on using the changeset viewer.