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

Diff Legend

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