Enable -Werror by default

[deliverable/binutils-gdb.git] / binutils / windres.c

diff --git a/binutils/windres.c b/binutils/windres.c
index 359026bf4f6016f97ee33a80ef489d3e2154bfe4..24c5131b2cd2bb54d5c307d105cdbc849b6bc752 100644 (file)
--- a/binutils/windres.c
+++ b/binutils/windres.c
@@ -1,5 +1,6 @@
 /* windres.c -- a program to manipulate Windows resources
 /* windres.c -- a program to manipulate Windows resources

-   Copyright 1997 Free Software Foundation, Inc.
+   Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+   Free Software Foundation, Inc.

    Written by Ian Lance Taylor, Cygnus Support.
 
    This file is part of GNU Binutils.
    Written by Ian Lance Taylor, Cygnus Support.
 
    This file is part of GNU Binutils.


@@ -31,19 +32,25 @@
    * The rcl program, written by Gunther Ebert
      <gunther.ebert@ixos-leipzig.de>.
 
    * The rcl program, written by Gunther Ebert
      <gunther.ebert@ixos-leipzig.de>.
 

-   * The res2coff program, written by Pedro A. Aranda <paag@tid.es>.
-
-   */
+   * The res2coff program, written by Pedro A. Aranda <paag@tid.es>.  */

 
 

+#include "config.h"
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <assert.h>
+#include <time.h>

 #include "bfd.h"
 #include "getopt.h"
 #include "bucomm.h"
 #include "libiberty.h"
 #include "bfd.h"
 #include "getopt.h"
 #include "bucomm.h"
 #include "libiberty.h"

+#include "safe-ctype.h"

 #include "obstack.h"
 #include "windres.h"
 
 #include "obstack.h"
 #include "windres.h"
 

-#include <assert.h>
-#include <ctype.h>
+/* Used by resrc.c at least.  */
+
+int verbose = 0;

 
 /* An enumeration of format types.  */
 
 
 /* An enumeration of format types.  */
 


@@ -99,42 +106,17 @@ struct include_dir
 
 static struct include_dir *include_dirs;
 
 
 static struct include_dir *include_dirs;
 

-/* Long options.  */
-
-/* 150 isn't special; it's just an arbitrary non-ASCII char value.  */
-
-#define OPTION_DEFINE 150
-#define OPTION_HELP (OPTION_DEFINE + 1)
-#define OPTION_INCLUDE_DIR (OPTION_HELP + 1)
-#define OPTION_LANGUAGE (OPTION_INCLUDE_DIR + 1)
-#define OPTION_PREPROCESSOR (OPTION_LANGUAGE + 1)
-#define OPTION_VERSION (OPTION_PREPROCESSOR + 1)
-#define OPTION_YYDEBUG (OPTION_VERSION + 1)
-
-static const struct option long_options[] =
-{
-  {"define", required_argument, 0, OPTION_DEFINE},
-  {"help", no_argument, 0, OPTION_HELP},
-  {"include-dir", required_argument, 0, OPTION_INCLUDE_DIR},
-  {"input-format", required_argument, 0, 'I'},
-  {"language", required_argument, 0, OPTION_LANGUAGE},
-  {"output-format", required_argument, 0, 'O'},
-  {"preprocessor", required_argument, 0, OPTION_PREPROCESSOR},
-  {"target", required_argument, 0, 'F'},
-  {"version", no_argument, 0, OPTION_VERSION},
-  {"yydebug", no_argument, 0, OPTION_YYDEBUG},
-  {0, no_argument, 0, 0}
-};
-

 /* Static functions.  */
 
 /* Static functions.  */
 

-static void res_init PARAMS ((void));
-static int extended_menuitems PARAMS ((const struct menuitem *));
-static enum res_format format_from_name PARAMS ((const char *));
-static enum res_format format_from_filename PARAMS ((const char *, int));
-static void usage PARAMS ((FILE *, int));
-static int cmp_res_entry PARAMS ((const PTR, const PTR));
-static struct res_directory *sort_resources PARAMS ((struct res_directory *));
+static void res_init (void);
+static int extended_menuitems (const struct menuitem *);
+static enum res_format format_from_name (const char *, int);
+static enum res_format format_from_filename (const char *, int);
+static void usage (FILE *, int);
+static int cmp_res_entry (const void *, const void *);
+static struct res_directory *sort_resources (struct res_directory *);
+static void reswr_init (void);
+static const char * quot (const char *);

 \f
 /* When we are building a resource tree, we allocate everything onto
    an obstack, so that we can free it all at once if we want.  */
 \f
 /* When we are building a resource tree, we allocate everything onto
    an obstack, so that we can free it all at once if we want.  */


