Author: cazfi
Date: Sat May 7 20:39:41 2016
New Revision: 32615
URL: http://svn.gna.org/viewcvs/freeciv?rev=32615&view=rev
Log:
Construct paths passed to spawned server correctly in respect to DIR_SEPARATOR.
See bug #24640
Modified:
branches/S2_6/client/connectdlg_common.c
Modified: branches/S2_6/client/connectdlg_common.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/connectdlg_common.c?rev=32615&r1=32614&r2=32615&view=diff
==============================================================================
--- branches/S2_6/client/connectdlg_common.c (original)
+++ branches/S2_6/client/connectdlg_common.c Sat May 7 20:39:41 2016
@@ -206,10 +206,10 @@
char scensdir[MAX_LEN_PATH];
char options[512];
char *depr;
-#ifdef DEBUG
+#ifdef FREECIV_DEBUG
char cmdline1[512];
char cmdline2[512];
-#endif /* DEBUG */
+#endif /* FREECIV_DEBUG */
char cmdline3[512];
char cmdline4[512];
char logcmdline[512];
@@ -267,9 +267,9 @@
argv[argc++] = "1";
argv[argc++] = "-e";
argv[argc++] = "--saves";
- argv[argc++] = "~/.freeciv/saves";
+ argv[argc++] = "~" DIR_SEPARATOR ".freeciv "DIR_SEPARATOR "saves";
argv[argc++] = "--scenarios";
- argv[argc++] = "~/.freeciv/scenarios";
+ argv[argc++] = "~" DIR_SEPARATOR ".freeciv "DIR_SEPARATOR "scenarios";
argv[argc++] = "-A";
argv[argc++] = "none";
if (logfile) {
@@ -404,10 +404,12 @@
free(savefile_in_local_encoding);
}
- interpret_tilde(savesdir, sizeof(savesdir), "~/.freeciv/saves");
+ interpret_tilde(savesdir, sizeof(savesdir),
+ "~" DIR_SEPARATOR ".freeciv" DIR_SEPARATOR "saves");
internal_to_local_string_buffer(savesdir, savescmdline,
sizeof(savescmdline));
- interpret_tilde(scensdir, sizeof(scensdir), "~/.freeciv/scenarios");
+ interpret_tilde(scensdir, sizeof(scensdir),
+ "~" DIR_SEPARATOR ".freeciv" DIR_SEPARATOR "scenarios");
internal_to_local_string_buffer(scensdir, scenscmdline,
sizeof(scenscmdline));
if (are_deprecation_warnings_enabled()) {
@@ -571,7 +573,7 @@
/* get the full filename path */
interpret_tilde(challenge_fullname, sizeof(challenge_fullname),
- "~/.freeciv/");
+ "~/.freeciv/");
make_dir(challenge_fullname);
sz_strlcat(challenge_fullname, filename);
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
