Author: cazfi
Date: Thu Jul 28 08:09:23 2016
New Revision: 33341
URL: http://svn.gna.org/viewcvs/freeciv?rev=33341&view=rev
Log:
Made ruleset loading to respect DIR_SEPARATOR
See bug #24880
Modified:
trunk/server/ruleset.c
Modified: trunk/server/ruleset.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/ruleset.c?rev=33341&r1=33340&r2=33341&view=diff
==============================================================================
--- trunk/server/ruleset.c (original)
+++ trunk/server/ruleset.c Thu Jul 28 08:09:23 2016
@@ -228,7 +228,7 @@
fc_assert_ret_val(subdir && name && extension, NULL);
- fc_snprintf(filename, sizeof(filename), "%s/%s.%s",
+ fc_snprintf(filename, sizeof(filename), "%s" DIR_SEPARATOR "%s.%s",
subdir, name, extension);
log_verbose("Trying \"%s\".", filename);
dfilename = fileinfoname(get_data_dirs(), filename);
@@ -236,7 +236,7 @@
return dfilename;
}
- fc_snprintf(filename, sizeof(filename), "default/%s.%s", name, extension);
+ fc_snprintf(filename, sizeof(filename), "default" DIR_SEPARATOR "%s.%s",
name, extension);
log_verbose("Trying \"%s\": default ruleset directory.", filename);
dfilename = fileinfoname(get_data_dirs(), filename);
if (dfilename) {
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
