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