Author: cazfi
Date: Sat Dec 13 23:42:45 2014
New Revision: 27287
URL: http://svn.gna.org/viewcvs/freeciv?rev=27287&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:
branches/S2_5/client/gui-gtk-2.0/gui_main.c
branches/S2_5/client/gui-gtk-3.0/gui_main.c
branches/S2_5/client/gui-qt/gui_main.cpp
branches/S2_5/client/gui-sdl/gui_main.c
branches/S2_5/client/gui-stub/gui_main.c
branches/S2_5/client/gui-xaw/gui_main.c
Modified: branches/S2_5/client/gui-gtk-2.0/gui_main.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-2.0/gui_main.c?rev=27287&r1=27286&r2=27287&view=diff
==============================================================================
--- branches/S2_5/client/gui-gtk-2.0/gui_main.c (original)
+++ branches/S2_5/client/gui-gtk-2.0/gui_main.c Sat Dec 13 23:42:45 2014
@@ -300,6 +300,8 @@
print_usage(argv[0]);
exit(EXIT_SUCCESS);
}
+ /* Can't check against unknown options, as those might be gtk options */
+
i++;
}
}
Modified: branches/S2_5/client/gui-gtk-3.0/gui_main.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-3.0/gui_main.c?rev=27287&r1=27286&r2=27287&view=diff
==============================================================================
--- branches/S2_5/client/gui-gtk-3.0/gui_main.c (original)
+++ branches/S2_5/client/gui-gtk-3.0/gui_main.c Sat Dec 13 23:42:45 2014
@@ -285,6 +285,8 @@
print_usage(argv[0]);
exit(EXIT_SUCCESS);
}
+ /* Can't check against unknown options, as those might be gtk options */
+
i++;
}
}
Modified: branches/S2_5/client/gui-qt/gui_main.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-qt/gui_main.cpp?rev=27287&r1=27286&r2=27287&view=diff
==============================================================================
--- branches/S2_5/client/gui-qt/gui_main.cpp (original)
+++ branches/S2_5/client/gui-qt/gui_main.cpp Sat Dec 13 23:42:45 2014
@@ -125,6 +125,8 @@
print_usage();
return false;
}
+ // Can't check against unknown options, as those might be Qt options
+
i++;
}
Modified: branches/S2_5/client/gui-sdl/gui_main.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-sdl/gui_main.c?rev=27287&r1=27286&r2=27287&view=diff
==============================================================================
--- branches/S2_5/client/gui-sdl/gui_main.c (original)
+++ branches/S2_5/client/gui-sdl/gui_main.c Sat Dec 13 23:42:45 2014
@@ -192,17 +192,20 @@
if (is_option("--help", argv[i])) {
print_usage(argv[0]);
exit(EXIT_SUCCESS);
- } else if (is_option("--fullscreen",argv[i])) {
+ } else if (is_option("--fullscreen", argv[i])) {
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(gui_sdl_default_theme_name, option);
- }
+ } else {
+ fc_fprintf(stderr, _("Unrecognized option: \"%s\"\n"), argv[i]);
+ exit(EXIT_FAILURE);
+ }
+
i++;
}
-
}
/**************************************************************************
Modified: branches/S2_5/client/gui-stub/gui_main.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-stub/gui_main.c?rev=27287&r1=27286&r2=27287&view=diff
==============================================================================
--- branches/S2_5/client/gui-stub/gui_main.c (original)
+++ branches/S2_5/client/gui-stub/gui_main.c Sat Dec 13 23:42:45 2014
@@ -86,18 +86,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: branches/S2_5/client/gui-xaw/gui_main.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-xaw/gui_main.c?rev=27287&r1=27286&r2=27287&view=diff
==============================================================================
--- branches/S2_5/client/gui-xaw/gui_main.c (original)
+++ branches/S2_5/client/gui-xaw/gui_main.c Sat Dec 13 23:42:45 2014
@@ -260,21 +260,22 @@
}
/**************************************************************************
-...
+ Parse and enact any client-specific options.
**************************************************************************/
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);
}
- i += 1;
+
+ i++;
}
}
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
