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.33 by root, Wed Jan 18 12:06:11 2006 UTC

… …
12 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 12 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
14 * - extensive modifications 14 * - extensive modifications
15 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> 15 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
16 * - lastlog support 16 * - lastlog support
17 * Copyright (c) 2004 Marc Lehmann <pcg@goof.com> 17 * Copyright (c) 2004-2006 Marc Lehmann <pcg@goof.com>
18 * 18 *
19 * This program is free software; you can redistribute it and/or modify 19 * 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 20 * 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 21 * the Free Software Foundation; either version 2 of the License, or
22 * (at your option) any later version. 22 * (at your option) any later version.
… …
28 * 28 *
29 * You should have received a copy of the GNU General Public License 29 * You should have received a copy of the GNU General Public License
30 * along with this program; if not, write to the Free Software 30 * along with this program; if not, write to the Free Software
31 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 31 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
32 *----------------------------------------------------------------------*/ 32 *----------------------------------------------------------------------*/
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 33
42#include "../config.h" 34#include "../config.h"
43#include "rxvt.h" 35#include "rxvt.h"
44#include "logging.h" 36#include "ptytty.h"
45 37
46#ifdef UTMP_SUPPORT 38#if UTMP_SUPPORT
47 39
48#if HAVE_STRUCT_UTMP 40#if HAVE_STRUCT_UTMP
49int rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu); 41static int rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu);
50void rxvt_update_wtmp (const char *fname, const struct utmp *putmp); 42static void rxvt_update_wtmp (const char *fname, const struct utmp *putmp);
51#endif 43#endif
52 44
53void rxvt_update_lastlog (const char *fname, const char *pty, const char *host); 45static void rxvt_update_lastlog (const char *fname, const char *pty, const char *host);
54 46
55/* 47/*
56 * BSD style utmp entry 48 * BSD style utmp entry
57 * ut_line, ut_name, ut_host, ut_time 49 * ut_line, ut_name, ut_host, ut_time
58 * SYSV style utmp (and utmpx) entry 50 * SYSV style utmp (and utmpx) entry
… …
63 55
64/* 56/*
65 * make and write utmp and wtmp entries 57 * make and write utmp and wtmp entries
66 */ 58 */
67void 59void
68rxvt_term::makeutent (const char *pty, const char *hostname) 60rxvt_ptytty_unix::login (int cmd_pid, bool login_shell, const char *hostname)
69{ 61{
62 const char *pty = name;
63
64 if (!pty || !*pty)
65 return;
66
67 this->cmd_pid = cmd_pid;
68 this->login_shell = login_shell;
69
70#ifdef HAVE_STRUCT_UTMP 70#ifdef HAVE_STRUCT_UTMP
71 struct utmp *ut = &this->ut; 71 struct utmp *ut = &this->ut;
72#endif 72#endif
73#ifdef HAVE_STRUCT_UTMPX 73#ifdef HAVE_STRUCT_UTMPX
74 struct utmpx *utx = &this->utx; 74 struct utmpx *utx = &this->utx;
75#endif 75#endif
76#ifdef HAVE_UTMP_PID
77 int i; 76 int i;
78#endif
79 struct passwd *pwent = getpwuid (getuid ()); 77 struct passwd *pwent = getpwuid (getuid ());
80 78
81 if (!strncmp (pty, "/dev/", 5)) 79 if (!strncmp (pty, "/dev/", 5))
82 pty += 5; /* skip /dev/ prefix */ 80 pty += 5; /* skip /dev/ prefix */
83 81
84#ifdef HAVE_UTMP_PID 82#if defined(HAVE_UTMP_PID) || defined(HAVE_STRUCT_UTMPX)
85 if (!strncmp (pty, "pty", 3) || !strncmp (pty, "tty", 3)) 83 if (!strncmp (pty, "pty", 3) || !strncmp (pty, "tty", 3))
86 strncpy (ut_id, pty + 3, sizeof (ut_id)); 84 strncpy (ut_id, pty + 3, sizeof (ut_id));
87 else if (sscanf (pty, "pts/%d", &i) == 1) 85 else if (sscanf (pty, "pts/%d", &i) == 1)
88 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */ 86 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */
89 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3)) 87 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3))
… …
98# ifdef HAVE_UTMP_PID 96# ifdef HAVE_UTMP_PID
99 setutent (); 97 setutent ();
100 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id)); 98 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id));
101 ut->ut_type = DEAD_PROCESS; 99 ut->ut_type = DEAD_PROCESS;
102 getutid (ut); /* position to entry in utmp file */ 100 getutid (ut); /* position to entry in utmp file */
103 strncpy (ut_id, ut_id, sizeof (ut_id)); 101 strncpy (this->ut_id, ut_id, sizeof (this->ut_id));
104# endif 102# endif
105#endif 103#endif
106 104
107#ifdef HAVE_STRUCT_UTMPX 105#ifdef HAVE_STRUCT_UTMPX
108 memset (utx, 0, sizeof (struct utmpx)); 106 memset (utx, 0, sizeof (struct utmpx));
109 setutxent (); 107 setutxent ();
110 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id)); 108 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id));
111 utx->ut_type = DEAD_PROCESS; 109 utx->ut_type = DEAD_PROCESS;
112 getutxid (utx); /* position to entry in utmp file */ 110 getutxid (utx); /* position to entry in utmp file */
113 strncpy (ut_id, ut_id, sizeof (ut_id)); 111 strncpy (this->ut_id, ut_id, sizeof (this->ut_id));
114#endif 112#endif
115 113
116#ifdef HAVE_STRUCT_UTMP 114#ifdef HAVE_STRUCT_UTMP
117 strncpy (ut->ut_line, pty, sizeof (ut->ut_line)); 115 strncpy (ut->ut_line, pty, sizeof (ut->ut_line));
118 ut->ut_time = time (NULL); 116 ut->ut_time = time (NULL);
… …
165 endutxent (); /* close the file */ 163 endutxent (); /* close the file */
166 utmp_pos = 0; 164 utmp_pos = 0;
167#endif 165#endif
168 166
169#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID) 167#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
170
171 { 168 {
172 int i;
173# ifdef HAVE_TTYSLOT 169# ifdef HAVE_TTYSLOT
170 int fdstdin = dup (STDIN_FILENO);
171 dup2 (tty, STDIN_FILENO);
172
174 i = ttyslot (); 173 i = ttyslot ();
175 if (rxvt_write_bsd_utmp (i, ut)) 174 if (rxvt_write_bsd_utmp (i, ut))
176 utmp_pos = i; 175 utmp_pos = i;
176
177 dup2 (fdstdin, STDIN_FILENO);
178 close (fdstdin);
177# else 179# else
178 FILE *fd0; 180 FILE *fd0;
179 181
180 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL) 182 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL)
181 { 183 {
182 char buf[256], name[256]; 184 char buf[256], name[256];
183 185
… …
197 i++; 199 i++;
198 } 200 }
199 fclose (fd0); 201 fclose (fd0);
200 } 202 }
201# endif 203# endif
202
203 } 204 }
204#endif 205#endif
205 206
206#ifdef WTMP_SUPPORT 207#ifdef WTMP_SUPPORT
207# ifdef WTMP_ONLY_ON_LOGIN 208 if (login_shell)
208 if (OPTION (Opt_loginShell))
209# endif
210 { 209 {
211# ifdef HAVE_STRUCT_UTMP 210# ifdef HAVE_STRUCT_UTMP
212# ifdef HAVE_UPDWTMP 211# ifdef HAVE_UPDWTMP
213 updwtmp (RXVT_WTMP_FILE, ut); 212 updwtmp (RXVT_WTMP_FILE, ut);
214# else 213# else
215 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 214 rxvt_update_wtmp (RXVT_WTMP_FILE, ut);
216# endif 215# endif
217# endif 216# endif
218# ifdef HAVE_STRUCT_UTMPX 217# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
219# if HAVE_UPDWTMPX
220 updwtmpx (RXVT_WTMPX_FILE, utx); 218 updwtmpx (RXVT_WTMPX_FILE, utx);
221# else
222 pututxline (utx);
223# endif
224# endif 219# endif
225 } 220 }
226#endif 221#endif
227#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE) 222#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE)
228 if (OPTION (Opt_loginShell)) 223 if (login_shell)
229 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname); 224 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname);
230#endif 225#endif
231} 226}
232 227
233/* ------------------------------------------------------------------------- */ 228/* ------------------------------------------------------------------------- */
234/* 229/*
235 * remove utmp and wtmp entries 230 * remove utmp and wtmp entries
236 */ 231 */
237void 232void
238rxvt_term::cleanutent () 233rxvt_ptytty_unix::logout ()
239{ 234{
235 if (!cmd_pid)
236 return;
237
240#ifdef HAVE_STRUCT_UTMP 238#ifdef HAVE_STRUCT_UTMP
241 struct utmp *ut = &this->ut; 239 struct utmp *tmput, *ut = &this->ut;
242#endif 240#endif
243#ifdef HAVE_STRUCT_UTMPX 241#ifdef HAVE_STRUCT_UTMPX
244 struct utmpx *tmputx, *utx = &this->utx; 242 struct utmpx *tmputx, *utx = &this->utx;
245#endif 243#endif
246 244
247#ifdef HAVE_STRUCT_UTMP 245#ifdef HAVE_STRUCT_UTMP
248# ifdef HAVE_UTMP_PID 246# ifdef HAVE_UTMP_PID
249 memset (ut, 0, sizeof (struct utmp)); 247 memset (ut, 0, sizeof (struct utmp));
250 setutent (); 248 setutent ();
251 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id)); 249 strncpy (ut->ut_id, this->ut_id, sizeof (ut->ut_id));
252 ut->ut_type = USER_PROCESS; 250 ut->ut_type = USER_PROCESS;
253 {
254 struct utmp *tmput = getutid (ut);
255
256 if (tmput) /* position to entry in utmp file */ 251 if ((tmput = getutid (ut))) /* position to entry in utmp file */
257 ut = tmput; 252 ut = tmput;
258 }
259 ut->ut_type = DEAD_PROCESS; 253 ut->ut_type = DEAD_PROCESS;
260# else 254# else
261 memset (ut->ut_name, 0, sizeof (ut->ut_name)); 255 memset (ut->ut_name, 0, sizeof (ut->ut_name));
262# ifdef HAVE_UTMP_HOST 256# ifdef HAVE_UTMP_HOST
263 memset (ut->ut_host, 0, sizeof (ut->ut_host)); 257 memset (ut->ut_host, 0, sizeof (ut->ut_host));
… …
267#endif 261#endif
268 262
269#ifdef HAVE_STRUCT_UTMPX 263#ifdef HAVE_STRUCT_UTMPX
270 memset (utx, 0, sizeof (struct utmpx)); 264 memset (utx, 0, sizeof (struct utmpx));
271 setutxent (); 265 setutxent ();
272 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id)); 266 strncpy (utx->ut_id, this->ut_id, sizeof (utx->ut_id));
273 utx->ut_type = USER_PROCESS; 267 utx->ut_type = USER_PROCESS;
274 if ((tmputx = getutxid (utx))) /* position to entry in utmp file */ 268 if ((tmputx = getutxid (utx))) /* position to entry in utmp file */
275 utx = tmputx; 269 utx = tmputx;
276 utx->ut_type = DEAD_PROCESS; 270 utx->ut_type = DEAD_PROCESS;
277# if HAVE_UTMPX_SESSION 271# if HAVE_UTMPX_SESSION
… …
283 277
284 /* 278 /*
285 * Write ending wtmp entry 279 * Write ending wtmp entry
286 */ 280 */
287#ifdef WTMP_SUPPORT 281#ifdef WTMP_SUPPORT
288# ifdef WTMP_ONLY_ON_LOGIN 282 if (login_shell)
289 if (OPTION (Opt_loginShell))
290# endif
291 { 283 {
292# ifdef HAVE_STRUCT_UTMP 284# ifdef HAVE_STRUCT_UTMP
293# ifdef HAVE_UPDWTMP 285# ifdef HAVE_UPDWTMP
294 updwtmp (RXVT_WTMP_FILE, ut); 286 updwtmp (RXVT_WTMP_FILE, ut);
295# else 287# else
296 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 288 rxvt_update_wtmp (RXVT_WTMP_FILE, ut);
297# endif 289# endif
298# endif 290# endif
299# ifdef HAVE_STRUCT_UTMPX 291# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
300# if HAVE_UPDWTMPX
301 updwtmpx (RXVT_WTMPX_FILE, utx); 292 updwtmpx (RXVT_WTMPX_FILE, utx);
302# else
303 pututxline (utx);
304# endif
305# endif 293# endif
306 } 294 }
307#endif 295#endif
308 296
309 /* 297 /*
… …
322#ifdef HAVE_STRUCT_UTMPX 310#ifdef HAVE_STRUCT_UTMPX
323 if (utx->ut_pid == cmd_pid) 311 if (utx->ut_pid == cmd_pid)
324 pututxline (utx); 312 pututxline (utx);
325 endutxent (); 313 endutxent ();
326#endif 314#endif
315
316 cmd_pid = 0;
327} 317}
328 318
329/* ------------------------------------------------------------------------- */ 319/* ------------------------------------------------------------------------- */
330/* 320/*
331 * Write a BSD style utmp entry 321 * Write a BSD style utmp entry
332 */ 322 */
333#ifdef HAVE_UTMP_H 323#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
334int 324static int
335rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu) 325rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu)
336{ 326{
337 int fd; 327 int fd;
338 328
339 if (utmp_pos <= 0 || (fd = open (RXVT_UTMP_FILE, O_WRONLY)) == -1) 329 if (utmp_pos <= 0 || (fd = open (RXVT_UTMP_FILE, O_WRONLY)) == -1)
… …
349/* ------------------------------------------------------------------------- */ 339/* ------------------------------------------------------------------------- */
350/* 340/*
351 * Update a BSD style wtmp entry 341 * Update a BSD style wtmp entry
352 */ 342 */
353#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP) 343#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP)
354void 344static void
355rxvt_update_wtmp (const char *fname, const struct utmp *putmp) 345rxvt_update_wtmp (const char *fname, const struct utmp *putmp)
356{ 346{
357 int fd, gotlock, retry; 347 int fd, gotlock, retry;
358 struct flock lck; /* fcntl locking scheme */ 348 struct flock lck; /* fcntl locking scheme */
359 struct stat sbuf; 349 struct stat sbuf;
… …
390} 380}
391#endif 381#endif
392 382
393/* ------------------------------------------------------------------------- */ 383/* ------------------------------------------------------------------------- */
394#ifdef LASTLOG_SUPPORT 384#ifdef LASTLOG_SUPPORT
395void 385static void
396rxvt_update_lastlog (const char *fname, const char *pty, const char *host) 386rxvt_update_lastlog (const char *fname, const char *pty, const char *host)
397{ 387{
398# ifdef HAVE_STRUCT_LASTLOGX 388# ifdef HAVE_STRUCT_LASTLOGX
399 struct lastlogx llx; 389 struct lastlogx llx;
400# endif 390# endif

Diff Legend

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