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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines