Author: cazfi
Date: Sat Feb 4 09:33:49 2017
New Revision: 34951
URL: http://svn.gna.org/viewcvs/freeciv?rev=34951&view=rev
Log:
Respect DIR_SEPARATOR in path to modpack database file.
See bug #25485
Modified:
trunk/tools/modinst.c
Modified: trunk/tools/modinst.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/tools/modinst.c?rev=34951&r1=34950&r2=34951&view=diff
==============================================================================
--- trunk/tools/modinst.c (original)
+++ trunk/tools/modinst.c Sat Feb 4 09:33:49 2017
@@ -48,14 +48,18 @@
struct stat buf;
fc_snprintf(main_db_filename, sizeof(main_db_filename),
- "%s/" DATASUBDIR "/" FCMP_CONTROLD "/mp.db", fcmp->inst_prefix);
+ "%s" DIR_SEPARATOR DATASUBDIR DIR_SEPARATOR FCMP_CONTROLD
DIR_SEPARATOR "mp.db",
+ fcmp->inst_prefix);
fc_snprintf(scenario_db_filename, sizeof(scenario_db_filename),
- "%s/scenarios/" FCMP_CONTROLD "/mp.db", fcmp->inst_prefix);
+ "%s" DIR_SEPARATOR "scenarios" DIR_SEPARATOR FCMP_CONTROLD
DIR_SEPARATOR "mp.db",
+ fcmp->inst_prefix);
fc_snprintf(main_ii_filename, sizeof(main_ii_filename),
- "%s/" DATASUBDIR "/" FCMP_CONTROLD "/modpacks.db",
fcmp->inst_prefix);
+ "%s" DIR_SEPARATOR DATASUBDIR DIR_SEPARATOR FCMP_CONTROLD
DIR_SEPARATOR "modpacks.db",
+ fcmp->inst_prefix);
fc_snprintf(scenario_ii_filename, sizeof(scenario_ii_filename),
- "%s/scenarios/" FCMP_CONTROLD "/modpacks.db", fcmp->inst_prefix);
+ "%s" DIR_SEPARATOR "scenarios" DIR_SEPARATOR FCMP_CONTROLD
DIR_SEPARATOR "modpacks.db",
+ fcmp->inst_prefix);
if (fc_stat(main_db_filename, &buf)) {
create_mpdb(main_db_filename, FALSE);
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
