Author: cazfi
Date: Thu Jul 28 08:09:30 2016
New Revision: 33342

URL: http://svn.gna.org/viewcvs/freeciv?rev=33342&view=rev
Log:
Made ruleset loading to respect DIR_SEPARATOR

See bug #24880

Modified:
    branches/S2_6/server/ruleset.c

Modified: branches/S2_6/server/ruleset.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/ruleset.c?rev=33342&r1=33341&r2=33342&view=diff
==============================================================================
--- branches/S2_6/server/ruleset.c      (original)
+++ branches/S2_6/server/ruleset.c      Thu Jul 28 08:09:30 2016
@@ -208,7 +208,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);
@@ -216,7 +216,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

Reply via email to