Huge Windows utf8 I/O patch.

[platform/upstream/flac.git] / src / metaflac / main.c

diff --git a/src/metaflac/main.c b/src/metaflac/main.c
index 64ff446..e85d1c2 100644 (file)
--- a/src/metaflac/main.c
+++ b/src/metaflac/main.c
@@ -1,5 +1,5 @@
 /* metaflac - Command-line FLAC metadata editor
- * Copyright (C) 2001,2002,2003  Josh Coalson
+ * Copyright (C) 2001,2002,2003,2004,2005,2006,2007,2008,2009  Josh Coalson
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -11,9 +11,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #if HAVE_CONFIG_H
@@ -23,17 +23,32 @@
 #include "operations.h"
 #include "options.h"
 #include <locale.h>
+#include <stdlib.h>
+#include "share/compat.h"
 
 int main(int argc, char *argv[])
 {
        CommandLineOptions options;
        int ret = 0;
 
+#ifdef __EMX__
+       _response(&argc, &argv);
+       _wildcard(&argc, &argv);
+#endif
+#ifdef FLAC__STRINGS_IN_UTF8
+       if (get_utf8_argv(&argc, &argv) != 0) {
+               fprintf(stderr, "%ERROR: failed to convert command line parameters to UTF-8\n");
+               return 1;
+       }
+#endif
+
        setlocale(LC_ALL, "");
        init_options(&options);
 
-       if(parse_options(argc, argv, &options))
+       if ((ret = parse_options(argc, argv, &options)) == 0)
                ret = !do_operations(&options);
+       else
+               ret = 1;
 
        free_options(&options);