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