diff options
author | Tom Tromey <tromey@redhat.com> | 1998-04-22 05:32:22 +0000 |
---|---|---|
committer | Tom Tromey <tromey@redhat.com> | 1998-04-22 05:32:22 +0000 |
commit | 9d04d6183d792349aaab84ecb1338b9445c0981b (patch) | |
tree | ffb8293c9514ab8c38004dc3683d1c858d9e0828 /binutils/nlmconv.c | |
parent | 53d3ce37d4d65d2df72ec3c96e292adb1759d03e (diff) | |
download | gdb-9d04d6183d792349aaab84ecb1338b9445c0981b.zip gdb-9d04d6183d792349aaab84ecb1338b9445c0981b.tar.gz gdb-9d04d6183d792349aaab84ecb1338b9445c0981b.tar.bz2 |
* Many files: Added gettext invocations around user-visible
strings.
* bucomm.h: Added gettext-related includes and defines.
* acconfig.h (ENABLE_NLS, HAVE_CATGETS, HAVE_GETTEXT, HAVE_STPCPY,
HAVE_LC_MESSAGES): Define.
* configure.in: Call CY_GNU_GETTEXT. Create po/Makefile.in and
po/Makefile. Use AM_PROG_LEX.
* Makefile.am (SUBDIRS): New macro.
(POTFILES): Likewise.
(po/POTFILES.in): New target.
(LDADD): Added INTLLIBS.
(objdump_LDADD): Likewise.
(c__filt_LDADD): Likewise.
(ar_LDADD): Likewise.
(ranlib_LDADD): Likewise.
(dlltool_LDADD): Likewise.
(windres_LDADD): Likewise.
* po/Make-in, po/POTFILES.in, po/binutils.pot: New files.
Diffstat (limited to 'binutils/nlmconv.c')
-rw-r--r-- | binutils/nlmconv.c | 149 |
1 files changed, 81 insertions, 68 deletions
diff --git a/binutils/nlmconv.c b/binutils/nlmconv.c index e1df033..8544ba0 100644 --- a/binutils/nlmconv.c +++ b/binutils/nlmconv.c @@ -1,5 +1,5 @@ /* nlmconv.c -- NLM conversion program - Copyright (C) 1993, 94, 95, 96, 1997 Free Software Foundation, Inc. + Copyright (C) 1993, 94, 95, 96, 97, 1998 Free Software Foundation, Inc. This file is part of GNU Binutils. @@ -186,12 +186,25 @@ main (argc, argv) char inlead, outlead; boolean gotstart, gotexit, gotcheck; struct stat st; - FILE *custom_data, *help_data, *message_data, *rpc_data, *shared_data; - size_t custom_size, help_size, message_size, module_size, rpc_size; - asection *custom_section, *help_section, *message_section, *module_section; - asection *rpc_section, *shared_section; + FILE *custom_data = NULL; + FILE *help_data = NULL; + FILE *message_data = NULL; + FILE *rpc_data = NULL; + FILE *shared_data = NULL; + size_t custom_size = 0; + size_t help_size = 0; + size_t message_size = 0; + size_t module_size = 0; + size_t rpc_size = 0; + asection *custom_section = NULL; + asection *help_section = NULL; + asection *message_section = NULL; + asection *module_section = NULL; + asection *rpc_section = NULL; + asection *shared_section = NULL; bfd *sharedbfd; - size_t shared_offset, shared_size; + size_t shared_offset = 0; + size_t shared_size = 0; Nlm_Internal_Fixed_Header sharedhdr; int len; char *modname; @@ -253,7 +266,7 @@ main (argc, argv) if (strcmp (input_file, output_file) == 0) { fprintf (stderr, - "%s: input and output files must be different\n", + _("%s: input and output files must be different\n"), program_name); exit (1); } @@ -303,7 +316,7 @@ main (argc, argv) if (input_file != NULL) { fprintf (stderr, - "%s: input file named both on command line and with INPUT\n", + _("%s: input file named both on command line and with INPUT\n"), program_name); exit (1); } @@ -314,7 +327,7 @@ main (argc, argv) } else if (input_file == NULL) { - fprintf (stderr, "%s: no input file\n", program_name); + fprintf (stderr, _("%s: no input file\n"), program_name); show_usage (stderr, 1); } @@ -344,7 +357,7 @@ main (argc, argv) Otherwise use the file named in the OUTPUT statement. */ if (output_file == NULL) { - fprintf (stderr, "%s: no name for output file\n", + fprintf (stderr, _("%s: no name for output file\n"), program_name); show_usage (stderr, 1); } @@ -359,7 +372,7 @@ main (argc, argv) if (bfd_arch_get_compatible (inbfd, outbfd) == NULL) fprintf (stderr, - "%s: warning:input and output formats are not compatible\n", + _("%s: warning:input and output formats are not compatible\n"), program_name); /* Move the values read from the command file into outbfd. */ @@ -389,7 +402,7 @@ main (argc, argv) if (bss_sec == NULL || ! bfd_set_section_flags (outbfd, bss_sec, SEC_ALLOC) || ! bfd_set_section_alignment (outbfd, bss_sec, 1)) - bfd_fatal ("make .bss section"); + bfd_fatal (_("make .bss section")); } /* We store the original section names in the .nlmsections section, @@ -398,9 +411,9 @@ main (argc, argv) the NLM header area. */ secsec = bfd_make_section (outbfd, ".nlmsections"); if (secsec == NULL) - bfd_fatal ("make .nlmsections section"); + bfd_fatal (_("make .nlmsections section")); if (! bfd_set_section_flags (outbfd, secsec, SEC_HAS_CONTENTS)) - bfd_fatal ("set .nlmsections flags"); + bfd_fatal (_("set .nlmsections flags")); #ifdef NLMCONV_POWERPC /* For PowerPC NetWare we need to build stubs for calls to undefined @@ -428,14 +441,14 @@ main (argc, argv) add = ((vma + align - 1) &~ (align - 1)) - vma; vma += add; if (! bfd_set_section_vma (outbfd, bss_sec, vma)) - bfd_fatal ("set .bss vma"); + bfd_fatal (_("set .bss vma")); if (add != 0) { bfd_size_type data_size; data_size = bfd_get_section_size_before_reloc (data_sec); if (! bfd_set_section_size (outbfd, data_sec, data_size + add)) - bfd_fatal ("set .data size"); + bfd_fatal (_("set .data size")); } } @@ -616,7 +629,7 @@ main (argc, argv) } if (l == NULL) fprintf (stderr, - "%s: warning: symbol %s imported but not in import list\n", + _("%s: warning: symbol %s imported but not in import list\n"), program_name, bfd_asymbol_name (sym)); } @@ -636,7 +649,7 @@ main (argc, argv) && text_sec != (asection *) NULL) val += bfd_section_size (outbfd, text_sec); if (! bfd_set_start_address (outbfd, val)) - bfd_fatal ("set start address"); + bfd_fatal (_("set start address")); gotstart = true; } if (strcmp (bfd_asymbol_name (sym), exit_procedure) == 0) @@ -685,14 +698,14 @@ main (argc, argv) bfd_set_symtab (outbfd, outsyms, symcount + newsymcount); if (! gotstart) - fprintf (stderr, "%s: warning: START procedure %s not defined\n", + fprintf (stderr, _("%s: warning: START procedure %s not defined\n"), program_name, start_procedure); if (! gotexit) - fprintf (stderr, "%s: warning: EXIT procedure %s not defined\n", + fprintf (stderr, _("%s: warning: EXIT procedure %s not defined\n"), program_name, exit_procedure); if (check_procedure != NULL && ! gotcheck) - fprintf (stderr, "%s: warning: CHECK procedure %s not defined\n", + fprintf (stderr, _("%s: warning: CHECK procedure %s not defined\n"), program_name, check_procedure); /* Add additional sections required for the header information. */ @@ -714,7 +727,7 @@ main (argc, argv) || ! bfd_set_section_size (outbfd, custom_section, custom_size) || ! bfd_set_section_flags (outbfd, custom_section, SEC_HAS_CONTENTS)) - bfd_fatal ("custom section"); + bfd_fatal (_("custom section")); } } if (help_file != NULL) @@ -735,7 +748,7 @@ main (argc, argv) || ! bfd_set_section_size (outbfd, help_section, help_size) || ! bfd_set_section_flags (outbfd, help_section, SEC_HAS_CONTENTS)) - bfd_fatal ("help section"); + bfd_fatal (_("help section")); strncpy (nlm_extended_header (outbfd)->stamp, "MeSsAgEs", 8); } } @@ -757,7 +770,7 @@ main (argc, argv) || ! bfd_set_section_size (outbfd, message_section, message_size) || ! bfd_set_section_flags (outbfd, message_section, SEC_HAS_CONTENTS)) - bfd_fatal ("message section"); + bfd_fatal (_("message section")); strncpy (nlm_extended_header (outbfd)->stamp, "MeSsAgEs", 8); } } @@ -773,7 +786,7 @@ main (argc, argv) || ! bfd_set_section_size (outbfd, module_section, module_size) || ! bfd_set_section_flags (outbfd, module_section, SEC_HAS_CONTENTS)) - bfd_fatal ("module section"); + bfd_fatal (_("module section")); } if (rpc_file != NULL) { @@ -793,7 +806,7 @@ main (argc, argv) || ! bfd_set_section_size (outbfd, rpc_section, rpc_size) || ! bfd_set_section_flags (outbfd, rpc_section, SEC_HAS_CONTENTS)) - bfd_fatal ("rpc section"); + bfd_fatal (_("rpc section")); strncpy (nlm_extended_header (outbfd)->stamp, "MeSsAgEs", 8); } } @@ -830,19 +843,19 @@ main (argc, argv) { /* There is no place to record this information. */ fprintf (stderr, - "%s:%s: warning: shared libraries can not have uninitialized data\n", + _("%s:%s: warning: shared libraries can not have uninitialized data\n"), program_name, sharelib_file); } shared_offset = st.st_size; - if (shared_offset > sharedhdr.codeImageOffset) + if (shared_offset > (size_t) sharedhdr.codeImageOffset) shared_offset = sharedhdr.codeImageOffset; - if (shared_offset > sharedhdr.dataImageOffset) + if (shared_offset > (size_t) sharedhdr.dataImageOffset) shared_offset = sharedhdr.dataImageOffset; - if (shared_offset > sharedhdr.relocationFixupOffset) + if (shared_offset > (size_t) sharedhdr.relocationFixupOffset) shared_offset = sharedhdr.relocationFixupOffset; - if (shared_offset > sharedhdr.externalReferencesOffset) + if (shared_offset > (size_t) sharedhdr.externalReferencesOffset) shared_offset = sharedhdr.externalReferencesOffset; - if (shared_offset > sharedhdr.publicsOffset) + if (shared_offset > (size_t) sharedhdr.publicsOffset) shared_offset = sharedhdr.publicsOffset; shared_size = st.st_size - shared_offset; shared_section = bfd_make_section (outbfd, ".nlmshared"); @@ -851,7 +864,7 @@ main (argc, argv) shared_size) || ! bfd_set_section_flags (outbfd, shared_section, SEC_HAS_CONTENTS)) - bfd_fatal ("shared section"); + bfd_fatal (_("shared section")); strncpy (nlm_extended_header (outbfd)->stamp, "MeSsAgEs", 8); } } @@ -859,7 +872,7 @@ main (argc, argv) /* Check whether a version was given. */ if (strncmp (version_hdr->stamp, "VeRsIoN#", 8) != 0) - fprintf (stderr, "%s: warning: No version number given\n", + fprintf (stderr, _("%s: warning: No version number given\n"), program_name); /* At least for now, always create an extended header, because that @@ -900,13 +913,13 @@ main (argc, argv) data = xmalloc (custom_size); if (fread (data, 1, custom_size, custom_data) != custom_size) - fprintf (stderr, "%s:%s: read: %s\n", program_name, custom_file, + fprintf (stderr, _("%s:%s: read: %s\n"), program_name, custom_file, strerror (errno)); else { if (! bfd_set_section_contents (outbfd, custom_section, data, (file_ptr) 0, custom_size)) - bfd_fatal ("custom section"); + bfd_fatal (_("custom section")); nlm_fixed_header (outbfd)->customDataOffset = custom_section->filepos; nlm_fixed_header (outbfd)->customDataSize = custom_size; @@ -924,7 +937,7 @@ main (argc, argv) } if (map_file != NULL) fprintf (stderr, - "%s: warning: MAP and FULLMAP are not supported; try ld -M\n", + _("%s: warning: MAP and FULLMAP are not supported; try ld -M\n"), program_name); if (help_file != NULL) { @@ -932,13 +945,13 @@ main (argc, argv) data = xmalloc (help_size); if (fread (data, 1, help_size, help_data) != help_size) - fprintf (stderr, "%s:%s: read: %s\n", program_name, help_file, + fprintf (stderr, _("%s:%s: read: %s\n"), program_name, help_file, strerror (errno)); else { if (! bfd_set_section_contents (outbfd, help_section, data, (file_ptr) 0, help_size)) - bfd_fatal ("help section"); + bfd_fatal (_("help section")); nlm_extended_header (outbfd)->helpFileOffset = help_section->filepos; nlm_extended_header (outbfd)->helpFileLength = help_size; @@ -951,13 +964,13 @@ main (argc, argv) data = xmalloc (message_size); if (fread (data, 1, message_size, message_data) != message_size) - fprintf (stderr, "%s:%s: read: %s\n", program_name, message_file, + fprintf (stderr, _("%s:%s: read: %s\n"), program_name, message_file, strerror (errno)); else { if (! bfd_set_section_contents (outbfd, message_section, data, (file_ptr) 0, message_size)) - bfd_fatal ("message section"); + bfd_fatal (_("message section")); nlm_extended_header (outbfd)->messageFileOffset = message_section->filepos; nlm_extended_header (outbfd)->messageFileLength = message_size; @@ -990,7 +1003,7 @@ main (argc, argv) } if (! bfd_set_section_contents (outbfd, module_section, data, (file_ptr) 0, module_size)) - bfd_fatal ("module section"); + bfd_fatal (_("module section")); nlm_fixed_header (outbfd)->moduleDependencyOffset = module_section->filepos; nlm_fixed_header (outbfd)->numberOfModuleDependencies = c; @@ -1001,13 +1014,13 @@ main (argc, argv) data = xmalloc (rpc_size); if (fread (data, 1, rpc_size, rpc_data) != rpc_size) - fprintf (stderr, "%s:%s: read: %s\n", program_name, rpc_file, + fprintf (stderr, _("%s:%s: read: %s\n"), program_name, rpc_file, strerror (errno)); else { if (! bfd_set_section_contents (outbfd, rpc_section, data, (file_ptr) 0, rpc_size)) - bfd_fatal ("rpc section"); + bfd_fatal (_("rpc section")); nlm_extended_header (outbfd)->RPCDataOffset = rpc_section->filepos; nlm_extended_header (outbfd)->RPCDataLength = rpc_size; @@ -1021,13 +1034,13 @@ main (argc, argv) data = xmalloc (shared_size); if (fseek (shared_data, shared_offset, SEEK_SET) != 0 || fread (data, 1, shared_size, shared_data) != shared_size) - fprintf (stderr, "%s:%s: read: %s\n", program_name, sharelib_file, + fprintf (stderr, _("%s:%s: read: %s\n"), program_name, sharelib_file, strerror (errno)); else { if (! bfd_set_section_contents (outbfd, shared_section, data, (file_ptr) 0, shared_size)) - bfd_fatal ("shared section"); + bfd_fatal (_("shared section")); } nlm_extended_header (outbfd)->sharedCodeOffset = sharedhdr.codeImageOffset - shared_offset + shared_section->filepos; @@ -1074,7 +1087,7 @@ main (argc, argv) for (modname = nlm_fixed_header (outbfd)->moduleName; *modname != '\0'; modname++) - if (islower (*modname)) + if (islower ((unsigned char) *modname)) *modname = toupper (*modname); strncpy (nlm_variable_header (outbfd)->oldThreadName, " LONG", @@ -1099,7 +1112,7 @@ main (argc, argv) static void show_help () { - printf ("%s: Convert an object file into a NetWare Loadable Module\n", + printf (_("%s: Convert an object file into a NetWare Loadable Module\n"), program_name); show_usage (stdout, 0); } @@ -1111,15 +1124,15 @@ show_usage (file, status) FILE *file; int status; { - fprintf (file, "\ + fprintf (file, _("\ Usage: %s [-dhV] [-I bfdname] [-O bfdname] [-T header-file] [-l linker]\n\ [--input-target=bfdname] [--output-target=bfdname]\n\ [--header-file=file] [--linker=linker] [--debug]\n\ [--help] [--version]\n\ - [in-file [out-file]]\n", + [in-file [out-file]]\n"), program_name); if (status == 0) - fprintf (file, "Report bugs to bug-gnu-utils@prep.ai.mit.edu\n"); + fprintf (file, _("Report bugs to bug-gnu-utils@gnu.org\n")); exit (status); } @@ -1151,7 +1164,7 @@ select_output_format (arch, mach, bigendian) return "nlm32-powerpc"; #endif default: - fprintf (stderr, "%s: support not compiled in for %s\n", + fprintf (stderr, _("%s: support not compiled in for %s\n"), program_name, bfd_printable_arch_mach (arch, mach)); exit (1); /* Avoid warning. */ @@ -1194,7 +1207,7 @@ setup_sections (inbfd, insec, data_ptr) { outsec = bfd_make_section (outbfd, outname); if (outsec == NULL) - bfd_fatal ("make section"); + bfd_fatal (_("make section")); } insec->output_section = outsec; @@ -1208,17 +1221,17 @@ setup_sections (inbfd, insec, data_ptr) (bfd_section_size (outbfd, outsec) + bfd_section_size (inbfd, insec) + add))) - bfd_fatal ("set section size"); + bfd_fatal (_("set section size")); if ((bfd_section_alignment (inbfd, insec) > bfd_section_alignment (outbfd, outsec)) && ! bfd_set_section_alignment (outbfd, outsec, bfd_section_alignment (inbfd, insec))) - bfd_fatal ("set section alignment"); + bfd_fatal (_("set section alignment")); if (! bfd_set_section_flags (outbfd, outsec, f | bfd_get_section_flags (outbfd, outsec))) - bfd_fatal ("set section flags"); + bfd_fatal (_("set section flags")); bfd_set_reloc (outbfd, outsec, (arelent **) NULL, 0); @@ -1229,7 +1242,7 @@ setup_sections (inbfd, insec, data_ptr) secsecsize = (secsecsize + 3) &~ 3; secsecsize += 8; if (! bfd_set_section_size (outbfd, secsec, secsecsize)) - bfd_fatal ("set .nlmsections size"); + bfd_fatal (_("set .nlmsections size")); } /* Copy the section contents. */ @@ -1317,7 +1330,7 @@ copy_sections (inbfd, insec, data_ptr) /* Add this section to .nlmsections. */ if (! bfd_set_section_contents (outbfd, secsec, (PTR) inname, secsecoff, strlen (inname) + 1)) - bfd_fatal ("set .nlmsection contents"); + bfd_fatal (_("set .nlmsection contents")); secsecoff += strlen (inname) + 1; add = ((secsecoff + 3) &~ 3) - secsecoff; @@ -1325,7 +1338,7 @@ copy_sections (inbfd, insec, data_ptr) { bfd_h_put_32 (outbfd, (bfd_vma) 0, buf); if (! bfd_set_section_contents (outbfd, secsec, buf, secsecoff, add)) - bfd_fatal ("set .nlmsection contents"); + bfd_fatal (_("set .nlmsection contents")); secsecoff += add; } @@ -1334,12 +1347,12 @@ copy_sections (inbfd, insec, data_ptr) else bfd_h_put_32 (outbfd, (bfd_vma) 0, buf); if (! bfd_set_section_contents (outbfd, secsec, buf, secsecoff, 4)) - bfd_fatal ("set .nlmsection contents"); + bfd_fatal (_("set .nlmsection contents")); secsecoff += 4; bfd_h_put_32 (outbfd, (bfd_vma) size, buf); if (! bfd_set_section_contents (outbfd, secsec, buf, secsecoff, 4)) - bfd_fatal ("set .nlmsection contents"); + bfd_fatal (_("set .nlmsection contents")); secsecoff += 4; } @@ -1663,7 +1676,7 @@ alpha_mangle_relocs (outbfd, insec, relocs_ptr, reloc_count_ptr, contents, { register bfd_size_type i; - for (i = 0; i < old_reloc_count; i++, relocs++) + for (i = 0; i < (bfd_size_type) old_reloc_count; i++, relocs++) (*relocs)->address += insec->output_offset; } } @@ -1842,7 +1855,7 @@ powerpc_build_stubs (inbfd, outbfd, symbols_ptr, symcount_ptr) (got_base + (stubcount * POWERPC_STUB_TOC_ENTRY_SIZE)))) - bfd_fatal ("stub section sizes"); + bfd_fatal (_("stub section sizes")); } } @@ -1891,7 +1904,7 @@ powerpc_resolve_stubs (inbfd, outbfd) buf, l->start->value, POWERPC_STUB_SIZE)) - bfd_fatal ("writing stub"); + bfd_fatal (_("writing stub")); /* Create a new reloc for the TOC entry. */ reloc = (arelent *) xmalloc (sizeof (arelent)); @@ -1981,7 +1994,7 @@ powerpc_mangle_relocs (outbfd, insec, relocs_ptr, reloc_count_ptr, contents, between two sections both of which were placed in the same output section. This should not happen. */ if (bfd_get_section (sym) != insec->output_section) - fprintf (stderr, "%s: unresolved PC relative reloc against %s\n", + fprintf (stderr, _("%s: unresolved PC relative reloc against %s\n"), program_name, bfd_asymbol_name (sym)); else { @@ -2046,7 +2059,7 @@ powerpc_mangle_relocs (outbfd, insec, relocs_ptr, reloc_count_ptr, contents, if ((bfd_signed_vma) val < - 0x8000 || (bfd_signed_vma) val >= 0x8000) fprintf (stderr, - "%s: overflow when adjusting relocation against %s\n", + _("%s: overflow when adjusting relocation against %s\n"), program_name, bfd_asymbol_name (sym)); bfd_put_16 (outbfd, val, (bfd_byte *) contents + rel->address); break; @@ -2169,7 +2182,7 @@ link_inputs (inputs, ld) PEXECUTE_SEARCH | PEXECUTE_ONE); if (pid == -1) { - fprintf (stderr, "%s: execution of %s failed: ", program_name, ld); + fprintf (stderr, _("%s: execution of %s failed: "), program_name, ld); fprintf (stderr, errfmt, errarg); unlink (unlink_on_exit); exit (1); @@ -2184,7 +2197,7 @@ link_inputs (inputs, ld) if (status != 0) { - fprintf (stderr, "%s: Execution of %s failed\n", program_name, ld); + fprintf (stderr, _("%s: Execution of %s failed\n"), program_name, ld); unlink (unlink_on_exit); exit (1); } |