Additional k => tde renaming and fixes

pull/1/head
Slávek Banko 11 years ago
parent 3d846e4e86
commit 9af400f988

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

Loading…
Cancel
Save