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.8 by pcg, Wed Mar 17 03:47:12 2004 UTC vs.
Revision 1.15 by root, Wed Feb 16 21:21:43 2005 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: logging.c 2 * File: logging.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
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 * 18 *
18 * 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
19 * 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
20 * the Free Software Foundation; either version 2 of the License, or 21 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 22 * (at your option) any later version.
… …
41#include "../config.h" /* NECESSARY */ 42#include "../config.h" /* NECESSARY */
42#include "rxvt.h" /* NECESSARY */ 43#include "rxvt.h" /* NECESSARY */
43#include "logging.h" 44#include "logging.h"
44#ifdef UTMP_SUPPORT 45#ifdef UTMP_SUPPORT
45 46
47int rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu);
48void rxvt_update_wtmp (const char *fname, const struct utmp *putmp);
49void rxvt_update_lastlog (const char *fname, const char *pty, const char *host);
50
46/* 51/*
47 * BSD style utmp entry 52 * BSD style utmp entry
48 * ut_line, ut_name, ut_host, ut_time 53 * ut_line, ut_name, ut_host, ut_time
49 * SYSV style utmp (and utmpx) entry 54 * SYSV style utmp (and utmpx) entry
50 * ut_user, ut_id, ut_line, ut_pid, ut_type, ut_exit, ut_time 55 * ut_user, ut_id, ut_line, ut_pid, ut_type, ut_exit, ut_time
… …
57 */ 62 */
58void 63void
59rxvt_term::makeutent (const char *pty, const char *hostname) 64rxvt_term::makeutent (const char *pty, const char *hostname)
60{ 65{
61#ifdef HAVE_STRUCT_UTMP 66#ifdef HAVE_STRUCT_UTMP
62 struct utmp *ut = & (this->ut); 67 struct utmp *ut = &this->ut;
63#endif 68#endif
64#ifdef HAVE_STRUCT_UTMPX 69#ifdef HAVE_STRUCT_UTMPX
65 struct utmpx *utx = & (this->utx); 70 struct utmpx *utx = &this->utx;
66#endif 71#endif
67#ifdef HAVE_UTMP_PID 72#ifdef HAVE_UTMP_PID
68 int i; 73 int i;
69#endif 74#endif
70 char ut_id[5];
71 struct passwd *pwent = getpwuid (getuid ()); 75 struct passwd *pwent = getpwuid (getuid ());
72 76
73 if (!STRNCMP (pty, "/dev/", 5)) 77 if (!strncmp (pty, "/dev/", 5))
74 pty += 5; /* skip /dev/ prefix */ 78 pty += 5; /* skip /dev/ prefix */
75 79
76 if (!STRNCMP (pty, "pty", 3) || !STRNCMP (pty, "tty", 3))
77 {
78 STRNCPY (ut_id, (pty + 3), sizeof (ut_id));
79 }
80#ifdef HAVE_UTMP_PID 80#ifdef HAVE_UTMP_PID
81 if (!strncmp (pty, "pty", 3) || !strncmp (pty, "tty", 3))
82 strncpy (ut_id, pty + 3, sizeof (ut_id));
81 else if (sscanf (pty, "pts/%d", &i) == 1) 83 else if (sscanf (pty, "pts/%d", &i) == 1)
82 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */ 84 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */
83#endif
84 else if (STRNCMP (pty, "pty", 3) && STRNCMP (pty, "tty", 3)) 85 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3))
85 { 86 {
86 rxvt_warn ("can't parse tty name \"%s\", not adding utmp entry.\n", pty); 87 rxvt_warn ("can't parse tty name \"%s\", not adding utmp entry.\n", pty);
87 return; 88 return;
88 } 89 }
90#endif
89 91
90#ifdef HAVE_STRUCT_UTMP 92#ifdef HAVE_STRUCT_UTMP
91 MEMSET (ut, 0, sizeof (struct utmp)); 93 memset (ut, 0, sizeof (struct utmp));
92# ifdef HAVE_UTMP_PID 94# ifdef HAVE_UTMP_PID
93 setutent (); 95 setutent ();
94 STRNCPY (ut->ut_id, ut_id, sizeof (ut->ut_id)); 96 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id));
95 ut->ut_type = DEAD_PROCESS; 97 ut->ut_type = DEAD_PROCESS;
96 getutid (ut); /* position to entry in utmp file */ 98 getutid (ut); /* position to entry in utmp file */
97 STRNCPY (ut_id, ut_id, sizeof (ut_id)); 99 strncpy (ut_id, ut_id, sizeof (ut_id));
98# endif
99#endif 100# endif
101#endif
100 102
101#ifdef HAVE_STRUCT_UTMPX 103#ifdef HAVE_STRUCT_UTMPX
102 MEMSET (utx, 0, sizeof (struct utmpx)); 104 memset (utx, 0, sizeof (struct utmpx));
103 setutxent (); 105 setutxent ();
104 STRNCPY (utx->ut_id, ut_id, sizeof (utx->ut_id)); 106 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id));
105 utx->ut_type = DEAD_PROCESS; 107 utx->ut_type = DEAD_PROCESS;
106 getutxid (utx); /* position to entry in utmp file */ 108 getutxid (utx); /* position to entry in utmp file */
107 STRNCPY (ut_id, ut_id, sizeof (ut_id)); 109 strncpy (ut_id, ut_id, sizeof (ut_id));
108#endif 110#endif
109 111
110#ifdef HAVE_STRUCT_UTMP 112#ifdef HAVE_STRUCT_UTMP
111 STRNCPY (ut->ut_line, pty, sizeof (ut->ut_line)); 113 strncpy (ut->ut_line, pty, sizeof (ut->ut_line));
112 ut->ut_time = time (NULL); 114 ut->ut_time = time (NULL);
113# ifdef HAVE_UTMP_PID 115# ifdef HAVE_UTMP_PID
114 STRNCPY (ut->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?", 116 strncpy (ut->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?",
115 sizeof (ut->ut_user)); 117 sizeof (ut->ut_user));
116 STRNCPY (ut->ut_id, ut_id, sizeof (ut->ut_id)); 118 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id));
117 ut->ut_time = time (NULL); 119 ut->ut_time = time (NULL);
118 ut->ut_pid = cmd_pid; 120 ut->ut_pid = cmd_pid;
119# ifdef HAVE_UTMP_HOST 121# ifdef HAVE_UTMP_HOST
120 STRNCPY (ut->ut_host, hostname, sizeof (ut->ut_host)); 122 strncpy (ut->ut_host, hostname, sizeof (ut->ut_host));
121# endif 123# endif
122 ut->ut_type = USER_PROCESS; 124 ut->ut_type = USER_PROCESS;
123 pututline (ut); 125 pututline (ut);
124 endutent (); /* close the file */ 126 endutent (); /* close the file */
125 utmp_pos = 0; 127 utmp_pos = 0;
126# else 128# else
127 STRNCPY (ut->ut_name, (pwent && pwent->pw_name) ? pwent->pw_name : "?", 129 strncpy (ut->ut_name, (pwent && pwent->pw_name) ? pwent->pw_name : "?",
128 sizeof (ut->ut_name)); 130 sizeof (ut->ut_name));
129# ifdef HAVE_UTMP_HOST 131# ifdef HAVE_UTMP_HOST
130 STRNCPY (ut->ut_host, hostname, sizeof (ut->ut_host)); 132 strncpy (ut->ut_host, hostname, sizeof (ut->ut_host));
131# endif
132# endif 133# endif
133#endif 134# endif
135#endif
134 136
135#ifdef HAVE_STRUCT_UTMPX 137#ifdef HAVE_STRUCT_UTMPX
136 STRNCPY (utx->ut_line, pty, sizeof (utx->ut_line)); 138 strncpy (utx->ut_line, pty, sizeof (utx->ut_line));
137 STRNCPY (utx->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?", 139 strncpy (utx->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?",
138 sizeof (utx->ut_user)); 140 sizeof (utx->ut_user));
139 STRNCPY (utx->ut_id, ut_id, sizeof (utx->ut_id)); 141 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id));
142# if HAVE_UTMPX_SESSION
140 utx->ut_session = getsid (0); 143 utx->ut_session = getsid (0);
144# endif
141 utx->ut_tv.tv_sec = time (NULL); 145 utx->ut_tv.tv_sec = time (NULL);
142 utx->ut_tv.tv_usec = 0; 146 utx->ut_tv.tv_usec = 0;
143 utx->ut_pid = cmd_pid; 147 utx->ut_pid = cmd_pid;
144# ifdef HAVE_UTMPX_HOST 148# ifdef HAVE_UTMPX_HOST
145 STRNCPY (utx->ut_host, hostname, sizeof (utx->ut_host)); 149 strncpy (utx->ut_host, hostname, sizeof (utx->ut_host));
146# if 0 150# if 0
147 { 151 {
148 char *colon; 152 char *colon;
149 153
150 if ((colon = STRRCHR (ut->ut_host, ':')) != NULL) 154 if ((colon = strrchr (ut->ut_host, ':')) != NULL)
151 *colon = '\0'; 155 *colon = '\0';
152 } 156 }
153# endif 157# endif
154# endif 158# endif
155 utx->ut_type = USER_PROCESS; 159 utx->ut_type = USER_PROCESS;
… …
176 buf[sizeof (buf) - 1] = '\0'; 180 buf[sizeof (buf) - 1] = '\0';
177 for (i = 1; (fgets (buf, sizeof (buf) - 1, fd0) != NULL);) 181 for (i = 1; (fgets (buf, sizeof (buf) - 1, fd0) != NULL);)
178 { 182 {
179 if (*buf == '#' || sscanf (buf, "%s", name) != 1) 183 if (*buf == '#' || sscanf (buf, "%s", name) != 1)
180 continue; 184 continue;
181 if (!STRCMP (ut->ut_line, name)) 185 if (!strcmp (ut->ut_line, name))
182 { 186 {
183 if (!rxvt_write_bsd_utmp (i, ut)) 187 if (!rxvt_write_bsd_utmp (i, ut))
184 i = 0; 188 i = 0;
185 utmp_pos = i; 189 utmp_pos = i;
186 fclose (fd0); 190 fclose (fd0);
… …
195 } 199 }
196#endif 200#endif
197 201
198#ifdef WTMP_SUPPORT 202#ifdef WTMP_SUPPORT
199# ifdef WTMP_ONLY_ON_LOGIN 203# ifdef WTMP_ONLY_ON_LOGIN
200 if (Options & Opt_loginShell) 204 if (options & Opt_loginShell)
201# endif 205# endif
202 { 206 {
203# ifdef HAVE_STRUCT_UTMP 207# ifdef HAVE_STRUCT_UTMP
204# ifdef HAVE_UPDWTMP 208# ifdef HAVE_UPDWTMP
205 updwtmp (RXVT_WTMP_FILE, ut); 209 updwtmp (RXVT_WTMP_FILE, ut);
206# else 210# else
207 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 211 rxvt_update_wtmp (RXVT_WTMP_FILE, ut);
208# endif 212# endif
209# endif 213# endif
210# ifdef HAVE_STRUCT_UTMPX 214# ifdef HAVE_STRUCT_UTMPX
215# if HAVE_UPDWTMPX
211 updwtmpx (RXVT_WTMPX_FILE, utx); 216 updwtmpx (RXVT_WTMPX_FILE, utx);
217# endif
212# endif 218# endif
213 } 219 }
214#endif 220#endif
215#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE) 221#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE)
216 if (Options & Opt_loginShell) 222 if (options & Opt_loginShell)
217 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname); 223 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname);
218#endif 224#endif
219} 225}
220 226
221/* ------------------------------------------------------------------------- */ 227/* ------------------------------------------------------------------------- */
… …
224 */ 230 */
225void 231void
226rxvt_term::cleanutent () 232rxvt_term::cleanutent ()
227{ 233{
228#ifdef HAVE_STRUCT_UTMP 234#ifdef HAVE_STRUCT_UTMP
229 struct utmp *ut = & (this->ut); 235 struct utmp *ut = &this->ut;
230#endif 236#endif
231#ifdef HAVE_STRUCT_UTMPX 237#ifdef HAVE_STRUCT_UTMPX
232 struct utmpx *tmputx, *utx = & (this->utx); 238 struct utmpx *tmputx, *utx = &this->utx;
233#endif 239#endif
234 240
235#ifdef HAVE_STRUCT_UTMP 241#ifdef HAVE_STRUCT_UTMP
236# ifdef HAVE_UTMP_PID 242# ifdef HAVE_UTMP_PID
237 MEMSET (ut, 0, sizeof (struct utmp)); 243 memset (ut, 0, sizeof (struct utmp));
238 setutent (); 244 setutent ();
239 STRNCPY (ut->ut_id, ut_id, sizeof (ut->ut_id)); 245 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id));
240 ut->ut_type = USER_PROCESS; 246 ut->ut_type = USER_PROCESS;
241 { 247 {
242 struct utmp *tmput = getutid (ut); 248 struct utmp *tmput = getutid (ut);
243 249
244 if (tmput) /* position to entry in utmp file */ 250 if (tmput) /* position to entry in utmp file */
245 ut = tmput; 251 ut = tmput;
246 } 252 }
247 ut->ut_type = DEAD_PROCESS; 253 ut->ut_type = DEAD_PROCESS;
248# else 254# else
249 MEMSET (ut->ut_name, 0, sizeof (ut->ut_name)); 255 memset (ut->ut_name, 0, sizeof (ut->ut_name));
250# ifdef HAVE_UTMP_HOST 256# ifdef HAVE_UTMP_HOST
251 MEMSET (ut->ut_host, 0, sizeof (ut->ut_host)); 257 memset (ut->ut_host, 0, sizeof (ut->ut_host));
252# endif 258# endif
253# endif 259# endif
254 ut->ut_time = time (NULL); 260 ut->ut_time = time (NULL);
255#endif 261#endif
256 262
257#ifdef HAVE_STRUCT_UTMPX 263#ifdef HAVE_STRUCT_UTMPX
258 MEMSET (utx, 0, sizeof (struct utmpx)); 264 memset (utx, 0, sizeof (struct utmpx));
259 setutxent (); 265 setutxent ();
260 STRNCPY (utx->ut_id, ut_id, sizeof (utx->ut_id)); 266 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id));
261 utx->ut_type = USER_PROCESS; 267 utx->ut_type = USER_PROCESS;
262 if ((tmputx = getutxid (utx))) /* position to entry in utmp file */ 268 if ((tmputx = getutxid (utx))) /* position to entry in utmp file */
263 utx = tmputx; 269 utx = tmputx;
264 utx->ut_type = DEAD_PROCESS; 270 utx->ut_type = DEAD_PROCESS;
271# if HAVE_UTMPX_SESSION
265 utx->ut_session = getsid (0); 272 utx->ut_session = getsid (0);
273# endif
266 utx->ut_tv.tv_sec = time (NULL); 274 utx->ut_tv.tv_sec = time (NULL);
267 utx->ut_tv.tv_usec = 0; 275 utx->ut_tv.tv_usec = 0;
268#endif 276#endif
269 277
270 /* 278 /*
271 * Write ending wtmp entry 279 * Write ending wtmp entry
272 */ 280 */
273#ifdef WTMP_SUPPORT 281#ifdef WTMP_SUPPORT
274# ifdef WTMP_ONLY_ON_LOGIN 282# ifdef WTMP_ONLY_ON_LOGIN
275 if (Options & Opt_loginShell) 283 if (options & Opt_loginShell)
276# endif 284# endif
277 { 285 {
278# ifdef HAVE_STRUCT_UTMP 286# ifdef HAVE_STRUCT_UTMP
279# ifdef HAVE_UPDWTMP 287# ifdef HAVE_UPDWTMP
280 updwtmp (RXVT_WTMP_FILE, ut); 288 updwtmp (RXVT_WTMP_FILE, ut);
281# else 289# else
282 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 290 rxvt_update_wtmp (RXVT_WTMP_FILE, ut);
283# endif 291# endif
284# endif 292# endif
285# ifdef HAVE_STRUCT_UTMPX 293# ifdef HAVE_STRUCT_UTMPX
294# if HAVE_UPDWTMPX
286 updwtmpx (RXVT_WTMPX_FILE, utx); 295 updwtmpx (RXVT_WTMPX_FILE, utx);
296# endif
287# endif 297# endif
288 } 298 }
289#endif 299#endif
290 300
291 /* 301 /*
… …
295# ifdef HAVE_UTMP_PID 305# ifdef HAVE_UTMP_PID
296 if (ut->ut_pid == cmd_pid) 306 if (ut->ut_pid == cmd_pid)
297 pututline (ut); 307 pututline (ut);
298 endutent (); 308 endutent ();
299# else 309# else
300 MEMSET (ut, 0, sizeof (struct utmp)); 310 memset (ut, 0, sizeof (struct utmp));
301 rxvt_write_bsd_utmp (utmp_pos, ut); 311 rxvt_write_bsd_utmp (utmp_pos, ut);
302# endif 312# endif
303#endif 313#endif
304#ifdef HAVE_STRUCT_UTMPX 314#ifdef HAVE_STRUCT_UTMPX
305 if (utx->ut_pid == cmd_pid) 315 if (utx->ut_pid == cmd_pid)
… …
391# endif 401# endif
392 struct passwd *pwent; 402 struct passwd *pwent;
393# endif 403# endif
394 404
395# ifdef HAVE_STRUCT_LASTLOGX 405# ifdef HAVE_STRUCT_LASTLOGX
396 MEMSET (&llx, 0, sizeof (llx)); 406 memset (&llx, 0, sizeof (llx));
397 llx.ll_tv.tv_sec = time (NULL); 407 llx.ll_tv.tv_sec = time (NULL);
398 llx.ll_tv.tv_usec = 0; 408 llx.ll_tv.tv_usec = 0;
399 STRNCPY (llx.ll_line, pty, sizeof (llx.ll_line)); 409 strncpy (llx.ll_line, pty, sizeof (llx.ll_line));
400 STRNCPY (llx.ll_host, host, sizeof (llx.ll_host)); 410 strncpy (llx.ll_host, host, sizeof (llx.ll_host));
401 updlastlogx (RXVT_LASTLOGX_FILE, getuid (), &llx); 411 updlastlogx (RXVT_LASTLOGX_FILE, getuid (), &llx);
402# endif 412# endif
403 413
404# ifdef HAVE_STRUCT_LASTLOG 414# ifdef HAVE_STRUCT_LASTLOG
405 pwent = getpwuid (getuid ()); 415 pwent = getpwuid (getuid ());
… …
407 { 417 {
408 rxvt_warn ("no entry in password file, not updating lastlog.\n"); 418 rxvt_warn ("no entry in password file, not updating lastlog.\n");
409 return; 419 return;
410 } 420 }
411 421
412 MEMSET (&ll, 0, sizeof (ll)); 422 memset (&ll, 0, sizeof (ll));
413 ll.ll_time = time (NULL); 423 ll.ll_time = time (NULL);
414 STRNCPY (ll.ll_line, pty, sizeof (ll.ll_line)); 424 strncpy (ll.ll_line, pty, sizeof (ll.ll_line));
415 STRNCPY (ll.ll_host, host, sizeof (ll.ll_host)); 425 strncpy (ll.ll_host, host, sizeof (ll.ll_host));
416# ifdef LASTLOG_IS_DIR 426# ifdef LASTLOG_IS_DIR
417 sprintf (lastlogfile, "%.*s/%.*s", 427 sprintf (lastlogfile, "%.*s/%.*s",
418 sizeof (lastlogfile) - sizeof (pwent->pw_name) - 2, fname, 428 sizeof (lastlogfile) - sizeof (pwent->pw_name) - 2, fname,
419 sizeof (pwent->pw_name), 429 sizeof (pwent->pw_name),
420 (!pwent->pw_name || pwent->pw_name[0] == '\0') ? "unknown" 430 (!pwent->pw_name || pwent->pw_name[0] == '\0') ? "unknown"

Diff Legend

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