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