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

Diff Legend

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