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.15 by root, Wed Feb 16 21:21:43 2005 UTC vs.
Revision 1.38 by root, Sun Jan 22 04:01:52 2006 UTC

1// This file is part of libptytty. Do not make local modifications.
2// http://software.schmorp.de/pkg/libptytty
3
1/*--------------------------------*-C-*---------------------------------* 4/*----------------------------------------------------------------------*
2 * File: logging.C 5 * File: logging.C
3 *----------------------------------------------------------------------* 6 *----------------------------------------------------------------------*
4 * 7 *
5 * All portions of code are copyright by their respective author/s. 8 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey <jdb@ukc.ac.uk> 9 * Copyright (c) 1992 John Bovey <jdb@ukc.ac.uk>
… …
12 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 15 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 16 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
14 * - extensive modifications 17 * - extensive modifications
15 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> 18 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
16 * - lastlog support 19 * - lastlog support
17 * Copyright (c) 2004 Marc Lehmann <pcg@goof.com> 20 * Copyright (c) 2004-2006 Marc Lehmann <pcg@goof.com>
18 * 21 *
19 * This program is free software; you can redistribute it and/or modify 22 * 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 23 * 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 24 * the Free Software Foundation; either version 2 of the License, or
22 * (at your option) any later version. 25 * (at your option) any later version.
… …
28 * 31 *
29 * You should have received a copy of the GNU General Public License 32 * You should have received a copy of the GNU General Public License
30 * along with this program; if not, write to the Free Software 33 * along with this program; if not, write to the Free Software
31 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 34 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
32 *----------------------------------------------------------------------*/ 35 *----------------------------------------------------------------------*/
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 36
42#include "../config.h" /* NECESSARY */
43#include "rxvt.h" /* NECESSARY */
44#include "logging.h" 37#include "../config.h"
38
39#include <cstdio>
40
41#include <sys/types.h>
42#include <sys/stat.h>
43#include <sys/fcntl.h>
44#include <unistd.h>
45#include <time.h>
46
47#include "ptytty.h"
48
45#ifdef UTMP_SUPPORT 49#if UTMP_SUPPORT
46 50
51#if HAVE_STRUCT_UTMP
47int rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu); 52static int write_bsd_utmp (int utmp_pos, struct utmp *wu);
48void rxvt_update_wtmp (const char *fname, const struct utmp *putmp); 53static void update_wtmp (const char *fname, const struct utmp *putmp);
54#endif
55
49void rxvt_update_lastlog (const char *fname, const char *pty, const char *host); 56static void update_lastlog (const char *fname, const char *pty, const char *host);
50 57
51/* 58/*
52 * BSD style utmp entry 59 * BSD style utmp entry
53 * ut_line, ut_name, ut_host, ut_time 60 * ut_line, ut_name, ut_host, ut_time
54 * SYSV style utmp (and utmpx) entry 61 * SYSV style utmp (and utmpx) entry
… …
59 66
60/* 67/*
61 * make and write utmp and wtmp entries 68 * make and write utmp and wtmp entries
62 */ 69 */
63void 70void
64rxvt_term::makeutent (const char *pty, const char *hostname) 71ptytty_unix::login (int cmd_pid, bool login_shell, const char *hostname)
65{ 72{
73 const char *pty = name;
74
75 if (!pty || !*pty)
76 return;
77
78 this->cmd_pid = cmd_pid;
79 this->login_shell = login_shell;
80
66#ifdef HAVE_STRUCT_UTMP 81#ifdef HAVE_STRUCT_UTMP
67 struct utmp *ut = &this->ut; 82 struct utmp *ut = &this->ut;
68#endif 83#endif
69#ifdef HAVE_STRUCT_UTMPX 84#ifdef HAVE_STRUCT_UTMPX
70 struct utmpx *utx = &this->utx; 85 struct utmpx *utx = &this->utx;
71#endif 86#endif
72#ifdef HAVE_UTMP_PID
73 int i; 87 int i;
74#endif
75 struct passwd *pwent = getpwuid (getuid ()); 88 struct passwd *pwent = getpwuid (getuid ());
76 89
77 if (!strncmp (pty, "/dev/", 5)) 90 if (!strncmp (pty, "/dev/", 5))
78 pty += 5; /* skip /dev/ prefix */ 91 pty += 5; /* skip /dev/ prefix */
79 92
80#ifdef HAVE_UTMP_PID 93#if defined(HAVE_UTMP_PID) || defined(HAVE_STRUCT_UTMPX)
81 if (!strncmp (pty, "pty", 3) || !strncmp (pty, "tty", 3)) 94 if (!strncmp (pty, "pty", 3) || !strncmp (pty, "tty", 3))
82 strncpy (ut_id, pty + 3, sizeof (ut_id)); 95 strncpy (ut_id, pty + 3, sizeof (ut_id));
83 else if (sscanf (pty, "pts/%d", &i) == 1) 96 else if (sscanf (pty, "pts/%d", &i) == 1)
84 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */ 97 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */
85 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3)) 98 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3))
86 { 99 {
87 rxvt_warn ("can't parse tty name \"%s\", not adding utmp entry.\n", pty); 100 ptytty_warn ("can't parse tty name \"%s\", not adding utmp entry.\n", pty);
88 return; 101 return;
89 } 102 }
90#endif 103#endif
91 104
92#ifdef HAVE_STRUCT_UTMP 105#ifdef HAVE_STRUCT_UTMP
… …
94# ifdef HAVE_UTMP_PID 107# ifdef HAVE_UTMP_PID
95 setutent (); 108 setutent ();
96 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id)); 109 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id));
97 ut->ut_type = DEAD_PROCESS; 110 ut->ut_type = DEAD_PROCESS;
98 getutid (ut); /* position to entry in utmp file */ 111 getutid (ut); /* position to entry in utmp file */
99 strncpy (ut_id, ut_id, sizeof (ut_id)); 112 strncpy (this->ut_id, ut_id, sizeof (this->ut_id));
100# endif 113# endif
101#endif 114#endif
102 115
103#ifdef HAVE_STRUCT_UTMPX 116#ifdef HAVE_STRUCT_UTMPX
104 memset (utx, 0, sizeof (struct utmpx)); 117 memset (utx, 0, sizeof (struct utmpx));
105 setutxent (); 118 setutxent ();
106 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id)); 119 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id));
107 utx->ut_type = DEAD_PROCESS; 120 utx->ut_type = DEAD_PROCESS;
108 getutxid (utx); /* position to entry in utmp file */ 121 getutxid (utx); /* position to entry in utmp file */
109 strncpy (ut_id, ut_id, sizeof (ut_id)); 122 strncpy (this->ut_id, ut_id, sizeof (this->ut_id));
110#endif 123#endif
111 124
112#ifdef HAVE_STRUCT_UTMP 125#ifdef HAVE_STRUCT_UTMP
113 strncpy (ut->ut_line, pty, sizeof (ut->ut_line)); 126 strncpy (ut->ut_line, pty, sizeof (ut->ut_line));
114 ut->ut_time = time (NULL); 127 ut->ut_time = time (NULL);
… …
161 endutxent (); /* close the file */ 174 endutxent (); /* close the file */
162 utmp_pos = 0; 175 utmp_pos = 0;
163#endif 176#endif
164 177
165#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID) 178#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
166
167 { 179 {
168 int i;
169# ifdef HAVE_TTYSLOT 180# ifdef HAVE_TTYSLOT
181 int fdstdin = dup (STDIN_FILENO);
182 dup2 (tty, STDIN_FILENO);
183
170 i = ttyslot (); 184 i = ttyslot ();
171 if (rxvt_write_bsd_utmp (i, ut)) 185 if (write_bsd_utmp (i, ut))
172 utmp_pos = i; 186 utmp_pos = i;
187
188 dup2 (fdstdin, STDIN_FILENO);
189 close (fdstdin);
173# else 190# else
174 FILE *fd0; 191 FILE *fd0;
175 192
176 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL) 193 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL)
177 { 194 {
178 char buf[256], name[256]; 195 char buf[256], name[256];
179 196
180 buf[sizeof (buf) - 1] = '\0'; 197 buf[sizeof (buf) - 1] = '\0';
181 for (i = 1; (fgets (buf, sizeof (buf) - 1, fd0) != NULL);) 198 for (i = 1; (fgets (buf, sizeof (buf) - 1, fd0) != NULL);)
182 { 199 {
183 if (*buf == '#' || sscanf (buf, "%s", name) != 1) 200 if (*buf == '#' || sscanf (buf, "%s", name) != 1)
184 continue; 201 continue;
185 if (!strcmp (ut->ut_line, name)) 202 if (!strcmp (ut->ut_line, name))
186 { 203 {
187 if (!rxvt_write_bsd_utmp (i, ut)) 204 if (!write_bsd_utmp (i, ut))
188 i = 0; 205 i = 0;
189 utmp_pos = i; 206 utmp_pos = i;
190 fclose (fd0); 207 fclose (fd0);
191 break; 208 break;
192 } 209 }
193 i++; 210 i++;
194 } 211 }
195 fclose (fd0); 212 fclose (fd0);
196 } 213 }
197# endif 214# endif
198
199 } 215 }
200#endif 216#endif
201 217
202#ifdef WTMP_SUPPORT 218#ifdef WTMP_SUPPORT
203# ifdef WTMP_ONLY_ON_LOGIN 219#ifdef LOG_ONLY_ON_LOGIN
204 if (options & Opt_loginShell) 220 if (login_shell)
205# endif 221#endif
206 { 222 {
207# ifdef HAVE_STRUCT_UTMP 223# ifdef HAVE_STRUCT_UTMP
208# ifdef HAVE_UPDWTMP 224# ifdef HAVE_UPDWTMP
209 updwtmp (RXVT_WTMP_FILE, ut); 225 updwtmp (WTMP_FILE, ut);
210# else 226# else
211 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 227 update_wtmp (WTMP_FILE, ut);
212# endif
213# endif 228# endif
214# ifdef HAVE_STRUCT_UTMPX
215# if HAVE_UPDWTMPX
216 updwtmpx (RXVT_WTMPX_FILE, utx);
217# endif 229# endif
218# endif 230# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
219 } 231 updwtmpx (WTMPX_FILE, utx);
220#endif 232# endif
233 }
234#endif
221#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE) 235#if defined(LASTLOG_SUPPORT) && defined(LASTLOG_FILE)
222 if (options & Opt_loginShell) 236#ifdef LOG_ONLY_ON_LOGIN
237 if (login_shell)
238#endif
223 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname); 239 update_lastlog (LASTLOG_FILE, pty, hostname);
224#endif 240#endif
225} 241}
226 242
227/* ------------------------------------------------------------------------- */ 243/* ------------------------------------------------------------------------- */
228/* 244/*
229 * remove utmp and wtmp entries 245 * remove utmp and wtmp entries
230 */ 246 */
231void 247void
232rxvt_term::cleanutent () 248ptytty_unix::logout ()
233{ 249{
250 if (!cmd_pid)
251 return;
252
234#ifdef HAVE_STRUCT_UTMP 253#ifdef HAVE_STRUCT_UTMP
235 struct utmp *ut = &this->ut; 254 struct utmp *tmput, *ut = &this->ut;
236#endif 255#endif
237#ifdef HAVE_STRUCT_UTMPX 256#ifdef HAVE_STRUCT_UTMPX
238 struct utmpx *tmputx, *utx = &this->utx; 257 struct utmpx *tmputx, *utx = &this->utx;
239#endif 258#endif
240 259
241#ifdef HAVE_STRUCT_UTMP 260#ifdef HAVE_STRUCT_UTMP
242# ifdef HAVE_UTMP_PID 261# ifdef HAVE_UTMP_PID
243 memset (ut, 0, sizeof (struct utmp)); 262 memset (ut, 0, sizeof (struct utmp));
244 setutent (); 263 setutent ();
245 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id)); 264 strncpy (ut->ut_id, this->ut_id, sizeof (ut->ut_id));
246 ut->ut_type = USER_PROCESS; 265 ut->ut_type = USER_PROCESS;
247 {
248 struct utmp *tmput = getutid (ut);
249
250 if (tmput) /* position to entry in utmp file */ 266 if ((tmput = getutid (ut))) /* position to entry in utmp file */
251 ut = tmput; 267 ut = tmput;
252 }
253 ut->ut_type = DEAD_PROCESS; 268 ut->ut_type = DEAD_PROCESS;
254# else 269# else
255 memset (ut->ut_name, 0, sizeof (ut->ut_name)); 270 memset (ut->ut_name, 0, sizeof (ut->ut_name));
256# ifdef HAVE_UTMP_HOST 271# ifdef HAVE_UTMP_HOST
257 memset (ut->ut_host, 0, sizeof (ut->ut_host)); 272 memset (ut->ut_host, 0, sizeof (ut->ut_host));
… …
261#endif 276#endif
262 277
263#ifdef HAVE_STRUCT_UTMPX 278#ifdef HAVE_STRUCT_UTMPX
264 memset (utx, 0, sizeof (struct utmpx)); 279 memset (utx, 0, sizeof (struct utmpx));
265 setutxent (); 280 setutxent ();
266 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id)); 281 strncpy (utx->ut_id, this->ut_id, sizeof (utx->ut_id));
267 utx->ut_type = USER_PROCESS; 282 utx->ut_type = USER_PROCESS;
268 if ((tmputx = getutxid (utx))) /* position to entry in utmp file */ 283 if ((tmputx = getutxid (utx))) /* position to entry in utmp file */
269 utx = tmputx; 284 utx = tmputx;
270 utx->ut_type = DEAD_PROCESS; 285 utx->ut_type = DEAD_PROCESS;
271# if HAVE_UTMPX_SESSION 286# if HAVE_UTMPX_SESSION
… …
277 292
278 /* 293 /*
279 * Write ending wtmp entry 294 * Write ending wtmp entry
280 */ 295 */
281#ifdef WTMP_SUPPORT 296#ifdef WTMP_SUPPORT
282# ifdef WTMP_ONLY_ON_LOGIN 297#ifdef LOG_ONLY_ON_LOGIN
283 if (options & Opt_loginShell) 298 if (login_shell)
284# endif 299#endif
285 { 300 {
286# ifdef HAVE_STRUCT_UTMP 301# ifdef HAVE_STRUCT_UTMP
287# ifdef HAVE_UPDWTMP 302# ifdef HAVE_UPDWTMP
288 updwtmp (RXVT_WTMP_FILE, ut); 303 updwtmp (WTMP_FILE, ut);
289# else 304# else
290 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 305 update_wtmp (WTMP_FILE, ut);
291# endif
292# endif 306# endif
293# ifdef HAVE_STRUCT_UTMPX
294# if HAVE_UPDWTMPX
295 updwtmpx (RXVT_WTMPX_FILE, utx);
296# endif 307# endif
308# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
309 updwtmpx (WTMPX_FILE, utx);
297# endif 310# endif
298 } 311 }
299#endif 312#endif
300 313
301 /* 314 /*
… …
306 if (ut->ut_pid == cmd_pid) 319 if (ut->ut_pid == cmd_pid)
307 pututline (ut); 320 pututline (ut);
308 endutent (); 321 endutent ();
309# else 322# else
310 memset (ut, 0, sizeof (struct utmp)); 323 memset (ut, 0, sizeof (struct utmp));
311 rxvt_write_bsd_utmp (utmp_pos, ut); 324 write_bsd_utmp (utmp_pos, ut);
312# endif 325# endif
313#endif 326#endif
314#ifdef HAVE_STRUCT_UTMPX 327#ifdef HAVE_STRUCT_UTMPX
315 if (utx->ut_pid == cmd_pid) 328 if (utx->ut_pid == cmd_pid)
316 pututxline (utx); 329 pututxline (utx);
317 endutxent (); 330 endutxent ();
318#endif 331#endif
332
333 cmd_pid = 0;
319} 334}
320 335
321/* ------------------------------------------------------------------------- */ 336/* ------------------------------------------------------------------------- */
322/* 337/*
323 * Write a BSD style utmp entry 338 * Write a BSD style utmp entry
324 */ 339 */
325#ifdef HAVE_UTMP_H 340#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
326/* INTPROTO */ 341static int
327int
328rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu) 342write_bsd_utmp (int utmp_pos, struct utmp *wu)
329{ 343{
330 int fd; 344 int fd;
331 345
332 if (utmp_pos <= 0 || (fd = open (RXVT_UTMP_FILE, O_WRONLY)) == -1) 346 if (utmp_pos <= 0 || (fd = open (UTMP_FILE, O_WRONLY)) == -1)
333 return 0; 347 return 0;
334 348
335 if (lseek (fd, (off_t) (utmp_pos * sizeof (struct utmp)), SEEK_SET) != -1) 349 if (lseek (fd, (off_t) (utmp_pos * sizeof (struct utmp)), SEEK_SET) != -1)
336 write (fd, wu, sizeof (struct utmp)); 350 write (fd, wu, sizeof (struct utmp));
337 close (fd); 351 close (fd);
… …
341 355
342/* ------------------------------------------------------------------------- */ 356/* ------------------------------------------------------------------------- */
343/* 357/*
344 * Update a BSD style wtmp entry 358 * Update a BSD style wtmp entry
345 */ 359 */
346#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) 360#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP)
347/* INTPROTO */ 361static void
348void
349rxvt_update_wtmp (const char *fname, const struct utmp *putmp) 362update_wtmp (const char *fname, const struct utmp *putmp)
350{ 363{
351 int fd, gotlock, retry; 364 int fd, gotlock, retry;
352 struct flock lck; /* fcntl locking scheme */ 365 struct flock lck; /* fcntl locking scheme */
353 struct stat sbuf; 366 struct stat sbuf;
354 367
… …
384} 397}
385#endif 398#endif
386 399
387/* ------------------------------------------------------------------------- */ 400/* ------------------------------------------------------------------------- */
388#ifdef LASTLOG_SUPPORT 401#ifdef LASTLOG_SUPPORT
389/* INTPROTO */ 402static void
390void
391rxvt_update_lastlog (const char *fname, const char *pty, const char *host) 403update_lastlog (const char *fname, const char *pty, const char *host)
392{ 404{
393# ifdef HAVE_STRUCT_LASTLOGX 405# ifdef HAVE_STRUCT_LASTLOGX
394 struct lastlogx llx; 406 struct lastlogx llx;
395# endif 407# endif
396# ifdef HAVE_STRUCT_LASTLOG 408# ifdef HAVE_STRUCT_LASTLOG
… …
406 memset (&llx, 0, sizeof (llx)); 418 memset (&llx, 0, sizeof (llx));
407 llx.ll_tv.tv_sec = time (NULL); 419 llx.ll_tv.tv_sec = time (NULL);
408 llx.ll_tv.tv_usec = 0; 420 llx.ll_tv.tv_usec = 0;
409 strncpy (llx.ll_line, pty, sizeof (llx.ll_line)); 421 strncpy (llx.ll_line, pty, sizeof (llx.ll_line));
410 strncpy (llx.ll_host, host, sizeof (llx.ll_host)); 422 strncpy (llx.ll_host, host, sizeof (llx.ll_host));
411 updlastlogx (RXVT_LASTLOGX_FILE, getuid (), &llx); 423 updlastlogx (LASTLOGX_FILE, getuid (), &llx);
412# endif 424# endif
413 425
414# ifdef HAVE_STRUCT_LASTLOG 426# ifdef HAVE_STRUCT_LASTLOG
415 pwent = getpwuid (getuid ()); 427 pwent = getpwuid (getuid ());
416 if (!pwent) 428 if (!pwent)
417 { 429 {
418 rxvt_warn ("no entry in password file, not updating lastlog.\n"); 430 ptytty_warn ("no entry in password file, not updating lastlog.\n");
419 return; 431 return;
420 } 432 }
421 433
422 memset (&ll, 0, sizeof (ll)); 434 memset (&ll, 0, sizeof (ll));
423 ll.ll_time = time (NULL); 435 ll.ll_time = time (NULL);
… …
444 } 456 }
445# endif /* LASTLOG_IS_DIR */ 457# endif /* LASTLOG_IS_DIR */
446# endif /* HAVE_STRUCT_LASTLOG */ 458# endif /* HAVE_STRUCT_LASTLOG */
447} 459}
448#endif /* LASTLOG_SUPPORT */ 460#endif /* LASTLOG_SUPPORT */
449/* ------------------------------------------------------------------------- */
450 461
451#endif /* UTMP_SUPPORT */ 462#else
463void
464ptytty_unix::login (int cmd_pid, bool login_shell, const char *hostname)
465{
466}
467#endif
468

Diff Legend

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