--- rxvt-unicode/src/ptytty.h	2006/01/04 02:01:38	1.5
+++ rxvt-unicode/src/ptytty.h	2006/01/19 16:40:13	1.15
@@ -1,42 +1,86 @@
 #ifndef PTYTTY_H
 #define PTYTTY_H
 
+#include "rxvt.h"
 #include "feature.h"
 
 #if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
-# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX)
+# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_POSIX) || defined(PTYS_ARE_PTMX)
 #  define NO_SETOWNER_TTYDEV 1
 # endif
 #endif
-#if defined(__CYGWIN32__)
+#if defined(__CYGWIN__) || defined(PTYS_ARE_OPENPTY)
 # define NO_SETOWNER_TTYDEV 1
 #endif
 
-enum rxvt_privaction { IGNORE = 'i', SAVE = 's', RESTORE = 'r' };
+#if UTMP_SUPPORT
+# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX) || defined(__GLIBC__)
+#  undef HAVE_UTMPX_H
+#  undef HAVE_STRUCT_UTMPX
+# endif
+# if !defined(RXVT_UTMP_FILE) || !defined(HAVE_STRUCT_UTMP)
+#  undef HAVE_UTMP_H
+#  undef HAVE_STRUCT_UTMP
+# endif
+
+# ifdef HAVE_UTMPX_H
+#  include <utmpx.h>
+# endif
+# ifdef HAVE_UTMP_H
+#  include <utmp.h>
+# endif
+
+# if ! defined(HAVE_STRUCT_UTMPX) && ! defined(HAVE_STRUCT_UTMP)
+#  error cannot build with utmp support - no utmp or utmpx struct found
+# endif
+
+# ifdef HAVE_LASTLOG_H
+#  include <lastlog.h>
+# endif
+
+# include <pwd.h>
+
+# ifdef RXVT_UTMP_SYSV
+#  ifndef USER_PROCESS
+#   define USER_PROCESS		7
+#  endif
+#  ifndef DEAD_PROCESS
+#   define DEAD_PROCESS		8
+#  endif
+# endif
 
-struct rxvt_ptytty {
-#ifndef RESET_TTY_TO_COMMON_DEFAULTS
-  struct stat savestat; /* original status of our tty */
-#endif
-#ifndef NO_SETOWNER_TTYDEV
-  void privileges (rxvt_privaction action);
-  bool saved;
 #endif
-public:
-  int pty; // pty file descriptor; connected to rxvt
-  int tty; // tty file descriptor; connected to child
+
+struct rxvt_ptytty_unix : rxvt_ptytty
+{
   char *name;
 
-  rxvt_ptytty ();
-  ~rxvt_ptytty ();
+public:
+
+  rxvt_ptytty_unix ();
+  ~rxvt_ptytty_unix ();
 
   bool get ();
   void put ();
 
-  void close_tty ();
+#if UTMP_SUPPORT
+  int utmp_pos;
+  int cmd_pid;
+  bool login_shell;
 
-  bool make_controlling_tty ();
-  void set_utf8_mode (bool on);
+#ifdef HAVE_STRUCT_UTMP
+  struct utmp ut;
+#endif
+#ifdef HAVE_STRUCT_UTMPX
+  struct utmpx utx;
+#endif
+#if (defined(HAVE_STRUCT_UTMP) && defined(HAVE_UTMP_PID)) || defined(HAVE_STRUCT_UTMPX)
+  char ut_id[5];
+#endif
+
+  void login (int cmd_pid, bool login_shell, const char *hostname);
+  void logout ();
+#endif
 };
 
 #endif