From a8cddde41e8682fb32832826c8ec5dbdf3c7871f Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Sat, 6 Feb 2016 19:52:33 +1000 Subject: Put the ~/.SledHamr/ creation code into all three main binaries. sigh --- src/LuaSL/LuaSL_main.c | 6 ++++++ src/extantz/extantz.c | 15 +-------------- src/libraries/LumbrJack.c | 12 ++++++++++++ src/libraries/LumbrJack.h | 2 +- src/love/love.c | 7 +++++++ 5 files changed, 27 insertions(+), 15 deletions(-) (limited to 'src') diff --git a/src/LuaSL/LuaSL_main.c b/src/LuaSL/LuaSL_main.c index 0e70fe4..c28fe4a 100644 --- a/src/LuaSL/LuaSL_main.c +++ b/src/LuaSL/LuaSL_main.c @@ -328,7 +328,13 @@ int main(int argc, char **argv) if (eina_init()) { + char temp[PATH_MAX]; + logDom = HamrTime(argv[0], main, logDom); + // Create our home directories, if not already created. + // This should be in HamrTime, bit I had a HardTime getting LumbrJack to link to ecore-file. + sprintf(temp, "%s/.SledjHamr", eina_environment_home_get()); + ecore_file_mksubdirs(temp, dirs); ourGlobals.names = eina_hash_string_superfast_new(NULL); if (ecore_init()) { diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c index 7a21aee..ed78b24 100644 --- a/src/extantz/extantz.c +++ b/src/extantz/extantz.c @@ -15,19 +15,6 @@ globals ourGlobals; //static char *myKey = "12345678-1234-4321-abcd-0123456789ab"; //static char *myName = "onefang rejected"; -static const char *dirs[] = -{ - ".cache", - ".cache/compiled", - ".cache/converted", - ".cache/sha1", - ".cache/types", - ".cache/unpacked", - ".download", - "inventory", - NULL -}; - #if USE_LOVE static Eina_Bool _add(void *data, int type, Ecore_Con_Event_Server_Add *ev) @@ -602,8 +589,8 @@ EAPI_MAIN int elm_main(int argc, char **argv) // Eina_Bool gotWebKit = elm_need_web(); // Initialise ewebkit if it exists, or return EINA_FALSE if it don't. logDom = HamrTime(argv[0], elm_main, logDom); - // Create our home directories, if not already created. + // This should be in HamrTime, bit I had a HardTime getting LumbrJack to link to ecore-file. sprintf(temp, "%s/.SledjHamr", eina_environment_home_get()); ecore_file_mksubdirs(temp, dirs); diff --git a/src/libraries/LumbrJack.c b/src/libraries/LumbrJack.c index b92dc97..ee45f80 100644 --- a/src/libraries/LumbrJack.c +++ b/src/libraries/LumbrJack.c @@ -6,6 +6,18 @@ #include #include "LumbrJack.h" +const char *dirs[] = +{ + ".cache", + ".cache/compiled", + ".cache/converted", + ".cache/sha1", + ".cache/types", + ".cache/unpacked", + ".download", + "inventory", + NULL +}; static char dateTime[DATE_TIME_LEN]; static Eina_Prefix *prefix = NULL; diff --git a/src/libraries/LumbrJack.h b/src/libraries/LumbrJack.h index 74249ed..ff948fc 100644 --- a/src/libraries/LumbrJack.h +++ b/src/libraries/LumbrJack.h @@ -39,7 +39,7 @@ typedef enum } boolean; #endif - +extern const char *dirs[]; extern int logDom; int HamrTime(char *argv0, void *main, int logDom); diff --git a/src/love/love.c b/src/love/love.c index b686475..698726f 100644 --- a/src/love/love.c +++ b/src/love/love.c @@ -541,7 +541,14 @@ int main(int argc, char **argv) if (eina_init()) { + char temp[PATH_MAX]; + logDom = HamrTime(argv[0], main, logDom); + // Create our home directories, if not already created. + // This should be in HamrTime, bit I had a HardTime getting LumbrJack to link to ecore-file. + sprintf(temp, "%s/.SledjHamr", eina_environment_home_get()); + ecore_file_mksubdirs(temp, dirs); + ourGlobals.scripts = eina_hash_string_superfast_new(NULL); if (ecore_con_init()) -- cgit v1.1