Changeset 467

Timestamp:

08/08/07 06:52:41 (1 year ago)

Author:

takkaria

Message:

Move the user_name function to main.c, where it belongs.

Files:

• trunk/src/externs.h (modified) (1 diff)
• trunk/src/main.c (modified) (1 diff)
• trunk/src/z-file.c (modified) (1 diff)

trunk/src/externs.h

@@ -726 +726 @@
- */
-
-#ifdef SET_UID
-extern void user_name(char *buf, size_t len, int id);
-#endif /* SET_UID */
-
-
-#ifdef RISCOS
-/* main-ros.c */

trunk/src/main.c

@@ -250 +250 @@
-        }
-}
+
+
+
+
+#ifdef SET_UID
+
+/*
+ * Find a default user name from the system.
+ */
+static void user_name(char *buf, size_t len, int id)
+{
+        struct passwd *pw = getpwuid(id);
+
+        /* Default to PLAYER */
+        if (!pw)
+        {
+                my_strcpy(buf, "PLAYER", len);
+                return;
+        }
+
+        /* Capitalise and copy */
+        strnfmt(buf, len, "%^s", pw->pw_name);
+}
+
+#endif /* SET_UID */
-
-

trunk/src/z-file.c

@@ -333 +333 @@
-
-
-#ifdef SET_UID
-
-/*
- * Find a default user name from the system.
- */
-void user_name(char *buf, size_t len, int id)
-{
-        struct passwd *pw;
-
-        /* Look up the user name */
-        if ((pw = getpwuid(id)))
-        {
-                /* Get the first 15 characters of the user name */
-                my_strcpy(buf, pw->pw_name, len);
-
-                /* Capitalize the user name */
-                buf[0] = toupper((unsigned char)buf[0]);
-
-                return;
-        }
-
-        /* Oops.  Hack -- default to "PLAYER" */
-        my_strcpy(buf, "PLAYER", len);
-}
-
-#endif /* SET_UID */
-
-
-#if defined(SET_UID) || defined(USE_PRIVATE_PATHS)
-