Changeset 1161 in MondoRescue for trunk/mondo/src/common/libmondo-devices.c
- Timestamp:
- Feb 14, 2007, 1:13:49 PM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/mondo/src/common/libmondo-devices.c
r1086 r1161 18 18 #include "libmondo-stream-EXT.h" 19 19 #include "mr_mem.h" 20 #include "mr_msg.h" 20 21 21 22 #include <sys/ioctl.h> … … 169 170 bool am_I_in_disaster_recovery_mode(void) 170 171 { 171 char *tmp, *comment; 172 char *tmp = NULL; 173 char *comment = NULL; 172 174 bool is_this_a_ramdisk = FALSE; 173 175 … … 219 221 * @ingroup stringGroup 220 222 */ 221 char *bkptype_to_string(t_bkptype bt)223 static char *bkptype_to_string(t_bkptype bt) 222 224 { 223 225 char *output = NULL; 224 225 mr_free(output);226 226 227 227 switch (bt) { … … 250 250 mr_asprintf(&output, _("udev")); 251 251 break; 252 case usb: 253 mr_asprintf(&output, _("usb")); 254 break; 252 255 default: 253 256 mr_asprintf(&output, _("default")); … … 268 271 int eject_device(char *dev) 269 272 { 270 char *command ;273 char *command = NULL; 271 274 int res1 = 0, res2 = 0; 272 275 … … 309 312 int inject_device(char *dev) 310 313 { 311 char *command ;314 char *command = NULL; 312 315 int i; 313 316 … … 337 340 338 341 /*@ buffers *********************************************************** */ 339 char *tmp ;340 bool ret ;342 char *tmp = NULL; 343 bool ret = FALSE; 341 344 342 345 assert_string_is_neither_NULL_nor_zerolength(device); … … 380 383 { 381 384 /*@ buffers **************************************************** */ 382 char *program ;385 char *program = NULL; 383 386 char *incoming = NULL; 384 char *searchstr ;385 char *tmp ;387 char *searchstr = NULL; 388 char *tmp = NULL; 386 389 387 390 /*@ ints ******************************************************* */ … … 444 447 { 445 448 /*@ buffers **************************************************** */ 446 char *command ;449 char *command = NULL; 447 450 448 451 /*@ end vars *************************************************** */ … … 475 478 { 476 479 /*@ buffers **************************************************** */ 477 char *command ;480 char *command = NULL; 478 481 /*@ end vars *************************************************** */ 479 482 int ret; … … 1148 1151 /*@ buffers ***************************************************** */ 1149 1152 char *incoming = NULL; 1150 char *device_with_tab ;1151 char *device_with_space ;1152 char *tmp ;1153 char *device_with_tab = NULL; 1154 char *device_with_space = NULL; 1155 char *tmp = NULL; 1153 1156 size_t n = 0; 1154 1157 … … 1190 1193 { 1191 1194 paranoid_pclose(fin); 1195 mr_free(incoming); 1192 1196 return(TRUE); 1193 1197 } … … 1232 1236 mr_free(mddevice); 1233 1237 mr_asprintf(&mddevice, "vn%ic", vndev++); 1234 1235 1238 mr_free(command); 1236 1239 mr_asprintf(&command, "vnconfig %s %s", mddevice, fname); … … 1281 1284 ("/sbin/sysctl -n kern.osreldate")) < 500000) { 1282 1285 mr_asprintf(&command, "vnconfig -d %s", dname); 1283 ret = system(command);1284 mr_free(command);1285 return(ret);1286 1286 } else { 1287 1287 mr_asprintf(&command, "mdconfig -d -u %s", dname); 1288 ret = system(command); 1289 mr_free(command); 1290 return(ret); 1291 } 1292 /*NOTREACHED*/ return 255; 1288 } 1289 ret = system(command); 1290 mr_free(command); 1291 return(ret); 1293 1292 } 1294 1293 #endif … … 1315 1314 1316 1315 /*@ buffers ********************************************************* */ 1317 char *tmp ;1318 char *request ;1316 char *tmp = NULL; 1317 char *request = NULL; 1319 1318 1320 1319 assert(bkpinfo != NULL); … … 1328 1327 return; 1329 1328 } 1330 1331 1329 mr_asprintf(&tmp, "mkdir -p " MNT_CDROM); 1332 1330 run_program_and_log_output(tmp, 5); … … 1708 1706 mr_asprintf(&comment, 1709 1707 _("How much data (in Megabytes) will each media store?")); 1710 if (!popup_and_get_string(_("Size"), comment, sz_size )) {1708 if (!popup_and_get_string(_("Size"), comment, sz_size, 5)) { 1711 1709 log_to_screen(_("User has chosen not to backup the PC")); 1712 1710 finish(1); 1713 1711 } 1712 mr_free(comment); 1714 1713 for (i = 0; i <= MAX_NOOF_MEDIA; i++) { 1715 1714 bkpinfo->media_size[i] = atoi(sz_size); … … 1719 1718 finish(1); 1720 1719 } 1721 mr_free(comment);1722 1720 } 1723 1721 if (bkpinfo->disaster_recovery) { … … 1769 1767 1770 1768 mr_free(command); 1771 mr_asprintf(&command, "echo hi > %s/%s/.dummy.txt",1772 bkpinfo->isodir,bkpinfo->nfs_remote_dir);1769 mr_asprintf(&command, "echo hi > '%s/%s/.dummy.txt'", bkpinfo->isodir, 1770 bkpinfo->nfs_remote_dir); 1773 1771 } 1774 1772 mr_free(command); … … 1984 1982 log_it("media size = %ld", bkpinfo->media_size[1]); 1985 1983 log_it("media type = %s", bkpinfo->backup_media_string); 1986 mr_free(tmp);1987 1984 log_it("prefix = %s", bkpinfo->prefix); 1988 1985 log_it("compression = %ld", bkpinfo->compression_level); … … 2021 2018 */ 2022 2019 } 2023 2024 2025 2020 /* @} - end of utilityGroup */ 2021 2026 2022 2027 2023 /** … … 2034 2030 { 2035 2031 char *tmp = NULL; 2036 2037 2032 char *command = NULL; 2033 char *sz = NULL; 2038 2034 int i = 0; 2039 2035 … … 2086 2082 bool set_dev_to_this_if_rx_OK(char *output, char *dev) 2087 2083 { 2088 char *command ;2084 char *command = NULL; 2089 2085 2090 2086 mr_free(output); … … 2142 2138 mr_free(mountdev); 2143 2139 mr_free(tmp); 2144 2145 2140 return (cd_number); 2146 2141 } … … 2200 2195 * @note Under Linux, all drives are examined, not just @p which_device. 2201 2196 */ 2197 char which_boot_loader(char *which_device) 2198 { 2202 2199 #ifdef __FreeBSD__ 2203 char which_boot_loader(char *which_device)2204 {2205 2200 int count_lilos = 0; 2206 2201 int count_grubs = 0; … … 2241 2236 return ('U'); 2242 2237 } 2243 }2244 2245 2238 #else 2246 2247 char which_boot_loader(char *which_device)2248 /* which_device is allocated here and needs to be freed by caller */2249 {2250 2239 /*@ buffer ***************************************************** */ 2251 2240 char *list_drives_cmd; … … 2310 2299 return ('U'); 2311 2300 } 2312 } 2313 #endif 2301 #endif 2302 } 2314 2303 2315 2304 … … 2435 2424 mr_free(tmp); 2436 2425 mr_msg(0, "Found %s partition table format type", output); 2437 return (output); 2438 } 2439 2426 return(output); 2427 } 2440 2428 /* @} - end of deviceGroup */
Note:
See TracChangeset
for help on using the changeset viewer.