@@ -149,18 +131,17 @@ static struct obstack res_obstack;
 /* Initialize the resource building obstack.  */
 
 static void
 /* Initialize the resource building obstack.  */
 
 static void

-res_init ()
+res_init (void)

 {
   obstack_init (&res_obstack);
 }
 
 /* Allocate space on the resource building obstack.  */
 
 {
   obstack_init (&res_obstack);
 }
 
 /* Allocate space on the resource building obstack.  */
 

-PTR
-res_alloc (bytes)
-     size_t bytes;
+void *
+res_alloc (size_t bytes)

 {
 {

-  return (PTR) obstack_alloc (&res_obstack, bytes);
+  return (void *) obstack_alloc (&res_obstack, bytes);

 }
 
 /* We also use an obstack to save memory used while writing out a set
 }
 
 /* We also use an obstack to save memory used while writing out a set


@@ -171,28 +152,24 @@ static struct obstack reswr_obstack;
 /* Initialize the resource writing obstack.  */
 
 static void
 /* Initialize the resource writing obstack.  */
 
 static void

-reswr_init ()
+reswr_init (void)

 {
   obstack_init (&reswr_obstack);
 }
 
 /* Allocate space on the resource writing obstack.  */
 
 {
   obstack_init (&reswr_obstack);
 }
 
 /* Allocate space on the resource writing obstack.  */
 

-PTR
-reswr_alloc (bytes)
-     size_t bytes;
+void *
+reswr_alloc (size_t bytes)

 {
 {

-  return (PTR) obstack_alloc (&reswr_obstack, bytes);
+  return (void *) obstack_alloc (&reswr_obstack, bytes);

 }
 \f
 /* Open a file using the include directory search list.  */
 
 FILE *
 }
 \f
 /* Open a file using the include directory search list.  */
 
 FILE *

-open_file_search (filename, mode, errmsg, real_filename)
-     const char *filename;
-     const char *mode;
-     const char *errmsg;
-     char **real_filename;
+open_file_search (const char *filename, const char *mode, const char *errmsg,
+                 char **real_filename)

 {
   FILE *e;
   struct include_dir *d;
 {
   FILE *e;
   struct include_dir *d;


@@ -224,82 +201,18 @@ open_file_search (filename, mode, errmsg, real_filename)
        }
     }
 
        }
     }
 

-  fatal ("can't open %s `%s': %s", errmsg, filename, strerror (errno));
+  fatal (_("can't open %s `%s': %s"), errmsg, filename, strerror (errno));

 
   /* Return a value to avoid a compiler warning.  */
   return NULL;
 }
 \f
 
   /* Return a value to avoid a compiler warning.  */
   return NULL;
 }
 \f

-/* Unicode support.  */
-
-/* Convert an ASCII string to a unicode string.  We just copy it,
-   expanding chars to shorts, rather than doing something intelligent.  */
-
-void
-unicode_from_ascii (length, unicode, ascii)
-     int *length;
-     unichar **unicode;
-     const char *ascii;
-{
-  int len;
-  const char *s;
-  unsigned short *w;
-
-  len = strlen (ascii);
-
-  if (length != NULL)
-    *length = len;
-
-  *unicode = ((unichar *) res_alloc ((len + 1) * sizeof (unichar)));
-
-  for (s = ascii, w = *unicode; *s != '\0'; s++, w++)
-    *w = *s & 0xff;
-  *w = 0;
-}
-
-/* Print the unicode string UNICODE to the file E.  LENGTH is the
-   number of characters to print, or -1 if we should print until the
-   end of the string.  */
-
-void
-unicode_print (e, unicode, length)
-     FILE *e;
-     const unichar *unicode;
-     int length;
-{
-  while (1)
-    {
-      unichar ch;
-
-      if (length == 0)
-       return;
-      if (length > 0)
-       --length;
-
-      ch = *unicode;
-
-      if (ch == 0 && length < 0)
-       return;
-
-      ++unicode;
-
-      if ((ch & 0x7f) == ch && isprint (ch))
-       putc (ch, e);
-      else if ((ch & 0xff) == ch)
-       fprintf (e, "\\%03o", (unsigned int) ch);
-      else
-       fprintf (e, "\\x%x", (unsigned int) ch);
-    }
-}
-\f

 /* Compare two resource ID's.  We consider name entries to come before
    numeric entries, because that is how they appear in the COFF .rsrc
    section.  */
 
 int
 /* Compare two resource ID's.  We consider name entries to come before
    numeric entries, because that is how they appear in the COFF .rsrc
    section.  */
 
 int

