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.9 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.15 by root, Wed Feb 16 21:21:43 2005 UTC

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