FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed some bd in which temp files and directory were left around.

Browse source 
Dir itself has a short enough name to function under sysv.
This commit is contained in:
David Henkel-Wallace 1991-04-08 20:40:37 +00:00
parent 726cc6ef80
commit ad19c0a2d1
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
binutils/copy.c
View file

@ -148,18 +148,19 @@ bfd *obfd;
bfd *this_element; bfd *this_element;
/* Read each archive element in turn from the input, copy the /* Read each archive element in turn from the input, copy the
contents to a temp file, and keep the temp file handle */ contents to a temp file, and keep the temp file handle */
char *dir = cat("./",make_tempname(""),"copy-dir"); char *dir = cat("./#",make_tempname(""),"cd");
/* Make a temp directory to hold the contents */ /* Make a temp directory to hold the contents */
mkdir(dir,0777); mkdir(dir,0777);
obfd->has_armap = ibfd->has_armap; obfd->has_armap = ibfd->has_armap;
this_element = bfd_openr_next_archived_file(ibfd, NULL); this_element = bfd_openr_next_archived_file(ibfd, NULL);
ibfd->archive_head = this_element;
while (this_element != (bfd *)NULL) { while (this_element != (bfd *)NULL) {
/* Create an output file for this member */ /* Create an output file for this member */
char *output_name = cat(dir, "/",this_element->filename); char *output_name = cat(dir, "/",this_element->filename);
bfd *output_bfd = bfd_openw(output_name, output_target); bfd *output_bfd = bfd_openw(output_name, output_target);
if (!bfd_set_format(obfd, bfd_get_format(ibfd))) if (!bfd_set_format(obfd, bfd_get_format(ibfd)))
bfd_fatal(output_filename); bfd_fatal(output_filename);
@ -178,7 +179,8 @@ bfd *obfd;
*ptr = output_bfd; *ptr = output_bfd;
ptr =&( output_bfd->next); ptr =&( output_bfd->next);
this_element = bfd_openr_next_archived_file(ibfd, this_element); this_element->next = bfd_openr_next_archived_file(ibfd, this_element);
this_element = this_element->next;
} }
*ptr = (bfd *)NULL; *ptr = (bfd *)NULL;
@ -186,17 +188,16 @@ bfd *obfd;
if (!bfd_close(obfd)) if (!bfd_close(obfd))
bfd_fatal(output_filename); bfd_fatal(output_filename);
/* Now delete all the files that we opened /* Now delete all the files that we opened.
We can't use the names in the obfd list since they may have been Construct their names again, unfortunately, but so what;
trampled by the archive output code we're about to exit anyway. */
*/
for (this_element = ibfd->archive_head; for (this_element = ibfd->archive_head;
this_element != (bfd *)NULL; this_element != (bfd *)NULL;
this_element = this_element->next) this_element = this_element->next)
{ {
unlink(cat(dir,"/",this_element->filename)); unlink(cat(dir,"/",this_element->filename));
} }
unlink(dir); rmdir(dir);
if (!bfd_close(ibfd)) if (!bfd_close(ibfd))
bfd_fatal(input_filename); bfd_fatal(input_filename);