Changeset 3278 in MondoRescue for branches/3.2/mondo/src/common/libmondo-tools.c
- Timestamp:
- Apr 30, 2014, 12:30:11 PM (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.2/mondo/src/common/libmondo-tools.c
r3268 r3278 351 351 char *mondo_mkisofs_sz = NULL; 352 352 char *command = NULL; 353 char *hostname = NULL;354 353 char *isofs_cmd = NULL; 355 char *ip_address = NULL;356 354 int retval = 0; 357 char *colon;358 355 char *cdr_exe = NULL; 359 356 char *tmp = NULL; … … 362 359 char *iso_mnt = NULL; 363 360 char *iso_tmp = NULL; 364 char *iso_path = NULL; 365 char *cfg_fname = NULL; 361 char *iso_dir = NULL; 366 362 367 363 assert(bkpinfo != NULL); … … 532 528 if (bkpinfo->backup_media_type == iso) { 533 529 534 /* Patch by Conor Daly <conor.daly@met.ie> 535 * 23-june-2004 536 * Break up isodir into iso_mnt and iso_path 530 /* Break up isodir into iso_mnt and iso_dir 537 531 * These will be used along with iso-dev at restore time 538 532 * to locate the ISOs where ever they're mounted … … 560 554 mr_free(command); 561 555 562 log_it("iso mnt: %s, %d", iso_mnt, strlen(iso_mnt));556 log_it("iso_mnt: %s, %d", iso_mnt, strlen(iso_mnt)); 563 557 mr_asprintf(iso_tmp, "%s", bkpinfo->isodir); 564 558 if (strlen(iso_tmp) < strlen(iso_mnt)) { 565 mr_asprintf(iso_ path, "%s", "");559 mr_asprintf(iso_dir, "%s", ""); 566 560 } else { 567 // If iso_mnt is only / then iso_ pathis the full dir561 // If iso_mnt is only / then iso_dir is the full dir 568 562 // (the formula bellow doesn't work in this case) 569 563 if (strcmp(iso_mnt, "/") == 0) { 570 mr_asprintf(iso_ path, "%s", iso_tmp);564 mr_asprintf(iso_dir, "%s", iso_tmp); 571 565 // else it's a part of iso_tmp 572 566 } else { 573 mr_asprintf(iso_ path, "%s", iso_tmp + strlen(iso_mnt));567 mr_asprintf(iso_dir, "%s", iso_tmp + strlen(iso_mnt)); 574 568 } 575 569 } … … 577 571 mr_free(iso_tmp); 578 572 579 mr_asprintf(tmp, "%s/ISO DIR", bkpinfo->tmpdir);580 write_one_liner_data_file(tmp, iso_ path);581 mr_free(tmp); 582 583 log_it("iso dir: %s", iso_path);584 mr_free(iso_ path);573 mr_asprintf(tmp, "%s/ISO-DIR", bkpinfo->tmpdir); 574 write_one_liner_data_file(tmp, iso_dir); 575 mr_free(tmp); 576 577 log_it("iso-dir: %s", iso_dir); 578 mr_free(iso_dir); 585 579 586 580 mr_asprintf(tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir); … … 596 590 mr_asprintf(tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir); 597 591 write_one_liner_data_file(tmp, bkpinfo->prefix); 592 mr_free(tmp); 593 594 mr_asprintf(tmp, "%s/ISO-MNT", bkpinfo->tmpdir); 595 write_one_liner_data_file(tmp, bkpinfo->isodir); 596 mr_free(tmp); 597 598 mr_asprintf(tmp, "%s/ISO-DIR", bkpinfo->tmpdir); 599 write_one_liner_data_file(tmp, bkpinfo->netfs_remote_dir); 598 600 mr_free(tmp); 599 601
Note:
See TracChangeset
for help on using the changeset viewer.