windres: -fo (fwd)

[Dimitrie O. Paun]

---------- Forwarded message ----------
Date: Tue, 22 Apr 2003 14:07:11 -0400 (EDT)
From: Dimitrie O. Paun 
To: [e-mail]
Subject: windres: -fo

This one is the last (famous last words :)) patch in
my series of compatibility patches. With this one in,
we can hopefully get rid of the ugly ifdefs in Makefiles.

You gotta hate MS for the ugly choice of option names... :(

BTW, this is now also supported by wrc, so we get the
tree way compatibility: windres, wrc, rc.

2003-04-22  Dimitrie O. Paun

* windres.c: Support -fo for compatibility with rc.
        (main): Support the -fo option as a synonym for -o.
        * doc/binutils.texi: Added -fo to the list of options.

Index: windres.c
===================================================================
RCS file: /cvs/src/src/binutils/windres.c,v
retrieving revision 1.17
diff -u -r1.17 windres.c
--- windres.c	22 Apr 2003 17:31:08 -0000	1.17
+++ windres.c	22 Apr 2003 18:01:56 -0000
@@ -698,7 +698,7 @@
       program_name);
   fprintf (stream, _(" The options are:\n\
   -i --input=<file>            Name input file\n\
-  -o --output=<file>           Name output file\n\
+  -o -fo --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\
@@ -813,7 +813,7 @@
   language = 0x409;   /* LANG_ENGLISH, SUBLANG_ENGLISH_US.  */
   use_temp_file = 0;

-  while ((c = getopt_long (argc, argv, "i:l:o:I:J:O:F:D:U:rhHvV", 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)
@@ -822,6 +822,10 @@
      input_filename = optarg;
      break;

+	case 'f':
+	  if (*optarg != 'o') fatal (_("Unknown option -f%s.\n"), optarg);
+	  optarg++;
+	  /* fall through */
    case 'o':
      output_filename = optarg;
      break;
Index: doc/binutils.texi
===================================================================
RCS file: /cvs/src/src/binutils/doc/binutils.texi,v
retrieving revision 1.37
diff -u -r1.37 binutils.texi
--- doc/binutils.texi	22 Apr 2003 17:31:08 -0000	1.37
+++ doc/binutils.texi	22 Apr 2003 18:02:05 -0000
@@ -2570,6 +2570,7 @@
 standard input.

@item -o @var{filename}
+@item -fo@var{filename}
 @itemx --output @var{filename}
 The name of the output file.  If this option is not used, then
 @command{windres} will use the first non-option argument, after any used