-res_id_cmp (a, b)
-     struct res_id a;
-     struct res_id b;
+res_id_cmp (struct res_id a, struct res_id b)

 {
   if (! a.named)
     {
 {
   if (! a.named)
     {


@@ -347,10 +260,7 @@ res_id_cmp (a, b)
 /* Print a resource ID.  */
 
 void
 /* Print a resource ID.  */
 
 void

-res_id_print (stream, id, quote)
-     FILE *stream;
-     struct res_id id;
-     int quote;
+res_id_print (FILE *stream, struct res_id id, int quote)

 {
   if (! id.named)
     fprintf (stream, "%lu", id.u.id);
 {
   if (! id.named)
     fprintf (stream, "%lu", id.u.id);


@@ -367,10 +277,7 @@ res_id_print (stream, id, quote)
 /* Print a list of resource ID's.  */
 
 void
 /* Print a list of resource ID's.  */
 
 void

-res_ids_print (stream, cids, ids)
-     FILE *stream;
-     int cids;
-     const struct res_id *ids;
+res_ids_print (FILE *stream, int cids, const struct res_id *ids)

 {
   int i;
 
 {
   int i;
 


@@ -385,9 +292,7 @@ res_ids_print (stream, cids, ids)
 /* Convert an ASCII string to a resource ID.  */
 
 void
 /* Convert an ASCII string to a resource ID.  */
 
 void

-res_string_to_id (res_id, string)
-     struct res_id *res_id;
-     const char *string;
+res_string_to_id (struct res_id *res_id, const char *string)

 {
   res_id->named = 1;
   unicode_from_ascii (&res_id->u.n.length, &res_id->u.n.name, string);
 {
   res_id->named = 1;
   unicode_from_ascii (&res_id->u.n.length, &res_id->u.n.name, string);


@@ -402,11 +307,8 @@ res_string_to_id (res_id, string)
    one.  */
 
 struct res_resource *
    one.  */
 
 struct res_resource *

-define_resource (resources, cids, ids, dupok)
-     struct res_directory **resources;
-     int cids;
-     const struct res_id *ids;
-     int dupok;
+define_resource (struct res_directory **resources, int cids,
+                const struct res_id *ids, int dupok)

 {
   struct res_entry *re = NULL;
   int i;
 {
   struct res_entry *re = NULL;
   int i;


@@ -418,10 +320,17 @@ define_resource (resources, cids, ids, dupok)
 
       if (*resources == NULL)
        {
 
       if (*resources == NULL)
        {

+         static unsigned long timeval;
+
+         /* Use the same timestamp for every resource created in a
+             single run.  */
+         if (timeval == 0)
+           timeval = time (NULL);
+

          *resources = ((struct res_directory *)
                        res_alloc (sizeof **resources));
          (*resources)->characteristics = 0;
          *resources = ((struct res_directory *)
                        res_alloc (sizeof **resources));
          (*resources)->characteristics = 0;

-         (*resources)->time = 0;
+         (*resources)->time = timeval;

          (*resources)->major = 0;
          (*resources)->minor = 0;
          (*resources)->entries = NULL;
          (*resources)->major = 0;
          (*resources)->minor = 0;
          (*resources)->entries = NULL;


@@ -458,7 +367,7 @@ define_resource (resources, cids, ids, dupok)
            {
              fprintf (stderr, "%s: ", program_name);
              res_ids_print (stderr, i, ids);
            {
              fprintf (stderr, "%s: ", program_name);
              res_ids_print (stderr, i, ids);

-             fprintf (stderr, ": expected to be a directory\n");
+             fprintf (stderr, _(": expected to be a directory\n"));

              xexit (1);
            }
 
              xexit (1);
            }
 


@@ -470,7 +379,7 @@ define_resource (resources, cids, ids, dupok)
     {
       fprintf (stderr, "%s: ", program_name);
       res_ids_print (stderr, cids, ids);
     {
       fprintf (stderr, "%s: ", program_name);
       res_ids_print (stderr, cids, ids);

-      fprintf (stderr, ": expected to be a leaf\n");
+      fprintf (stderr, _(": expected to be a leaf\n"));

       xexit (1);
     }
 
       xexit (1);
     }
 


@@ -479,18 +388,16 @@ define_resource (resources, cids, ids, dupok)
       if (dupok)
        return re->u.res;
 
       if (dupok)
        return re->u.res;
 

-      fprintf (stderr, "%s: warning: ", program_name);
+      fprintf (stderr, _("%s: warning: "), program_name);

       res_ids_print (stderr, cids, ids);
       res_ids_print (stderr, cids, ids);

-      fprintf (stderr, ": duplicate value\n");
+      fprintf (stderr, _(": duplicate value\n"));

     }
 
   re->u.res = ((struct res_resource *)
               res_alloc (sizeof (struct res_resource)));
     }
 
   re->u.res = ((struct res_resource *)
               res_alloc (sizeof (struct res_resource)));

+  memset (re->u.res, 0, sizeof (struct res_resource));

 
   re->u.res->type = RES_TYPE_UNINITIALIZED;
 
   re->u.res->type = RES_TYPE_UNINITIALIZED;

-  memset (&re->u.res->res_info, 0, sizeof (struct res_res_info));
-  memset (&re->u.res->coff_info, 0, sizeof (struct res_coff_info));
-

   return re->u.res;
 }
 
   return re->u.res;
 }
 


@@ -498,12 +405,8 @@ define_resource (resources, cids, ids, dupok)
    that just takes type, name, and language arguments.  */
 
 struct res_resource *
    that just takes type, name, and language arguments.  */
 
 struct res_resource *

-define_standard_resource (resources, type, name, language, dupok)
-     struct res_directory **resources;
-     int type;
-     struct res_id name;
-     int language;
-     int dupok;
+define_standard_resource (struct res_directory **resources, int type,
+                         struct res_id name, int language, int dupok)

 {
   struct res_id a[3];
 
 {
   struct res_id a[3];
 


@@ -518,9 +421,7 @@ define_standard_resource (resources, type, name, language, dupok)
 /* Comparison routine for resource sorting.  */
 
 static int
 /* Comparison routine for resource sorting.  */
 
 static int

-cmp_res_entry (p1, p2)
-     const PTR p1;
-     const PTR p2;
+cmp_res_entry (const void *p1, const void *p2)

 {
   const struct res_entry **re1, **re2;
 
 {
   const struct res_entry **re1, **re2;
 


@@ -532,8 +433,7 @@ cmp_res_entry (p1, p2)
 /* Sort the resources.  */
 
 static struct res_directory *
 /* Sort the resources.  */
 
 static struct res_directory *

-sort_resources (resdir)
-     struct res_directory *resdir;
+sort_resources (struct res_directory *resdir)

 {
   int c, i;
   struct res_entry *re;
 {
   int c, i;
   struct res_entry *re;


@@ -575,8 +475,7 @@ sort_resources (resdir)
    DIALOGEX.  */
 
 int
    DIALOGEX.  */
 
 int

-extended_dialog (dialog)
-     const struct dialog *dialog;
+extended_dialog (const struct dialog *dialog)

 {
   const struct dialog_control *c;
 
 {
   const struct dialog_control *c;
 


@@ -593,15 +492,13 @@ extended_dialog (dialog)
 /* Return whether MENUITEMS are a MENU or a MENUEX.  */
 
 int
 /* Return whether MENUITEMS are a MENU or a MENUEX.  */
 
 int

-extended_menu (menu)
-     const struct menu *menu;
+extended_menu (const struct menu *menu)

 {
   return extended_menuitems (menu->items);
 }
 
 static int
 {
   return extended_menuitems (menu->items);
 }
 
 static int

-extended_menuitems (menuitems)
-     const struct menuitem *menuitems;
+extended_menuitems (const struct menuitem *menuitems)

 {
   const struct menuitem *mi;
 
 {
   const struct menuitem *mi;
 


@@ -633,8 +530,7 @@ extended_menuitems (menuitems)
 /* Convert a string to a format type, or exit if it can't be done.  */
 
 static enum res_format
 /* Convert a string to a format type, or exit if it can't be done.  */
 
 static enum res_format

-format_from_name (name)
-     const char *name;
+format_from_name (const char *name, int exit_on_error)

 {
   const struct format_map *m;
 
 {
   const struct format_map *m;
 


@@ -642,10 +538,10 @@ format_from_name (name)
     if (strcasecmp (m->name, name) == 0)
       break;
 
     if (strcasecmp (m->name, name) == 0)
       break;
 

-  if (m->name == NULL)
+  if (m->name == NULL && exit_on_error)

     {
     {

-      fprintf (stderr, "%s: unknown format type `%s'\n", program_name, name);
-      fprintf (stderr, "%s: supported formats:", program_name);
+      non_fatal (_("unknown format type `%s'"), name);
+      fprintf (stderr, _("%s: supported formats:"), program_name);

       for (m = format_names; m->name != NULL; m++)
        fprintf (stderr, " %s", m->name);
       fprintf (stderr, "\n");
       for (m = format_names; m->name != NULL; m++)
        fprintf (stderr, " %s", m->name);
       fprintf (stderr, "\n");


@@ -659,9 +555,7 @@ format_from_name (name)
    it's OK to look at the file itself.  */
 
 static enum res_format
    it's OK to look at the file itself.  */
 
 static enum res_format

-format_from_filename (filename, input)
-     const char *filename;
-     int input;
+format_from_filename (const char *filename, int input)

 {
   const char *ext;
   FILE *e;
 {
   const char *ext;
   FILE *e;


@@ -683,13 +577,11 @@ format_from_filename (filename, input)
 
   /* If we don't recognize the name of an output file, assume it's a
      COFF file.  */
 
   /* If we don't recognize the name of an output file, assume it's a
      COFF file.  */

-

   if (! input)
     return RES_FORMAT_COFF;
 
   /* Read the first few bytes of the file to see if we can guess what
      it is.  */
   if (! input)
     return RES_FORMAT_COFF;
 
   /* Read the first few bytes of the file to see if we can guess what
      it is.  */

-

   e = fopen (filename, FOPEN_RB);
   if (e == NULL)
     fatal ("%s: %s", filename, strerror (errno));
   e = fopen (filename, FOPEN_RB);
   if (e == NULL)
     fatal ("%s: %s", filename, strerror (errno));


@@ -724,15 +616,15 @@ format_from_filename (filename, input)
     return RES_FORMAT_RES;
 
   /* If every character is printable or space, assume it's an RC file.  */
     return RES_FORMAT_RES;
 
   /* If every character is printable or space, assume it's an RC file.  */

-  if ((isprint (b1) || isspace (b1))
-      && (isprint (b2) || isspace (b2))
-      && (isprint (b3) || isspace (b3))
-      && (isprint (b4) || isspace (b4))
-      && (isprint (b5) || isspace (b5)))
+  if ((ISPRINT (b1) || ISSPACE (b1))
+      && (ISPRINT (b2) || ISSPACE (b2))
+      && (ISPRINT (b3) || ISSPACE (b3))
+      && (ISPRINT (b4) || ISSPACE (b4))
+      && (ISPRINT (b5) || ISSPACE (b5)))

     return RES_FORMAT_RC;
 
   /* Otherwise, we give up.  */
     return RES_FORMAT_RC;
 
   /* Otherwise, we give up.  */

-  fatal ("can not determine type of file `%s'; use the -I option",
+  fatal (_("can not determine type of file `%s'; use the -J option"),

         filename);
 
   /* Return something to silence the compiler warning.  */
         filename);
 
   /* Return something to silence the compiler warning.  */


@@ -742,59 +634,135 @@ format_from_filename (filename, input)
 /* Print a usage message and exit.  */
 
 static void
 /* Print a usage message and exit.  */
 
 static void

-usage (stream, status)
-     FILE *stream;
-     int status;
+usage (FILE *stream, int status)

 {
 {

-  fprintf (stream, "Usage: %s [options] [input-file] [output-file]\n",
+  fprintf (stream, _("Usage: %s [option(s)] [input-file] [output-file]\n"),

           program_name);
           program_name);

-  fprintf (stream, "\
-Options:\n\
-  -i FILE, --input FILE       Name input file\n\
-  -o FILE, --output FILE      Name output file\n\
-  -I FORMAT, --input-format FORMAT\n\
-                              Specify input format\n\
-  -O FORMAT, --output-format FORMAT\n\
-                              Specify output format\n\
-  -F TARGET, --target TARGET  Specify COFF target\n\
-  --preprocessor PROGRAM      Program to use to preprocess rc file\n\
-  --include-dir DIR           Include directory when preprocessing rc file\n\
-  --define SYM[=VAL]          Define SYM when preprocessing rc file\n\
-  --language VAL              Set language when reading rc file\n");
+  fprintf (stream, _(" The options are:\n\
+  -i --input=<file>            Name input file\n\
+  -o --output=<file>           Name output file\n\
+  -J --input-format=<format>   Specify input format\n\
+  -O --output-format=<format>  Specify output format\n\
+  -F --target=<target>         Specify COFF target\n\
+     --preprocessor=<program>  Program to use to preprocess rc file\n\
+  -I --include-dir=<dir>       Include directory when preprocessing rc file\n\
+  -D --define <sym>[=<val>]    Define SYM when preprocessing rc file\n\
+  -U --undefine <sym>          Undefine SYM when preprocessing rc file\n\
+  -v --verbose                 Verbose - tells you what it's doing\n\
+  -l --language=<val>          Set language when reading rc file\n\
+     --use-temp-file           Use a temporary file instead of popen to read\n\
+                               the preprocessor output\n\
+     --no-use-temp-file        Use popen (default)\n"));

 #ifdef YYDEBUG
 #ifdef YYDEBUG

-  fprintf (stream, "\
-  --yydebug                   Turn on parser debugging\n");
+  fprintf (stream, _("\
+     --yydebug                 Turn on parser debugging\n"));

 #endif
 #endif

-  fprintf (stream, "\
-  --help                      Print this help message\n\
-  --version                   Print version information\n");
-  fprintf (stream, "\
+  fprintf (stream, _("\
+  -r                           Ignored for compatibility with rc\n\
+  -h --help                    Print this help message\n\
+  -V --version                 Print version information\n"));
+  fprintf (stream, _("\

 FORMAT is one of rc, res, or coff, and is deduced from the file name\n\
 extension if not specified.  A single file name is an input file.\n\
 FORMAT is one of rc, res, or coff, and is deduced from the file name\n\
 extension if not specified.  A single file name is an input file.\n\

-No input-file is stdin, default rc.  No output-file is stdout, default rc.\n");
+No input-file is stdin, default rc.  No output-file is stdout, default rc.\n"));
+

   list_supported_targets (program_name, stream);
   list_supported_targets (program_name, stream);

+

   if (status == 0)
   if (status == 0)

-    fprintf (stream, "Report bugs to bug-gnu-utils@prep.ai.mit.edu\n");
+    fprintf (stream, _("Report bugs to %s\n"), REPORT_BUGS_TO);
+

   exit (status);
 }
 
   exit (status);
 }
 

+/* Quote characters that will confuse the shell when we run the preprocessor.  */
+
+static const char *
+quot (const char *string)
+{
+  static char *buf = 0;
+  static int buflen = 0;
+  int slen = strlen (string);
+  const char *src;
+  char *dest;
+
+  if ((buflen < slen * 2 + 2) || !buf)
+    {
+      buflen = slen * 2 + 2;
+      if (buf)
+       free (buf);
+      buf = (char *) xmalloc (buflen);
+    }
+
+  for (src=string, dest=buf; *src; src++, dest++)
+    {
+      if (*src == '(' || *src == ')' || *src == ' ')
+       *dest++ = '\\';
+      *dest = *src;
+    }
+  *dest = 0;
+  return buf;
+}
+
+/* Long options.  */
+
+/* 150 isn't special; it's just an arbitrary non-ASCII char value.  */
+
+#define OPTION_PREPROCESSOR    150
+#define OPTION_USE_TEMP_FILE   (OPTION_PREPROCESSOR + 1)
+#define OPTION_NO_USE_TEMP_FILE        (OPTION_USE_TEMP_FILE + 1)
+#define OPTION_YYDEBUG         (OPTION_NO_USE_TEMP_FILE + 1)
+
+static const struct option long_options[] =
+{
+  {"input", required_argument, 0, 'i'},
+  {"output", required_argument, 0, 'o'},
+  {"input-format", required_argument, 0, 'J'},
+  {"output-format", required_argument, 0, 'O'},
+  {"target", required_argument, 0, 'F'},
+  {"preprocessor", required_argument, 0, OPTION_PREPROCESSOR},
+  {"include-dir", required_argument, 0, 'I'},
+  {"define", required_argument, 0, 'D'},
+  {"undefine", required_argument, 0, 'U'},
+  {"verbose", no_argument, 0, 'v'},
+  {"language", required_argument, 0, 'l'},
+  {"use-temp-file", no_argument, 0, OPTION_USE_TEMP_FILE},
+  {"no-use-temp-file", no_argument, 0, OPTION_NO_USE_TEMP_FILE},
+  {"yydebug", no_argument, 0, OPTION_YYDEBUG},
+  {"version", no_argument, 0, 'V'},
+  {"help", no_argument, 0, 'h'},
+  {0, no_argument, 0, 0}
+};
+
+/* This keeps gcc happy when using -Wmissing-prototypes -Wstrict-prototypes.  */
+int main (int, char **);
+

 /* The main function.  */
 
 int
 /* The main function.  */
 
 int

-main (argc, argv)
-     int argc;
-     char **argv;
+main (int argc, char **argv)

 {
   int c;
   char *input_filename;
   char *output_filename;
   enum res_format input_format;
 {
   int c;
   char *input_filename;
   char *output_filename;
   enum res_format input_format;

+  enum res_format input_format_tmp;

   enum res_format output_format;
   char *target;
   char *preprocessor;
   char *preprocargs;
   enum res_format output_format;
   char *target;
   char *preprocessor;
   char *preprocargs;

+  const char *quotedarg;

   int language;
   struct res_directory *resources;
   int language;
   struct res_directory *resources;

+  int use_temp_file;
+
+#if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES)
+  setlocale (LC_MESSAGES, "");
+#endif
+#if defined (HAVE_SETLOCALE)
+  setlocale (LC_CTYPE, "");
+#endif
+  bindtextdomain (PACKAGE, LOCALEDIR);
+  textdomain (PACKAGE);

 
   program_name = argv[0];
   xmalloc_set_program_name (program_name);
 
   program_name = argv[0];
   xmalloc_set_program_name (program_name);


@@ -811,9 +779,10 @@ main (argc, argv)
   target = NULL;
   preprocessor = NULL;
   preprocargs = NULL;
   target = NULL;
   preprocessor = NULL;
   preprocargs = NULL;

-  language = -1;
+  language = 0x409;   /* LANG_ENGLISH, SUBLANG_ENGLISH_US.  */
+  use_temp_file = 0;

 
 

-  while ((c = getopt_long (argc, argv, "i:o:I:O:F:", long_options,
+  while ((c = getopt_long (argc, argv, "f:i:l:o:I:J:O:F:D:U:rhHvV", long_options,

                           (int *) 0)) != EOF)
     {
       switch (c)
                           (int *) 0)) != EOF)
     {
       switch (c)


@@ -822,16 +791,32 @@ main (argc, argv)
          input_filename = optarg;
          break;
 
          input_filename = optarg;
          break;
 

+       case 'f':
+         /* For compatibility with rc we accept "-fo <name>" as being the
+            equivalent of "-o <name>".  We do not advertise this fact
+            though, as we do not want users to use non-GNU like command
+            line switches.  */
+         if (*optarg != 'o')
+           fatal (_("invalid option -f\n"));
+         optarg++;
+         if (* optarg == 0)
+           {
+             if (optind == argc)
+               fatal (_("No filename following the -fo option.\n"));
+             optarg = argv [optind++];
+           }
+         /* Fall through.  */
+

        case 'o':
          output_filename = optarg;
          break;
 
        case 'o':
          output_filename = optarg;
          break;
 

-       case 'I':
-         input_format = format_from_name (optarg);
+       case 'J':
+         input_format = format_from_name (optarg, 1);

          break;
 
        case 'O':
          break;
 
        case 'O':

-         output_format = format_from_name (optarg);
+         output_format = format_from_name (optarg, 1);

          break;
 
        case 'F':
          break;
 
        case 'F':


@@ -842,35 +827,57 @@ main (argc, argv)
          preprocessor = optarg;
          break;
 
          preprocessor = optarg;
          break;
 

-       case OPTION_DEFINE:
+       case 'D':
+       case 'U':

          if (preprocargs == NULL)
            {
          if (preprocargs == NULL)
            {

-             preprocargs = xmalloc (strlen (optarg) + 3);
-             sprintf (preprocargs, "-D%s", optarg);
+             quotedarg = quot (optarg);
+             preprocargs = xmalloc (strlen (quotedarg) + 3);
+             sprintf (preprocargs, "-%c%s", c, quotedarg);

            }
          else
            {
              char *n;
 
            }
          else
            {
              char *n;
 

-             n = xmalloc (strlen (preprocargs) + strlen (optarg) + 4);
-             sprintf (n, "%s -D%s", preprocargs, optarg);
+             quotedarg = quot (optarg);
+             n = xmalloc (strlen (preprocargs) + strlen (quotedarg) + 4);
+             sprintf (n, "%s -%c%s", preprocargs, c, quotedarg);

              free (preprocargs);
              preprocargs = n;
            }
          break;
 
              free (preprocargs);
              preprocargs = n;
            }
          break;
 

-       case OPTION_INCLUDE_DIR:
+       case 'r':
+         /* Ignored for compatibility with rc.  */
+         break;
+
+       case 'v':
+         verbose ++;
+         break;
+
+       case 'I':
+         /* For backward compatibility, should be removed in the future.  */
+         input_format_tmp = format_from_name (optarg, 0);
+         if (input_format_tmp != RES_FORMAT_UNKNOWN)
+           {
+             fprintf (stderr, _("Option -I is deprecated for setting the input format, please use -J instead.\n"));
+             input_format = input_format_tmp;
+             break;
+           }
+

          if (preprocargs == NULL)
            {
          if (preprocargs == NULL)
            {

-             preprocargs = xmalloc (strlen (optarg) + 3);
-             sprintf (preprocargs, "-I%s", optarg);
+             quotedarg = quot (optarg);
+             preprocargs = xmalloc (strlen (quotedarg) + 3);
+             sprintf (preprocargs, "-I%s", quotedarg);

            }
          else
            {
              char *n;
 
            }
          else
            {
              char *n;
 

-             n = xmalloc (strlen (preprocargs) + strlen (optarg) + 4);
-             sprintf (n, "%s -I%s", preprocargs, optarg);
+             quotedarg = quot (optarg);
+             n = xmalloc (strlen (preprocargs) + strlen (quotedarg) + 4);
+             sprintf (n, "%s -I%s", preprocargs, quotedarg);

              free (preprocargs);
              preprocargs = n;
            }
              free (preprocargs);
              preprocargs = n;
            }


@@ -889,21 +896,30 @@ main (argc, argv)
 
          break;
 
 
          break;
 

-       case OPTION_LANGUAGE:
+       case 'l':

          language = strtol (optarg, (char **) NULL, 16);
          break;
 
          language = strtol (optarg, (char **) NULL, 16);
          break;
 

+       case OPTION_USE_TEMP_FILE:
+         use_temp_file = 1;
+         break;
+
+       case OPTION_NO_USE_TEMP_FILE:
+         use_temp_file = 0;
+         break;
+

 #ifdef YYDEBUG
        case OPTION_YYDEBUG:
          yydebug = 1;
          break;
 #endif
 
 #ifdef YYDEBUG
        case OPTION_YYDEBUG:
          yydebug = 1;
          break;
 #endif
 

-       case OPTION_HELP:
+       case 'h':
+       case 'H':

          usage (stdout, 0);
          break;
 
          usage (stdout, 0);
          break;
 

-       case OPTION_VERSION:
+       case 'V':

          print_version ("windres");
          break;
 
          print_version ("windres");
          break;
 


@@ -945,14 +961,13 @@ main (argc, argv)
     }
 
   /* Read the input file.  */
     }
 
   /* Read the input file.  */

-

   switch (input_format)
     {
     default:
       abort ();
     case RES_FORMAT_RC:
       resources = read_rc_file (input_filename, preprocessor, preprocargs,
   switch (input_format)
     {
     default:
       abort ();
     case RES_FORMAT_RC:
       resources = read_rc_file (input_filename, preprocessor, preprocargs,

-                               language);
+                               language, use_temp_file);

       break;
     case RES_FORMAT_RES:
       resources = read_res_file (input_filename);
       break;
     case RES_FORMAT_RES:
       resources = read_res_file (input_filename);


@@ -963,15 +978,13 @@ main (argc, argv)
     }
 
   if (resources == NULL)
     }
 
   if (resources == NULL)

-    fatal ("no resources");
+    fatal (_("no resources"));

 
   /* Sort the resources.  This is required for COFF, convenient for
      rc, and unimportant for res.  */
 
   /* Sort the resources.  This is required for COFF, convenient for
      rc, and unimportant for res.  */

-

   resources = sort_resources (resources);
 
   /* Write the output file.  */
   resources = sort_resources (resources);
 
   /* Write the output file.  */

-

   reswr_init ();
 
   switch (output_format)
   reswr_init ();
 
   switch (output_format)


@@ -992,19 +1005,3 @@ main (argc, argv)
   xexit (0);
   return 0;
 }
   xexit (0);
   return 0;
 }

-
-struct res_directory *
-read_res_file (filename)
-     const char *filename;
-{
-  fatal ("read_res_file unimplemented");
-  return NULL;
-}
-
-void
-write_res_file (filename, resources)
-     const char *filename;
-     const struct res_directory *resources;
-{
-  fatal ("write_res_file unimplemented");
-}