Get top level build script n.sh working again, improve path auto detect stuff

[43bsd.git] / lib / libc / gen / getpwnamuid.c

diff --git a/lib/libc/gen/getpwnamuid.c b/lib/libc/gen/getpwnamuid.c
index 6d2ab2f..43ef93a 100644 (file)
--- a/lib/libc/gen/getpwnamuid.c
+++ b/lib/libc/gen/getpwnamuid.c
@@ -48,32 +48,18 @@ static struct passwd *fetchpw(key) datum key; {
 #else
 #define        EXPAND(e)       passwd.pw_/**/e = tp; while (*tp++ = *cp++);
 #endif
-#ifdef X_
-/* without this adjustment it tries to access x_passwd.x_pw_x_name etc */
-       EXPAND(nox_name);
-       EXPAND(nox_passwd);
-#else
        EXPAND(name);
        EXPAND(passwd);
-#endif
        bcopy(cp, (char *)&passwd.pw_uid, sizeof (int));
        cp += sizeof (int);
        bcopy(cp, (char *)&passwd.pw_gid, sizeof (int));
        cp += sizeof (int);
        bcopy(cp, (char *)&passwd.pw_quota, sizeof (int));
        cp += sizeof (int);
-#ifdef X_
-/* without this adjustment it tries to access x_passwd.x_pw_x_name etc */
-       EXPAND(nox_comment);
-       EXPAND(nox_gecos);
-       EXPAND(nox_dir);
-       EXPAND(nox_shell);
-#else
        EXPAND(comment);
        EXPAND(gecos);
        EXPAND(dir);
        EXPAND(shell);
-#endif
         return (&passwd);
 }