Changeset 1543 in MondoRescue for branches/stable/mondo/src/mondoarchive/mondoarchive.c
- Timestamp:
- Jul 23, 2007, 1:05:36 AM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/stable/mondo/src/mondoarchive/mondoarchive.c
r1535 r1543 55 55 static char *g_dvd_drive_is_here = NULL; 56 56 57 struct mr_ar_conf mr_conf;57 struct mr_ar_conf *mr_conf = NULL; 58 58 59 59 /***************** global vars ******************/ … … 257 257 mr_free(mr_cnf->tmp_dir); 258 258 mr_free(mr_cnf->images_dir); 259 mr_free(mr_cnf); 259 260 } 260 261 … … 270 271 /* Highly incomplete function for the moment */ 271 272 /* We have to free all allocated memory */ 272 mr_ar_clean_conf( &mr_conf);273 mr_ar_clean_conf(mr_conf); 273 274 /* We have to remove all temporary files */ 274 275 /* We have to unmount what has been mounted */ … … 332 333 mr_log_exit(-1, "Unable to open "MONDO_CONF_DIR"/mondo.conf.dist"); 333 334 } 334 mr_ar_store_conf(&mr_conf); 335 mr_conf = malloc(sizeof(struct mr_ar_conf)); 336 mr_ar_store_conf(mr_conf); 335 337 /* Reference the right cleanup function for mr_exit now it's allocated */ 336 338 mr_cleanup = &mr_ar_cleanup; … … 345 347 mr_log_exit(-1, "Unable to open "MINDI_CONF_DIR"/mindi.conf.dist"); 346 348 } 347 mr_ar_store_conf_mindi( &mr_conf);349 mr_ar_store_conf_mindi(mr_conf); 348 350 mr_conf_close(); 349 351 350 352 if (mr_conf_open(MINDI_CONF_DIR"/mindi.conf") == 0) { 351 mr_ar_store_conf_mindi( &mr_conf);353 mr_ar_store_conf_mindi(mr_conf); 352 354 mr_conf_close(); 353 355 }
Note:
See TracChangeset
for help on using the changeset viewer.