Mirrors_UI_SDK/MiniGUI
1
0
Fork 0
mirror of https://github.com/VincentWei/MiniGUI.git synced 2026-02-06 18:31:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

move code for initializing cfg_res_path to __sysres_get_system_res_path()

Browse Source
This commit is contained in:
Vincent Wei
2020-06-04 09:15:15 +08:00
parent be5f46f92d
commit 78a0a8addf
1 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/sysres/resmgr.c
View File

@@ -397,29 +397,10 @@ static void free_val_bitmap (void *val)
map_t* __mg_sys_bmp_map;
BOOL mg_InitResManager(int hash_table_size)
{
char szpath[MAX_PATH+1];
char* p = NULL;
pwd_res_path = strdup("./");
//initialize paths
#if !defined(__NOUNIX__) || defined(WIN32)
if ((p = getenv ("MG_RES_PATH"))) {
int len = strlen(p);
if (p[len-1] == '/')
sprintf(szpath, "%s", p);
else
sprintf(szpath, "%s/", p);
cfg_res_path = strdup(szpath);
}
else
#endif
{
//step 2: get from MiniGUI.cfg
if (GetMgEtcValue("resinfo", "respath",
szpath, sizeof(szpath)-1) == ETC_OK) {
cfg_res_path = strdup(szpath);
}
}
// initialize paths
if (pwd_res_path == NULL)
pwd_res_path = strdup ("./");
__sysres_get_system_res_path();
//initialize hash table
init_hash_table (&hash_table, hash_table_size);
@@ -475,6 +456,31 @@ void TerminateResManager()
const char* __sysres_get_system_res_path()
{
char szpath [MAX_PATH+1];
char* p = NULL;
if (cfg_res_path)
return cfg_res_path;
#if !defined(__NOUNIX__) || defined(WIN32)
if ((p = getenv ("MG_RES_PATH"))) {
int len = strlen (p);
if (p[len-1] == '/')
sprintf (szpath, "%s", p);
else
sprintf (szpath, "%s/", p);
cfg_res_path = strdup (szpath);
}
else
#endif
{
// get from MiniGUI.cfg
if (GetMgEtcValue ("resinfo", "respath",
szpath, sizeof (szpath)-1) == ETC_OK) {
cfg_res_path = strdup (szpath);
}
}
return cfg_res_path;
}
@@ -496,7 +502,7 @@ int SetResPath(const char* path)
//test path is valid directory
#if !defined(__NOUNIX__) && !defined(WIN32)
struct stat buf;
if(stat(path, &buf) != 0 || !S_ISDIR(buf.st_mode)) {
if (stat(path, &buf) != 0 || !S_ISDIR(buf.st_mode)) {
# ifdef _DEBUG
ERR_RETV (RES_RET_INVALID_PARAM, RES_RET_INVALID_PARAM, "param path (%s) is not a valid directory", path);
# else
@@ -505,7 +511,7 @@ int SetResPath(const char* path)
}
#endif
if(usr_res_path != NULL)
if (usr_res_path != NULL)
DELETE(usr_res_path);
usr_res_path = STR_DUP(path);
@@ -632,8 +638,7 @@ static char* get_res_file(const char* res_name, char* filename)
}
}
for(i=0; res_paths[i]; i++)
{
for (i=0; res_paths[i]; i++) {
#ifndef __NOUNIX__
struct stat buf;
sprintf(filename,"%s/%s", res_paths[i], res_name);