--- rxvt-unicode/src/logging.C	2004/04/08 20:31:45	1.9
+++ rxvt-unicode/src/logging.C	2006/01/16 10:37:32	1.24
@@ -39,11 +39,19 @@
  *	rxvt_update_wtmp ();
  *----------------------------------------------------------------------*/
 
-#include "../config.h"		/* NECESSARY */
-#include "rxvt.h"		/* NECESSARY */
+#include "../config.h"
+#include "rxvt.h"
 #include "logging.h"
+
 #ifdef 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
  *      ut_line, ut_name, ut_host, ut_time
@@ -60,95 +68,92 @@
 rxvt_term::makeutent (const char *pty, const char *hostname)
 {
 #ifdef HAVE_STRUCT_UTMP
-  struct utmp    *ut = & (this->ut);
+  struct utmp *ut = &this->ut;
 #endif
 #ifdef HAVE_STRUCT_UTMPX
-  struct utmpx   *utx = & (this->utx);
+  struct utmpx *utx = &this->utx;
 #endif
-#ifdef HAVE_UTMP_PID
-  int             i;
-#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
@@ -162,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))
@@ -172,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;
@@ -192,13 +196,12 @@
         fclose (fd0);
       }
 # endif
-
   }
 #endif
 
 #ifdef WTMP_SUPPORT
 # ifdef WTMP_ONLY_ON_LOGIN
-  if (Options & Opt_loginShell)
+  if (OPTION (Opt_loginShell))
 # endif
     {
 # ifdef HAVE_STRUCT_UTMP
@@ -208,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 (OPTION (Opt_loginShell))
     rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname);
 #endif
 }
@@ -227,43 +230,45 @@
 rxvt_term::cleanutent ()
 {
 #ifdef HAVE_STRUCT_UTMP
-  struct utmp    *ut = & (this->ut);
+  struct utmp *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);
+    struct utmp *tmput = getutid (ut);
 
     if (tmput)		/* 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
@@ -273,7 +278,7 @@
    */
 #ifdef WTMP_SUPPORT
 # ifdef WTMP_ONLY_ON_LOGIN
-  if (Options & Opt_loginShell)
+  if (OPTION (Opt_loginShell))
 # endif
     {
 # ifdef HAVE_STRUCT_UTMP
@@ -283,7 +288,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
     }
@@ -298,7 +303,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
@@ -313,9 +318,8 @@
 /*
  * 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;
@@ -334,9 +338,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;
@@ -377,8 +380,7 @@
 
 /* ------------------------------------------------------------------------- */
 #ifdef LASTLOG_SUPPORT
-/* INTPROTO */
-void
+static void
 rxvt_update_lastlog (const char *fname, const char *pty, const char *host)
 {
 # ifdef HAVE_STRUCT_LASTLOGX
@@ -394,11 +396,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
 
@@ -410,10 +412,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,