ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/logging.C
(Generate patch)

Comparing rxvt-unicode/src/logging.C (file contents):
Revision 1.25 by root, Tue Jan 17 06:06:42 2006 UTC vs.
Revision 1.33 by root, Wed Jan 18 12:06:11 2006 UTC

… …
12 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 12 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
14 * - extensive modifications 14 * - extensive modifications
15 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> 15 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
16 * - lastlog support 16 * - lastlog support
17 * Copyright (c) 2004 Marc Lehmann <pcg@goof.com> 17 * Copyright (c) 2004-2006 Marc Lehmann <pcg@goof.com>
18 * 18 *
19 * This program is free software; you can redistribute it and/or modify 19 * This program is free software; you can redistribute it and/or modify
20 * it under the terms of the GNU General Public License as published by 20 * it under the terms of the GNU General Public License as published by
21 * the Free Software Foundation; either version 2 of the License, or 21 * the Free Software Foundation; either version 2 of the License, or
22 * (at your option) any later version. 22 * (at your option) any later version.
… …
31 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 31 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
32 *----------------------------------------------------------------------*/ 32 *----------------------------------------------------------------------*/
33 33
34#include "../config.h" 34#include "../config.h"
35#include "rxvt.h" 35#include "rxvt.h"
36#include "logging.h" 36#include "ptytty.h"
37 37
38#ifdef UTMP_SUPPORT 38#if UTMP_SUPPORT
39 39
40#if HAVE_STRUCT_UTMP 40#if HAVE_STRUCT_UTMP
41static int rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu); 41static int rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu);
42static void rxvt_update_wtmp (const char *fname, const struct utmp *putmp); 42static void rxvt_update_wtmp (const char *fname, const struct utmp *putmp);
43#endif 43#endif
… …
55 55
56/* 56/*
57 * make and write utmp and wtmp entries 57 * make and write utmp and wtmp entries
58 */ 58 */
59void 59void
60rxvt_session::login (const char *pty, int cmd_pid, bool login_shell, const char *hostname) 60rxvt_ptytty_unix::login (int cmd_pid, bool login_shell, const char *hostname)
61{ 61{
62 const char *pty = name;
63
64 if (!pty || !*pty)
65 return;
66
62 this->cmd_pid = cmd_pid; 67 this->cmd_pid = cmd_pid;
63 this->login_shell = login_shell; 68 this->login_shell = login_shell;
64 69
65#ifdef HAVE_STRUCT_UTMP 70#ifdef HAVE_STRUCT_UTMP
66 struct utmp *ut = &this->ut; 71 struct utmp *ut = &this->ut;
… …
158 endutxent (); /* close the file */ 163 endutxent (); /* close the file */
159 utmp_pos = 0; 164 utmp_pos = 0;
160#endif 165#endif
161 166
162#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID) 167#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
163
164 { 168 {
165# ifdef HAVE_TTYSLOT 169# ifdef HAVE_TTYSLOT
170 int fdstdin = dup (STDIN_FILENO);
171 dup2 (tty, STDIN_FILENO);
172
166 i = ttyslot (); 173 i = ttyslot ();
167 if (rxvt_write_bsd_utmp (i, ut)) 174 if (rxvt_write_bsd_utmp (i, ut))
168 utmp_pos = i; 175 utmp_pos = i;
176
177 dup2 (fdstdin, STDIN_FILENO);
178 close (fdstdin);
169# else 179# else
170 FILE *fd0; 180 FILE *fd0;
171 181
172 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL) 182 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL)
173 { 183 {
174 char buf[256], name[256]; 184 char buf[256], name[256];
175 185
… …
193# endif 203# endif
194 } 204 }
195#endif 205#endif
196 206
197#ifdef WTMP_SUPPORT 207#ifdef WTMP_SUPPORT
198# ifdef WTMP_ONLY_ON_LOGIN
199 if (login_shell) 208 if (login_shell)
200# endif
201 { 209 {
202# ifdef HAVE_STRUCT_UTMP 210# ifdef HAVE_STRUCT_UTMP
203# ifdef HAVE_UPDWTMP 211# ifdef HAVE_UPDWTMP
204 updwtmp (RXVT_WTMP_FILE, ut); 212 updwtmp (RXVT_WTMP_FILE, ut);
205# else 213# else
… …
220/* ------------------------------------------------------------------------- */ 228/* ------------------------------------------------------------------------- */
221/* 229/*
222 * remove utmp and wtmp entries 230 * remove utmp and wtmp entries
223 */ 231 */
224void 232void
225rxvt_session::logout () 233rxvt_ptytty_unix::logout ()
226{ 234{
235 if (!cmd_pid)
236 return;
237
227#ifdef HAVE_STRUCT_UTMP 238#ifdef HAVE_STRUCT_UTMP
228 struct utmp *ut = &this->ut; 239 struct utmp *tmput, *ut = &this->ut;
229#endif 240#endif
230#ifdef HAVE_STRUCT_UTMPX 241#ifdef HAVE_STRUCT_UTMPX
231 struct utmpx *tmputx, *utx = &this->utx; 242 struct utmpx *tmputx, *utx = &this->utx;
232#endif 243#endif
233 244
… …
235# ifdef HAVE_UTMP_PID 246# ifdef HAVE_UTMP_PID
236 memset (ut, 0, sizeof (struct utmp)); 247 memset (ut, 0, sizeof (struct utmp));
237 setutent (); 248 setutent ();
238 strncpy (ut->ut_id, this->ut_id, sizeof (ut->ut_id)); 249 strncpy (ut->ut_id, this->ut_id, sizeof (ut->ut_id));
239 ut->ut_type = USER_PROCESS; 250 ut->ut_type = USER_PROCESS;
240 {
241 struct utmp *tmput = getutid (ut);
242
243 if (tmput) /* position to entry in utmp file */ 251 if ((tmput = getutid (ut))) /* position to entry in utmp file */
244 ut = tmput; 252 ut = tmput;
245 }
246 ut->ut_type = DEAD_PROCESS; 253 ut->ut_type = DEAD_PROCESS;
247# else 254# else
248 memset (ut->ut_name, 0, sizeof (ut->ut_name)); 255 memset (ut->ut_name, 0, sizeof (ut->ut_name));
249# ifdef HAVE_UTMP_HOST 256# ifdef HAVE_UTMP_HOST
250 memset (ut->ut_host, 0, sizeof (ut->ut_host)); 257 memset (ut->ut_host, 0, sizeof (ut->ut_host));
… …
270 277
271 /* 278 /*
272 * Write ending wtmp entry 279 * Write ending wtmp entry
273 */ 280 */
274#ifdef WTMP_SUPPORT 281#ifdef WTMP_SUPPORT
275# ifdef WTMP_ONLY_ON_LOGIN
276 if (login_shell) 282 if (login_shell)
277# endif
278 { 283 {
279# ifdef HAVE_STRUCT_UTMP 284# ifdef HAVE_STRUCT_UTMP
280# ifdef HAVE_UPDWTMP 285# ifdef HAVE_UPDWTMP
281 updwtmp (RXVT_WTMP_FILE, ut); 286 updwtmp (RXVT_WTMP_FILE, ut);
282# else 287# else
… …
305#ifdef HAVE_STRUCT_UTMPX 310#ifdef HAVE_STRUCT_UTMPX
306 if (utx->ut_pid == cmd_pid) 311 if (utx->ut_pid == cmd_pid)
307 pututxline (utx); 312 pututxline (utx);
308 endutxent (); 313 endutxent ();
309#endif 314#endif
315
316 cmd_pid = 0;
310} 317}
311 318
312/* ------------------------------------------------------------------------- */ 319/* ------------------------------------------------------------------------- */
313/* 320/*
314 * Write a BSD style utmp entry 321 * Write a BSD style utmp entry

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines