/* windmc.c -- a program to compile Windows message files.
- Copyright 2007
+ Copyright 2007, 2008
Free Software Foundation, Inc.
Written by Kai Tietz, Onevision.
void *
res_alloc (rc_uint_type bytes)
{
- return (void *) obstack_alloc (&res_obstack, (size_t) bytes);
+ return obstack_alloc (&res_obstack, (size_t) bytes);
}
static FILE *
if (! target_vec)
fatal ("Can't detect target endianess and architecture.");
target_is_bigendian = ((target_vec->byteorder == BFD_ENDIAN_BIG) ? 1 : 0);
+
{
- const char *tname = target_vec->name;
- const char **arch = bfd_arch_list ();
+ const char * tname = target_vec->name;
+ const char ** arches = bfd_arch_list ();
- if (arch && tname)
+ if (arches && tname)
{
+ const char ** arch = arches;
+
if (strchr (tname, '-') != NULL)
tname = strchr (tname, '-') + 1;
+
while (*arch != NULL)
{
const char *in_a = strstr (*arch, tname);
char end_ch = (in_a ? in_a[strlen (tname)] : 0);
+
if (in_a && (in_a == *arch || in_a[-1] == ':')
&& end_ch == 0)
{
arch++;
}
}
+
+ free (arches);
+
if (! def_target_arch)
fatal ("Can't detect architecture.");
}
return NULL;
codepage_from_unicode (&l, usz, &s, mcset_codepage_out);
if (! s)
- fatal ("unicode string not mappable to ASCII codepage 0x%lx.\n", (long) mcset_codepage_out);
+ fatal ("unicode string not mappable to ASCII codepage 0x%lx.\n",
+ (unsigned long) mcset_codepage_out);
return s;
}
if (elems <= 0)
return;
mc_bfd.abfd = windmc_open_as_binary (filename);
- mc_bfd.sec = bfd_make_section (mc_bfd.abfd, ".data");
+ mc_bfd.sec = bfd_make_section_with_flags (mc_bfd.abfd, ".data",
+ (SEC_HAS_CONTENTS | SEC_ALLOC
+ | SEC_LOAD | SEC_DATA));
if (mc_bfd.sec == NULL)
bfd_fatal ("bfd_make_section");
- if (! bfd_set_section_flags (mc_bfd.abfd, mc_bfd.sec,
- (SEC_HAS_CONTENTS | SEC_ALLOC
- | SEC_LOAD | SEC_DATA)))
- bfd_fatal ("bfd_set_section_flags");
/* Requiring this is probably a bug in BFD. */
mc_bfd.sec->output_section = mc_bfd.sec;
int i, l;
fprintf (fp,
- "/* Do not edit this file manually.\n"
- " This file is autogenerated by windmc. */\n\n");
+ "/* Do not edit this file manually.\n"
+ " This file is autogenerated by windmc. */\n\n");
if (! mc_nodes_lang_count)
return;
n = NULL;
++i;
n = mc_nodes_lang[l];
fprintf (fp, "\n// Country: %s\n// Language: %s\n#pragma code_page(%u)\n",
- n->lang->lang_info.country, n->lang->lang_info.name,
- (unsigned) n->lang->lang_info.wincp);
- fprintf (fp, "LANGUAGE 0x%lx, 0x%lx\n", (long) (n->lang->nval & 0x3ff),
- (long) ((n->lang->nval & 0xffff) >> 10));
+ n->lang->lang_info.country, n->lang->lang_info.name,
+ (unsigned) n->lang->lang_info.wincp);
+ fprintf (fp, "LANGUAGE 0x%lx, 0x%lx\n",
+ (unsigned long) (n->lang->nval & 0x3ff),
+ (unsigned long) ((n->lang->nval & 0xffff) >> 10));
fprintf (fp, "1 MESSAGETABLE \"");
if (mcset_prefix_bin)
fprintf (fp, "%s_", mcset_mc_basename);
unichar *u;
rc_uint_type ul;
char *buff;
- long flen;
+ bfd_size_type flen;
FILE *fp = fopen (input_filename, "rb");
if (!fp)
fseek (fp, 0, SEEK_SET);
buff = malloc (flen + 3);
memset (buff, 0, flen + 3);
- fread (buff, 1, flen, fp);
+ if (fread (buff, 1, flen, fp) < flen)
+ fatal (_("unable to read contents of %s"), input_filename);
fclose (fp);
if (mcset_text_in_is_unicode != 1)
{