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.29 by root, Tue Jan 17 10:59:32 2006 UTC vs.
Revision 1.39 by root, Sun Jan 22 12:21:47 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>
21 * Copyright (c) 2006 Emanuele Giaquinta <e.giaquinta@glauco.it>
18 * 22 *
19 * This program is free software; you can redistribute it and/or modify 23 * 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 24 * 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 25 * the Free Software Foundation; either version 2 of the License, or
22 * (at your option) any later version. 26 * (at your option) any later version.
… …
30 * along with this program; if not, write to the Free Software 34 * along with this program; if not, write to the Free Software
31 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 35 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
32 *----------------------------------------------------------------------*/ 36 *----------------------------------------------------------------------*/
33 37
34#include "../config.h" 38#include "../config.h"
35#include "rxvt.h" 39
40#include <cstdio>
41
42#include <sys/types.h>
43#include <sys/stat.h>
44#include <sys/fcntl.h>
45#include <unistd.h>
46#include <time.h>
47
36#include "ptytty.h" 48#include "ptytty.h"
37 49
38#if UTMP_SUPPORT 50#if UTMP_SUPPORT
39 51
40#if HAVE_STRUCT_UTMP 52#if HAVE_STRUCT_UTMP
41static int rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu); 53static int write_bsd_utmp (int utmp_pos, struct utmp *wu);
42static void rxvt_update_wtmp (const char *fname, const struct utmp *putmp); 54static void update_wtmp (const char *fname, const struct utmp *putmp);
43#endif 55#endif
44 56
45static void rxvt_update_lastlog (const char *fname, const char *pty, const char *host); 57static void update_lastlog (const char *fname, const char *pty, const char *host);
46 58
47/* 59/*
48 * BSD style utmp entry 60 * BSD style utmp entry
49 * ut_line, ut_name, ut_host, ut_time 61 * ut_line, ut_name, ut_host, ut_time
50 * SYSV style utmp (and utmpx) entry 62 * SYSV style utmp (and utmpx) entry
… …
55 67
56/* 68/*
57 * make and write utmp and wtmp entries 69 * make and write utmp and wtmp entries
58 */ 70 */
59void 71void
60rxvt_ptytty_unix::login (int cmd_pid, bool login_shell, const char *hostname) 72ptytty_unix::login (int cmd_pid, bool login_shell, const char *hostname)
61{ 73{
62 const char *pty = name; 74 const char *pty = name;
63 75
64 if (!pty || !*pty) 76 if (!pty || !*pty)
65 return; 77 return;
… …
84 strncpy (ut_id, pty + 3, sizeof (ut_id)); 96 strncpy (ut_id, pty + 3, sizeof (ut_id));
85 else if (sscanf (pty, "pts/%d", &i) == 1) 97 else if (sscanf (pty, "pts/%d", &i) == 1)
86 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */ 98 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */
87 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3)) 99 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3))
88 { 100 {
89 rxvt_warn ("can't parse tty name \"%s\", not adding utmp entry.\n", pty); 101 ptytty_warn ("can't parse tty name \"%s\", not adding utmp entry.\n", pty);
90 return; 102 return;
91 } 103 }
92#endif 104#endif
93 105
94#ifdef HAVE_STRUCT_UTMP 106#ifdef HAVE_STRUCT_UTMP
… …
163 endutxent (); /* close the file */ 175 endutxent (); /* close the file */
164 utmp_pos = 0; 176 utmp_pos = 0;
165#endif 177#endif
166 178
167#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID) 179#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
168
169 { 180 {
170# ifdef HAVE_TTYSLOT 181# ifdef HAVE_TTYSLOT
182 int fdstdin = dup (STDIN_FILENO);
183 dup2 (tty, STDIN_FILENO);
184
171 i = ttyslot (); 185 i = ttyslot ();
172 if (rxvt_write_bsd_utmp (i, ut)) 186 if (write_bsd_utmp (i, ut))
173 utmp_pos = i; 187 utmp_pos = i;
188
189 dup2 (fdstdin, STDIN_FILENO);
190 close (fdstdin);
174# else 191# else
175 FILE *fd0; 192 FILE *fd0;
176 193
177 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL) 194 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL)
178 { 195 {
179 char buf[256], name[256]; 196 char buf[256], name[256];
180 197
… …
183 { 200 {
184 if (*buf == '#' || sscanf (buf, "%s", name) != 1) 201 if (*buf == '#' || sscanf (buf, "%s", name) != 1)
185 continue; 202 continue;
186 if (!strcmp (ut->ut_line, name)) 203 if (!strcmp (ut->ut_line, name))
187 { 204 {
188 if (!rxvt_write_bsd_utmp (i, ut)) 205 if (!write_bsd_utmp (i, ut))
189 i = 0; 206 i = 0;
190 utmp_pos = i; 207 utmp_pos = i;
191 fclose (fd0); 208 fclose (fd0);
192 break; 209 break;
193 } 210 }
… …
198# endif 215# endif
199 } 216 }
200#endif 217#endif
201 218
202#ifdef WTMP_SUPPORT 219#ifdef WTMP_SUPPORT
203# ifdef WTMP_ONLY_ON_LOGIN 220#ifdef LOG_ONLY_ON_LOGIN
204 if (login_shell) 221 if (login_shell)
205# endif 222#endif
206 { 223 {
207# ifdef HAVE_STRUCT_UTMP 224# ifdef HAVE_STRUCT_UTMP
208# ifdef HAVE_UPDWTMP 225# ifdef HAVE_UPDWTMP
209 updwtmp (RXVT_WTMP_FILE, ut); 226 updwtmp (WTMP_FILE, ut);
210# else 227# else
211 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 228 update_wtmp (WTMP_FILE, ut);
212# endif 229# endif
213# endif 230# endif
214# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX) 231# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
215 updwtmpx (RXVT_WTMPX_FILE, utx); 232 updwtmpx (WTMPX_FILE, utx);
216# endif
217 }
218#endif 233# endif
234 }
235#endif
219#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE) 236#if defined(LASTLOG_SUPPORT) && defined(LASTLOG_FILE)
237#ifdef LOG_ONLY_ON_LOGIN
220 if (login_shell) 238 if (login_shell)
239#endif
221 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname); 240 update_lastlog (LASTLOG_FILE, pty, hostname);
222#endif 241#endif
223} 242}
224 243
225/* ------------------------------------------------------------------------- */ 244/* ------------------------------------------------------------------------- */
226/* 245/*
227 * remove utmp and wtmp entries 246 * remove utmp and wtmp entries
228 */ 247 */
229void 248void
230rxvt_ptytty_unix::logout () 249ptytty_unix::logout ()
231{ 250{
232 if (!cmd_pid) 251 if (!cmd_pid)
233 return; 252 return;
234 253
235#ifdef HAVE_STRUCT_UTMP 254#ifdef HAVE_STRUCT_UTMP
… …
274 293
275 /* 294 /*
276 * Write ending wtmp entry 295 * Write ending wtmp entry
277 */ 296 */
278#ifdef WTMP_SUPPORT 297#ifdef WTMP_SUPPORT
279# ifdef WTMP_ONLY_ON_LOGIN 298#ifdef LOG_ONLY_ON_LOGIN
280 if (login_shell) 299 if (login_shell)
281# endif 300#endif
282 { 301 {
283# ifdef HAVE_STRUCT_UTMP 302# ifdef HAVE_STRUCT_UTMP
284# ifdef HAVE_UPDWTMP 303# ifdef HAVE_UPDWTMP
285 updwtmp (RXVT_WTMP_FILE, ut); 304 updwtmp (WTMP_FILE, ut);
286# else 305# else
287 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 306 update_wtmp (WTMP_FILE, ut);
288# endif 307# endif
289# endif 308# endif
290# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX) 309# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
291 updwtmpx (RXVT_WTMPX_FILE, utx); 310 updwtmpx (WTMPX_FILE, utx);
292# endif 311# endif
293 } 312 }
294#endif 313#endif
295 314
296 /* 315 /*
… …
301 if (ut->ut_pid == cmd_pid) 320 if (ut->ut_pid == cmd_pid)
302 pututline (ut); 321 pututline (ut);
303 endutent (); 322 endutent ();
304# else 323# else
305 memset (ut, 0, sizeof (struct utmp)); 324 memset (ut, 0, sizeof (struct utmp));
306 rxvt_write_bsd_utmp (utmp_pos, ut); 325 write_bsd_utmp (utmp_pos, ut);
307# endif 326# endif
308#endif 327#endif
309#ifdef HAVE_STRUCT_UTMPX 328#ifdef HAVE_STRUCT_UTMPX
310 if (utx->ut_pid == cmd_pid) 329 if (utx->ut_pid == cmd_pid)
311 pututxline (utx); 330 pututxline (utx);
… …
319/* 338/*
320 * Write a BSD style utmp entry 339 * Write a BSD style utmp entry
321 */ 340 */
322#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID) 341#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
323static int 342static int
324rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu) 343write_bsd_utmp (int utmp_pos, struct utmp *wu)
325{ 344{
326 int fd; 345 int fd;
327 346
328 if (utmp_pos <= 0 || (fd = open (RXVT_UTMP_FILE, O_WRONLY)) == -1) 347 if (utmp_pos <= 0 || (fd = open (UTMP_FILE, O_WRONLY)) == -1)
329 return 0; 348 return 0;
330 349
331 if (lseek (fd, (off_t) (utmp_pos * sizeof (struct utmp)), SEEK_SET) != -1) 350 if (lseek (fd, (off_t) (utmp_pos * sizeof (struct utmp)), SEEK_SET) != -1)
332 write (fd, wu, sizeof (struct utmp)); 351 write (fd, wu, sizeof (struct utmp));
333 close (fd); 352 close (fd);
… …
339/* 358/*
340 * Update a BSD style wtmp entry 359 * Update a BSD style wtmp entry
341 */ 360 */
342#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP) 361#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP)
343static void 362static void
344rxvt_update_wtmp (const char *fname, const struct utmp *putmp) 363update_wtmp (const char *fname, const struct utmp *putmp)
345{ 364{
346 int fd, gotlock, retry; 365 int fd, gotlock, retry;
347 struct flock lck; /* fcntl locking scheme */ 366 struct flock lck; /* fcntl locking scheme */
348 struct stat sbuf; 367 struct stat sbuf;
349 368
… …
380#endif 399#endif
381 400
382/* ------------------------------------------------------------------------- */ 401/* ------------------------------------------------------------------------- */
383#ifdef LASTLOG_SUPPORT 402#ifdef LASTLOG_SUPPORT
384static void 403static void
385rxvt_update_lastlog (const char *fname, const char *pty, const char *host) 404update_lastlog (const char *fname, const char *pty, const char *host)
386{ 405{
387# ifdef HAVE_STRUCT_LASTLOGX 406# ifdef HAVE_STRUCT_LASTLOGX
388 struct lastlogx llx; 407 struct lastlogx llx;
389# endif 408# endif
390# ifdef HAVE_STRUCT_LASTLOG 409# ifdef HAVE_STRUCT_LASTLOG
… …
400 memset (&llx, 0, sizeof (llx)); 419 memset (&llx, 0, sizeof (llx));
401 llx.ll_tv.tv_sec = time (NULL); 420 llx.ll_tv.tv_sec = time (NULL);
402 llx.ll_tv.tv_usec = 0; 421 llx.ll_tv.tv_usec = 0;
403 strncpy (llx.ll_line, pty, sizeof (llx.ll_line)); 422 strncpy (llx.ll_line, pty, sizeof (llx.ll_line));
404 strncpy (llx.ll_host, host, sizeof (llx.ll_host)); 423 strncpy (llx.ll_host, host, sizeof (llx.ll_host));
405 updlastlogx (RXVT_LASTLOGX_FILE, getuid (), &llx); 424 updlastlogx (LASTLOGX_FILE, getuid (), &llx);
406# endif 425# endif
407 426
408# ifdef HAVE_STRUCT_LASTLOG 427# ifdef HAVE_STRUCT_LASTLOG
409 pwent = getpwuid (getuid ()); 428 pwent = getpwuid (getuid ());
410 if (!pwent) 429 if (!pwent)
411 { 430 {
412 rxvt_warn ("no entry in password file, not updating lastlog.\n"); 431 ptytty_warn ("no entry in password file, not updating lastlog.\n");
413 return; 432 return;
414 } 433 }
415 434
416 memset (&ll, 0, sizeof (ll)); 435 memset (&ll, 0, sizeof (ll));
417 ll.ll_time = time (NULL); 436 ll.ll_time = time (NULL);
… …
438 } 457 }
439# endif /* LASTLOG_IS_DIR */ 458# endif /* LASTLOG_IS_DIR */
440# endif /* HAVE_STRUCT_LASTLOG */ 459# endif /* HAVE_STRUCT_LASTLOG */
441} 460}
442#endif /* LASTLOG_SUPPORT */ 461#endif /* LASTLOG_SUPPORT */
443/* ------------------------------------------------------------------------- */
444 462
445#endif /* UTMP_SUPPORT */ 463#else
464void
465ptytty_unix::login (int cmd_pid, bool login_shell, const char *hostname)
466{
467}
468#endif
469

Diff Legend

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