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