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.18 by root, Tue Nov 8 17:35:28 2005 UTC vs.
Revision 1.31 by root, Tue Jan 17 15:17:39 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" /* NECESSARY */
43#include "rxvt.h" /* NECESSARY */
44#include "logging.h" 34#include "../config.h"
35#include "rxvt.h"
36#include "ptytty.h"
37
45#ifdef UTMP_SUPPORT 38#if UTMP_SUPPORT
46 39
47#if HAVE_STRUCT_UTMP 40#if HAVE_STRUCT_UTMP
48int rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu); 41static int rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu);
49void rxvt_update_wtmp (const char *fname, const struct utmp *putmp); 42static void rxvt_update_wtmp (const char *fname, const struct utmp *putmp);
50#endif 43#endif
51 44
52void rxvt_update_lastlog (const char *fname, const char *pty, const char *host); 45static void rxvt_update_lastlog (const char *fname, const char *pty, const char *host);
53 46
54/* 47/*
55 * BSD style utmp entry 48 * BSD style utmp entry
56 * ut_line, ut_name, ut_host, ut_time 49 * ut_line, ut_name, ut_host, ut_time
57 * SYSV style utmp (and utmpx) entry 50 * SYSV style utmp (and utmpx) entry
… …
62 55
63/* 56/*
64 * make and write utmp and wtmp entries 57 * make and write utmp and wtmp entries
65 */ 58 */
66void 59void
67rxvt_term::makeutent (const char *pty, const char *hostname) 60rxvt_ptytty_unix::login (int cmd_pid, bool login_shell, const char *hostname)
68{ 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
69#ifdef HAVE_STRUCT_UTMP 70#ifdef HAVE_STRUCT_UTMP
70 struct utmp *ut = &this->ut; 71 struct utmp *ut = &this->ut;
71#endif 72#endif
72#ifdef HAVE_STRUCT_UTMPX 73#ifdef HAVE_STRUCT_UTMPX
73 struct utmpx *utx = &this->utx; 74 struct utmpx *utx = &this->utx;
74#endif 75#endif
75#ifdef HAVE_UTMP_PID
76 int i; 76 int i;
77#endif
78 struct passwd *pwent = getpwuid (getuid ()); 77 struct passwd *pwent = getpwuid (getuid ());
79 78
80 if (!strncmp (pty, "/dev/", 5)) 79 if (!strncmp (pty, "/dev/", 5))
81 pty += 5; /* skip /dev/ prefix */ 80 pty += 5; /* skip /dev/ prefix */
82 81
83#ifdef HAVE_UTMP_PID 82#if defined(HAVE_UTMP_PID) || defined(HAVE_STRUCT_UTMPX)
84 if (!strncmp (pty, "pty", 3) || !strncmp (pty, "tty", 3)) 83 if (!strncmp (pty, "pty", 3) || !strncmp (pty, "tty", 3))
85 strncpy (ut_id, pty + 3, sizeof (ut_id)); 84 strncpy (ut_id, pty + 3, sizeof (ut_id));
86 else if (sscanf (pty, "pts/%d", &i) == 1) 85 else if (sscanf (pty, "pts/%d", &i) == 1)
87 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */ 86 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */
88 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3)) 87 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3))
… …
97# ifdef HAVE_UTMP_PID 96# ifdef HAVE_UTMP_PID
98 setutent (); 97 setutent ();
99 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id)); 98 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id));
100 ut->ut_type = DEAD_PROCESS; 99 ut->ut_type = DEAD_PROCESS;
101 getutid (ut); /* position to entry in utmp file */ 100 getutid (ut); /* position to entry in utmp file */
102 strncpy (ut_id, ut_id, sizeof (ut_id)); 101 strncpy (this->ut_id, ut_id, sizeof (this->ut_id));
103# endif 102# endif
104#endif 103#endif
105 104
106#ifdef HAVE_STRUCT_UTMPX 105#ifdef HAVE_STRUCT_UTMPX
107 memset (utx, 0, sizeof (struct utmpx)); 106 memset (utx, 0, sizeof (struct utmpx));
108 setutxent (); 107 setutxent ();
109 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id)); 108 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id));
110 utx->ut_type = DEAD_PROCESS; 109 utx->ut_type = DEAD_PROCESS;
111 getutxid (utx); /* position to entry in utmp file */ 110 getutxid (utx); /* position to entry in utmp file */
112 strncpy (ut_id, ut_id, sizeof (ut_id)); 111 strncpy (this->ut_id, ut_id, sizeof (this->ut_id));
113#endif 112#endif
114 113
115#ifdef HAVE_STRUCT_UTMP 114#ifdef HAVE_STRUCT_UTMP
116 strncpy (ut->ut_line, pty, sizeof (ut->ut_line)); 115 strncpy (ut->ut_line, pty, sizeof (ut->ut_line));
117 ut->ut_time = time (NULL); 116 ut->ut_time = time (NULL);
… …
164 endutxent (); /* close the file */ 163 endutxent (); /* close the file */
165 utmp_pos = 0; 164 utmp_pos = 0;
166#endif 165#endif
167 166
168#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID) 167#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
169
170 { 168 {
171 int i;
172# ifdef HAVE_TTYSLOT 169# ifdef HAVE_TTYSLOT
170 int fdstdin = dup (STDIN_FILENO);
171 dup2 (pty->tty, STDIN_FILENO);
172
173 i = ttyslot (); 173 i = ttyslot ();
174 if (rxvt_write_bsd_utmp (i, ut)) 174 if (rxvt_write_bsd_utmp (i, ut))
175 utmp_pos = i; 175 utmp_pos = i;
176
177 dup2 (fdstdin, STDIN_FILENO);
178 close (fdstdin);
176# else 179# else
177 FILE *fd0; 180 FILE *fd0;
178 181
179 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL) 182 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL)
180 { 183 {
181 char buf[256], name[256]; 184 char buf[256], name[256];
182 185
… …
196 i++; 199 i++;
197 } 200 }
198 fclose (fd0); 201 fclose (fd0);
199 } 202 }
200# endif 203# endif
201
202 } 204 }
203#endif 205#endif
204 206
205#ifdef WTMP_SUPPORT 207#ifdef WTMP_SUPPORT
206# ifdef WTMP_ONLY_ON_LOGIN 208# ifdef WTMP_ONLY_ON_LOGIN
207 if (options & Opt_loginShell) 209 if (login_shell)
208# endif 210# endif
209 { 211 {
210# ifdef HAVE_STRUCT_UTMP 212# ifdef HAVE_STRUCT_UTMP
211# ifdef HAVE_UPDWTMP 213# ifdef HAVE_UPDWTMP
212 updwtmp (RXVT_WTMP_FILE, ut); 214 updwtmp (RXVT_WTMP_FILE, ut);
213# else 215# else
214 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 216 rxvt_update_wtmp (RXVT_WTMP_FILE, ut);
215# endif 217# endif
216# endif 218# endif
217# ifdef HAVE_STRUCT_UTMPX 219# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
218# if HAVE_UPDWTMPX
219 updwtmpx (RXVT_WTMPX_FILE, utx); 220 updwtmpx (RXVT_WTMPX_FILE, utx);
220# else
221 pututxline (utx);
222# endif
223# endif 221# endif
224 } 222 }
225#endif 223#endif
226#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE) 224#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE)
227 if (options & Opt_loginShell) 225 if (login_shell)
228 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname); 226 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname);
229#endif 227#endif
230} 228}
231 229
232/* ------------------------------------------------------------------------- */ 230/* ------------------------------------------------------------------------- */
233/* 231/*
234 * remove utmp and wtmp entries 232 * remove utmp and wtmp entries
235 */ 233 */
236void 234void
237rxvt_term::cleanutent () 235rxvt_ptytty_unix::logout ()
238{ 236{
237 if (!cmd_pid)
238 return;
239
239#ifdef HAVE_STRUCT_UTMP 240#ifdef HAVE_STRUCT_UTMP
240 struct utmp *ut = &this->ut; 241 struct utmp *tmput, *ut = &this->ut;
241#endif 242#endif
242#ifdef HAVE_STRUCT_UTMPX 243#ifdef HAVE_STRUCT_UTMPX
243 struct utmpx *tmputx, *utx = &this->utx; 244 struct utmpx *tmputx, *utx = &this->utx;
244#endif 245#endif
245 246
246#ifdef HAVE_STRUCT_UTMP 247#ifdef HAVE_STRUCT_UTMP
247# ifdef HAVE_UTMP_PID 248# ifdef HAVE_UTMP_PID
248 memset (ut, 0, sizeof (struct utmp)); 249 memset (ut, 0, sizeof (struct utmp));
249 setutent (); 250 setutent ();
250 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id)); 251 strncpy (ut->ut_id, this->ut_id, sizeof (ut->ut_id));
251 ut->ut_type = USER_PROCESS; 252 ut->ut_type = USER_PROCESS;
252 {
253 struct utmp *tmput = getutid (ut);
254
255 if (tmput) /* position to entry in utmp file */ 253 if ((tmput = getutid (ut))) /* position to entry in utmp file */
256 ut = tmput; 254 ut = tmput;
257 }
258 ut->ut_type = DEAD_PROCESS; 255 ut->ut_type = DEAD_PROCESS;
259# else 256# else
260 memset (ut->ut_name, 0, sizeof (ut->ut_name)); 257 memset (ut->ut_name, 0, sizeof (ut->ut_name));
261# ifdef HAVE_UTMP_HOST 258# ifdef HAVE_UTMP_HOST
262 memset (ut->ut_host, 0, sizeof (ut->ut_host)); 259 memset (ut->ut_host, 0, sizeof (ut->ut_host));
… …
266#endif 263#endif
267 264
268#ifdef HAVE_STRUCT_UTMPX 265#ifdef HAVE_STRUCT_UTMPX
269 memset (utx, 0, sizeof (struct utmpx)); 266 memset (utx, 0, sizeof (struct utmpx));
270 setutxent (); 267 setutxent ();
271 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id)); 268 strncpy (utx->ut_id, this->ut_id, sizeof (utx->ut_id));
272 utx->ut_type = USER_PROCESS; 269 utx->ut_type = USER_PROCESS;
273 if ((tmputx = getutxid (utx))) /* position to entry in utmp file */ 270 if ((tmputx = getutxid (utx))) /* position to entry in utmp file */
274 utx = tmputx; 271 utx = tmputx;
275 utx->ut_type = DEAD_PROCESS; 272 utx->ut_type = DEAD_PROCESS;
276# if HAVE_UTMPX_SESSION 273# if HAVE_UTMPX_SESSION
… …
283 /* 280 /*
284 * Write ending wtmp entry 281 * Write ending wtmp entry
285 */ 282 */
286#ifdef WTMP_SUPPORT 283#ifdef WTMP_SUPPORT
287# ifdef WTMP_ONLY_ON_LOGIN 284# ifdef WTMP_ONLY_ON_LOGIN
288 if (options & Opt_loginShell) 285 if (login_shell)
289# endif 286# endif
290 { 287 {
291# ifdef HAVE_STRUCT_UTMP 288# ifdef HAVE_STRUCT_UTMP
292# ifdef HAVE_UPDWTMP 289# ifdef HAVE_UPDWTMP
293 updwtmp (RXVT_WTMP_FILE, ut); 290 updwtmp (RXVT_WTMP_FILE, ut);
294# else 291# else
295 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 292 rxvt_update_wtmp (RXVT_WTMP_FILE, ut);
296# endif 293# endif
297# endif 294# endif
298# ifdef HAVE_STRUCT_UTMPX 295# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
299# if HAVE_UPDWTMPX
300 updwtmpx (RXVT_WTMPX_FILE, utx); 296 updwtmpx (RXVT_WTMPX_FILE, utx);
301# else
302 pututxline (utx);
303# endif
304# endif 297# endif
305 } 298 }
306#endif 299#endif
307 300
308 /* 301 /*
… …
321#ifdef HAVE_STRUCT_UTMPX 314#ifdef HAVE_STRUCT_UTMPX
322 if (utx->ut_pid == cmd_pid) 315 if (utx->ut_pid == cmd_pid)
323 pututxline (utx); 316 pututxline (utx);
324 endutxent (); 317 endutxent ();
325#endif 318#endif
319
320 cmd_pid = 0;
326} 321}
327 322
328/* ------------------------------------------------------------------------- */ 323/* ------------------------------------------------------------------------- */
329/* 324/*
330 * Write a BSD style utmp entry 325 * Write a BSD style utmp entry
331 */ 326 */
332#ifdef HAVE_UTMP_H 327#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
333int 328static int
334rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu) 329rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu)
335{ 330{
336 int fd; 331 int fd;
337 332
338 if (utmp_pos <= 0 || (fd = open (RXVT_UTMP_FILE, O_WRONLY)) == -1) 333 if (utmp_pos <= 0 || (fd = open (RXVT_UTMP_FILE, O_WRONLY)) == -1)
… …
348/* ------------------------------------------------------------------------- */ 343/* ------------------------------------------------------------------------- */
349/* 344/*
350 * Update a BSD style wtmp entry 345 * Update a BSD style wtmp entry
351 */ 346 */
352#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP) 347#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP)
353void 348static void
354rxvt_update_wtmp (const char *fname, const struct utmp *putmp) 349rxvt_update_wtmp (const char *fname, const struct utmp *putmp)
355{ 350{
356 int fd, gotlock, retry; 351 int fd, gotlock, retry;
357 struct flock lck; /* fcntl locking scheme */ 352 struct flock lck; /* fcntl locking scheme */
358 struct stat sbuf; 353 struct stat sbuf;
… …
389} 384}
390#endif 385#endif
391 386
392/* ------------------------------------------------------------------------- */ 387/* ------------------------------------------------------------------------- */
393#ifdef LASTLOG_SUPPORT 388#ifdef LASTLOG_SUPPORT
394void 389static void
395rxvt_update_lastlog (const char *fname, const char *pty, const char *host) 390rxvt_update_lastlog (const char *fname, const char *pty, const char *host)
396{ 391{
397# ifdef HAVE_STRUCT_LASTLOGX 392# ifdef HAVE_STRUCT_LASTLOGX
398 struct lastlogx llx; 393 struct lastlogx llx;
399# endif 394# endif

Diff Legend

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