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

Diff Legend

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