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.12 by root, Wed Jan 19 15:20:47 2005 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" /* 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
39
40#if HAVE_STRUCT_UTMP
41static int rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu);
42static void rxvt_update_wtmp (const char *fname, const struct utmp *putmp);
43#endif
44
45static void rxvt_update_lastlog (const char *fname, const char *pty, const char *host);
46 46
47/* 47/*
48 * BSD style utmp entry 48 * BSD style utmp entry
49 * ut_line, ut_name, ut_host, ut_time 49 * ut_line, ut_name, ut_host, ut_time
50 * SYSV style utmp (and utmpx) entry 50 * SYSV style utmp (and utmpx) entry
… …
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_term::makeutent (const char *pty, 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
67 this->cmd_pid = cmd_pid;
68 this->login_shell = login_shell;
69
62#ifdef HAVE_STRUCT_UTMP 70#ifdef HAVE_STRUCT_UTMP
63 struct utmp *ut = &this->ut; 71 struct utmp *ut = &this->ut;
64#endif 72#endif
65#ifdef HAVE_STRUCT_UTMPX 73#ifdef HAVE_STRUCT_UTMPX
66 struct utmpx *utx = &this->utx; 74 struct utmpx *utx = &this->utx;
67#endif 75#endif
68#ifdef HAVE_UTMP_PID
69 int i; 76 int i;
70#endif
71 struct passwd *pwent = getpwuid (getuid ()); 77 struct passwd *pwent = getpwuid (getuid ());
72 78
73 if (!strncmp (pty, "/dev/", 5)) 79 if (!strncmp (pty, "/dev/", 5))
74 pty += 5; /* skip /dev/ prefix */ 80 pty += 5; /* skip /dev/ prefix */
75 81
82#if defined(HAVE_UTMP_PID) || defined(HAVE_STRUCT_UTMPX)
76 if (!strncmp (pty, "pty", 3) || !strncmp (pty, "tty", 3)) 83 if (!strncmp (pty, "pty", 3) || !strncmp (pty, "tty", 3))
77 strncpy (ut_id, (pty + 3), sizeof (ut_id)); 84 strncpy (ut_id, pty + 3, sizeof (ut_id));
78#ifdef HAVE_UTMP_PID
79 else if (sscanf (pty, "pts/%d", &i) == 1) 85 else if (sscanf (pty, "pts/%d", &i) == 1)
80 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */ 86 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */
81#endif
82 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3)) 87 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3))
83 { 88 {
84 rxvt_warn ("can't parse tty name \"%s\", not adding utmp entry.\n", pty); 89 rxvt_warn ("can't parse tty name \"%s\", not adding utmp entry.\n", pty);
85 return; 90 return;
86 } 91 }
92#endif
87 93
88#ifdef HAVE_STRUCT_UTMP 94#ifdef HAVE_STRUCT_UTMP
89 memset (ut, 0, sizeof (struct utmp)); 95 memset (ut, 0, sizeof (struct utmp));
90# ifdef HAVE_UTMP_PID 96# ifdef HAVE_UTMP_PID
91 setutent (); 97 setutent ();
92 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id)); 98 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id));
93 ut->ut_type = DEAD_PROCESS; 99 ut->ut_type = DEAD_PROCESS;
94 getutid (ut); /* position to entry in utmp file */ 100 getutid (ut); /* position to entry in utmp file */
95 strncpy (ut_id, ut_id, sizeof (ut_id)); 101 strncpy (this->ut_id, ut_id, sizeof (this->ut_id));
96# endif 102# endif
97#endif 103#endif
98 104
99#ifdef HAVE_STRUCT_UTMPX 105#ifdef HAVE_STRUCT_UTMPX
100 memset (utx, 0, sizeof (struct utmpx)); 106 memset (utx, 0, sizeof (struct utmpx));
101 setutxent (); 107 setutxent ();
102 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id)); 108 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id));
103 utx->ut_type = DEAD_PROCESS; 109 utx->ut_type = DEAD_PROCESS;
104 getutxid (utx); /* position to entry in utmp file */ 110 getutxid (utx); /* position to entry in utmp file */
105 strncpy (ut_id, ut_id, sizeof (ut_id)); 111 strncpy (this->ut_id, ut_id, sizeof (this->ut_id));
106#endif 112#endif
107 113
108#ifdef HAVE_STRUCT_UTMP 114#ifdef HAVE_STRUCT_UTMP
109 strncpy (ut->ut_line, pty, sizeof (ut->ut_line)); 115 strncpy (ut->ut_line, pty, sizeof (ut->ut_line));
110 ut->ut_time = time (NULL); 116 ut->ut_time = time (NULL);
… …
133#ifdef HAVE_STRUCT_UTMPX 139#ifdef HAVE_STRUCT_UTMPX
134 strncpy (utx->ut_line, pty, sizeof (utx->ut_line)); 140 strncpy (utx->ut_line, pty, sizeof (utx->ut_line));
135 strncpy (utx->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?", 141 strncpy (utx->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?",
136 sizeof (utx->ut_user)); 142 sizeof (utx->ut_user));
137 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id)); 143 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id));
144# if HAVE_UTMPX_SESSION
138 utx->ut_session = getsid (0); 145 utx->ut_session = getsid (0);
146# endif
139 utx->ut_tv.tv_sec = time (NULL); 147 utx->ut_tv.tv_sec = time (NULL);
140 utx->ut_tv.tv_usec = 0; 148 utx->ut_tv.tv_usec = 0;
141 utx->ut_pid = cmd_pid; 149 utx->ut_pid = cmd_pid;
142# ifdef HAVE_UTMPX_HOST 150# ifdef HAVE_UTMPX_HOST
143 strncpy (utx->ut_host, hostname, sizeof (utx->ut_host)); 151 strncpy (utx->ut_host, hostname, sizeof (utx->ut_host));
… …
155 endutxent (); /* close the file */ 163 endutxent (); /* close the file */
156 utmp_pos = 0; 164 utmp_pos = 0;
157#endif 165#endif
158 166
159#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID) 167#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
160
161 { 168 {
162 int i;
163# ifdef HAVE_TTYSLOT 169# ifdef HAVE_TTYSLOT
170 int fdstdin = dup (STDIN_FILENO);
171 dup2 (tty, STDIN_FILENO);
172
164 i = ttyslot (); 173 i = ttyslot ();
165 if (rxvt_write_bsd_utmp (i, ut)) 174 if (rxvt_write_bsd_utmp (i, ut))
166 utmp_pos = i; 175 utmp_pos = i;
176
177 dup2 (fdstdin, STDIN_FILENO);
178 close (fdstdin);
167# else 179# else
168 FILE *fd0; 180 FILE *fd0;
169 181
170 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL) 182 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL)
171 { 183 {
172 char buf[256], name[256]; 184 char buf[256], name[256];
173 185
174 buf[sizeof (buf) - 1] = '\0'; 186 buf[sizeof (buf) - 1] = '\0';
175 for (i = 1; (fgets (buf, sizeof (buf) - 1, fd0) != NULL);) 187 for (i = 1; (fgets (buf, sizeof (buf) - 1, fd0) != NULL);)
176 { 188 {
177 if (*buf == '#' || sscanf (buf, "%s", name) != 1) 189 if (*buf == '#' || sscanf (buf, "%s", name) != 1)
… …
187 i++; 199 i++;
188 } 200 }
189 fclose (fd0); 201 fclose (fd0);
190 } 202 }
191# endif 203# endif
192
193 } 204 }
194#endif 205#endif
195 206
196#ifdef WTMP_SUPPORT 207#ifdef WTMP_SUPPORT
197# ifdef WTMP_ONLY_ON_LOGIN 208 if (login_shell)
198 if (options & Opt_loginShell)
199# endif
200 { 209 {
201# ifdef HAVE_STRUCT_UTMP 210# ifdef HAVE_STRUCT_UTMP
202# ifdef HAVE_UPDWTMP 211# ifdef HAVE_UPDWTMP
203 updwtmp (RXVT_WTMP_FILE, ut); 212 updwtmp (RXVT_WTMP_FILE, ut);
204# else 213# else
205 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 214 rxvt_update_wtmp (RXVT_WTMP_FILE, ut);
206# endif 215# endif
207# endif 216# endif
208# ifdef HAVE_STRUCT_UTMPX 217# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
209 updwtmpx (RXVT_WTMPX_FILE, utx); 218 updwtmpx (RXVT_WTMPX_FILE, utx);
210# endif 219# endif
211 } 220 }
212#endif 221#endif
213#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE) 222#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE)
214 if (options & Opt_loginShell) 223 if (login_shell)
215 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname); 224 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname);
216#endif 225#endif
217} 226}
218 227
219/* ------------------------------------------------------------------------- */ 228/* ------------------------------------------------------------------------- */
220/* 229/*
221 * remove utmp and wtmp entries 230 * remove utmp and wtmp entries
222 */ 231 */
223void 232void
224rxvt_term::cleanutent () 233rxvt_ptytty_unix::logout ()
225{ 234{
235 if (!cmd_pid)
236 return;
237
226#ifdef HAVE_STRUCT_UTMP 238#ifdef HAVE_STRUCT_UTMP
227 struct utmp *ut = &this->ut; 239 struct utmp *tmput, *ut = &this->ut;
228#endif 240#endif
229#ifdef HAVE_STRUCT_UTMPX 241#ifdef HAVE_STRUCT_UTMPX
230 struct utmpx *tmputx, *utx = &this->utx; 242 struct utmpx *tmputx, *utx = &this->utx;
231#endif 243#endif
232 244
233#ifdef HAVE_STRUCT_UTMP 245#ifdef HAVE_STRUCT_UTMP
234# ifdef HAVE_UTMP_PID 246# ifdef HAVE_UTMP_PID
235 memset (ut, 0, sizeof (struct utmp)); 247 memset (ut, 0, sizeof (struct utmp));
236 setutent (); 248 setutent ();
237 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id)); 249 strncpy (ut->ut_id, this->ut_id, sizeof (ut->ut_id));
238 ut->ut_type = USER_PROCESS; 250 ut->ut_type = USER_PROCESS;
239 {
240 struct utmp *tmput = getutid (ut);
241
242 if (tmput) /* position to entry in utmp file */ 251 if ((tmput = getutid (ut))) /* position to entry in utmp file */
243 ut = tmput; 252 ut = tmput;
244 }
245 ut->ut_type = DEAD_PROCESS; 253 ut->ut_type = DEAD_PROCESS;
246# else 254# else
247 memset (ut->ut_name, 0, sizeof (ut->ut_name)); 255 memset (ut->ut_name, 0, sizeof (ut->ut_name));
248# ifdef HAVE_UTMP_HOST 256# ifdef HAVE_UTMP_HOST
249 memset (ut->ut_host, 0, sizeof (ut->ut_host)); 257 memset (ut->ut_host, 0, sizeof (ut->ut_host));
… …
253#endif 261#endif
254 262
255#ifdef HAVE_STRUCT_UTMPX 263#ifdef HAVE_STRUCT_UTMPX
256 memset (utx, 0, sizeof (struct utmpx)); 264 memset (utx, 0, sizeof (struct utmpx));
257 setutxent (); 265 setutxent ();
258 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id)); 266 strncpy (utx->ut_id, this->ut_id, sizeof (utx->ut_id));
259 utx->ut_type = USER_PROCESS; 267 utx->ut_type = USER_PROCESS;
260 if ((tmputx = getutxid (utx))) /* position to entry in utmp file */ 268 if ((tmputx = getutxid (utx))) /* position to entry in utmp file */
261 utx = tmputx; 269 utx = tmputx;
262 utx->ut_type = DEAD_PROCESS; 270 utx->ut_type = DEAD_PROCESS;
271# if HAVE_UTMPX_SESSION
263 utx->ut_session = getsid (0); 272 utx->ut_session = getsid (0);
273# endif
264 utx->ut_tv.tv_sec = time (NULL); 274 utx->ut_tv.tv_sec = time (NULL);
265 utx->ut_tv.tv_usec = 0; 275 utx->ut_tv.tv_usec = 0;
266#endif 276#endif
267 277
268 /* 278 /*
269 * Write ending wtmp entry 279 * Write ending wtmp entry
270 */ 280 */
271#ifdef WTMP_SUPPORT 281#ifdef WTMP_SUPPORT
272# ifdef WTMP_ONLY_ON_LOGIN 282 if (login_shell)
273 if (options & Opt_loginShell)
274# endif
275 { 283 {
276# ifdef HAVE_STRUCT_UTMP 284# ifdef HAVE_STRUCT_UTMP
277# ifdef HAVE_UPDWTMP 285# ifdef HAVE_UPDWTMP
278 updwtmp (RXVT_WTMP_FILE, ut); 286 updwtmp (RXVT_WTMP_FILE, ut);
279# else 287# else
280 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 288 rxvt_update_wtmp (RXVT_WTMP_FILE, ut);
281# endif 289# endif
282# endif 290# endif
283# ifdef HAVE_STRUCT_UTMPX 291# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
284 updwtmpx (RXVT_WTMPX_FILE, utx); 292 updwtmpx (RXVT_WTMPX_FILE, utx);
285# endif 293# endif
286 } 294 }
287#endif 295#endif
288 296
… …
302#ifdef HAVE_STRUCT_UTMPX 310#ifdef HAVE_STRUCT_UTMPX
303 if (utx->ut_pid == cmd_pid) 311 if (utx->ut_pid == cmd_pid)
304 pututxline (utx); 312 pututxline (utx);
305 endutxent (); 313 endutxent ();
306#endif 314#endif
315
316 cmd_pid = 0;
307} 317}
308 318
309/* ------------------------------------------------------------------------- */ 319/* ------------------------------------------------------------------------- */
310/* 320/*
311 * Write a BSD style utmp entry 321 * Write a BSD style utmp entry
312 */ 322 */
313#ifdef HAVE_UTMP_H 323#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
314/* INTPROTO */ 324static int
315int
316rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu) 325rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu)
317{ 326{
318 int fd; 327 int fd;
319 328
320 if (utmp_pos <= 0 || (fd = open (RXVT_UTMP_FILE, O_WRONLY)) == -1) 329 if (utmp_pos <= 0 || (fd = open (RXVT_UTMP_FILE, O_WRONLY)) == -1)
… …
329 338
330/* ------------------------------------------------------------------------- */ 339/* ------------------------------------------------------------------------- */
331/* 340/*
332 * Update a BSD style wtmp entry 341 * Update a BSD style wtmp entry
333 */ 342 */
334#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) 343#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP)
335/* INTPROTO */ 344static void
336void
337rxvt_update_wtmp (const char *fname, const struct utmp *putmp) 345rxvt_update_wtmp (const char *fname, const struct utmp *putmp)
338{ 346{
339 int fd, gotlock, retry; 347 int fd, gotlock, retry;
340 struct flock lck; /* fcntl locking scheme */ 348 struct flock lck; /* fcntl locking scheme */
341 struct stat sbuf; 349 struct stat sbuf;
… …
372} 380}
373#endif 381#endif
374 382
375/* ------------------------------------------------------------------------- */ 383/* ------------------------------------------------------------------------- */
376#ifdef LASTLOG_SUPPORT 384#ifdef LASTLOG_SUPPORT
377/* INTPROTO */ 385static void
378void
379rxvt_update_lastlog (const char *fname, const char *pty, const char *host) 386rxvt_update_lastlog (const char *fname, const char *pty, const char *host)
380{ 387{
381# ifdef HAVE_STRUCT_LASTLOGX 388# ifdef HAVE_STRUCT_LASTLOGX
382 struct lastlogx llx; 389 struct lastlogx llx;
383# endif 390# endif

Diff Legend

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