*
* \author John Levon
*
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
*/
#include <config.h>
-#include "userinfo.h"
-#include "LAssert.h"
-#include "filetools.h"
+#include "support/userinfo.h"
+#include "support/environment.h"
+
+#include <boost/assert.hpp>
#include <pwd.h>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
#include <sys/types.h>
-
+
+using std::string;
+
namespace lyx {
+namespace support {
string const user_name()
{
struct passwd * pw(getpwuid(geteuid()));
- lyx::Assert(pw);
-
+ BOOST_ASSERT(pw);
+
string name = pw->pw_gecos;
if (name.empty())
name = pw->pw_name;
return name;
}
-
+
string const user_email()
{
- string email = GetEnv("EMAIL_ADDRESS");
+ string email = getEnv("EMAIL_ADDRESS");
if (email.empty())
- email = GetEnv("EMAIL");
+ email = getEnv("EMAIL");
return email;
}
-
+} // namespace support
} // namespace lyx