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

Diff Legend

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