Changeset 2325 in MondoRescue for branches/2.2.10/mondo/src/mondorestore/mondo-rstr-newt.c
- Timestamp:
- Aug 18, 2009, 3:19:15 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.10/mondo/src/mondorestore/mondo-rstr-newt.c
r2323 r2325 2261 2261 /** 2262 2262 * Get information about the location of ISO images from the user. 2263 * @param isodir_device Where to put the device (e.g. /dev/hda4) the user enters. 2263 * @param isodir_device Where to put the device (e.g. /dev/hda4) the user enters. Allocted by the function 2264 2264 * @param isodir_format Where to put the format (e.g. ext2) the user enters. 2265 2265 * @param isodir_path Where to put the path (e.g. /var/cache/mondo) the user enters. … … 2267 2267 * @return TRUE if OK was pressed, FALSE otherwise. 2268 2268 */ 2269 bool get_isodir_info(char *isodir_device, char *isodir_format, char *isodir_path, bool nuke_me_please) 2270 { 2269 bool get_isodir_info(char *isodir_device, char *isodir_format, char *isodir_path, bool nuke_me_please) { 2271 2270 2272 2271 char *p = NULL; … … 2278 2277 /** initialize ********************************************************/ 2279 2278 2280 assert(isodir_device != NULL);2281 2279 assert(isodir_path != NULL); 2282 2280 2283 2281 log_it("isodir_path = %s", isodir_path); 2284 if (isodir_device [0] == '\0') {2282 if (isodir_device == NULL) { 2285 2283 mr_asprintf(idev, "/dev/"); 2286 2284 } else { … … 2297 2295 2298 2296 /* modify for the caller */ 2299 strcpy(isodir_device, idev); 2297 mr_free(isodir_device); 2298 isodir_device = idev; 2300 2299 if (nuke_me_please) { 2301 2300 ret = TRUE; … … 2316 2315 2317 2316 /* modify for the caller */ 2318 strcpy(isodir_device, p); 2317 mr_free(isodir_device); 2318 isodir_device = p; 2319 2319 mr_free(isodir_path); 2320 2320 isodir_path = r; … … 2327 2327 mr_free(p); 2328 2328 } 2329 mr_free(idev);2330 2329 mr_free(isodir_format); 2331 2330 return(ret);
Note:
See TracChangeset
for help on using the changeset viewer.