Browse Source

Additional k => tde renaming and fixes

pull/1/head
Slávek Banko 8 years ago
parent
commit
9af400f988
  1. 14
      ltdl_win.c

14
ltdl_win.c

@ -62,7 +62,7 @@ void win32_mapSo2Dll( char *path )
}
#define MAX_PATH 0x1ff
static char win32_mapDir_KDEDIR[MAX_PATH] = "";
static char win32_mapDir_TDEDIR[MAX_PATH] = "";
// paths name mappings
// when mapping is performed, frees old name at *dir and allocates new path for *dir
@ -72,19 +72,19 @@ void win32_mapDir( char **dir )
static const char* WIN32_LIBDIR_TO = "c:/kde/lib/trinity";
char *e;
//TODO........
if (!*win32_mapDir_KDEDIR) {
e = getenv("KDEDIR");
if (!*win32_mapDir_TDEDIR) {
e = getenv("TDEDIR");
if (e)
strncpy( win32_mapDir_KDEDIR, e, MAX_PATH );
strncpy( win32_mapDir_TDEDIR, e, MAX_PATH );
}
assert(dir && *dir && win32_mapDir_KDEDIR && *win32_mapDir_KDEDIR);
assert(dir && *dir && win32_mapDir_TDEDIR && *win32_mapDir_TDEDIR);
// /opt/trinity/lib/trinity -> <letter>:/kde/lib/trinity
if (strcmp(*dir, WIN32_LIBDIR_FROM)==0) {
free(*dir);
*dir=strdup(WIN32_LIBDIR_TO);
if (win32_mapDir_KDEDIR && *win32_mapDir_KDEDIR) {
(*dir)[0]=win32_mapDir_KDEDIR[0]; //copy drive letter
if (win32_mapDir_TDEDIR && *win32_mapDir_TDEDIR) {
(*dir)[0]=win32_mapDir_TDEDIR[0]; //copy drive letter
}
}
}

Loading…
Cancel
Save