Author: cazfi Date: Sat Dec 13 23:42:36 2014 New Revision: 27286 URL: http://svn.gna.org/viewcvs/freeciv?rev=27286&view=rev Log: Sdl-, Xaw-, and Stub-client give an error about unknown gui-specific commandline option. Gtk- and Qt-client cannot do that, so only a comment explaining the situation added.
See bug #23035 Modified: trunk/client/gui-gtk-2.0/gui_main.c trunk/client/gui-gtk-3.0/gui_main.c trunk/client/gui-qt/gui_main.cpp trunk/client/gui-sdl/gui_main.c trunk/client/gui-sdl2/gui_main.c trunk/client/gui-stub/gui_main.c trunk/client/gui-xaw/gui_main.c Modified: trunk/client/gui-gtk-2.0/gui_main.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/gui_main.c?rev=27286&r1=27285&r2=27286&view=diff ============================================================================== --- trunk/client/gui-gtk-2.0/gui_main.c (original) +++ trunk/client/gui-gtk-2.0/gui_main.c Sat Dec 13 23:42:36 2014 @@ -294,6 +294,8 @@ print_usage(); exit(EXIT_SUCCESS); } + /* Can't check against unknown options, as those might be gtk options */ + i++; } } Modified: trunk/client/gui-gtk-3.0/gui_main.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/gui_main.c?rev=27286&r1=27285&r2=27286&view=diff ============================================================================== --- trunk/client/gui-gtk-3.0/gui_main.c (original) +++ trunk/client/gui-gtk-3.0/gui_main.c Sat Dec 13 23:42:36 2014 @@ -291,6 +291,7 @@ set_map_zoom(strtof(option, &endptr)); } + /* Can't check against unknown options, as those might be gtk options */ i++; } Modified: trunk/client/gui-qt/gui_main.cpp URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/gui_main.cpp?rev=27286&r1=27285&r2=27286&view=diff ============================================================================== --- trunk/client/gui-qt/gui_main.cpp (original) +++ trunk/client/gui-qt/gui_main.cpp Sat Dec 13 23:42:36 2014 @@ -124,6 +124,8 @@ print_usage(); return false; } + // Can't check against unknown options, as those might be Qt options + i++; } Modified: trunk/client/gui-sdl/gui_main.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl/gui_main.c?rev=27286&r1=27285&r2=27286&view=diff ============================================================================== --- trunk/client/gui-sdl/gui_main.c (original) +++ trunk/client/gui-sdl/gui_main.c Sat Dec 13 23:42:36 2014 @@ -188,17 +188,20 @@ if (is_option("--help", argv[i])) { print_usage(); exit(EXIT_SUCCESS); - } else if (is_option("--fullscreen",argv[i])) { + } else if (is_option("--fullscreen", argv[i])) { options.gui_sdl_fullscreen = TRUE; - } else if (is_option("--eventthread",argv[i])) { + } else if (is_option("--eventthread", argv[i])) { /* init events in other thread ( only linux and BeOS ) */ SDL_InitSubSystem(SDL_INIT_EVENTTHREAD); } else if ((option = get_option_malloc("--theme", argv, &i, argc))) { sz_strlcpy(options.gui_sdl_default_theme_name, option); - } + } else { + fc_fprintf(stderr, _("Unrecognized option: \"%s\"\n"), argv[i]); + exit(EXIT_FAILURE); + } + i++; } - } /************************************************************************** Modified: trunk/client/gui-sdl2/gui_main.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/gui_main.c?rev=27286&r1=27285&r2=27286&view=diff ============================================================================== --- trunk/client/gui-sdl2/gui_main.c (original) +++ trunk/client/gui-sdl2/gui_main.c Sat Dec 13 23:42:36 2014 @@ -188,15 +188,18 @@ if (is_option("--help", argv[i])) { print_usage(); exit(EXIT_SUCCESS); - } else if (is_option("--fullscreen",argv[i])) { + } else if (is_option("--fullscreen", argv[i])) { options.gui_sdl2_fullscreen = TRUE; #if 0 - } else if (is_option("--eventthread",argv[i])) { + } else if (is_option("--eventthread", argv[i])) { /* init events in other thread ( only linux and BeOS ) */ SDL_InitSubSystem(SDL_INIT_EVENTTHREAD); #endif } else if ((option = get_option_malloc("--theme", argv, &i, argc))) { sz_strlcpy(options.gui_sdl2_default_theme_name, option); + } else { + fc_fprintf(stderr, _("Unrecognized option: \"%s\"\n"), argv[i]); + exit(EXIT_FAILURE); } i++; Modified: trunk/client/gui-stub/gui_main.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-stub/gui_main.c?rev=27286&r1=27285&r2=27286&view=diff ============================================================================== --- trunk/client/gui-stub/gui_main.c (original) +++ trunk/client/gui-stub/gui_main.c Sat Dec 13 23:42:36 2014 @@ -85,18 +85,18 @@ **************************************************************************/ static void parse_options(int argc, char **argv) { - int i; - - i = 1; - while (i < argc) - { - if (is_option("--help", argv[i])) - { + int i = 1; + + while (i < argc) { + if (is_option("--help", argv[i])) { print_usage(argv[0]); exit(EXIT_SUCCESS); + } else { + fc_fprintf(stderr, _("Unrecognized option: \"%s\"\n"), argv[i]); + exit(EXIT_FAILURE); } - /* PORTME */ - i += 1; + + i++; } } Modified: trunk/client/gui-xaw/gui_main.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-xaw/gui_main.c?rev=27286&r1=27285&r2=27286&view=diff ============================================================================== --- trunk/client/gui-xaw/gui_main.c (original) +++ trunk/client/gui-xaw/gui_main.c Sat Dec 13 23:42:36 2014 @@ -263,15 +263,18 @@ **************************************************************************/ static void parse_options(int argc, char **argv) { - int i; - - i = 1; + int i = 1; + while (i < argc) { if (is_option("--help", argv[i])) { print_usage(); exit(EXIT_SUCCESS); + } else { + fc_fprintf(stderr, _("Unrecognized option: \"%s\"\n"), argv[i]); + exit(EXIT_FAILURE); } - i += 1; + + i++; } } _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits