-/* arsup.c - Archive support for MRI compatibility */
-
-/* Copyright (C) 1992 Free Software Foundation, Inc.
+/* arsup.c - Archive support for MRI compatibility
+ Copyright 1992, 1994, 1995, 1996, 1997, 2000
+ Free Software Foundation, Inc.
This file is part of GNU Binutils.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
/* Contributed by Steve Chamberlain
#include "bfd.h"
#include "arsup.h"
-#include <sysdep.h>
+#include "libiberty.h"
#include "bucomm.h"
-extern bfd *inarch;
-extern int verbose;
-
+#include "filenames.h"
+static void map_over_list
+ PARAMS ((bfd *, void (*function) (bfd *, bfd *), struct list *));
+static void ar_directory_doer PARAMS ((bfd *, bfd *));
+static void ar_addlib_doer PARAMS ((bfd *, bfd *));
-void
-DEFUN(map_over_list,(function, list),
- void (*function) () AND
- struct list *list)
+extern int verbose;
+static void
+map_over_list (arch, function, list)
+ bfd *arch;
+ void (*function) PARAMS ((bfd *, bfd *));
+ struct list *list;
{
- bfd *head;
+ bfd *head;
- if (list == 0) {
- for (head = inarch->next; head; head = head->next){
- function(head);
+ if (list == NULL)
+ {
+ bfd *next;
+
+ head = arch->next;
+ while (head != NULL)
+ {
+ next = head->next;
+ function (head, (bfd *) NULL);
+ head = next;
+ }
}
- }
- else {
- /*
- This may appear to be a baroque way of accomplishing what we want.
- however we have to iterate over the filenames in order to notice where
- a filename is requested but does not exist in the archive. Ditto
- mapping over each file each time -- we want to hack multiple
- references.
- */
- struct list *ptr = list;
-
- for (ptr = list; ptr; ptr=ptr->next)
+ else
{
- boolean found = false;
- bfd *prev = inarch;
- for (head = inarch->next; head; head = head->next)
- {
- if ((head->filename != NULL) &&
- (!strcmp(ptr->name, head->filename)))
+ struct list *ptr;
+
+ /* This may appear to be a baroque way of accomplishing what we
+ want. however we have to iterate over the filenames in order
+ to notice where a filename is requested but does not exist in
+ the archive. Ditto mapping over each file each time -- we
+ want to hack multiple references. */
+ for (ptr = list; ptr; ptr = ptr->next)
{
- found = true;
- function(head, prev);
-
+ boolean found = false;
+ bfd *prev = arch;
+
+ for (head = arch->next; head; head = head->next)
+ {
+ if (head->filename != NULL
+ && FILENAME_CMP (ptr->name, head->filename) == 0)
+ {
+ found = true;
+ function (head, prev);
+ }
+ prev = head;
+ }
+ if (! found)
+ fprintf (stderr, _("No entry %s in archive.\n"), ptr->name);
}
- prev = head;
- }
- if (!found)
- fprintf(stderr, "No entry %s in archive.\n", ptr->name);
}
- }
}
FILE *outfile;
-void
-DEFUN(ar_directory_doer,(abfd),
- bfd *abfd)
+
+/*ARGSUSED*/
+static void
+ar_directory_doer (abfd, ignore)
+ bfd *abfd;
+ bfd *ignore ATTRIBUTE_UNUSED;
{
print_arelt_descr(outfile, abfd, verbose);
}
void
-DEFUN(ar_directory,(ar_name, list, output),
- char *ar_name AND
- struct list *list AND
- char *output)
+ar_directory (ar_name, list, output)
+ char *ar_name;
+ struct list *list;
+ char *output;
{
- open_inarch(ar_name);
- if (output) {
- outfile = fopen(output,"w");
- if (outfile == 0) {
- outfile =stdout;
- fprintf(stderr,"Can't open file %s\n", output);
- output = 0;
+ bfd *arch;
+
+ arch = open_inarch (ar_name, (char *) NULL);
+ if (output)
+ {
+ outfile = fopen(output,"w");
+ if (outfile == 0)
+ {
+ outfile = stdout;
+ fprintf (stderr,_("Can't open file %s\n"), output);
+ output = 0;
+ }
}
- }
else
- outfile = stdout;
+ outfile = stdout;
+
+ map_over_list (arch, ar_directory_doer, list);
+
+ bfd_close (arch);
- map_over_list(ar_directory_doer, list);
- bfd_close(inarch);
if (output)
- fclose(outfile);
+ fclose (outfile);
}
void
}
void
-DEFUN_VOID(maybequit)
+maybequit ()
{
-if (!interactive)
- exit(9);
+ if (! interactive)
+ xexit (9);
}
int t)
{
- char *tname = malloc(strlen(name)+10);
+ char *tname = (char *) xmalloc (strlen (name) + 10);
+ const char *bname = lbasename (name);
real_name = name;
- sprintf(tname, "%s-tmp", name);
+ /* Prepend tmp- to the beginning, to avoid file-name clashes after
+ truncation on filesystems with limited namespaces (DOS). */
+ sprintf(tname, "%.*stmp-%s", (int) (bname - name), name, bname);
obfd = bfd_openw(tname, NULL);
if (!obfd) {
- fprintf(stderr,"%s: Can't open output archive %s\n", program_name,
+ fprintf(stderr,_("%s: Can't open output archive %s\n"), program_name,
tname);
maybequit();
bfd *element;
bfd *ibfd;
ibfd = bfd_openr(name, NULL);
+ if (!ibfd) {
+ fprintf(stderr,_("%s: Can't open input archive %s\n"),
+ program_name, name);
+ maybequit();
+ return;
+ }
if (bfd_check_format(ibfd, bfd_archive) != true) {
- fprintf(stderr,"%s: file %s is not an archive\n", program_name,
+ fprintf(stderr,_("%s: file %s is not an archive\n"), program_name,
name);
maybequit();
return;
}
-void
-DEFUN(ar_addlib_doer, (abfd, prev),
- bfd *abfd AND
- bfd *prev)
+static void
+ar_addlib_doer (abfd, prev)
+ bfd *abfd;
+ bfd *prev;
{
/* Add this module to the output bfd */
-
- prev->next = abfd->next;
+ if (prev != NULL)
+ prev->next = abfd->next;
abfd->next = obfd->archive_head;
obfd->archive_head = abfd;
}
void
-DEFUN(ar_addlib, (name, list),
- char *name AND
- struct list *list)
+ar_addlib (name, list)
+ char *name;
+ struct list *list;
{
- if (!obfd) {
- fprintf(stderr, "%s: no output archive specified yet\n", program_name);
- maybequit();
- }
- else {
- if (open_inarch(name) ) {
- map_over_list(ar_addlib_doer, list);
+ if (obfd == NULL)
+ {
+ fprintf (stderr, _("%s: no output archive specified yet\n"), program_name);
+ maybequit ();
}
- /* Don't close the bfd, since it will make the elements disasppear */
- }
-}
+ else
+ {
+ bfd *arch;
+ arch = open_inarch (name, (char *) NULL);
+ if (arch != NULL)
+ map_over_list (arch, ar_addlib_doer, list);
+ /* Don't close the bfd, since it will make the elements disasppear */
+ }
+}
void
DEFUN(ar_addmod, (list),
struct list *list)
{
if (!obfd) {
- fprintf(stderr, "%s: no open output archive\n", program_name);
+ fprintf(stderr, _("%s: no open output archive\n"), program_name);
maybequit();
}
else
while (list) {
bfd *abfd = bfd_openr(list->name, NULL);
if (!abfd) {
- fprintf(stderr,"%s: can't open file %s\n", program_name,
+ fprintf(stderr,_("%s: can't open file %s\n"), program_name,
list->name);
maybequit();
}
struct list *list)
{
if (!obfd) {
- fprintf(stderr, "%s: no open output archive\n", program_name);
+ fprintf(stderr, _("%s: no open output archive\n"), program_name);
maybequit();
}
else
bfd **prev = &(obfd->archive_head);
int found = 0;
while (member) {
- if (strcmp(member->filename, list->name) == 0) {
+ if (FILENAME_CMP(member->filename, list->name) == 0) {
*prev = member->next;
found = 1;
}
member = member->next;
}
if (!found) {
- fprintf(stderr,"%s: can't find module file %s\n", program_name,
+ fprintf(stderr,_("%s: can't find module file %s\n"), program_name,
list->name);
maybequit();
}
{
if (!obfd) {
- fprintf(stderr, "%s: no open output archive\n", program_name);
+ fprintf(stderr, _("%s: no open output archive\n"), program_name);
maybequit();
}
else {
+ char *ofilename = xstrdup (bfd_get_filename (obfd));
bfd_close(obfd);
- unlink(real_name);
- link(obfd->filename, real_name);
- unlink(obfd->filename);
+
+ rename (ofilename, real_name);
obfd = 0;
+ free(ofilename);
}
}
struct list *list)
{
if (!obfd) {
- fprintf(stderr, "%s: no open output archive\n", program_name);
+ fprintf(stderr, _("%s: no open output archive\n"), program_name);
maybequit();
}
else
int found = 0;
while (member)
{
- if (strcmp(member->filename, list->name) == 0)
+ if (FILENAME_CMP(member->filename, list->name) == 0)
{
/* Found the one to replace */
bfd *abfd = bfd_openr(list->name, 0);
if (!abfd)
{
- fprintf(stderr, "%s: can't open file %s\n", program_name, list->name);
+ fprintf(stderr, _("%s: can't open file %s\n"), program_name, list->name);
maybequit();
}
else {
}
if (!found) {
bfd *abfd = bfd_openr(list->name, 0);
- fprintf(stderr,"%s: can't find module file %s\n", program_name,
+ fprintf(stderr,_("%s: can't find module file %s\n"), program_name,
list->name);
if (!abfd)
{
- fprintf(stderr, "%s: can't open file %s\n", program_name, list->name);
+ fprintf(stderr, _("%s: can't open file %s\n"), program_name, list->name);
maybequit();
}
else
{
if (!obfd)
{
- fprintf(stderr, "%s: no open output archive\n", program_name);
+ fprintf(stderr, _("%s: no open output archive\n"), program_name);
maybequit();
}
else {
bfd *abfd;
outfile = stdout;
verbose =1 ;
- printf("Current open archive is %s\n", obfd->filename);
+ printf(_("Current open archive is %s\n"), bfd_get_filename (obfd));
for (abfd = obfd->archive_head;
abfd != (bfd *)NULL;
abfd = abfd->next)
{
- ar_directory_doer(abfd);
+ ar_directory_doer (abfd, (bfd *) NULL);
+ }
+ }
+}
+
+
+void
+DEFUN_VOID(ar_end)
+{
+ if (obfd)
+ {
+ fclose((FILE *)(obfd->iostream));
+ unlink(bfd_get_filename (obfd));
+ }
+}
+void
+DEFUN(ar_extract,(list),
+ struct list *list)
+{
+ if (!obfd)
+ {
+
+ fprintf(stderr, _("%s: no open archive\n"), program_name);
+ maybequit();
+ }
+ else
+ {
+ while (list) {
+ /* Find this name in the archive */
+ bfd *member = obfd->archive_head;
+ int found = 0;
+ while (member && !found)
+ {
+ if (FILENAME_CMP(member->filename, list->name) == 0)
+ {
+ extract_file(member);
+ found = 1;
+ }
+
+ member = member->next;
+ }
+ if (!found) {
+ bfd_openr(list->name, 0);
+ fprintf(stderr,_("%s: can't find module file %s\n"), program_name,
+ list->name);
+
+ }
+ list = list->next;
}
}
}
projects / deliverable / binutils-gdb.git / blobdiff