Changeset 437

Timestamp:

Oct 15, 2014, 7:25:59 PM (11 years ago)

Author:

dmik

Message:

icedtea-web: Override getpwuid on OS/2.

This is because kLIBC doesn't provide a working version (yet). This override fixes detection of the user home directory.

File:

• trunk/icedtea-web/plugin/icedteanp/IcedTeaParseProperties.cc (modified) (1 diff)

trunk/icedtea-web/plugin/icedteanp/IcedTeaParseProperties.cc

@@ -58 +58 @@
  tested.
 */
+
+#ifdef __EMX__
+// getpwuid isn't fully implemented yet, let the env vars override it
+struct passwd *my_getpwuid(uid_t uid)
+{
+    static struct passwd pw_buf;
+
+    struct passwd *pw = getpwuid(uid);
+    if (pw)
+        memcpy(&pw_buf, pw, sizeof(struct passwd));
+    else
+        return 0;
+
+    char *env_var;
+    env_var = getenv("HOME");
+    if (env_var && env_var[0]) {
+        pw_buf.pw_dir = env_var;
+        while (*env_var) {
+            if (*env_var == '\\')
+                *env_var = '/';
+            ++env_var;
+        }
+    }
+
+    return &pw_buf;
+}
+#undef getpwuid
+#define getpwuid my_getpwuid
+#endif
 
 using namespace std;