* layouttranslations.review - remove dupes

[lyx.git] / src / support / userinfo.cpp

diff --git a/src/support/userinfo.cpp b/src/support/userinfo.cpp
index df8a3ac83ff1f3defc4b6aa0e6c04939a8d83871..af33d1d66a11f40464f4a326211e642def27eacb 100644 (file)
--- a/src/support/userinfo.cpp
+++ b/src/support/userinfo.cpp
@@ -14,7 +14,7 @@
 #include "support/environment.h"
 #include "support/docstring.h"
 
-#include "support/assert.h"
+#include "support/lassert.h"
 
 #if defined (_WIN32)
 # include "support/gettext.h"
@@ -46,9 +46,11 @@ docstring const user_name()
        return from_local8bit(name);
 #else
        struct passwd * pw = getpwuid(geteuid());
-       LASSERT(pw, /**/);
+       LASSERT(pw, return docstring());
 
-       string name = pw->pw_gecos;
+       const string gecos = pw->pw_gecos;
+       const size_t pos = gecos.find(",");
+       string name = gecos.substr(0, pos);
        if (name.empty())
                name = pw->pw_name;
        return from_local8bit(name);