Author: cazfi
Date: Thu Oct 15 18:42:55 2015
New Revision: 30095
URL: http://svn.gna.org/viewcvs/freeciv?rev=30095&view=rev
Log:
Unified freeciv home/storage terminology so that 'storage' is used everywhere.
See patch #6425
Modified:
trunk/bootstrap/fcgui.in
trunk/bootstrap/fcruledit.in
trunk/bootstrap/fcser.in
trunk/bootstrap/freeciv.project
trunk/client/options.c
trunk/common/fc_interface.c
trunk/configure.ac
trunk/gen_headers/freeciv_config.h.in
trunk/server/gamehand.c
trunk/server/sernet.c
trunk/utility/shared.c
trunk/utility/shared.h
Modified: trunk/bootstrap/fcgui.in
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/bootstrap/fcgui.in?rev=30095&r1=30094&r2=30095&view=diff
==============================================================================
--- trunk/bootstrap/fcgui.in (original)
+++ trunk/bootstrap/fcgui.in Thu Oct 15 18:42:55 2015
@@ -51,19 +51,19 @@
fi
if test "x$FREECIV_DATA_PATH" = "x" ; then
-
FREECIV_DATA_PATH=".@HOST_PATH_SEPARATOR@data@HOST_PATH_SEPARATOR@@FREECIV_HOME_DIR@/@DATASUBDIR@"
+
FREECIV_DATA_PATH=".@HOST_PATH_SEPARATOR@data@HOST_PATH_SEPARATOR@@FREECIV_STORAGE_DIR@/@DATASUBDIR@"
fi
FREECIV_DATA_PATH="${FREECIV_DATA_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@/data@HOST_PATH_SEPARATOR@@abs_top_srcdir@/data"
export FREECIV_DATA_PATH
if test "x$FREECIV_SAVE_PATH" = "x" ; then
- FREECIV_SAVE_PATH=".@HOST_PATH_SEPARATOR@@FREECIV_HOME_DIR@/saves"
+ FREECIV_SAVE_PATH=".@HOST_PATH_SEPARATOR@@FREECIV_STORAGE_DIR@/saves"
fi
FREECIV_SAVE_PATH="${FREECIV_SAVE_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@@HOST_PATH_SEPARATOR@@abs_top_srcdir@"
export FREECIV_SAVE_PATH
if test "x$FREECIV_SCENARIO_PATH" = "x" ; then
-
FREECIV_SCENARIO_PATH=".@HOST_PATH_SEPARATOR@data/scenarios@HOST_PATH_SEPARATOR@@FREECIV_HOME_DIR@/@DATASUBDIR@/scenarios@HOST_PATH_SEPARATOR@@FREECIV_HOME_DIR@/scenarios"
+
FREECIV_SCENARIO_PATH=".@HOST_PATH_SEPARATOR@data/scenarios@HOST_PATH_SEPARATOR@@FREECIV_STORAGE_DIR@/@DATASUBDIR@/scenarios@HOST_PATH_SEPARATOR@@FREECIV_STORAGE_DIR@/scenarios"
fi
FREECIV_SCENARIO_PATH="${FREECIV_SCENARIO_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@/data/scenarios@HOST_PATH_SEPARATOR@@abs_top_srcdir@/data/scenarios"
export FREECIV_SCENARIO_PATH
Modified: trunk/bootstrap/fcruledit.in
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/bootstrap/fcruledit.in?rev=30095&r1=30094&r2=30095&view=diff
==============================================================================
--- trunk/bootstrap/fcruledit.in (original)
+++ trunk/bootstrap/fcruledit.in Thu Oct 15 18:42:55 2015
@@ -28,7 +28,7 @@
fi
if test "x$FREECIV_DATA_PATH" = "x" ; then
-
FREECIV_DATA_PATH=".@HOST_PATH_SEPARATOR@data@HOST_PATH_SEPARATOR@@FREECIV_HOME_DIR@/@DATASUBDIR@"
+
FREECIV_DATA_PATH=".@HOST_PATH_SEPARATOR@data@HOST_PATH_SEPARATOR@@FREECIV_STORAGE_DIR@/@DATASUBDIR@"
fi
FREECIV_DATA_PATH="${FREECIV_DATA_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@/data@HOST_PATH_SEPARATOR@@abs_top_srcdir@/data"
export FREECIV_DATA_PATH
Modified: trunk/bootstrap/fcser.in
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/bootstrap/fcser.in?rev=30095&r1=30094&r2=30095&view=diff
==============================================================================
--- trunk/bootstrap/fcser.in (original)
+++ trunk/bootstrap/fcser.in Thu Oct 15 18:42:55 2015
@@ -18,19 +18,19 @@
EXENAME=freeciv-server@EXEEXT@
if test "x$FREECIV_DATA_PATH" = "x" ; then
-
FREECIV_DATA_PATH=".@HOST_PATH_SEPARATOR@data@HOST_PATH_SEPARATOR@@FREECIV_HOME_DIR@/@DATASUBDIR@"
+
FREECIV_DATA_PATH=".@HOST_PATH_SEPARATOR@data@HOST_PATH_SEPARATOR@@FREECIV_STORAGE_DIR@/@DATASUBDIR@"
fi
FREECIV_DATA_PATH="${FREECIV_DATA_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@/data@HOST_PATH_SEPARATOR@@abs_top_srcdir@/data"
export FREECIV_DATA_PATH
if test "x$FREECIV_SAVE_PATH" = "x" ; then
- FREECIV_SAVE_PATH=".@HOST_PATH_SEPARATOR@@FREECIV_HOME_DIR@/saves"
+ FREECIV_SAVE_PATH=".@HOST_PATH_SEPARATOR@@FREECIV_STORAGE_DIR@/saves"
fi
FREECIV_SAVE_PATH="${FREECIV_SAVE_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@@HOST_PATH_SEPARATOR@@abs_top_srcdir@"
export FREECIV_SAVE_PATH
if test "x$FREECIV_SCENARIO_PATH" = "x" ; then
-
FREECIV_SCENARIO_PATH=".@HOST_PATH_SEPARATOR@data/scenarios@HOST_PATH_SEPARATOR@@FREECIV_HOME_DIR@/@DATASUBDIR@/scenarios@HOST_PATH_SEPARATOR@@FREECIV_HOME_DIR@/scenarios"
+
FREECIV_SCENARIO_PATH=".@HOST_PATH_SEPARATOR@data/scenarios@HOST_PATH_SEPARATOR@@FREECIV_STORAGE_DIR@/@DATASUBDIR@/scenarios@HOST_PATH_SEPARATOR@@FREECIV_STORAGE_DIR@/scenarios"
fi
FREECIV_SCENARIO_PATH="${FREECIV_SCENARIO_PATH}@HOST_PATH_SEPARATOR@@abs_top_builddir@/data/scenarios@HOST_PATH_SEPARATOR@@abs_top_srcdir@/data/scenarios"
export FREECIV_SCENARIO_PATH
Modified: trunk/bootstrap/freeciv.project
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/bootstrap/freeciv.project?rev=30095&r1=30094&r2=30095&view=diff
==============================================================================
--- trunk/bootstrap/freeciv.project (original)
+++ trunk/bootstrap/freeciv.project Thu Oct 15 18:42:55 2015
@@ -8,4 +8,4 @@
# Where to store user files. Note that changing this after user has already
stored
# something to the old dir with older version of the projects means that those
# files won't be used any more.
-FREECIV_HOME_DIR="~/.freeciv"
+FREECIV_STORAGE_DIR="~/.freeciv"
Modified: trunk/client/options.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/options.c?rev=30095&r1=30094&r2=30095&view=diff
==============================================================================
--- trunk/client/options.c (original)
+++ trunk/client/options.c Thu Oct 15 18:42:55 2015
@@ -4774,7 +4774,7 @@
#ifdef OPTION_FILE_NAME
fc_strlcpy(name_buffer, OPTION_FILE_NAME, sizeof(name_buffer));
#else
- name = freeciv_home_dir();
+ name = freeciv_storage_dir();
if (!name) {
log_error(_("Cannot find freeciv storage directory"));
return NULL;
@@ -4819,7 +4819,7 @@
int major, minor;
struct stat buf;
- name = freeciv_home_dir();
+ name = freeciv_storage_dir();
if (name == NULL) {
log_error(_("Cannot find freeciv storage directory"));
Modified: trunk/common/fc_interface.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/fc_interface.c?rev=30095&r1=30094&r2=30095&view=diff
==============================================================================
--- trunk/common/fc_interface.c (original)
+++ trunk/common/fc_interface.c Thu Oct 15 18:42:55 2015
@@ -74,7 +74,7 @@
diplrel_mess_close();
free_data_dir_names();
free_multicast_group();
- free_freeciv_home_dir();
+ free_freeciv_storage_dir();
free_user_home_dir();
free_fileinfo_data();
fc_strAPI_free();
Modified: trunk/configure.ac
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=30095&r1=30094&r2=30095&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Thu Oct 15 18:42:55 2015
@@ -194,7 +194,7 @@
AC_DEFINE_UNQUOTED([MODPACK_LIST_URL], ["${MODPACK_LIST_URL}"], [Default
modpack list URL])
fi
-AC_DEFINE_UNQUOTED([FREECIV_HOME_DIR], ["$FREECIV_HOME_DIR"], [Location for
freeciv to store its information])
+AC_DEFINE_UNQUOTED([FREECIV_STORAGE_DIR], ["$FREECIV_STORAGE_DIR"], [Location
for freeciv to store its information])
AC_ARG_WITH([readline],
AS_HELP_STRING([--with-readline], [support fancy command line editing]),
@@ -1076,7 +1076,7 @@
AC_SUBST([VERSION_WITHOUT_LABEL])
AC_SUBST([VERSION_LABEL])
AC_SUBST([HOST_PATH_SEPARATOR])
-AC_SUBST([FREECIV_HOME_DIR])
+AC_SUBST([FREECIV_STORAGE_DIR])
AM_CONDITIONAL(AUDIO_SDL, test "x$SDL_mixer" != "xno")
AM_CONDITIONAL(CLIENT_GUI_SDL, test "x$gui_sdl" = "xyes")
AM_CONDITIONAL(CLIENT_GUI_SDL2, test "x$gui_sdl2" = "xyes")
@@ -1213,21 +1213,21 @@
FC_EXPAND_DIR(FREECIV_DATADIR, "$datadir/freeciv")
if test x"$MINGW32" = xyes; then
- DEFAULT_SAVE_PATH=".;$FREECIV_HOME_DIR/saves"
+ DEFAULT_SAVE_PATH=".;$FREECIV_STORAGE_DIR/saves"
if test x$crosser = xyes ; then
FC_CONF_PATH="../etc/freeciv"
-
DEFAULT_DATA_PATH=".;data;$FREECIV_HOME_DIR/$DATASUBDIR;$datadir/freeciv;../share/freeciv"
-
DEFAULT_SCENARIO_PATH=".;data/scenarios;$FREECIV_HOME_DIR/$DATASUBDIR/scenarios;~/$FREECIV_HOME_DIR/scenarios;$datadir/freeciv/scenarios;../share/freeciv/scenarios"
+
DEFAULT_DATA_PATH=".;data;$FREECIV_STORAGE_DIR/$DATASUBDIR;$datadir/freeciv;../share/freeciv"
+
DEFAULT_SCENARIO_PATH=".;data/scenarios;$FREECIV_STORAGE_DIR/$DATASUBDIR/scenarios;~/$FREECIV_STORAGE_DIR/scenarios;$datadir/freeciv/scenarios;../share/freeciv/scenarios"
else
FC_CONF_PATH="etc/freeciv"
- DEFAULT_DATA_PATH=".;data;$FREECIV_HOME_DIR/$DATASUBDIR;$datadir/freeciv"
-
DEFAULT_SCENARIO_PATH=".;data/scenarios;$FREECIV_HOME_DIR/$DATASUBDIR/scenarios;$FREECIV_HOME_DIR/scenarios;$datadir/freeciv/scenarios"
+
DEFAULT_DATA_PATH=".;data;$FREECIV_STORAGE_DIR/$DATASUBDIR;$datadir/freeciv"
+
DEFAULT_SCENARIO_PATH=".;data/scenarios;$FREECIV_STORAGE_DIR/$DATASUBDIR/scenarios;$FREECIV_STORAGE_DIR/scenarios;$datadir/freeciv/scenarios"
fi
else
FC_CONF_PATH="$sysconfdir/freeciv"
- DEFAULT_DATA_PATH=".:data:$FREECIV_HOME_DIR/$DATASUBDIR:$datadir/freeciv"
- DEFAULT_SAVE_PATH=".:$FREECIV_HOME_DIR/saves"
-
DEFAULT_SCENARIO_PATH=".:data/scenarios:$FREECIV_HOME_DIR/$DATASUBDIR/scenarios:$FREECIV_HOME_DIR/scenarios:$datadir/freeciv/scenarios"
+ DEFAULT_DATA_PATH=".:data:$FREECIV_STORAGE_DIR/$DATASUBDIR:$datadir/freeciv"
+ DEFAULT_SAVE_PATH=".:$FREECIV_STORAGE_DIR/saves"
+
DEFAULT_SCENARIO_PATH=".:data/scenarios:$FREECIV_STORAGE_DIR/$DATASUBDIR/scenarios:$FREECIV_STORAGE_DIR/scenarios:$datadir/freeciv/scenarios"
fi
CPPFLAGS="$CPPFLAGS -DFC_CONF_PATH=\"\\\"$FC_CONF_PATH\\\"\""
CPPFLAGS="$CPPFLAGS -DDEFAULT_DATA_PATH=\"\\\"$DEFAULT_DATA_PATH\\\"\""
Modified: trunk/gen_headers/freeciv_config.h.in
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/gen_headers/freeciv_config.h.in?rev=30095&r1=30094&r2=30095&view=diff
==============================================================================
--- trunk/gen_headers/freeciv_config.h.in (original)
+++ trunk/gen_headers/freeciv_config.h.in Thu Oct 15 18:42:55 2015
@@ -75,6 +75,6 @@
#undef FREECIV_HAVE_LIBLZMA
/* Location for freeciv to store its information */
-#undef FREECIV_HOME_DIR
+#undef FREECIV_STORAGE_DIR
#endif /* FC__FREECIV_CONFIG_H */
Modified: trunk/server/gamehand.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/gamehand.c?rev=30095&r1=30094&r2=30095&view=diff
==============================================================================
--- trunk/server/gamehand.c (original)
+++ trunk/server/gamehand.c Thu Oct 15 18:42:55 2015
@@ -1015,10 +1015,10 @@
static const char *get_challenge_fullname(struct connection *pc)
{
static char fullname[MAX_LEN_PATH];
- const char *hdir = freeciv_home_dir();
+ const char *sdir = freeciv_storage_dir();
const char *cname;
- if (hdir == NULL) {
+ if (sdir == NULL) {
return NULL;
}
@@ -1028,7 +1028,7 @@
return NULL;
}
- fc_snprintf(fullname, sizeof(fullname), "%s/%s", hdir, cname);
+ fc_snprintf(fullname, sizeof(fullname), "%s/%s", sdir, cname);
return fullname;
}
Modified: trunk/server/sernet.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/sernet.c?rev=30095&r1=30094&r2=30095&view=diff
==============================================================================
--- trunk/server/sernet.c (original)
+++ trunk/server/sernet.c Thu Oct 15 18:42:55 2015
@@ -504,14 +504,14 @@
#ifdef HAVE_LIBREADLINE
{
if (!no_input && !readline_initialized) {
- char *home_dir = freeciv_home_dir();
-
- if (home_dir) {
- int fcdl = strlen(home_dir) + 1;
+ char *storage_dir = freeciv_storage_dir();
+
+ if (storage_dir != NULL) {
+ int fcdl = strlen(storage_dir) + 1;
char *fc_dir = fc_malloc(fcdl);
if (fc_dir != NULL) {
- fc_snprintf(fc_dir, fcdl, "%s", home_dir);
+ fc_snprintf(fc_dir, fcdl, "%s", storage_dir);
if (make_dir(fc_dir)) {
history_file
Modified: trunk/utility/shared.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/utility/shared.c?rev=30095&r1=30094&r2=30095&view=diff
==============================================================================
--- trunk/utility/shared.c (original)
+++ trunk/utility/shared.c Thu Oct 15 18:42:55 2015
@@ -74,18 +74,18 @@
#ifndef DEFAULT_DATA_PATH
#define DEFAULT_DATA_PATH "." PATH_SEPARATOR \
"data" PATH_SEPARATOR \
- FREECIV_HOME_DIR DATASUBDIR
+ FREECIV_STORAGE_DIR DATASUBDIR
#endif
#ifndef DEFAULT_SAVE_PATH
#define DEFAULT_SAVE_PATH "." PATH_SEPARATOR \
- FREECIV_HOME_DIR "/saves"
+ FREECIV_STORAGE_DIR "/saves"
#endif
#ifndef DEFAULT_SCENARIO_PATH
#define DEFAULT_SCENARIO_PATH \
"." PATH_SEPARATOR \
"data/scenarios" PATH_SEPARATOR \
- FREECIV_HOME_DIR DATASUBDIR "/scenarios" PATH_SEPARATOR \
- FREECIV_HOME_DIR "/scenarios"
+ FREECIV_STORAGE_DIR DATASUBDIR "/scenarios" PATH_SEPARATOR \
+ FREECIV_STORAGE_DIR "/scenarios"
#endif /* DEFAULT_SCENARIO_PATH */
/* environment */
@@ -115,7 +115,7 @@
static char *mc_group = NULL;
static char *home_dir_user = NULL;
-static char *home_dir_freeciv = NULL;
+static char *storage_dir_freeciv = NULL;
static struct astring realfile = ASTRING_INIT;
@@ -812,27 +812,27 @@
Gets value once, and then caches result.
Note the caller should not mess with the returned string.
***************************************************************************/
-char *freeciv_home_dir(void)
-{
- if (home_dir_freeciv == NULL) {
- home_dir_freeciv = fc_malloc(strlen(FREECIV_HOME_DIR) + 1);
-
- strcpy(home_dir_freeciv, FREECIV_HOME_DIR);
-
- home_dir_freeciv = expand_dir(home_dir_freeciv, TRUE);
- }
-
- return home_dir_freeciv;
-}
-
-/***************************************************************************
- Free freeciv home directory information
-***************************************************************************/
-void free_freeciv_home_dir(void)
-{
- if (home_dir_freeciv != NULL) {
- free(home_dir_freeciv);
- home_dir_freeciv = NULL;
+char *freeciv_storage_dir(void)
+{
+ if (storage_dir_freeciv == NULL) {
+ storage_dir_freeciv = fc_malloc(strlen(FREECIV_STORAGE_DIR) + 1);
+
+ strcpy(storage_dir_freeciv, FREECIV_STORAGE_DIR);
+
+ storage_dir_freeciv = expand_dir(storage_dir_freeciv, TRUE);
+ }
+
+ return storage_dir_freeciv;
+}
+
+/***************************************************************************
+ Free freeciv storage directory information
+***************************************************************************/
+void free_freeciv_storage_dir(void)
+{
+ if (storage_dir_freeciv != NULL) {
+ free(storage_dir_freeciv);
+ storage_dir_freeciv = NULL;
}
}
Modified: trunk/utility/shared.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/utility/shared.h?rev=30095&r1=30094&r2=30095&view=diff
==============================================================================
--- trunk/utility/shared.h (original)
+++ trunk/utility/shared.h Thu Oct 15 18:42:55 2015
@@ -150,8 +150,8 @@
char *user_home_dir(void);
void free_user_home_dir(void);
char *user_username(char *buf, size_t bufsz);
-char *freeciv_home_dir(void);
-void free_freeciv_home_dir(void);
+char *freeciv_storage_dir(void);
+void free_freeciv_storage_dir(void);
const struct strvec *get_data_dirs(void);
const struct strvec *get_save_dirs(void);
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
