shithub: choc

Info  •  Files  •  Log  •  Branches

Use SDL's getenv/putenv implementation, and populate at startup.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1577

--- a/pcsound/pcsound.c

+++ b/pcsound/pcsound.c

@@ -27,6 +27,7 @@

 #include <stdlib.h>

 #include <string.h>

+#include "SDL_getenv.h"

 #include "config.h"

 #include "pcsound.h"

 #include "pcsound_internal.h"

--- a/setup/mainmenu.c

+++ b/setup/mainmenu.c

@@ -22,6 +22,10 @@

 #include <stdlib.h>

 #include <string.h>

+#ifdef _WIN32_WCE

+#include "libc_wince.h"

+#endif

+

 #include "config.h"

 #include "textscreen.h"

@@ -213,6 +217,15 @@

 {

     myargc = argc;

     myargv = argv;

+

+#ifdef _WIN32_WCE

+

+    // Windows CE has no environment, but SDL provides an implementation.

+    // Populate the environment with the values we normally find.

+

+    PopulateEnvironment();

+

+#endif

     InitConfig();

     RunGUI();

--- a/src/i_main.c

+++ b/src/i_main.c

@@ -133,6 +133,15 @@

     myargc = argc;

     myargv = argv;

+#ifdef _WIN32_WCE

+

+    // Windows CE has no environment, but SDL provides an implementation.

+    // Populate the environment with the values we normally find.

+

+    PopulateEnvironment();

+

+#endif

+

     // Only schedule on a single core, if we have multiple

     // cores.  This is to work around a bug in SDL_mixer.

--- a/wince/env.c

+++ b/wince/env.c

@@ -14,22 +14,34 @@

 #include "env.h"

-static int buffers_loaded = 0;

-static char username_buf[UNLEN + 1];

-static char temp_buf[MAX_PATH + 1];

-static char home_buf[MAX_PATH + 1];

-

 static void WCharToChar(wchar_t *src, char *dest, int buf_len)

 {

     unsigned int len;

-    len = wcslen(src);

+    len = wcslen(src) + 1;

     WideCharToMultiByte(CP_OEMCP, 0, src, len, dest, buf_len, NULL, NULL);

 }

-static void LoadBuffers(void)

+static void SetEnvironment(char *env_string, wchar_t *wvalue)

 {

+    char value[MAX_PATH + 10];

+    int env_len;

+

+    // Construct the string for putenv: NAME=value

+

+    env_len = strlen(env_string);

+    strcpy(value, env_string);

+

+    WCharToChar(wvalue, value + env_len, sizeof(value) - env_len);

+

+    // Set the environment variable:

+

+    putenv(value);

+}

+

+void PopulateEnvironment(void)

+{

     wchar_t temp[MAX_PATH];

     DWORD buf_len;

@@ -37,42 +49,26 @@

     buf_len = UNLEN;

     GetUserNameExW(NameDisplay, temp, &buf_len);

-    WCharToChar(temp, temp_buf, MAX_PATH);

+    SetEnvironment("USER=", temp);

+    SetEnvironment("USERNAME=", temp);

     // Temp dir:

     GetTempPathW(MAX_PATH, temp);

-    WCharToChar(temp, temp_buf, MAX_PATH);

+    SetEnvironment("TEMP=", temp);

     // Use My Documents dir as home:

     SHGetSpecialFolderPath(NULL, temp, CSIDL_PERSONAL, 0);

-    WCharToChar(temp, home_buf, MAX_PATH);

-}

+    SetEnvironment("HOME=", temp);

-char *getenv(const char *name)

-{

-    if (!buffers_loaded)

     {

-        LoadBuffers();

-        buffers_loaded = 1;

-    }

+        char *home = getenv("HOME");

-    if (!strcmp(name, "USER") || !strcmp(name, "USERNAME"))

-    {

-        return username_buf;

-    }

-    else if (!strcmp(name, "TEMP"))

-    {

-        return temp_buf;

-    }

-    else if (!strcmp(name, "HOME"))

-    {

-        return home_buf;

-    }

-    else

-    {

-        return NULL;

+        MultiByteToWideChar(CP_ACP, 0,

+                            home, strlen(home) + 1,

+                            temp, sizeof(temp));

+        MessageBoxW(NULL, temp, L"Home", MB_OK);

     }

 }

--- a/wince/env.h

+++ b/wince/env.h

@@ -7,7 +7,11 @@

 #ifndef WINCE_ENV_H

 #define WINCE_ENV_H

-extern char *getenv(const char *name);

+// SDL provides an implementation of getenv/putenv:

+

+#include "SDL_getenv.h"

+

+extern void PopulateEnvironment(void);

 #endif /* #ifndef WINCE_ENV_H */