Changeset 2211 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-tools.c
- Timestamp:
- Jun 3, 2009, 7:10:19 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.9/mondo/src/common/libmondo-tools.c
r2205 r2211 10 10 11 11 #include "my-stuff.h" 12 #include "mr_mem.h" 12 13 #include "mondostructures.h" 13 14 #include "lib-common-externs.h" … … 232 233 233 234 uname(&utsn); 234 asprintf(&tmp, "%s", utsn.machine);235 mr_asprintf(&tmp, "%s", utsn.machine); 235 236 return (tmp); 236 237 } … … 420 421 int post_param_configuration() 421 422 { 422 char *extra_cdrom_params ;423 char *mondo_mkisofs_sz ;423 char *extra_cdrom_params = NULL; 424 char *mondo_mkisofs_sz = NULL; 424 425 char *command; 425 426 char *mtpt; 426 char *hostname, *ip_address; 427 char *hostname; 428 char *ip_address = NULL; 427 429 int retval = 0; 428 430 char *colon; … … 440 442 441 443 assert(bkpinfo != NULL); 442 malloc_string(extra_cdrom_params);443 malloc_string(mondo_mkisofs_sz);444 444 malloc_string(command); 445 445 malloc_string(mtpt); 446 446 malloc_string(hostname); 447 malloc_string(ip_address);448 447 malloc_string(cdr_exe); 449 448 malloc_string(tmp); … … 497 496 498 497 if (bkpinfo->backup_media_type == dvd) { 499 extra_cdrom_params[0] = '\0';500 mondo_mkisofs_sz[0] = '\0';501 498 if (find_home_of_exe("growisofs")) { 502 499 strcpy(cdr_exe, "growisofs"); … … 506 503 } 507 504 if (bkpinfo->nonbootable_backup) { 508 strcat(mondo_mkisofs_sz, MONDO_GROWISOFS_NONBOOT);505 mr_asprintf(&mondo_mkisofs_sz, MONDO_GROWISOFS_NONBOOT); 509 506 } else if 510 507 #ifdef __FreeBSD__ … … 515 512 #ifdef __IA64__ 516 513 { 517 strcat(mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_ELILO);514 mr_asprintf(&mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_ELILO); 518 515 } 519 516 #else 520 517 { 521 strcat(mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_LILO);518 mr_asprintf(&mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_LILO); 522 519 } 523 520 #endif 524 521 else 525 522 { 526 strcat(mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_SYSLINUX);523 mr_asprintf(&mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_SYSLINUX); 527 524 } 528 525 if (bkpinfo->manual_cd_tray) { 526 paranoid_free(mondo_mkisofs_sz); 529 527 fatal_error("Manual CD tray + DVD not supported yet."); 530 528 // -m isn't supported by growisofs, BTW... … … 533 531 "%s %s -Z %s . 2>> _ERR_", 534 532 mondo_mkisofs_sz, 535 extra_cdrom_params, bkpinfo->media_device); 533 "", bkpinfo->media_device); 534 paranoid_free(mondo_mkisofs_sz); 536 535 } 537 536 if (getenv ("SUDO_COMMAND")) { … … 549 548 if (bkpinfo->backup_media_type == cdrw 550 549 || bkpinfo->backup_media_type == cdr) { 551 extra_cdrom_params[0] = '\0';552 550 if (!bkpinfo->manual_cd_tray) { 553 strcat(extra_cdrom_params, "-waiti ");551 mr_asprintf(&extra_cdrom_params, "-waiti "); 554 552 } 555 553 if (bkpinfo->backup_media_type == cdrw) { 556 strcat(extra_cdrom_params, "blank=fast ");554 mr_asprintf(&extra_cdrom_params, "blank=fast "); 557 555 } 558 556 if (find_home_of_exe("cdrecord")) { … … 564 562 } 565 563 if (bkpinfo->nonbootable_backup) { 566 strcpy(mondo_mkisofs_sz, MONDO_MKISOFS_NONBOOT);564 mr_asprintf(&mondo_mkisofs_sz, MONDO_MKISOFS_NONBOOT); 567 565 } else if 568 566 #ifdef __FreeBSD__ … … 573 571 #ifdef __IA64__ 574 572 { 575 strcat(mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_ELILO);573 mr_asprintf(&mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_ELILO); 576 574 } 577 575 #else 578 576 { 579 strcpy(mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_LILO);577 mr_asprintf(&mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_LILO); 580 578 } 581 579 #endif 582 580 else 583 581 { 584 strcpy(mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_SYSLINUX);582 mr_asprintf(&mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_SYSLINUX); 585 583 } 586 584 if (bkpinfo->manual_cd_tray) { … … 609 607 bkpinfo->cdrw_speed); 610 608 } 609 paranoid_free(mondo_mkisofs_sz); 610 paranoid_free(extra_cdrom_params); 611 611 } // end of CD code 612 612 … … 693 693 retval++; 694 694 } else { 695 strcpy(ip_address, inet_ntoa695 mr_asprintf(&ip_address, inet_ntoa 696 696 ((struct in_addr) 697 697 *((struct in_addr *) hent->h_addr))); 698 strcat(ip_address, strchr(bkpinfo->nfs_mount, ':'));698 mr_strcat(ip_address, strchr(bkpinfo->nfs_mount, ':')); 699 699 strcpy(bkpinfo->nfs_mount, ip_address); 700 paranoid_free(ip_address); 700 701 } 701 702 } … … 718 719 g_backup_media_type = bkpinfo->backup_media_type; 719 720 paranoid_free(mtpt); 720 paranoid_free(extra_cdrom_params);721 paranoid_free(mondo_mkisofs_sz);722 721 paranoid_free(command); 723 722 paranoid_free(hostname); 724 paranoid_free(ip_address);725 723 paranoid_free(cdr_exe); 726 724 paranoid_free(tmp); … … 758 756 759 757 unlink(MONDO_TRACEFILE); 760 asprintf(&tmp,"rm -Rf %s/changed.files*",MONDO_CACHE);758 mr_asprintf(&tmp,"rm -Rf %s/changed.files*",MONDO_CACHE); 761 759 run_program_and_log_output(tmp, FALSE); 762 760 paranoid_free(tmp); … … 783 781 if ((bkpinfo->tmpdir != NULL) && (strstr(bkpinfo->tmpdir,"mondo.tmp.") != NULL)) { 784 782 /* purging a potential old tmpdir */ 785 asprintf(&tmp,"rm -Rf %s",bkpinfo->tmpdir);783 mr_asprintf(&tmp,"rm -Rf %s",bkpinfo->tmpdir); 786 784 system(tmp); 787 785 paranoid_free(tmp); … … 789 787 790 788 if (path != NULL) { 791 asprintf(&tmp, "%s/mondo.tmp.XXXXXX", path);789 mr_asprintf(&tmp, "%s/mondo.tmp.XXXXXX", path); 792 790 } else if (getenv("TMPDIR")) { 793 asprintf(&tmp, "%s/mondo.tmp.XXXXXX", getenv("TMPDIR"));791 mr_asprintf(&tmp, "%s/mondo.tmp.XXXXXX", getenv("TMPDIR")); 794 792 } else if (getenv("TMP")) { 795 asprintf(&tmp, "%s/mondo.tmp.XXXXXX", getenv("TMP"));793 mr_asprintf(&tmp, "%s/mondo.tmp.XXXXXX", getenv("TMP")); 796 794 } else { 797 asprintf(&tmp, "/tmp/mondo.tmp.XXXXXX");795 mr_asprintf(&tmp, "/tmp/mondo.tmp.XXXXXX"); 798 796 } 799 797 p = mkdtemp(tmp);
Note:
See TracChangeset
for help on using the changeset viewer.