From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 27 Sep 2019 11:38:56 +0000 (+0200)
Subject: patch 8.1.2084: Amiga: cannot get the user name
X-Git-Tag: v8.1.2084
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5e8e967f25085de78d7826fe5a6bebbace1c6823;p=vim

patch 8.1.2084: Amiga: cannot get the user name

Problem:    Amiga: cannot get the user name.
Solution:   Use getpwuid() if available. (Ola Söder, closes #4985)
---

diff --git a/src/os_amiga.c b/src/os_amiga.c
index dfc805374..aff24c567 100644
--- a/src/os_amiga.c
+++ b/src/os_amiga.c
@@ -664,7 +664,15 @@ mch_can_restore_icon(void)
     int
 mch_get_user_name(char_u *s, int len)
 {
-    /* TODO: Implement this. */
+#if defined(__amigaos4__) || defined(__AROS__) || defined(__MORPHOS__)
+    struct passwd   *pwd = getpwuid(getuid());
+
+    if (pwd != NULL && pwd->pw_name && len > 0)
+    {
+        vim_strncpy(s, (char_u *)pwd->pw_name, len - 1);
+        return OK;
+    }
+#endif
     *s = NUL;
     return FAIL;
 }
diff --git a/src/os_amiga.h b/src/os_amiga.h
index 6f951fb96..71841ac6a 100644
--- a/src/os_amiga.h
+++ b/src/os_amiga.h
@@ -90,6 +90,7 @@ typedef long off_t;
 # include <unistd.h>
 # include <limits.h>
 # include <errno.h>
+# include <pwd.h>
 # include <dirent.h>
 #endif
 
diff --git a/src/version.c b/src/version.c
index 98ddcca84..6c17851ec 100644
--- a/src/version.c
+++ b/src/version.c
@@ -757,6 +757,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2084,
 /**/
     2083,
 /**/