Changeset 1168 in MondoRescue for branches/stable/mondo/src/common/libmondo-devices.c
- Timestamp:
- Feb 15, 2007, 12:27:39 AM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/stable/mondo/src/common/libmondo-devices.c
r1166 r1168 19 19 #include "mr_mem.h" 20 20 #include "mr_msg.h" 21 #include "mr_str.h" 21 22 22 23 #include <sys/ioctl.h> … … 1108 1109 1109 1110 FILE *pin = NULL; 1110 bool retval ;1111 bool retval = FALSE; 1111 1112 size_t n = 0; 1112 1113 assert_string_is_neither_NULL_nor_zerolength(format); … … 1127 1128 if (!pin) { 1128 1129 log_OS_error("Unable to read good formats"); 1129 retval = FALSE;1130 1130 } else { 1131 1131 mr_getline(&good_formats, &n , pin); … … 1133 1133 log_OS_error("Cannot pclose good formats"); 1134 1134 } 1135 strip_spaces(good_formats);1135 mr_strip_spaces(good_formats); 1136 1136 // " ntfs 7 " -- um, cheating much? :) 1137 1137 mr_asprintf(&tmp, " %s swap lvm raid ntfs 7 ",good_formats); … … 1141 1141 if (strstr(good_formats, format_sz)) { 1142 1142 retval = TRUE; 1143 } else {1144 retval = FALSE;1145 1143 } 1146 1144 mr_free(good_formats); … … 1704 1702 // check whether already mounted - we better remove 1705 1703 // surrounding spaces and trailing '/' for this 1706 /* BERLIOS: Useless 1707 strip_spaces(bkpinfo->nfs_mount); 1708 */ 1704 mr_strip_spaces(bkpinfo->nfs_mount); 1709 1705 if (bkpinfo->nfs_mount[strlen(bkpinfo->nfs_mount) - 1] == '/') 1710 1706 bkpinfo->nfs_mount[strlen(bkpinfo->nfs_mount) - 1] = '\0'; … … 1768 1764 mr_free(tmp); 1769 1765 // check whether writable - we better remove surrounding spaces for this 1770 strip_spaces(bkpinfo->nfs_remote_dir);1766 mr_strip_spaces(bkpinfo->nfs_remote_dir); 1771 1767 mr_asprintf(&command, "echo hi > '%s/%s/.dummy.txt'", bkpinfo->isodir, 1772 1768 bkpinfo->nfs_remote_dir); … … 1786 1782 mr_free(tmp); 1787 1783 // check whether writable - we better remove surrounding space s for this 1788 strip_spaces(bkpinfo->nfs_remote_dir);1784 mr_strip_spaces(bkpinfo->nfs_remote_dir); 1789 1785 1790 1786 mr_free(command); … … 2293 2289 for (mr_getline(¤t_drive, &n, pdrives); !feof(pdrives); 2294 2290 mr_getline(¤t_drive, &n, pdrives)) { 2295 strip_spaces(current_drive);2291 mr_strip_spaces(current_drive); 2296 2292 log_it("looking at drive %s's MBR", current_drive); 2297 2293 if (does_string_exist_in_boot_block(current_drive, "GRUB")) {
Note:
See TracChangeset
for help on using the changeset viewer.