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.20 by root, Fri Jan 13 07:03:48 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
49int rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu); 52static int write_bsd_utmp (int utmp_pos, struct utmp *wu);
50void 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
53void 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;
75#endif 86#endif
76#ifdef HAVE_UTMP_PID
77 int i; 87 int i;
78#endif
79 struct passwd *pwent = getpwuid (getuid ()); 88 struct passwd *pwent = getpwuid (getuid ());
80 89
81 if (!strncmp (pty, "/dev/", 5)) 90 if (!strncmp (pty, "/dev/", 5))
82 pty += 5; /* skip /dev/ prefix */ 91 pty += 5; /* skip /dev/ prefix */
83 92
84#ifdef HAVE_UTMP_PID 93#if defined(HAVE_UTMP_PID) || defined(HAVE_STRUCT_UTMPX)
85 if (!strncmp (pty, "pty", 3) || !strncmp (pty, "tty", 3)) 94 if (!strncmp (pty, "pty", 3) || !strncmp (pty, "tty", 3))
86 strncpy (ut_id, pty + 3, sizeof (ut_id)); 95 strncpy (ut_id, pty + 3, sizeof (ut_id));
87 else if (sscanf (pty, "pts/%d", &i) == 1) 96 else if (sscanf (pty, "pts/%d", &i) == 1)
88 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */ 97 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */
89 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3)) 98 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3))
90 { 99 {
91 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);
92 return; 101 return;
93 } 102 }
94#endif 103#endif
95 104
96#ifdef HAVE_STRUCT_UTMP 105#ifdef HAVE_STRUCT_UTMP
… …
98# ifdef HAVE_UTMP_PID 107# ifdef HAVE_UTMP_PID
99 setutent (); 108 setutent ();
100 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id)); 109 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id));
101 ut->ut_type = DEAD_PROCESS; 110 ut->ut_type = DEAD_PROCESS;
102 getutid (ut); /* position to entry in utmp file */ 111 getutid (ut); /* position to entry in utmp file */
103 strncpy (ut_id, ut_id, sizeof (ut_id)); 112 strncpy (this->ut_id, ut_id, sizeof (this->ut_id));
104# endif 113# endif
105#endif 114#endif
106 115
107#ifdef HAVE_STRUCT_UTMPX 116#ifdef HAVE_STRUCT_UTMPX
108 memset (utx, 0, sizeof (struct utmpx)); 117 memset (utx, 0, sizeof (struct utmpx));
109 setutxent (); 118 setutxent ();
110 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id)); 119 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id));
111 utx->ut_type = DEAD_PROCESS; 120 utx->ut_type = DEAD_PROCESS;
112 getutxid (utx); /* position to entry in utmp file */ 121 getutxid (utx); /* position to entry in utmp file */
113 strncpy (ut_id, ut_id, sizeof (ut_id)); 122 strncpy (this->ut_id, ut_id, sizeof (this->ut_id));
114#endif 123#endif
115 124
116#ifdef HAVE_STRUCT_UTMP 125#ifdef HAVE_STRUCT_UTMP
117 strncpy (ut->ut_line, pty, sizeof (ut->ut_line)); 126 strncpy (ut->ut_line, pty, sizeof (ut->ut_line));
118 ut->ut_time = time (NULL); 127 ut->ut_time = time (NULL);
… …
165 endutxent (); /* close the file */ 174 endutxent (); /* close the file */
166 utmp_pos = 0; 175 utmp_pos = 0;
167#endif 176#endif
168 177
169#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID) 178#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
170
171 { 179 {
172 int i;
173# ifdef HAVE_TTYSLOT 180# ifdef HAVE_TTYSLOT
181 int fdstdin = dup (STDIN_FILENO);
182 dup2 (tty, STDIN_FILENO);
183
174 i = ttyslot (); 184 i = ttyslot ();
175 if (rxvt_write_bsd_utmp (i, ut)) 185 if (write_bsd_utmp (i, ut))
176 utmp_pos = i; 186 utmp_pos = i;
187
188 dup2 (fdstdin, STDIN_FILENO);
189 close (fdstdin);
177# else 190# else
178 FILE *fd0; 191 FILE *fd0;
179 192
180 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL) 193 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL)
181 { 194 {
182 char buf[256], name[256]; 195 char buf[256], name[256];
183 196
… …
186 { 199 {
187 if (*buf == '#' || sscanf (buf, "%s", name) != 1) 200 if (*buf == '#' || sscanf (buf, "%s", name) != 1)
188 continue; 201 continue;
189 if (!strcmp (ut->ut_line, name)) 202 if (!strcmp (ut->ut_line, name))
190 { 203 {
191 if (!rxvt_write_bsd_utmp (i, ut)) 204 if (!write_bsd_utmp (i, ut))
192 i = 0; 205 i = 0;
193 utmp_pos = i; 206 utmp_pos = i;
194 fclose (fd0); 207 fclose (fd0);
195 break; 208 break;
196 } 209 }
197 i++; 210 i++;
198 } 211 }
199 fclose (fd0); 212 fclose (fd0);
200 } 213 }
201# endif 214# endif
202
203 } 215 }
204#endif 216#endif
205 217
206#ifdef WTMP_SUPPORT 218#ifdef WTMP_SUPPORT
207# ifdef WTMP_ONLY_ON_LOGIN 219#ifdef LOG_ONLY_ON_LOGIN
208 if (OPTION (Opt_loginShell)) 220 if (login_shell)
209# endif 221#endif
210 { 222 {
211# ifdef HAVE_STRUCT_UTMP 223# ifdef HAVE_STRUCT_UTMP
212# ifdef HAVE_UPDWTMP 224# ifdef HAVE_UPDWTMP
213 updwtmp (RXVT_WTMP_FILE, ut); 225 updwtmp (WTMP_FILE, ut);
214# else 226# else
215 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 227 update_wtmp (WTMP_FILE, ut);
216# endif
217# endif 228# endif
218# ifdef HAVE_STRUCT_UTMPX
219# if HAVE_UPDWTMPX
220 updwtmpx (RXVT_WTMPX_FILE, utx);
221# else
222 pututxline (utx);
223# endif 229# endif
224# endif 230# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
225 } 231 updwtmpx (WTMPX_FILE, utx);
226#endif 232# endif
233 }
234#endif
227#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE) 235#if defined(LASTLOG_SUPPORT) && defined(LASTLOG_FILE)
228 if (OPTION (Opt_loginShell)) 236#ifdef LOG_ONLY_ON_LOGIN
237 if (login_shell)
238#endif
229 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname); 239 update_lastlog (LASTLOG_FILE, pty, hostname);
230#endif 240#endif
231} 241}
232 242
233/* ------------------------------------------------------------------------- */ 243/* ------------------------------------------------------------------------- */
234/* 244/*
235 * remove utmp and wtmp entries 245 * remove utmp and wtmp entries
236 */ 246 */
237void 247void
238rxvt_term::cleanutent () 248ptytty_unix::logout ()
239{ 249{
250 if (!cmd_pid)
251 return;
252
240#ifdef HAVE_STRUCT_UTMP 253#ifdef HAVE_STRUCT_UTMP
241 struct utmp *ut = &this->ut; 254 struct utmp *tmput, *ut = &this->ut;
242#endif 255#endif
243#ifdef HAVE_STRUCT_UTMPX 256#ifdef HAVE_STRUCT_UTMPX
244 struct utmpx *tmputx, *utx = &this->utx; 257 struct utmpx *tmputx, *utx = &this->utx;
245#endif 258#endif
246 259
247#ifdef HAVE_STRUCT_UTMP 260#ifdef HAVE_STRUCT_UTMP
248# ifdef HAVE_UTMP_PID 261# ifdef HAVE_UTMP_PID
249 memset (ut, 0, sizeof (struct utmp)); 262 memset (ut, 0, sizeof (struct utmp));
250 setutent (); 263 setutent ();
251 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id)); 264 strncpy (ut->ut_id, this->ut_id, sizeof (ut->ut_id));
252 ut->ut_type = USER_PROCESS; 265 ut->ut_type = USER_PROCESS;
253 {
254 struct utmp *tmput = getutid (ut);
255
256 if (tmput) /* position to entry in utmp file */ 266 if ((tmput = getutid (ut))) /* position to entry in utmp file */
257 ut = tmput; 267 ut = tmput;
258 }
259 ut->ut_type = DEAD_PROCESS; 268 ut->ut_type = DEAD_PROCESS;
260# else 269# else
261 memset (ut->ut_name, 0, sizeof (ut->ut_name)); 270 memset (ut->ut_name, 0, sizeof (ut->ut_name));
262# ifdef HAVE_UTMP_HOST 271# ifdef HAVE_UTMP_HOST
263 memset (ut->ut_host, 0, sizeof (ut->ut_host)); 272 memset (ut->ut_host, 0, sizeof (ut->ut_host));
… …
267#endif 276#endif
268 277
269#ifdef HAVE_STRUCT_UTMPX 278#ifdef HAVE_STRUCT_UTMPX
270 memset (utx, 0, sizeof (struct utmpx)); 279 memset (utx, 0, sizeof (struct utmpx));
271 setutxent (); 280 setutxent ();
272 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id)); 281 strncpy (utx->ut_id, this->ut_id, sizeof (utx->ut_id));
273 utx->ut_type = USER_PROCESS; 282 utx->ut_type = USER_PROCESS;
274 if ((tmputx = getutxid (utx))) /* position to entry in utmp file */ 283 if ((tmputx = getutxid (utx))) /* position to entry in utmp file */
275 utx = tmputx; 284 utx = tmputx;
276 utx->ut_type = DEAD_PROCESS; 285 utx->ut_type = DEAD_PROCESS;
277# if HAVE_UTMPX_SESSION 286# if HAVE_UTMPX_SESSION
… …
283 292
284 /* 293 /*
285 * Write ending wtmp entry 294 * Write ending wtmp entry
286 */ 295 */
287#ifdef WTMP_SUPPORT 296#ifdef WTMP_SUPPORT
288# ifdef WTMP_ONLY_ON_LOGIN 297#ifdef LOG_ONLY_ON_LOGIN
289 if (OPTION (Opt_loginShell)) 298 if (login_shell)
290# endif 299#endif
291 { 300 {
292# ifdef HAVE_STRUCT_UTMP 301# ifdef HAVE_STRUCT_UTMP
293# ifdef HAVE_UPDWTMP 302# ifdef HAVE_UPDWTMP
294 updwtmp (RXVT_WTMP_FILE, ut); 303 updwtmp (WTMP_FILE, ut);
295# else 304# else
296 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 305 update_wtmp (WTMP_FILE, ut);
297# endif
298# endif 306# endif
299# ifdef HAVE_STRUCT_UTMPX
300# if HAVE_UPDWTMPX
301 updwtmpx (RXVT_WTMPX_FILE, utx);
302# else
303 pututxline (utx);
304# endif 307# endif
308# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
309 updwtmpx (WTMPX_FILE, utx);
305# endif 310# endif
306 } 311 }
307#endif 312#endif
308 313
309 /* 314 /*
… …
314 if (ut->ut_pid == cmd_pid) 319 if (ut->ut_pid == cmd_pid)
315 pututline (ut); 320 pututline (ut);
316 endutent (); 321 endutent ();
317# else 322# else
318 memset (ut, 0, sizeof (struct utmp)); 323 memset (ut, 0, sizeof (struct utmp));
319 rxvt_write_bsd_utmp (utmp_pos, ut); 324 write_bsd_utmp (utmp_pos, ut);
320# endif 325# endif
321#endif 326#endif
322#ifdef HAVE_STRUCT_UTMPX 327#ifdef HAVE_STRUCT_UTMPX
323 if (utx->ut_pid == cmd_pid) 328 if (utx->ut_pid == cmd_pid)
324 pututxline (utx); 329 pututxline (utx);
325 endutxent (); 330 endutxent ();
326#endif 331#endif
332
333 cmd_pid = 0;
327} 334}
328 335
329/* ------------------------------------------------------------------------- */ 336/* ------------------------------------------------------------------------- */
330/* 337/*
331 * Write a BSD style utmp entry 338 * Write a BSD style utmp entry
332 */ 339 */
333#ifdef HAVE_UTMP_H 340#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
334int 341static int
335rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu) 342write_bsd_utmp (int utmp_pos, struct utmp *wu)
336{ 343{
337 int fd; 344 int fd;
338 345
339 if (utmp_pos <= 0 || (fd = open (RXVT_UTMP_FILE, O_WRONLY)) == -1) 346 if (utmp_pos <= 0 || (fd = open (UTMP_FILE, O_WRONLY)) == -1)
340 return 0; 347 return 0;
341 348
342 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)
343 write (fd, wu, sizeof (struct utmp)); 350 write (fd, wu, sizeof (struct utmp));
344 close (fd); 351 close (fd);
… …
349/* ------------------------------------------------------------------------- */ 356/* ------------------------------------------------------------------------- */
350/* 357/*
351 * Update a BSD style wtmp entry 358 * Update a BSD style wtmp entry
352 */ 359 */
353#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP) 360#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP)
354void 361static void
355rxvt_update_wtmp (const char *fname, const struct utmp *putmp) 362update_wtmp (const char *fname, const struct utmp *putmp)
356{ 363{
357 int fd, gotlock, retry; 364 int fd, gotlock, retry;
358 struct flock lck; /* fcntl locking scheme */ 365 struct flock lck; /* fcntl locking scheme */
359 struct stat sbuf; 366 struct stat sbuf;
360 367
… …
390} 397}
391#endif 398#endif
392 399
393/* ------------------------------------------------------------------------- */ 400/* ------------------------------------------------------------------------- */
394#ifdef LASTLOG_SUPPORT 401#ifdef LASTLOG_SUPPORT
395void 402static void
396rxvt_update_lastlog (const char *fname, const char *pty, const char *host) 403update_lastlog (const char *fname, const char *pty, const char *host)
397{ 404{
398# ifdef HAVE_STRUCT_LASTLOGX 405# ifdef HAVE_STRUCT_LASTLOGX
399 struct lastlogx llx; 406 struct lastlogx llx;
400# endif 407# endif
401# ifdef HAVE_STRUCT_LASTLOG 408# ifdef HAVE_STRUCT_LASTLOG
… …
411 memset (&llx, 0, sizeof (llx)); 418 memset (&llx, 0, sizeof (llx));
412 llx.ll_tv.tv_sec = time (NULL); 419 llx.ll_tv.tv_sec = time (NULL);
413 llx.ll_tv.tv_usec = 0; 420 llx.ll_tv.tv_usec = 0;
414 strncpy (llx.ll_line, pty, sizeof (llx.ll_line)); 421 strncpy (llx.ll_line, pty, sizeof (llx.ll_line));
415 strncpy (llx.ll_host, host, sizeof (llx.ll_host)); 422 strncpy (llx.ll_host, host, sizeof (llx.ll_host));
416 updlastlogx (RXVT_LASTLOGX_FILE, getuid (), &llx); 423 updlastlogx (LASTLOGX_FILE, getuid (), &llx);
417# endif 424# endif
418 425
419# ifdef HAVE_STRUCT_LASTLOG 426# ifdef HAVE_STRUCT_LASTLOG
420 pwent = getpwuid (getuid ()); 427 pwent = getpwuid (getuid ());
421 if (!pwent) 428 if (!pwent)
422 { 429 {
423 rxvt_warn ("no entry in password file, not updating lastlog.\n"); 430 ptytty_warn ("no entry in password file, not updating lastlog.\n");
424 return; 431 return;
425 } 432 }
426 433
427 memset (&ll, 0, sizeof (ll)); 434 memset (&ll, 0, sizeof (ll));
428 ll.ll_time = time (NULL); 435 ll.ll_time = time (NULL);
… …
449 } 456 }
450# endif /* LASTLOG_IS_DIR */ 457# endif /* LASTLOG_IS_DIR */
451# endif /* HAVE_STRUCT_LASTLOG */ 458# endif /* HAVE_STRUCT_LASTLOG */
452} 459}
453#endif /* LASTLOG_SUPPORT */ 460#endif /* LASTLOG_SUPPORT */
454/* ------------------------------------------------------------------------- */
455 461
456#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