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.27 by root, Tue Jan 17 10:14:26 2006 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.
… …
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 36
34#include "../config.h" 37#include "../config.h"
35#include "rxvt.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
36#include "ptytty.h" 47#include "ptytty.h"
37 48
38#if UTMP_SUPPORT 49#if UTMP_SUPPORT
39 50
40#if HAVE_STRUCT_UTMP 51#if HAVE_STRUCT_UTMP
41static int rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu); 52static int write_bsd_utmp (int utmp_pos, struct utmp *wu);
42static void rxvt_update_wtmp (const char *fname, const struct utmp *putmp); 53static void update_wtmp (const char *fname, const struct utmp *putmp);
43#endif 54#endif
44 55
45static void 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);
46 57
47/* 58/*
48 * BSD style utmp entry 59 * BSD style utmp entry
49 * ut_line, ut_name, ut_host, ut_time 60 * ut_line, ut_name, ut_host, ut_time
50 * SYSV style utmp (and utmpx) entry 61 * SYSV style utmp (and utmpx) entry
… …
55 66
56/* 67/*
57 * make and write utmp and wtmp entries 68 * make and write utmp and wtmp entries
58 */ 69 */
59void 70void
60rxvt_ptytty::login (int cmd_pid, bool login_shell, const char *hostname) 71ptytty_unix::login (int cmd_pid, bool login_shell, const char *hostname)
61{ 72{
73 const char *pty = name;
74
75 if (!pty || !*pty)
76 return;
77
62 this->cmd_pid = cmd_pid; 78 this->cmd_pid = cmd_pid;
63 this->login_shell = login_shell; 79 this->login_shell = login_shell;
64
65 const char *pty = name;
66 80
67#ifdef HAVE_STRUCT_UTMP 81#ifdef HAVE_STRUCT_UTMP
68 struct utmp *ut = &this->ut; 82 struct utmp *ut = &this->ut;
69#endif 83#endif
70#ifdef HAVE_STRUCT_UTMPX 84#ifdef HAVE_STRUCT_UTMPX
… …
81 strncpy (ut_id, pty + 3, sizeof (ut_id)); 95 strncpy (ut_id, pty + 3, sizeof (ut_id));
82 else if (sscanf (pty, "pts/%d", &i) == 1) 96 else if (sscanf (pty, "pts/%d", &i) == 1)
83 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */ 97 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */
84 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3)) 98 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3))
85 { 99 {
86 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);
87 return; 101 return;
88 } 102 }
89#endif 103#endif
90 104
91#ifdef HAVE_STRUCT_UTMP 105#ifdef HAVE_STRUCT_UTMP
… …
160 endutxent (); /* close the file */ 174 endutxent (); /* close the file */
161 utmp_pos = 0; 175 utmp_pos = 0;
162#endif 176#endif
163 177
164#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID) 178#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
165
166 { 179 {
167# ifdef HAVE_TTYSLOT 180# ifdef HAVE_TTYSLOT
181 int fdstdin = dup (STDIN_FILENO);
182 dup2 (tty, STDIN_FILENO);
183
168 i = ttyslot (); 184 i = ttyslot ();
169 if (rxvt_write_bsd_utmp (i, ut)) 185 if (write_bsd_utmp (i, ut))
170 utmp_pos = i; 186 utmp_pos = i;
187
188 dup2 (fdstdin, STDIN_FILENO);
189 close (fdstdin);
171# else 190# else
172 FILE *fd0; 191 FILE *fd0;
173 192
174 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL) 193 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL)
175 { 194 {
176 char buf[256], name[256]; 195 char buf[256], name[256];
177 196
… …
180 { 199 {
181 if (*buf == '#' || sscanf (buf, "%s", name) != 1) 200 if (*buf == '#' || sscanf (buf, "%s", name) != 1)
182 continue; 201 continue;
183 if (!strcmp (ut->ut_line, name)) 202 if (!strcmp (ut->ut_line, name))
184 { 203 {
185 if (!rxvt_write_bsd_utmp (i, ut)) 204 if (!write_bsd_utmp (i, ut))
186 i = 0; 205 i = 0;
187 utmp_pos = i; 206 utmp_pos = i;
188 fclose (fd0); 207 fclose (fd0);
189 break; 208 break;
190 } 209 }
… …
195# endif 214# endif
196 } 215 }
197#endif 216#endif
198 217
199#ifdef WTMP_SUPPORT 218#ifdef WTMP_SUPPORT
200# ifdef WTMP_ONLY_ON_LOGIN 219#ifdef LOG_ONLY_ON_LOGIN
201 if (login_shell) 220 if (login_shell)
202# endif 221#endif
203 { 222 {
204# ifdef HAVE_STRUCT_UTMP 223# ifdef HAVE_STRUCT_UTMP
205# ifdef HAVE_UPDWTMP 224# ifdef HAVE_UPDWTMP
206 updwtmp (RXVT_WTMP_FILE, ut); 225 updwtmp (WTMP_FILE, ut);
207# else 226# else
208 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 227 update_wtmp (WTMP_FILE, ut);
209# endif 228# endif
210# endif 229# endif
211# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX) 230# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
212 updwtmpx (RXVT_WTMPX_FILE, utx); 231 updwtmpx (WTMPX_FILE, utx);
213# endif
214 }
215#endif 232# endif
233 }
234#endif
216#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE) 235#if defined(LASTLOG_SUPPORT) && defined(LASTLOG_FILE)
236#ifdef LOG_ONLY_ON_LOGIN
217 if (login_shell) 237 if (login_shell)
238#endif
218 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname); 239 update_lastlog (LASTLOG_FILE, pty, hostname);
219#endif 240#endif
220} 241}
221 242
222/* ------------------------------------------------------------------------- */ 243/* ------------------------------------------------------------------------- */
223/* 244/*
224 * remove utmp and wtmp entries 245 * remove utmp and wtmp entries
225 */ 246 */
226void 247void
227rxvt_ptytty::logout () 248ptytty_unix::logout ()
228{ 249{
250 if (!cmd_pid)
251 return;
252
229#ifdef HAVE_STRUCT_UTMP 253#ifdef HAVE_STRUCT_UTMP
230 struct utmp *tmput, *ut = &this->ut; 254 struct utmp *tmput, *ut = &this->ut;
231#endif 255#endif
232#ifdef HAVE_STRUCT_UTMPX 256#ifdef HAVE_STRUCT_UTMPX
233 struct utmpx *tmputx, *utx = &this->utx; 257 struct utmpx *tmputx, *utx = &this->utx;
… …
268 292
269 /* 293 /*
270 * Write ending wtmp entry 294 * Write ending wtmp entry
271 */ 295 */
272#ifdef WTMP_SUPPORT 296#ifdef WTMP_SUPPORT
273# ifdef WTMP_ONLY_ON_LOGIN 297#ifdef LOG_ONLY_ON_LOGIN
274 if (login_shell) 298 if (login_shell)
275# endif 299#endif
276 { 300 {
277# ifdef HAVE_STRUCT_UTMP 301# ifdef HAVE_STRUCT_UTMP
278# ifdef HAVE_UPDWTMP 302# ifdef HAVE_UPDWTMP
279 updwtmp (RXVT_WTMP_FILE, ut); 303 updwtmp (WTMP_FILE, ut);
280# else 304# else
281 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 305 update_wtmp (WTMP_FILE, ut);
282# endif 306# endif
283# endif 307# endif
284# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX) 308# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
285 updwtmpx (RXVT_WTMPX_FILE, utx); 309 updwtmpx (WTMPX_FILE, utx);
286# endif 310# endif
287 } 311 }
288#endif 312#endif
289 313
290 /* 314 /*
… …
295 if (ut->ut_pid == cmd_pid) 319 if (ut->ut_pid == cmd_pid)
296 pututline (ut); 320 pututline (ut);
297 endutent (); 321 endutent ();
298# else 322# else
299 memset (ut, 0, sizeof (struct utmp)); 323 memset (ut, 0, sizeof (struct utmp));
300 rxvt_write_bsd_utmp (utmp_pos, ut); 324 write_bsd_utmp (utmp_pos, ut);
301# endif 325# endif
302#endif 326#endif
303#ifdef HAVE_STRUCT_UTMPX 327#ifdef HAVE_STRUCT_UTMPX
304 if (utx->ut_pid == cmd_pid) 328 if (utx->ut_pid == cmd_pid)
305 pututxline (utx); 329 pututxline (utx);
306 endutxent (); 330 endutxent ();
307#endif 331#endif
332
333 cmd_pid = 0;
308} 334}
309 335
310/* ------------------------------------------------------------------------- */ 336/* ------------------------------------------------------------------------- */
311/* 337/*
312 * Write a BSD style utmp entry 338 * Write a BSD style utmp entry
313 */ 339 */
314#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID) 340#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
315static int 341static int
316rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu) 342write_bsd_utmp (int utmp_pos, struct utmp *wu)
317{ 343{
318 int fd; 344 int fd;
319 345
320 if (utmp_pos <= 0 || (fd = open (RXVT_UTMP_FILE, O_WRONLY)) == -1) 346 if (utmp_pos <= 0 || (fd = open (UTMP_FILE, O_WRONLY)) == -1)
321 return 0; 347 return 0;
322 348
323 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)
324 write (fd, wu, sizeof (struct utmp)); 350 write (fd, wu, sizeof (struct utmp));
325 close (fd); 351 close (fd);
… …
331/* 357/*
332 * Update a BSD style wtmp entry 358 * Update a BSD style wtmp entry
333 */ 359 */
334#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP) 360#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP)
335static void 361static void
336rxvt_update_wtmp (const char *fname, const struct utmp *putmp) 362update_wtmp (const char *fname, const struct utmp *putmp)
337{ 363{
338 int fd, gotlock, retry; 364 int fd, gotlock, retry;
339 struct flock lck; /* fcntl locking scheme */ 365 struct flock lck; /* fcntl locking scheme */
340 struct stat sbuf; 366 struct stat sbuf;
341 367
… …
372#endif 398#endif
373 399
374/* ------------------------------------------------------------------------- */ 400/* ------------------------------------------------------------------------- */
375#ifdef LASTLOG_SUPPORT 401#ifdef LASTLOG_SUPPORT
376static void 402static void
377rxvt_update_lastlog (const char *fname, const char *pty, const char *host) 403update_lastlog (const char *fname, const char *pty, const char *host)
378{ 404{
379# ifdef HAVE_STRUCT_LASTLOGX 405# ifdef HAVE_STRUCT_LASTLOGX
380 struct lastlogx llx; 406 struct lastlogx llx;
381# endif 407# endif
382# ifdef HAVE_STRUCT_LASTLOG 408# ifdef HAVE_STRUCT_LASTLOG
… …
392 memset (&llx, 0, sizeof (llx)); 418 memset (&llx, 0, sizeof (llx));
393 llx.ll_tv.tv_sec = time (NULL); 419 llx.ll_tv.tv_sec = time (NULL);
394 llx.ll_tv.tv_usec = 0; 420 llx.ll_tv.tv_usec = 0;
395 strncpy (llx.ll_line, pty, sizeof (llx.ll_line)); 421 strncpy (llx.ll_line, pty, sizeof (llx.ll_line));
396 strncpy (llx.ll_host, host, sizeof (llx.ll_host)); 422 strncpy (llx.ll_host, host, sizeof (llx.ll_host));
397 updlastlogx (RXVT_LASTLOGX_FILE, getuid (), &llx); 423 updlastlogx (LASTLOGX_FILE, getuid (), &llx);
398# endif 424# endif
399 425
400# ifdef HAVE_STRUCT_LASTLOG 426# ifdef HAVE_STRUCT_LASTLOG
401 pwent = getpwuid (getuid ()); 427 pwent = getpwuid (getuid ());
402 if (!pwent) 428 if (!pwent)
403 { 429 {
404 rxvt_warn ("no entry in password file, not updating lastlog.\n"); 430 ptytty_warn ("no entry in password file, not updating lastlog.\n");
405 return; 431 return;
406 } 432 }
407 433
408 memset (&ll, 0, sizeof (ll)); 434 memset (&ll, 0, sizeof (ll));
409 ll.ll_time = time (NULL); 435 ll.ll_time = time (NULL);
… …
430 } 456 }
431# endif /* LASTLOG_IS_DIR */ 457# endif /* LASTLOG_IS_DIR */
432# endif /* HAVE_STRUCT_LASTLOG */ 458# endif /* HAVE_STRUCT_LASTLOG */
433} 459}
434#endif /* LASTLOG_SUPPORT */ 460#endif /* LASTLOG_SUPPORT */
435/* ------------------------------------------------------------------------- */
436 461
437#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