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

Diff Legend

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