diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-11-15 15:06:51 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-11-15 15:06:51 +0000 |
| commit | 9826b83826190e514ed115e15691ca015780f9bc (patch) | |
| tree | e6ede7a76c2edc14ff3025fbc0fb65757327cde0 /xkb | |
| parent | cecb668149e1956fb29bc89855182349122e2f4e (diff) | |
Bufzilla #1802, http://freedesktop.org/bugzilla/show_bug.cgi?id=1802 Added
mingw (Win32) port
Diffstat (limited to 'xkb')
| -rw-r--r-- | xkb/ddxLoad.c | 31 |
1 files changed, 27 insertions, 4 deletions
diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c index 636882955..f346afd78 100644 --- a/xkb/ddxLoad.c +++ b/xkb/ddxLoad.c @@ -71,6 +71,19 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define POST_ERROR_MSG1 "\"Errors from xkbcomp are not fatal to the X server\"" #define POST_ERROR_MSG2 "\"End of messages from xkbcomp\"" +#ifdef WIN32 +static const char* +Win32TempDir() +{ + if (getenv("TEMP") != NULL) + return getenv("TEMP"); + else if (getenv("TMP") != NULL) + return getenv("TEMP"); + else + return "/tmp"; +} +#endif + static void OutputDirectory( char* outdir) @@ -88,7 +101,12 @@ OutputDirectory( if (outdir[strlen(outdir) - 1] != '/') /* Hi IBM, Digital */ (void) strcat (outdir, "/"); #else +#ifndef WIN32 (void) strcpy (outdir, "/tmp/"); +#else + strcpy(outdir, Win32TempDir()); + strcat(outdir, "\\"); +#endif #endif } } @@ -196,7 +214,7 @@ char cmd[PATH_MAX],file[PATH_MAX],xkm_output_dir[PATH_MAX],*map,*outFile; _XkbFree(outFile); return False; } - + Bool XkbDDXCompileKeymapByNames( XkbDescPtr xkb, XkbComponentNamesPtr names, @@ -208,7 +226,7 @@ XkbDDXCompileKeymapByNames( XkbDescPtr xkb, FILE * out; char buf[PATH_MAX],keymap[PATH_MAX],xkm_output_dir[PATH_MAX]; #ifdef WIN32 -char tmpname[32]; +char tmpname[MAX_PATH]; #endif #ifdef __UNIXOS2__ char *tmpbase; @@ -228,7 +246,8 @@ int i; XkbEnsureSafeMapName(keymap); OutputDirectory(xkm_output_dir); #ifdef WIN32 - strcpy(tmpname, "\\temp\\xkb_XXXXXX"); + strcpy(tmpname, Win32TempDir()); + strcat(tmpname, "\\xkb_XXXXXX"); (void) mktemp(tmpname); #endif #ifdef __UNIXOS2__ @@ -387,7 +406,11 @@ FILE * file; buf[0]= '\0'; if (mapName!=NULL) { OutputDirectory(xkm_output_dir); - if ((XkbBaseDirectory!=NULL)&&(xkm_output_dir[0]!='/')) { + if ((XkbBaseDirectory!=NULL)&&(xkm_output_dir[0]!='/') +#ifdef WIN32 + &&(!isalpha(xkm_output_dir[0]) || xkm_output_dir[1]!=':') +#endif + ) { if (strlen(XkbBaseDirectory)+strlen(xkm_output_dir) +strlen(mapName)+6 <= PATH_MAX) { |