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