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.7 by pcg, Fri Feb 13 12:16:21 2004 UTC vs.
Revision 1.26 by ayin, Tue Jan 17 09:31:24 2006 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.
… …
27 * 28 *
28 * 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
29 * along with this program; if not, write to the Free Software 30 * along with this program; if not, write to the Free Software
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 31 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *----------------------------------------------------------------------*/ 32 *----------------------------------------------------------------------*/
32/*----------------------------------------------------------------------*
33 * Public:
34 * extern void cleanutent (void);
35 * extern void makeutent (const char * pty, const char * hostname);
36 *
37 * Private:
38 * rxvt_update_wtmp ();
39 *----------------------------------------------------------------------*/
40 33
41#include "../config.h" /* NECESSARY */ 34#include "../config.h"
42#include "rxvt.h" /* NECESSARY */ 35#include "rxvt.h"
43#include "logging.h" 36#include "logging.h"
37
44#ifdef UTMP_SUPPORT 38#ifdef UTMP_SUPPORT
39
40#if HAVE_STRUCT_UTMP
41static int rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu);
42static void rxvt_update_wtmp (const char *fname, const struct utmp *putmp);
43#endif
44
45static void rxvt_update_lastlog (const char *fname, const char *pty, const char *host);
45 46
46/* 47/*
47 * BSD style utmp entry 48 * BSD style utmp entry
48 * ut_line, ut_name, ut_host, ut_time 49 * ut_line, ut_name, ut_host, ut_time
49 * SYSV style utmp (and utmpx) entry 50 * SYSV style utmp (and utmpx) entry
… …
54 55
55/* 56/*
56 * make and write utmp and wtmp entries 57 * make and write utmp and wtmp entries
57 */ 58 */
58void 59void
59rxvt_term::makeutent (const char *pty, const char *hostname) 60rxvt_session::login (const char *pty, int cmd_pid, bool login_shell, const char *hostname)
60{ 61{
61#ifdef HAVE_STRUCT_UTMP 62 this->cmd_pid = cmd_pid;
62 struct utmp *ut = & (this->ut); 63 this->login_shell = login_shell;
63#endif 64
64#ifdef HAVE_STRUCT_UTMPX 65#ifdef HAVE_STRUCT_UTMP
66 struct utmp *ut = &this->ut;
67#endif
68#ifdef HAVE_STRUCT_UTMPX
65 struct utmpx *utx = & (this->utx); 69 struct utmpx *utx = &this->utx;
66#endif 70#endif
67#ifdef HAVE_UTMP_PID 71 int i;
68 int i;
69#endif
70 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
77#if defined(HAVE_UTMP_PID) || defined(HAVE_STRUCT_UTMPX)
76 if (!STRNCMP (pty, "pty", 3) || !STRNCMP (pty, "tty", 3)) 78 if (!strncmp (pty, "pty", 3) || !strncmp (pty, "tty", 3))
77 {
78 STRNCPY (ut_id, (pty + 3), sizeof (ut_id)); 79 strncpy (ut_id, pty + 3, sizeof (ut_id));
79 }
80#ifdef HAVE_UTMP_PID
81 else if (sscanf (pty, "pts/%d", &i) == 1) 80 else if (sscanf (pty, "pts/%d", &i) == 1)
82 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */ 81 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */
83#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_print_error ("can't parse tty name \"%s\"", pty); 84 rxvt_warn ("can't parse tty name \"%s\", not adding utmp entry.\n", pty);
87 return; 85 return;
88 } 86 }
87#endif
89 88
90#ifdef HAVE_STRUCT_UTMP 89#ifdef HAVE_STRUCT_UTMP
91 MEMSET (ut, 0, sizeof (struct utmp)); 90 memset (ut, 0, sizeof (struct utmp));
92# ifdef HAVE_UTMP_PID 91# ifdef HAVE_UTMP_PID
93 setutent (); 92 setutent ();
94 STRNCPY (ut->ut_id, ut_id, sizeof (ut->ut_id)); 93 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id));
95 ut->ut_type = DEAD_PROCESS; 94 ut->ut_type = DEAD_PROCESS;
96 getutid (ut); /* position to entry in utmp file */ 95 getutid (ut); /* position to entry in utmp file */
97 STRNCPY (ut_id, ut_id, sizeof (ut_id)); 96 strncpy (this->ut_id, ut_id, sizeof (this->ut_id));
98# endif
99#endif 97# endif
98#endif
100 99
101#ifdef HAVE_STRUCT_UTMPX 100#ifdef HAVE_STRUCT_UTMPX
102 MEMSET (utx, 0, sizeof (struct utmpx)); 101 memset (utx, 0, sizeof (struct utmpx));
103 setutxent (); 102 setutxent ();
104 STRNCPY (utx->ut_id, ut_id, sizeof (utx->ut_id)); 103 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id));
105 utx->ut_type = DEAD_PROCESS; 104 utx->ut_type = DEAD_PROCESS;
106 getutxid (utx); /* position to entry in utmp file */ 105 getutxid (utx); /* position to entry in utmp file */
107 STRNCPY (ut_id, ut_id, sizeof (ut_id)); 106 strncpy (this->ut_id, ut_id, sizeof (this->ut_id));
108#endif 107#endif
109 108
110#ifdef HAVE_STRUCT_UTMP 109#ifdef HAVE_STRUCT_UTMP
111 STRNCPY (ut->ut_line, pty, sizeof (ut->ut_line)); 110 strncpy (ut->ut_line, pty, sizeof (ut->ut_line));
112 ut->ut_time = time (NULL); 111 ut->ut_time = time (NULL);
113# ifdef HAVE_UTMP_PID 112# ifdef HAVE_UTMP_PID
114 STRNCPY (ut->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?", 113 strncpy (ut->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?",
115 sizeof (ut->ut_user)); 114 sizeof (ut->ut_user));
116 STRNCPY (ut->ut_id, ut_id, sizeof (ut->ut_id)); 115 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id));
117 ut->ut_time = time (NULL); 116 ut->ut_time = time (NULL);
118 ut->ut_pid = cmd_pid; 117 ut->ut_pid = cmd_pid;
119# ifdef HAVE_UTMP_HOST 118# ifdef HAVE_UTMP_HOST
120 STRNCPY (ut->ut_host, hostname, sizeof (ut->ut_host)); 119 strncpy (ut->ut_host, hostname, sizeof (ut->ut_host));
121# endif 120# endif
122 ut->ut_type = USER_PROCESS; 121 ut->ut_type = USER_PROCESS;
123 pututline (ut); 122 pututline (ut);
124 endutent (); /* close the file */ 123 endutent (); /* close the file */
125 utmp_pos = 0; 124 utmp_pos = 0;
126# else 125# else
127 STRNCPY (ut->ut_name, (pwent && pwent->pw_name) ? pwent->pw_name : "?", 126 strncpy (ut->ut_name, (pwent && pwent->pw_name) ? pwent->pw_name : "?",
128 sizeof (ut->ut_name)); 127 sizeof (ut->ut_name));
129# ifdef HAVE_UTMP_HOST 128# ifdef HAVE_UTMP_HOST
130 STRNCPY (ut->ut_host, hostname, sizeof (ut->ut_host)); 129 strncpy (ut->ut_host, hostname, sizeof (ut->ut_host));
131# endif
132# endif 130# endif
133#endif 131# endif
132#endif
134 133
135#ifdef HAVE_STRUCT_UTMPX 134#ifdef HAVE_STRUCT_UTMPX
136 STRNCPY (utx->ut_line, pty, sizeof (utx->ut_line)); 135 strncpy (utx->ut_line, pty, sizeof (utx->ut_line));
137 STRNCPY (utx->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?", 136 strncpy (utx->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?",
138 sizeof (utx->ut_user)); 137 sizeof (utx->ut_user));
139 STRNCPY (utx->ut_id, ut_id, sizeof (utx->ut_id)); 138 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id));
139# if HAVE_UTMPX_SESSION
140 utx->ut_session = getsid (0); 140 utx->ut_session = getsid (0);
141# endif
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;
… …
159#endif 160#endif
160 161
161#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID) 162#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
162 163
163 { 164 {
164 int i;
165# ifdef HAVE_TTYSLOT 165# ifdef HAVE_TTYSLOT
166 i = ttyslot (); 166 i = ttyslot ();
167 if (rxvt_write_bsd_utmp (i, ut)) 167 if (rxvt_write_bsd_utmp (i, ut))
168 utmp_pos = i; 168 utmp_pos = i;
169# else 169# else
170 FILE *fd0; 170 FILE *fd0;
171 171
172 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL) 172 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL)
173 { 173 {
174 char buf[256], name[256]; 174 char buf[256], name[256];
175 175
176 buf[sizeof (buf) - 1] = '\0'; 176 buf[sizeof (buf) - 1] = '\0';
177 for (i = 1; (fgets (buf, sizeof (buf) - 1, fd0) != NULL);) 177 for (i = 1; (fgets (buf, sizeof (buf) - 1, fd0) != NULL);)
178 { 178 {
179 if (*buf == '#' || sscanf (buf, "%s", name) != 1) 179 if (*buf == '#' || sscanf (buf, "%s", name) != 1)
180 continue; 180 continue;
181 if (!STRCMP (ut->ut_line, name)) 181 if (!strcmp (ut->ut_line, name))
182 { 182 {
183 if (!rxvt_write_bsd_utmp (i, ut)) 183 if (!rxvt_write_bsd_utmp (i, ut))
184 i = 0; 184 i = 0;
185 utmp_pos = i; 185 utmp_pos = i;
186 fclose (fd0); 186 fclose (fd0);
… …
189 i++; 189 i++;
190 } 190 }
191 fclose (fd0); 191 fclose (fd0);
192 } 192 }
193# endif 193# endif
194
195 } 194 }
196#endif 195#endif
197 196
198#ifdef WTMP_SUPPORT 197#ifdef WTMP_SUPPORT
199# ifdef WTMP_ONLY_ON_LOGIN 198# ifdef WTMP_ONLY_ON_LOGIN
200 if (Options & Opt_loginShell) 199 if (login_shell)
201# endif 200# endif
202 { 201 {
203# ifdef HAVE_STRUCT_UTMP 202# ifdef HAVE_STRUCT_UTMP
204# ifdef HAVE_UPDWTMP 203# ifdef HAVE_UPDWTMP
205 updwtmp (RXVT_WTMP_FILE, ut); 204 updwtmp (RXVT_WTMP_FILE, ut);
206# else 205# else
207 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 206 rxvt_update_wtmp (RXVT_WTMP_FILE, ut);
208# endif 207# endif
209# endif 208# endif
210# ifdef HAVE_STRUCT_UTMPX 209# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
211 updwtmpx (RXVT_WTMPX_FILE, utx); 210 updwtmpx (RXVT_WTMPX_FILE, utx);
212# endif 211# endif
213 } 212 }
214#endif 213#endif
215#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE) 214#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE)
216 if (Options & Opt_loginShell) 215 if (login_shell)
217 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname); 216 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname);
218#endif 217#endif
219} 218}
220 219
221/* ------------------------------------------------------------------------- */ 220/* ------------------------------------------------------------------------- */
222/* 221/*
223 * remove utmp and wtmp entries 222 * remove utmp and wtmp entries
224 */ 223 */
225void 224void
226rxvt_term::cleanutent () 225rxvt_session::logout ()
227{ 226{
228#ifdef HAVE_STRUCT_UTMP 227#ifdef HAVE_STRUCT_UTMP
229 struct utmp *ut = & (this->ut); 228 struct utmp *tmput, *ut = &this->ut;
230#endif 229#endif
231#ifdef HAVE_STRUCT_UTMPX 230#ifdef HAVE_STRUCT_UTMPX
232 struct utmpx *tmputx, *utx = & (this->utx); 231 struct utmpx *tmputx, *utx = &this->utx;
233#endif 232#endif
234 233
235#ifdef HAVE_STRUCT_UTMP 234#ifdef HAVE_STRUCT_UTMP
236# ifdef HAVE_UTMP_PID 235# ifdef HAVE_UTMP_PID
237 MEMSET (ut, 0, sizeof (struct utmp)); 236 memset (ut, 0, sizeof (struct utmp));
238 setutent (); 237 setutent ();
239 STRNCPY (ut->ut_id, ut_id, sizeof (ut->ut_id)); 238 strncpy (ut->ut_id, this->ut_id, sizeof (ut->ut_id));
240 ut->ut_type = USER_PROCESS; 239 ut->ut_type = USER_PROCESS;
241 {
242 struct utmp *tmput = getutid (ut);
243
244 if (tmput) /* position to entry in utmp file */ 240 if ((tmput = getutid (ut))) /* position to entry in utmp file */
245 ut = tmput; 241 ut = tmput;
246 }
247 ut->ut_type = DEAD_PROCESS; 242 ut->ut_type = DEAD_PROCESS;
248# else 243# else
249 MEMSET (ut->ut_name, 0, sizeof (ut->ut_name)); 244 memset (ut->ut_name, 0, sizeof (ut->ut_name));
250# ifdef HAVE_UTMP_HOST 245# ifdef HAVE_UTMP_HOST
251 MEMSET (ut->ut_host, 0, sizeof (ut->ut_host)); 246 memset (ut->ut_host, 0, sizeof (ut->ut_host));
252# endif 247# endif
253# endif 248# endif
254 ut->ut_time = time (NULL); 249 ut->ut_time = time (NULL);
255#endif 250#endif
256 251
257#ifdef HAVE_STRUCT_UTMPX 252#ifdef HAVE_STRUCT_UTMPX
258 MEMSET (utx, 0, sizeof (struct utmpx)); 253 memset (utx, 0, sizeof (struct utmpx));
259 setutxent (); 254 setutxent ();
260 STRNCPY (utx->ut_id, ut_id, sizeof (utx->ut_id)); 255 strncpy (utx->ut_id, this->ut_id, sizeof (utx->ut_id));
261 utx->ut_type = USER_PROCESS; 256 utx->ut_type = USER_PROCESS;
262 if ((tmputx = getutxid (utx))) /* position to entry in utmp file */ 257 if ((tmputx = getutxid (utx))) /* position to entry in utmp file */
263 utx = tmputx; 258 utx = tmputx;
264 utx->ut_type = DEAD_PROCESS; 259 utx->ut_type = DEAD_PROCESS;
260# if HAVE_UTMPX_SESSION
265 utx->ut_session = getsid (0); 261 utx->ut_session = getsid (0);
262# endif
266 utx->ut_tv.tv_sec = time (NULL); 263 utx->ut_tv.tv_sec = time (NULL);
267 utx->ut_tv.tv_usec = 0; 264 utx->ut_tv.tv_usec = 0;
268#endif 265#endif
269 266
270 /* 267 /*
271 * Write ending wtmp entry 268 * Write ending wtmp entry
272 */ 269 */
273#ifdef WTMP_SUPPORT 270#ifdef WTMP_SUPPORT
274# ifdef WTMP_ONLY_ON_LOGIN 271# ifdef WTMP_ONLY_ON_LOGIN
275 if (Options & Opt_loginShell) 272 if (login_shell)
276# endif 273# endif
277 { 274 {
278# ifdef HAVE_STRUCT_UTMP 275# ifdef HAVE_STRUCT_UTMP
279# ifdef HAVE_UPDWTMP 276# ifdef HAVE_UPDWTMP
280 updwtmp (RXVT_WTMP_FILE, ut); 277 updwtmp (RXVT_WTMP_FILE, ut);
281# else 278# else
282 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 279 rxvt_update_wtmp (RXVT_WTMP_FILE, ut);
283# endif 280# endif
284# endif 281# endif
285# ifdef HAVE_STRUCT_UTMPX 282# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
286 updwtmpx (RXVT_WTMPX_FILE, utx); 283 updwtmpx (RXVT_WTMPX_FILE, utx);
287# endif 284# endif
288 } 285 }
289#endif 286#endif
290 287
… …
295# ifdef HAVE_UTMP_PID 292# ifdef HAVE_UTMP_PID
296 if (ut->ut_pid == cmd_pid) 293 if (ut->ut_pid == cmd_pid)
297 pututline (ut); 294 pututline (ut);
298 endutent (); 295 endutent ();
299# else 296# else
300 MEMSET (ut, 0, sizeof (struct utmp)); 297 memset (ut, 0, sizeof (struct utmp));
301 rxvt_write_bsd_utmp (utmp_pos, ut); 298 rxvt_write_bsd_utmp (utmp_pos, ut);
302# endif 299# endif
303#endif 300#endif
304#ifdef HAVE_STRUCT_UTMPX 301#ifdef HAVE_STRUCT_UTMPX
305 if (utx->ut_pid == cmd_pid) 302 if (utx->ut_pid == cmd_pid)
… …
310 307
311/* ------------------------------------------------------------------------- */ 308/* ------------------------------------------------------------------------- */
312/* 309/*
313 * Write a BSD style utmp entry 310 * Write a BSD style utmp entry
314 */ 311 */
315#ifdef HAVE_UTMP_H 312#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
316/* INTPROTO */ 313static int
317int
318rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu) 314rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu)
319{ 315{
320 int fd; 316 int fd;
321 317
322 if (utmp_pos <= 0 || (fd = open (RXVT_UTMP_FILE, O_WRONLY)) == -1) 318 if (utmp_pos <= 0 || (fd = open (RXVT_UTMP_FILE, O_WRONLY)) == -1)
… …
331 327
332/* ------------------------------------------------------------------------- */ 328/* ------------------------------------------------------------------------- */
333/* 329/*
334 * Update a BSD style wtmp entry 330 * Update a BSD style wtmp entry
335 */ 331 */
336#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) 332#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP)
337/* INTPROTO */ 333static void
338void
339rxvt_update_wtmp (const char *fname, const struct utmp *putmp) 334rxvt_update_wtmp (const char *fname, const struct utmp *putmp)
340{ 335{
341 int fd, gotlock, retry; 336 int fd, gotlock, retry;
342 struct flock lck; /* fcntl locking scheme */ 337 struct flock lck; /* fcntl locking scheme */
343 struct stat sbuf; 338 struct stat sbuf;
… …
374} 369}
375#endif 370#endif
376 371
377/* ------------------------------------------------------------------------- */ 372/* ------------------------------------------------------------------------- */
378#ifdef LASTLOG_SUPPORT 373#ifdef LASTLOG_SUPPORT
379/* INTPROTO */ 374static void
380void
381rxvt_update_lastlog (const char *fname, const char *pty, const char *host) 375rxvt_update_lastlog (const char *fname, const char *pty, const char *host)
382{ 376{
383# ifdef HAVE_STRUCT_LASTLOGX 377# ifdef HAVE_STRUCT_LASTLOGX
384 struct lastlogx llx; 378 struct lastlogx llx;
385# endif 379# endif
… …
391# endif 385# endif
392 struct passwd *pwent; 386 struct passwd *pwent;
393# endif 387# endif
394 388
395# ifdef HAVE_STRUCT_LASTLOGX 389# ifdef HAVE_STRUCT_LASTLOGX
396 MEMSET (&llx, 0, sizeof (llx)); 390 memset (&llx, 0, sizeof (llx));
397 llx.ll_tv.tv_sec = time (NULL); 391 llx.ll_tv.tv_sec = time (NULL);
398 llx.ll_tv.tv_usec = 0; 392 llx.ll_tv.tv_usec = 0;
399 STRNCPY (llx.ll_line, pty, sizeof (llx.ll_line)); 393 strncpy (llx.ll_line, pty, sizeof (llx.ll_line));
400 STRNCPY (llx.ll_host, host, sizeof (llx.ll_host)); 394 strncpy (llx.ll_host, host, sizeof (llx.ll_host));
401 updlastlogx (RXVT_LASTLOGX_FILE, getuid (), &llx); 395 updlastlogx (RXVT_LASTLOGX_FILE, getuid (), &llx);
402# endif 396# endif
403 397
404# ifdef HAVE_STRUCT_LASTLOG 398# ifdef HAVE_STRUCT_LASTLOG
405 pwent = getpwuid (getuid ()); 399 pwent = getpwuid (getuid ());
406 if (!pwent) 400 if (!pwent)
407 { 401 {
408 rxvt_print_error ("no entry in password file"); 402 rxvt_warn ("no entry in password file, not updating lastlog.\n");
409 return; 403 return;
410 } 404 }
405
411 MEMSET (&ll, 0, sizeof (ll)); 406 memset (&ll, 0, sizeof (ll));
412 ll.ll_time = time (NULL); 407 ll.ll_time = time (NULL);
413 STRNCPY (ll.ll_line, pty, sizeof (ll.ll_line)); 408 strncpy (ll.ll_line, pty, sizeof (ll.ll_line));
414 STRNCPY (ll.ll_host, host, sizeof (ll.ll_host)); 409 strncpy (ll.ll_host, host, sizeof (ll.ll_host));
415# ifdef LASTLOG_IS_DIR 410# ifdef LASTLOG_IS_DIR
416 sprintf (lastlogfile, "%.*s/%.*s", 411 sprintf (lastlogfile, "%.*s/%.*s",
417 sizeof (lastlogfile) - sizeof (pwent->pw_name) - 2, fname, 412 sizeof (lastlogfile) - sizeof (pwent->pw_name) - 2, fname,
418 sizeof (pwent->pw_name), 413 sizeof (pwent->pw_name),
419 (!pwent->pw_name || pwent->pw_name[0] == '\0') ? "unknown" 414 (!pwent->pw_name || pwent->pw_name[0] == '\0') ? "unknown"

Diff Legend

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