--- rxvt-unicode/src/logging.C 2004/03/17 03:47:12 1.8 +++ rxvt-unicode/src/logging.C 2006/01/17 10:19:13 1.28 @@ -1,5 +1,5 @@ /*--------------------------------*-C-*---------------------------------* - * File: logging.c + * File: logging.C *----------------------------------------------------------------------* * * All portions of code are copyright by their respective author/s. @@ -14,6 +14,7 @@ * - extensive modifications * Copyright (c) 1999 D J Hawkey Jr * - lastlog support + * Copyright (c) 2004 Marc Lehmann * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,19 +30,19 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. *----------------------------------------------------------------------*/ -/*----------------------------------------------------------------------* - * Public: - * extern void cleanutent (void); - * extern void makeutent (const char * pty, const char * hostname); - * - * Private: - * rxvt_update_wtmp (); - *----------------------------------------------------------------------*/ -#include "../config.h" /* NECESSARY */ -#include "rxvt.h" /* NECESSARY */ -#include "logging.h" -#ifdef UTMP_SUPPORT +#include "../config.h" +#include "rxvt.h" +#include "ptytty.h" + +#if UTMP_SUPPORT + +#if HAVE_STRUCT_UTMP +static int rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu); +static void rxvt_update_wtmp (const char *fname, const struct utmp *putmp); +#endif + +static void rxvt_update_lastlog (const char *fname, const char *pty, const char *host); /* * BSD style utmp entry @@ -56,98 +57,103 @@ * make and write utmp and wtmp entries */ void -rxvt_term::makeutent (const char *pty, const char *hostname) +rxvt_ptytty::login (int cmd_pid, bool login_shell, const char *hostname) { + const char *pty = name; + + if (!pty || !*pty) + return; + + this->cmd_pid = cmd_pid; + this->login_shell = login_shell; + #ifdef HAVE_STRUCT_UTMP - struct utmp *ut = & (this->ut); + struct utmp *ut = &this->ut; #endif #ifdef HAVE_STRUCT_UTMPX - struct utmpx *utx = & (this->utx); -#endif -#ifdef HAVE_UTMP_PID - int i; + struct utmpx *utx = &this->utx; #endif - char ut_id[5]; - struct passwd *pwent = getpwuid (getuid ()); + int i; + struct passwd *pwent = getpwuid (getuid ()); - if (!STRNCMP (pty, "/dev/", 5)) + if (!strncmp (pty, "/dev/", 5)) pty += 5; /* skip /dev/ prefix */ - if (!STRNCMP (pty, "pty", 3) || !STRNCMP (pty, "tty", 3)) - { - STRNCPY (ut_id, (pty + 3), sizeof (ut_id)); - } -#ifdef HAVE_UTMP_PID +#if defined(HAVE_UTMP_PID) || defined(HAVE_STRUCT_UTMPX) + if (!strncmp (pty, "pty", 3) || !strncmp (pty, "tty", 3)) + strncpy (ut_id, pty + 3, sizeof (ut_id)); else if (sscanf (pty, "pts/%d", &i) == 1) sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */ -#endif - else if (STRNCMP (pty, "pty", 3) && STRNCMP (pty, "tty", 3)) + else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3)) { rxvt_warn ("can't parse tty name \"%s\", not adding utmp entry.\n", pty); return; } +#endif #ifdef HAVE_STRUCT_UTMP - MEMSET (ut, 0, sizeof (struct utmp)); + memset (ut, 0, sizeof (struct utmp)); # ifdef HAVE_UTMP_PID setutent (); - STRNCPY (ut->ut_id, ut_id, sizeof (ut->ut_id)); + strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id)); ut->ut_type = DEAD_PROCESS; getutid (ut); /* position to entry in utmp file */ - STRNCPY (ut_id, ut_id, sizeof (ut_id)); + strncpy (this->ut_id, ut_id, sizeof (this->ut_id)); # endif #endif #ifdef HAVE_STRUCT_UTMPX - MEMSET (utx, 0, sizeof (struct utmpx)); + memset (utx, 0, sizeof (struct utmpx)); setutxent (); - STRNCPY (utx->ut_id, ut_id, sizeof (utx->ut_id)); + strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id)); utx->ut_type = DEAD_PROCESS; getutxid (utx); /* position to entry in utmp file */ - STRNCPY (ut_id, ut_id, sizeof (ut_id)); + strncpy (this->ut_id, ut_id, sizeof (this->ut_id)); #endif #ifdef HAVE_STRUCT_UTMP - STRNCPY (ut->ut_line, pty, sizeof (ut->ut_line)); + strncpy (ut->ut_line, pty, sizeof (ut->ut_line)); ut->ut_time = time (NULL); # ifdef HAVE_UTMP_PID - STRNCPY (ut->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?", + strncpy (ut->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?", sizeof (ut->ut_user)); - STRNCPY (ut->ut_id, ut_id, sizeof (ut->ut_id)); + strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id)); ut->ut_time = time (NULL); ut->ut_pid = cmd_pid; # ifdef HAVE_UTMP_HOST - STRNCPY (ut->ut_host, hostname, sizeof (ut->ut_host)); + strncpy (ut->ut_host, hostname, sizeof (ut->ut_host)); # endif ut->ut_type = USER_PROCESS; pututline (ut); endutent (); /* close the file */ utmp_pos = 0; # else - STRNCPY (ut->ut_name, (pwent && pwent->pw_name) ? pwent->pw_name : "?", + strncpy (ut->ut_name, (pwent && pwent->pw_name) ? pwent->pw_name : "?", sizeof (ut->ut_name)); # ifdef HAVE_UTMP_HOST - STRNCPY (ut->ut_host, hostname, sizeof (ut->ut_host)); + strncpy (ut->ut_host, hostname, sizeof (ut->ut_host)); # endif # endif #endif #ifdef HAVE_STRUCT_UTMPX - STRNCPY (utx->ut_line, pty, sizeof (utx->ut_line)); - STRNCPY (utx->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?", + strncpy (utx->ut_line, pty, sizeof (utx->ut_line)); + strncpy (utx->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?", sizeof (utx->ut_user)); - STRNCPY (utx->ut_id, ut_id, sizeof (utx->ut_id)); + strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id)); +# if HAVE_UTMPX_SESSION utx->ut_session = getsid (0); +# endif utx->ut_tv.tv_sec = time (NULL); utx->ut_tv.tv_usec = 0; utx->ut_pid = cmd_pid; # ifdef HAVE_UTMPX_HOST - STRNCPY (utx->ut_host, hostname, sizeof (utx->ut_host)); + strncpy (utx->ut_host, hostname, sizeof (utx->ut_host)); # if 0 { char *colon; - if ((colon = STRRCHR (ut->ut_host, ':')) != NULL) + if ((colon = strrchr (ut->ut_host, ':')) != NULL) *colon = '\0'; } # endif @@ -161,7 +167,6 @@ #if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID) { - int i; # ifdef HAVE_TTYSLOT i = ttyslot (); if (rxvt_write_bsd_utmp (i, ut)) @@ -171,14 +176,14 @@ if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL) { - char buf[256], name[256]; + char buf[256], name[256]; buf[sizeof (buf) - 1] = '\0'; for (i = 1; (fgets (buf, sizeof (buf) - 1, fd0) != NULL);) { if (*buf == '#' || sscanf (buf, "%s", name) != 1) continue; - if (!STRCMP (ut->ut_line, name)) + if (!strcmp (ut->ut_line, name)) { if (!rxvt_write_bsd_utmp (i, ut)) i = 0; @@ -191,13 +196,12 @@ fclose (fd0); } # endif - } #endif #ifdef WTMP_SUPPORT # ifdef WTMP_ONLY_ON_LOGIN - if (Options & Opt_loginShell) + if (login_shell) # endif { # ifdef HAVE_STRUCT_UTMP @@ -207,13 +211,13 @@ rxvt_update_wtmp (RXVT_WTMP_FILE, ut); # endif # endif -# ifdef HAVE_STRUCT_UTMPX +# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX) updwtmpx (RXVT_WTMPX_FILE, utx); # endif } #endif #if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE) - if (Options & Opt_loginShell) + if (login_shell) rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname); #endif } @@ -223,46 +227,47 @@ * remove utmp and wtmp entries */ void -rxvt_term::cleanutent () +rxvt_ptytty::logout () { + if (!cmd_pid) + return; + #ifdef HAVE_STRUCT_UTMP - struct utmp *ut = & (this->ut); + struct utmp *tmput, *ut = &this->ut; #endif #ifdef HAVE_STRUCT_UTMPX - struct utmpx *tmputx, *utx = & (this->utx); + struct utmpx *tmputx, *utx = &this->utx; #endif #ifdef HAVE_STRUCT_UTMP # ifdef HAVE_UTMP_PID - MEMSET (ut, 0, sizeof (struct utmp)); + memset (ut, 0, sizeof (struct utmp)); setutent (); - STRNCPY (ut->ut_id, ut_id, sizeof (ut->ut_id)); + strncpy (ut->ut_id, this->ut_id, sizeof (ut->ut_id)); ut->ut_type = USER_PROCESS; - { - struct utmp *tmput = getutid (ut); - - if (tmput) /* position to entry in utmp file */ - ut = tmput; - } + if ((tmput = getutid (ut))) /* position to entry in utmp file */ + ut = tmput; ut->ut_type = DEAD_PROCESS; # else - MEMSET (ut->ut_name, 0, sizeof (ut->ut_name)); + memset (ut->ut_name, 0, sizeof (ut->ut_name)); # ifdef HAVE_UTMP_HOST - MEMSET (ut->ut_host, 0, sizeof (ut->ut_host)); + memset (ut->ut_host, 0, sizeof (ut->ut_host)); # endif # endif ut->ut_time = time (NULL); #endif #ifdef HAVE_STRUCT_UTMPX - MEMSET (utx, 0, sizeof (struct utmpx)); + memset (utx, 0, sizeof (struct utmpx)); setutxent (); - STRNCPY (utx->ut_id, ut_id, sizeof (utx->ut_id)); + strncpy (utx->ut_id, this->ut_id, sizeof (utx->ut_id)); utx->ut_type = USER_PROCESS; if ((tmputx = getutxid (utx))) /* position to entry in utmp file */ utx = tmputx; utx->ut_type = DEAD_PROCESS; +# if HAVE_UTMPX_SESSION utx->ut_session = getsid (0); +# endif utx->ut_tv.tv_sec = time (NULL); utx->ut_tv.tv_usec = 0; #endif @@ -272,7 +277,7 @@ */ #ifdef WTMP_SUPPORT # ifdef WTMP_ONLY_ON_LOGIN - if (Options & Opt_loginShell) + if (login_shell) # endif { # ifdef HAVE_STRUCT_UTMP @@ -282,7 +287,7 @@ rxvt_update_wtmp (RXVT_WTMP_FILE, ut); # endif # endif -# ifdef HAVE_STRUCT_UTMPX +# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX) updwtmpx (RXVT_WTMPX_FILE, utx); # endif } @@ -297,7 +302,7 @@ pututline (ut); endutent (); # else - MEMSET (ut, 0, sizeof (struct utmp)); + memset (ut, 0, sizeof (struct utmp)); rxvt_write_bsd_utmp (utmp_pos, ut); # endif #endif @@ -306,15 +311,16 @@ pututxline (utx); endutxent (); #endif + + cmd_pid = 0; } /* ------------------------------------------------------------------------- */ /* * Write a BSD style utmp entry */ -#ifdef HAVE_UTMP_H -/* INTPROTO */ -int +#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID) +static int rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu) { int fd; @@ -333,9 +339,8 @@ /* * Update a BSD style wtmp entry */ -#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) -/* INTPROTO */ -void +#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP) +static void rxvt_update_wtmp (const char *fname, const struct utmp *putmp) { int fd, gotlock, retry; @@ -376,8 +381,7 @@ /* ------------------------------------------------------------------------- */ #ifdef LASTLOG_SUPPORT -/* INTPROTO */ -void +static void rxvt_update_lastlog (const char *fname, const char *pty, const char *host) { # ifdef HAVE_STRUCT_LASTLOGX @@ -393,11 +397,11 @@ # endif # ifdef HAVE_STRUCT_LASTLOGX - MEMSET (&llx, 0, sizeof (llx)); + memset (&llx, 0, sizeof (llx)); llx.ll_tv.tv_sec = time (NULL); llx.ll_tv.tv_usec = 0; - STRNCPY (llx.ll_line, pty, sizeof (llx.ll_line)); - STRNCPY (llx.ll_host, host, sizeof (llx.ll_host)); + strncpy (llx.ll_line, pty, sizeof (llx.ll_line)); + strncpy (llx.ll_host, host, sizeof (llx.ll_host)); updlastlogx (RXVT_LASTLOGX_FILE, getuid (), &llx); # endif @@ -409,10 +413,10 @@ return; } - MEMSET (&ll, 0, sizeof (ll)); + memset (&ll, 0, sizeof (ll)); ll.ll_time = time (NULL); - STRNCPY (ll.ll_line, pty, sizeof (ll.ll_line)); - STRNCPY (ll.ll_host, host, sizeof (ll.ll_host)); + strncpy (ll.ll_line, pty, sizeof (ll.ll_line)); + strncpy (ll.ll_host, host, sizeof (ll.ll_host)); # ifdef LASTLOG_IS_DIR sprintf (lastlogfile, "%.*s/%.*s", sizeof (lastlogfile) - sizeof (pwent->pw_name) - 2, fname,