--- rxvt-unicode/src/logging.C	2004/08/15 22:09:24	1.11
+++ rxvt-unicode/src/logging.C	2005/02/16 21:37:10	1.16
@@ -44,6 +44,13 @@
 #include "logging.h"
 #ifdef UTMP_SUPPORT
 
+#if HAVE_STRUCT_UTMP
+int              rxvt_write_bsd_utmp              (int utmp_pos, struct utmp *wu);
+void             rxvt_update_wtmp                 (const char *fname, const struct utmp *putmp);
+#endif
+
+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,33 +67,30 @@
 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;
+  int i;
 #endif
-  char            ut_id[5];
   struct passwd  *pwent = getpwuid (getuid ());
 
   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 (!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))
     {
       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));
@@ -138,7 +142,9 @@
   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));
+# 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;
@@ -209,7 +215,11 @@
 #  endif
 # endif
 # ifdef HAVE_STRUCT_UTMPX
+#  if HAVE_UPDWTMPX
       updwtmpx (RXVT_WTMPX_FILE, utx);
+#  else
+      pututxline (utx);
+#  endif
 # endif
     }
 #endif
@@ -227,10 +237,10 @@
 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
@@ -263,7 +273,9 @@
   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
@@ -284,7 +296,11 @@
 #  endif
 # endif
 # ifdef HAVE_STRUCT_UTMPX
+#  if HAVE_UPDWTMPX
       updwtmpx (RXVT_WTMPX_FILE, utx);
+#  else
+      pututxline (utx);
+#  endif
 # endif
     }
 #endif
@@ -314,7 +330,6 @@
  * Write a BSD style utmp entry
  */
 #ifdef HAVE_UTMP_H
-/* INTPROTO */
 int
 rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu)
 {
@@ -334,8 +349,7 @@
 /*
  * Update a BSD style wtmp entry
  */
-#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP)
-/* INTPROTO */
+#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP)
 void
 rxvt_update_wtmp (const char *fname, const struct utmp *putmp)
 {
@@ -377,7 +391,6 @@
 
 /* ------------------------------------------------------------------------- */
 #ifdef LASTLOG_SUPPORT
-/* INTPROTO */
 void
 rxvt_update_lastlog (const char *fname, const char *pty, const char *host)
 {