Merged in changes from CVS HEAD
Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-53 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-54 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-55 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-56 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-70
This commit is contained in:
commit
465fc071a1
19 changed files with 276 additions and 147 deletions
|
@ -473,12 +473,14 @@ main (argc, argv)
|
|||
that init_editfns uses to set the global Vuser_full_name. */
|
||||
|
||||
char *user_name = (char *) getenv ("LOGNAME");
|
||||
|
||||
if (!user_name)
|
||||
user_name = (char *) getenv ("USER");
|
||||
|
||||
if (user_name)
|
||||
{
|
||||
struct passwd *pw = getpwnam (user_name);
|
||||
|
||||
if (pw && (pw->pw_uid != geteuid ()))
|
||||
{
|
||||
/* We're running under su, apparently. */
|
||||
|
@ -497,6 +499,8 @@ main (argc, argv)
|
|||
sock_status = socket_status (server.sun_path);
|
||||
saved_errno = errno;
|
||||
}
|
||||
else
|
||||
errno = saved_errno;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue