MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-06-16 17:08:20 +02:00
Code Issues Releases Wiki Activity

ircd:;fs::base: Fixes for GCC-8 ternary GNU-extension.

Browse source
This commit is contained in:
Jason Volk 2020-04-19 21:56:12 -07:00
parent ca6a1d127f
commit 266530bc5e
1 changed files with 53 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
ircd/fs_path.cc
View file

@ -68,8 +68,11 @@ ircd::fs::base::prefix
{ "name", "ircd.fs.base.prefix" }, { "name", "ircd.fs.base.prefix" },
{ "persist", false }, { "persist", false },
{ "help", "directory prefix" }, { "help", "directory prefix" },
{ "default", getenv("IRCD_PREFIX")?: {
RB_PREFIX "default",
getenv("IRCD_PREFIX")?
getenv("IRCD_PREFIX"):
RB_PREFIX
}, },
}; };
@ -81,8 +84,11 @@ ircd::fs::base::bin
{ "name", "ircd.fs.base.bin" }, { "name", "ircd.fs.base.bin" },
{ "persist", false }, { "persist", false },
{ "help", "binary directory" }, { "help", "binary directory" },
{ "default", getenv("IRCD_BIN_DIR")?: {
RB_BIN_DIR "default",
getenv("IRCD_BIN_DIR")?
getenv("IRCD_BIN_DIR"):
RB_BIN_DIR
}, },
}; };
@ -92,12 +98,15 @@ decltype(ircd::fs::base::etc)
ircd::fs::base::etc ircd::fs::base::etc
{ {
{ "name", "ircd.fs.base.etc" }, { "name", "ircd.fs.base.etc" },
{ "default", RB_CONF_DIR },
{ "persist", false }, { "persist", false },
{ "help", "configuration directory" }, { "help", "configuration directory" },
{ "default", getenv("CONFIGURATION_DIRECTORY")?: {
getenv("IRCD_CONF_DIR")?: "default",
RB_CONF_DIR getenv("CONFIGURATION_DIRECTORY")?
getenv("CONFIGURATION_DIRECTORY"):
getenv("IRCD_CONF_DIR")?
getenv("IRCD_CONF_DIR"):
RB_CONF_DIR
}, },
}; };
@ -109,8 +118,11 @@ ircd::fs::base::lib
{ "name", "ircd.fs.base.lib" }, { "name", "ircd.fs.base.lib" },
{ "persist", false }, { "persist", false },
{ "help", "library directory" }, { "help", "library directory" },
{ "default", getenv("IRCD_LIB_DIR")?: {
RB_LIB_DIR "default",
getenv("IRCD_LIB_DIR")?
getenv("IRCD_LIB_DIR"):
RB_LIB_DIR
}, },
}; };
@ -122,8 +134,11 @@ ircd::fs::base::modules
{ "name", "ircd.fs.base.modules" }, { "name", "ircd.fs.base.modules" },
{ "persist", false }, { "persist", false },
{ "help", "modules directory" }, { "help", "modules directory" },
{ "default", getenv("IRCD_MODULE_DIR")?: {
RB_MODULE_DIR "default",
getenv("IRCD_MODULE_DIR")?
getenv("IRCD_MODULE_DIR"):
RB_MODULE_DIR
}, },
}; };
@ -135,8 +150,11 @@ ircd::fs::base::share
{ "name", "ircd.fs.base.share" }, { "name", "ircd.fs.base.share" },
{ "persist", false }, { "persist", false },
{ "help", "read-only data directory" }, { "help", "read-only data directory" },
{ "default", getenv("IRCD_DATA_DIR")?: {
RB_DATA_DIR "default",
getenv("IRCD_DATA_DIR")?
getenv("IRCD_DATA_DIR"):
RB_DATA_DIR
}, },
}; };
@ -148,9 +166,13 @@ ircd::fs::base::run
{ "name", "ircd.fs.base.run" }, { "name", "ircd.fs.base.run" },
{ "persist", false }, { "persist", false },
{ "help", "runtime directory" }, { "help", "runtime directory" },
{ "default", getenv("RUNTIME_DIRECTORY")?: {
getenv("IRCD_RUN_DIR")?: "default",
RB_RUN_DIR getenv("RUNTIME_DIRECTORY")?
getenv("RUNTIME_DIRECTORY"):
getenv("IRCD_RUN_DIR")?
getenv("IRCD_RUN_DIR"):
RB_RUN_DIR
}, },
}; };
@ -162,9 +184,13 @@ ircd::fs::base::log
{ "name", "ircd.fs.base.log" }, { "name", "ircd.fs.base.log" },
{ "persist", false }, { "persist", false },
{ "help", "logging directory" }, { "help", "logging directory" },
{ "default", getenv("LOGS_DIRECTORY")?: {
getenv("IRCD_LOG_DIR")?: "default",
RB_LOG_DIR getenv("LOGS_DIRECTORY")?
getenv("LOGS_DIRECTORY"):
getenv("IRCD_LOG_DIR")?
getenv("IRCD_LOG_DIR"):
RB_LOG_DIR
}, },
}; };
@ -176,9 +202,13 @@ ircd::fs::base::db
{ "name", "ircd.fs.base.db" }, { "name", "ircd.fs.base.db" },
{ "persist", false }, { "persist", false },
{ "help", "database directory" }, { "help", "database directory" },
{ "default", getenv("STATE_DIRECTORY")?: {
getenv("IRCD_DB_DIR")?: "default",
RB_DB_DIR getenv("STATE_DIRECTORY")?
getenv("STATE_DIRECTORY"):
getenv("IRCD_DB_DIR")?
getenv("IRCD_DB_DIR"):
RB_DB_DIR
}, },
}; };