--- rxvt-unicode/src/logging.C 2006/01/17 06:06:42 1.25 +++ rxvt-unicode/src/logging.C 2006/01/22 12:21:47 1.39 @@ -1,4 +1,7 @@ -/*--------------------------------*-C-*---------------------------------* +// This file is part of libptytty. Do not make local modifications. +// http://software.schmorp.de/pkg/libptytty + +/*----------------------------------------------------------------------* * File: logging.C *----------------------------------------------------------------------* * @@ -14,7 +17,8 @@ * - extensive modifications * Copyright (c) 1999 D J Hawkey Jr * - lastlog support - * Copyright (c) 2004 Marc Lehmann + * Copyright (c) 2004-2006 Marc Lehmann + * Copyright (c) 2006 Emanuele Giaquinta * * 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 @@ -32,17 +36,25 @@ *----------------------------------------------------------------------*/ #include "../config.h" -#include "rxvt.h" -#include "logging.h" -#ifdef UTMP_SUPPORT +#include + +#include +#include +#include +#include +#include + +#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); +static int write_bsd_utmp (int utmp_pos, struct utmp *wu); +static void update_wtmp (const char *fname, const struct utmp *putmp); #endif -static void rxvt_update_lastlog (const char *fname, const char *pty, const char *host); +static void update_lastlog (const char *fname, const char *pty, const char *host); /* * BSD style utmp entry @@ -57,8 +69,13 @@ * make and write utmp and wtmp entries */ void -rxvt_session::login (const char *pty, int cmd_pid, bool login_shell, const char *hostname) +ptytty_unix::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; @@ -81,7 +98,7 @@ sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */ else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3)) { - rxvt_warn ("can't parse tty name \"%s\", not adding utmp entry.\n", pty); + ptytty_warn ("can't parse tty name \"%s\", not adding utmp entry.\n", pty); return; } #endif @@ -160,14 +177,19 @@ #endif #if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID) - { # ifdef HAVE_TTYSLOT + int fdstdin = dup (STDIN_FILENO); + dup2 (tty, STDIN_FILENO); + i = ttyslot (); - if (rxvt_write_bsd_utmp (i, ut)) + if (write_bsd_utmp (i, ut)) utmp_pos = i; + + dup2 (fdstdin, STDIN_FILENO); + close (fdstdin); # else - FILE *fd0; + FILE *fd0; if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL) { @@ -180,7 +202,7 @@ continue; if (!strcmp (ut->ut_line, name)) { - if (!rxvt_write_bsd_utmp (i, ut)) + if (!write_bsd_utmp (i, ut)) i = 0; utmp_pos = i; fclose (fd0); @@ -195,25 +217,27 @@ #endif #ifdef WTMP_SUPPORT -# ifdef WTMP_ONLY_ON_LOGIN +#ifdef LOG_ONLY_ON_LOGIN if (login_shell) -# endif +#endif { # ifdef HAVE_STRUCT_UTMP # ifdef HAVE_UPDWTMP - updwtmp (RXVT_WTMP_FILE, ut); + updwtmp (WTMP_FILE, ut); # else - rxvt_update_wtmp (RXVT_WTMP_FILE, ut); + update_wtmp (WTMP_FILE, ut); # endif # endif # if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX) - updwtmpx (RXVT_WTMPX_FILE, utx); + updwtmpx (WTMPX_FILE, utx); # endif } #endif -#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE) +#if defined(LASTLOG_SUPPORT) && defined(LASTLOG_FILE) +#ifdef LOG_ONLY_ON_LOGIN if (login_shell) - rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname); +#endif + update_lastlog (LASTLOG_FILE, pty, hostname); #endif } @@ -222,10 +246,13 @@ * remove utmp and wtmp entries */ void -rxvt_session::logout () +ptytty_unix::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; @@ -237,12 +264,8 @@ setutent (); 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)); @@ -272,19 +295,19 @@ * Write ending wtmp entry */ #ifdef WTMP_SUPPORT -# ifdef WTMP_ONLY_ON_LOGIN +#ifdef LOG_ONLY_ON_LOGIN if (login_shell) -# endif +#endif { # ifdef HAVE_STRUCT_UTMP # ifdef HAVE_UPDWTMP - updwtmp (RXVT_WTMP_FILE, ut); + updwtmp (WTMP_FILE, ut); # else - rxvt_update_wtmp (RXVT_WTMP_FILE, ut); + update_wtmp (WTMP_FILE, ut); # endif # endif # if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX) - updwtmpx (RXVT_WTMPX_FILE, utx); + updwtmpx (WTMPX_FILE, utx); # endif } #endif @@ -299,7 +322,7 @@ endutent (); # else memset (ut, 0, sizeof (struct utmp)); - rxvt_write_bsd_utmp (utmp_pos, ut); + write_bsd_utmp (utmp_pos, ut); # endif #endif #ifdef HAVE_STRUCT_UTMPX @@ -307,6 +330,8 @@ pututxline (utx); endutxent (); #endif + + cmd_pid = 0; } /* ------------------------------------------------------------------------- */ @@ -315,11 +340,11 @@ */ #if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID) static int -rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu) +write_bsd_utmp (int utmp_pos, struct utmp *wu) { int fd; - if (utmp_pos <= 0 || (fd = open (RXVT_UTMP_FILE, O_WRONLY)) == -1) + if (utmp_pos <= 0 || (fd = open (UTMP_FILE, O_WRONLY)) == -1) return 0; if (lseek (fd, (off_t) (utmp_pos * sizeof (struct utmp)), SEEK_SET) != -1) @@ -335,7 +360,7 @@ */ #if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP) static void -rxvt_update_wtmp (const char *fname, const struct utmp *putmp) +update_wtmp (const char *fname, const struct utmp *putmp) { int fd, gotlock, retry; struct flock lck; /* fcntl locking scheme */ @@ -376,7 +401,7 @@ /* ------------------------------------------------------------------------- */ #ifdef LASTLOG_SUPPORT static void -rxvt_update_lastlog (const char *fname, const char *pty, const char *host) +update_lastlog (const char *fname, const char *pty, const char *host) { # ifdef HAVE_STRUCT_LASTLOGX struct lastlogx llx; @@ -396,14 +421,14 @@ llx.ll_tv.tv_usec = 0; strncpy (llx.ll_line, pty, sizeof (llx.ll_line)); strncpy (llx.ll_host, host, sizeof (llx.ll_host)); - updlastlogx (RXVT_LASTLOGX_FILE, getuid (), &llx); + updlastlogx (LASTLOGX_FILE, getuid (), &llx); # endif # ifdef HAVE_STRUCT_LASTLOG pwent = getpwuid (getuid ()); if (!pwent) { - rxvt_warn ("no entry in password file, not updating lastlog.\n"); + ptytty_warn ("no entry in password file, not updating lastlog.\n"); return; } @@ -434,6 +459,11 @@ # endif /* HAVE_STRUCT_LASTLOG */ } #endif /* LASTLOG_SUPPORT */ -/* ------------------------------------------------------------------------- */ -#endif /* UTMP_SUPPORT */ +#else +void +ptytty_unix::login (int cmd_pid, bool login_shell, const char *hostname) +{ +} +#endif +