| @@ -672,27 +672,27 @@ handle_sig(int sig) | | | @@ -672,27 +672,27 @@ handle_sig(int sig) |
| 672 | } | | 672 | } |
| 673 | | | 673 | |
| 674 | static void | | 674 | static void |
| 675 | terminate_cleanup(void) | | 675 | terminate_cleanup(void) |
| 676 | { | | 676 | { |
| 677 | int dounlink = getenv("CTFMERGE_TERMINATE_NO_UNLINK") ? 0 : 1; | | 677 | int dounlink = getenv("CTFMERGE_TERMINATE_NO_UNLINK") ? 0 : 1; |
| 678 | | | 678 | |
| 679 | if (tmpname != NULL && dounlink) | | 679 | if (tmpname != NULL && dounlink) |
| 680 | unlink(tmpname); | | 680 | unlink(tmpname); |
| 681 | | | 681 | |
| 682 | if (outfile == NULL) | | 682 | if (outfile == NULL) |
| 683 | return; | | 683 | return; |
| 684 | | | 684 | |
| 685 | #if !defined (__FreeBSD__) && !defined(__NetBSD__) | | 685 | #if !defined (__FreeBSD__) && !(defined(__NetBSD__) || HAVE_NBTOOL_CONFIG_H) |
| 686 | if (dounlink) { | | 686 | if (dounlink) { |
| 687 | fprintf(stderr, "Removing %s\n", outfile); | | 687 | fprintf(stderr, "Removing %s\n", outfile); |
| 688 | unlink(outfile); | | 688 | unlink(outfile); |
| 689 | } | | 689 | } |
| 690 | #endif | | 690 | #endif |
| 691 | } | | 691 | } |
| 692 | | | 692 | |
| 693 | static void | | 693 | static void |
| 694 | copy_ctf_data(char *srcfile, char *destfile, int keep_stabs) | | 694 | copy_ctf_data(char *srcfile, char *destfile, int keep_stabs) |
| 695 | { | | 695 | { |
| 696 | tdata_t *srctd; | | 696 | tdata_t *srctd; |
| 697 | | | 697 | |
| 698 | if (read_ctf(&srcfile, 1, NULL, read_ctf_save_cb, &srctd, 1) == 0) | | 698 | if (read_ctf(&srcfile, 1, NULL, read_ctf_save_cb, &srctd, 1) == 0) |