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.23 by root, Mon Jan 16 09:10:16 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.
… …
28 * 28 *
29 * You should have received a copy of the GNU General Public License 29 * You should have received a copy of the GNU General Public License
30 * along with this program; if not, write to the Free Software 30 * along with this program; if not, write to the Free Software
31 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 31 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
32 *----------------------------------------------------------------------*/ 32 *----------------------------------------------------------------------*/
33/*----------------------------------------------------------------------*
34 * Public:
35 * extern void cleanutent (void);
36 * extern void makeutent (const char * pty, const char * hostname);
37 *
38 * Private:
39 * rxvt_update_wtmp ();
40 *----------------------------------------------------------------------*/
41 33
42#include "../config.h" 34#include "../config.h"
43#include "rxvt.h" 35#include "rxvt.h"
44#include "logging.h" 36#include "ptytty.h"
45 37
46#ifdef UTMP_SUPPORT 38#if UTMP_SUPPORT
47 39
48#if HAVE_STRUCT_UTMP 40#if HAVE_STRUCT_UTMP
49static int rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu); 41static int rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu);
50static void rxvt_update_wtmp (const char *fname, const struct utmp *putmp); 42static void rxvt_update_wtmp (const char *fname, const struct utmp *putmp);
51#endif 43#endif
… …
63 55
64/* 56/*
65 * make and write utmp and wtmp entries 57 * make and write utmp and wtmp entries
66 */ 58 */
67void 59void
68rxvt_term::makeutent (const char *pty, const char *hostname) 60rxvt_ptytty_unix::login (int cmd_pid, bool login_shell, const char *hostname)
69{ 61{
62 const char *pty = name;
63
64 if (!pty || !*pty)
65 return;
66
67 this->cmd_pid = cmd_pid;
68 this->login_shell = login_shell;
69
70#ifdef HAVE_STRUCT_UTMP 70#ifdef HAVE_STRUCT_UTMP
71 struct utmp *ut = &this->ut; 71 struct utmp *ut = &this->ut;
72#endif 72#endif
73#ifdef HAVE_STRUCT_UTMPX 73#ifdef HAVE_STRUCT_UTMPX
74 struct utmpx *utx = &this->utx; 74 struct utmpx *utx = &this->utx;
… …
163 endutxent (); /* close the file */ 163 endutxent (); /* close the file */
164 utmp_pos = 0; 164 utmp_pos = 0;
165#endif 165#endif
166 166
167#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID) 167#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
168
169 { 168 {
170# ifdef HAVE_TTYSLOT 169# ifdef HAVE_TTYSLOT
170 int fdstdin = dup (STDIN_FILENO);
171 dup2 (tty, STDIN_FILENO);
172
171 i = ttyslot (); 173 i = ttyslot ();
172 if (rxvt_write_bsd_utmp (i, ut)) 174 if (rxvt_write_bsd_utmp (i, ut))
173 utmp_pos = i; 175 utmp_pos = i;
176
177 dup2 (fdstdin, STDIN_FILENO);
178 close (fdstdin);
174# else 179# else
175 FILE *fd0; 180 FILE *fd0;
176 181
177 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL) 182 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL)
178 { 183 {
179 char buf[256], name[256]; 184 char buf[256], name[256];
180 185
… …
198# endif 203# endif
199 } 204 }
200#endif 205#endif
201 206
202#ifdef WTMP_SUPPORT 207#ifdef WTMP_SUPPORT
203# ifdef WTMP_ONLY_ON_LOGIN 208 if (login_shell)
204 if (OPTION (Opt_loginShell))
205# endif
206 { 209 {
207# ifdef HAVE_STRUCT_UTMP 210# ifdef HAVE_STRUCT_UTMP
208# ifdef HAVE_UPDWTMP 211# ifdef HAVE_UPDWTMP
209 updwtmp (RXVT_WTMP_FILE, ut); 212 updwtmp (RXVT_WTMP_FILE, ut);
210# else 213# else
… …
215 updwtmpx (RXVT_WTMPX_FILE, utx); 218 updwtmpx (RXVT_WTMPX_FILE, utx);
216# endif 219# endif
217 } 220 }
218#endif 221#endif
219#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE) 222#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE)
220 if (OPTION (Opt_loginShell)) 223 if (login_shell)
221 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname); 224 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname);
222#endif 225#endif
223} 226}
224 227
225/* ------------------------------------------------------------------------- */ 228/* ------------------------------------------------------------------------- */
226/* 229/*
227 * remove utmp and wtmp entries 230 * remove utmp and wtmp entries
228 */ 231 */
229void 232void
230rxvt_term::cleanutent () 233rxvt_ptytty_unix::logout ()
231{ 234{
235 if (!cmd_pid)
236 return;
237
232#ifdef HAVE_STRUCT_UTMP 238#ifdef HAVE_STRUCT_UTMP
233 struct utmp *ut = &this->ut; 239 struct utmp *tmput, *ut = &this->ut;
234#endif 240#endif
235#ifdef HAVE_STRUCT_UTMPX 241#ifdef HAVE_STRUCT_UTMPX
236 struct utmpx *tmputx, *utx = &this->utx; 242 struct utmpx *tmputx, *utx = &this->utx;
237#endif 243#endif
238 244
… …
240# ifdef HAVE_UTMP_PID 246# ifdef HAVE_UTMP_PID
241 memset (ut, 0, sizeof (struct utmp)); 247 memset (ut, 0, sizeof (struct utmp));
242 setutent (); 248 setutent ();
243 strncpy (ut->ut_id, this->ut_id, sizeof (ut->ut_id)); 249 strncpy (ut->ut_id, this->ut_id, sizeof (ut->ut_id));
244 ut->ut_type = USER_PROCESS; 250 ut->ut_type = USER_PROCESS;
245 {
246 struct utmp *tmput = getutid (ut);
247
248 if (tmput) /* position to entry in utmp file */ 251 if ((tmput = getutid (ut))) /* position to entry in utmp file */
249 ut = tmput; 252 ut = tmput;
250 }
251 ut->ut_type = DEAD_PROCESS; 253 ut->ut_type = DEAD_PROCESS;
252# else 254# else
253 memset (ut->ut_name, 0, sizeof (ut->ut_name)); 255 memset (ut->ut_name, 0, sizeof (ut->ut_name));
254# ifdef HAVE_UTMP_HOST 256# ifdef HAVE_UTMP_HOST
255 memset (ut->ut_host, 0, sizeof (ut->ut_host)); 257 memset (ut->ut_host, 0, sizeof (ut->ut_host));
… …
275 277
276 /* 278 /*
277 * Write ending wtmp entry 279 * Write ending wtmp entry
278 */ 280 */
279#ifdef WTMP_SUPPORT 281#ifdef WTMP_SUPPORT
280# ifdef WTMP_ONLY_ON_LOGIN 282 if (login_shell)
281 if (OPTION (Opt_loginShell))
282# endif
283 { 283 {
284# ifdef HAVE_STRUCT_UTMP 284# ifdef HAVE_STRUCT_UTMP
285# ifdef HAVE_UPDWTMP 285# ifdef HAVE_UPDWTMP
286 updwtmp (RXVT_WTMP_FILE, ut); 286 updwtmp (RXVT_WTMP_FILE, ut);
287# else 287# else
288 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 288 rxvt_update_wtmp (RXVT_WTMP_FILE, ut);
289# endif 289# endif
290# endif 290# endif
291# ifdef HAVE_STRUCT_UTMPX 291# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
292# if HAVE_UPDWTMPX
293 updwtmpx (RXVT_WTMPX_FILE, utx); 292 updwtmpx (RXVT_WTMPX_FILE, utx);
294# else
295 pututxline (utx);
296# endif
297# endif 293# endif
298 } 294 }
299#endif 295#endif
300 296
301 /* 297 /*
… …
314#ifdef HAVE_STRUCT_UTMPX 310#ifdef HAVE_STRUCT_UTMPX
315 if (utx->ut_pid == cmd_pid) 311 if (utx->ut_pid == cmd_pid)
316 pututxline (utx); 312 pututxline (utx);
317 endutxent (); 313 endutxent ();
318#endif 314#endif
315
316 cmd_pid = 0;
319} 317}
320 318
321/* ------------------------------------------------------------------------- */ 319/* ------------------------------------------------------------------------- */
322/* 320/*
323 * Write a BSD style utmp entry 321 * Write a BSD style utmp entry

Diff Legend

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