Attachment #421 for bug #860

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 860
Collapse All | Expand All




}

#define MAX_PATH 0x1ff
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 

    static const char* WIN32_LIBDIR_TO = "c:/kde/lib/trinity";
    char *e;
//TODO........
    if (!*win32_mapDir_TDEDIR) {
      e = getenv("TDEDIR");
      if (e)
        strncpy( win32_mapDir_TDEDIR, e, MAX_PATH );
    }
    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_TDEDIR && *win32_mapDir_TDEDIR) {
			(*dir)[0]=win32_mapDir_TDEDIR[0]; //copy drive letter
		}
    }
}

Return to bug 860

Lines 62-68 Link Here

(-)arts/libltdl/ltdl_win.c (-7 / +7 lines)
62	}	62	}
63		63
64	#define MAX_PATH 0x1ff	64	#define MAX_PATH 0x1ff
65	static char win32_mapDir_KDEDIR[MAX_PATH] = "";	65	static char win32_mapDir_TDEDIR[MAX_PATH] = "";
66		66
67	// paths name mappings	67	// paths name mappings
68	// when mapping is performed, frees old name at dir and allocates new path for dir	68	// when mapping is performed, frees old name at dir and allocates new path for dir
Lines 72-90 Link Here
72	static const char* WIN32_LIBDIR_TO = "c:/kde/lib/trinity";	72	static const char* WIN32_LIBDIR_TO = "c:/kde/lib/trinity";
73	char *e;	73	char *e;
74	//TODO........	74	//TODO........
75	if (!*win32_mapDir_KDEDIR) {	75	if (!*win32_mapDir_TDEDIR) {
76	e = getenv("KDEDIR");	76	e = getenv("TDEDIR");
77	if (e)	77	if (e)
78	strncpy( win32_mapDir_KDEDIR, e, MAX_PATH );	78	strncpy( win32_mapDir_TDEDIR, e, MAX_PATH );
79	}	79	}
80	assert(dir && dir && win32_mapDir_KDEDIR && win32_mapDir_KDEDIR);	80	assert(dir && dir && win32_mapDir_TDEDIR && win32_mapDir_TDEDIR);
81	// /opt/trinity/lib/trinity -> <letter>:/kde/lib/trinity	81	// /opt/trinity/lib/trinity -> <letter>:/kde/lib/trinity
82		82
83	if (strcmp(*dir, WIN32_LIBDIR_FROM)==0) {	83	if (strcmp(*dir, WIN32_LIBDIR_FROM)==0) {
84	free(*dir);	84	free(*dir);
85	*dir=strdup(WIN32_LIBDIR_TO);	85	*dir=strdup(WIN32_LIBDIR_TO);
86	if (win32_mapDir_KDEDIR && *win32_mapDir_KDEDIR) {	86	if (win32_mapDir_TDEDIR && *win32_mapDir_TDEDIR) {
87	(*dir)[0]=win32_mapDir_KDEDIR[0]; //copy drive letter	87	(*dir)[0]=win32_mapDir_TDEDIR[0]; //copy drive letter
88	}	88	}
89	}	89	}
90	}	90	}