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