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.32 by ayin, Wed Jan 18 08:40:44 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-2006 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 */
42#include "rxvt.h" /* NECESSARY */
43#include "logging.h" 34#include "../config.h"
35#include "rxvt.h"
36#include "ptytty.h"
37
44#ifdef UTMP_SUPPORT 38#if 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_ptytty_unix::login (int cmd_pid, bool login_shell, const char *hostname)
60{ 61{
61#ifdef HAVE_STRUCT_UTMP 62 const char *pty = name;
62 struct utmp *ut = & (this->ut); 63
63#endif 64 if (!pty || !*pty)
65 return;
66
67 this->cmd_pid = cmd_pid;
68 this->login_shell = login_shell;
69
64#ifdef HAVE_STRUCT_UTMPX 70#ifdef HAVE_STRUCT_UTMP
71 struct utmp *ut = &this->ut;
72#endif
73#ifdef HAVE_STRUCT_UTMPX
65 struct utmpx *utx = & (this->utx); 74 struct utmpx *utx = &this->utx;
66#endif 75#endif
67#ifdef HAVE_UTMP_PID 76 int i;
68 int i;
69#endif
70 char ut_id[5];
71 struct passwd *pwent = getpwuid (getuid ()); 77 struct passwd *pwent = getpwuid (getuid ());
72 78
73 if (!STRNCMP (pty, "/dev/", 5)) 79 if (!strncmp (pty, "/dev/", 5))
74 pty += 5; /* skip /dev/ prefix */ 80 pty += 5; /* skip /dev/ prefix */
75 81
82#if defined(HAVE_UTMP_PID) || defined(HAVE_STRUCT_UTMPX)
76 if (!STRNCMP (pty, "pty", 3) || !STRNCMP (pty, "tty", 3)) 83 if (!strncmp (pty, "pty", 3) || !strncmp (pty, "tty", 3))
77 {
78 STRNCPY (ut_id, (pty + 3), sizeof (ut_id)); 84 strncpy (ut_id, pty + 3, sizeof (ut_id));
79 }
80#ifdef HAVE_UTMP_PID
81 else if (sscanf (pty, "pts/%d", &i) == 1) 85 else if (sscanf (pty, "pts/%d", &i) == 1)
82 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */ 86 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */
83#endif
84 else if (STRNCMP (pty, "pty", 3) && STRNCMP (pty, "tty", 3)) 87 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3))
85 { 88 {
86 rxvt_print_error ("can't parse tty name \"%s\"", pty); 89 rxvt_warn ("can't parse tty name \"%s\", not adding utmp entry.\n", pty);
87 return; 90 return;
88 } 91 }
92#endif
89 93
90#ifdef HAVE_STRUCT_UTMP 94#ifdef HAVE_STRUCT_UTMP
91 MEMSET (ut, 0, sizeof (struct utmp)); 95 memset (ut, 0, sizeof (struct utmp));
92# ifdef HAVE_UTMP_PID 96# ifdef HAVE_UTMP_PID
93 setutent (); 97 setutent ();
94 STRNCPY (ut->ut_id, ut_id, sizeof (ut->ut_id)); 98 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id));
95 ut->ut_type = DEAD_PROCESS; 99 ut->ut_type = DEAD_PROCESS;
96 getutid (ut); /* position to entry in utmp file */ 100 getutid (ut); /* position to entry in utmp file */
97 STRNCPY (ut_id, ut_id, sizeof (ut_id)); 101 strncpy (this->ut_id, ut_id, sizeof (this->ut_id));
98# endif
99#endif 102# endif
103#endif
100 104
101#ifdef HAVE_STRUCT_UTMPX 105#ifdef HAVE_STRUCT_UTMPX
102 MEMSET (utx, 0, sizeof (struct utmpx)); 106 memset (utx, 0, sizeof (struct utmpx));
103 setutxent (); 107 setutxent ();
104 STRNCPY (utx->ut_id, ut_id, sizeof (utx->ut_id)); 108 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id));
105 utx->ut_type = DEAD_PROCESS; 109 utx->ut_type = DEAD_PROCESS;
106 getutxid (utx); /* position to entry in utmp file */ 110 getutxid (utx); /* position to entry in utmp file */
107 STRNCPY (ut_id, ut_id, sizeof (ut_id)); 111 strncpy (this->ut_id, ut_id, sizeof (this->ut_id));
108#endif 112#endif
109 113
110#ifdef HAVE_STRUCT_UTMP 114#ifdef HAVE_STRUCT_UTMP
111 STRNCPY (ut->ut_line, pty, sizeof (ut->ut_line)); 115 strncpy (ut->ut_line, pty, sizeof (ut->ut_line));
112 ut->ut_time = time (NULL); 116 ut->ut_time = time (NULL);
113# ifdef HAVE_UTMP_PID 117# ifdef HAVE_UTMP_PID
114 STRNCPY (ut->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?", 118 strncpy (ut->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?",
115 sizeof (ut->ut_user)); 119 sizeof (ut->ut_user));
116 STRNCPY (ut->ut_id, ut_id, sizeof (ut->ut_id)); 120 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id));
117 ut->ut_time = time (NULL); 121 ut->ut_time = time (NULL);
118 ut->ut_pid = cmd_pid; 122 ut->ut_pid = cmd_pid;
119# ifdef HAVE_UTMP_HOST 123# ifdef HAVE_UTMP_HOST
120 STRNCPY (ut->ut_host, hostname, sizeof (ut->ut_host)); 124 strncpy (ut->ut_host, hostname, sizeof (ut->ut_host));
121# endif 125# endif
122 ut->ut_type = USER_PROCESS; 126 ut->ut_type = USER_PROCESS;
123 pututline (ut); 127 pututline (ut);
124 endutent (); /* close the file */ 128 endutent (); /* close the file */
125 utmp_pos = 0; 129 utmp_pos = 0;
126# else 130# else
127 STRNCPY (ut->ut_name, (pwent && pwent->pw_name) ? pwent->pw_name : "?", 131 strncpy (ut->ut_name, (pwent && pwent->pw_name) ? pwent->pw_name : "?",
128 sizeof (ut->ut_name)); 132 sizeof (ut->ut_name));
129# ifdef HAVE_UTMP_HOST 133# ifdef HAVE_UTMP_HOST
130 STRNCPY (ut->ut_host, hostname, sizeof (ut->ut_host)); 134 strncpy (ut->ut_host, hostname, sizeof (ut->ut_host));
131# endif
132# endif 135# endif
133#endif 136# endif
137#endif
134 138
135#ifdef HAVE_STRUCT_UTMPX 139#ifdef HAVE_STRUCT_UTMPX
136 STRNCPY (utx->ut_line, pty, sizeof (utx->ut_line)); 140 strncpy (utx->ut_line, pty, sizeof (utx->ut_line));
137 STRNCPY (utx->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?", 141 strncpy (utx->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?",
138 sizeof (utx->ut_user)); 142 sizeof (utx->ut_user));
139 STRNCPY (utx->ut_id, ut_id, sizeof (utx->ut_id)); 143 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id));
144# if HAVE_UTMPX_SESSION
140 utx->ut_session = getsid (0); 145 utx->ut_session = getsid (0);
146# endif
141 utx->ut_tv.tv_sec = time (NULL); 147 utx->ut_tv.tv_sec = time (NULL);
142 utx->ut_tv.tv_usec = 0; 148 utx->ut_tv.tv_usec = 0;
143 utx->ut_pid = cmd_pid; 149 utx->ut_pid = cmd_pid;
144# ifdef HAVE_UTMPX_HOST 150# ifdef HAVE_UTMPX_HOST
145 STRNCPY (utx->ut_host, hostname, sizeof (utx->ut_host)); 151 strncpy (utx->ut_host, hostname, sizeof (utx->ut_host));
146# if 0 152# if 0
147 { 153 {
148 char *colon; 154 char *colon;
149 155
150 if ((colon = STRRCHR (ut->ut_host, ':')) != NULL) 156 if ((colon = strrchr (ut->ut_host, ':')) != NULL)
151 *colon = '\0'; 157 *colon = '\0';
152 } 158 }
153# endif 159# endif
154# endif 160# endif
155 utx->ut_type = USER_PROCESS; 161 utx->ut_type = USER_PROCESS;
… …
157 endutxent (); /* close the file */ 163 endutxent (); /* close the file */
158 utmp_pos = 0; 164 utmp_pos = 0;
159#endif 165#endif
160 166
161#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID) 167#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
162
163 { 168 {
164 int i;
165# ifdef HAVE_TTYSLOT 169# ifdef HAVE_TTYSLOT
170 int fdstdin = dup (STDIN_FILENO);
171 dup2 (pty->tty, STDIN_FILENO);
172
166 i = ttyslot (); 173 i = ttyslot ();
167 if (rxvt_write_bsd_utmp (i, ut)) 174 if (rxvt_write_bsd_utmp (i, ut))
168 utmp_pos = i; 175 utmp_pos = i;
176
177 dup2 (fdstdin, STDIN_FILENO);
178 close (fdstdin);
169# else 179# else
170 FILE *fd0; 180 FILE *fd0;
171 181
172 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL) 182 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL)
173 { 183 {
174 char buf[256], name[256]; 184 char buf[256], name[256];
175 185
176 buf[sizeof (buf) - 1] = '\0'; 186 buf[sizeof (buf) - 1] = '\0';
177 for (i = 1; (fgets (buf, sizeof (buf) - 1, fd0) != NULL);) 187 for (i = 1; (fgets (buf, sizeof (buf) - 1, fd0) != NULL);)
178 { 188 {
179 if (*buf == '#' || sscanf (buf, "%s", name) != 1) 189 if (*buf == '#' || sscanf (buf, "%s", name) != 1)
180 continue; 190 continue;
181 if (!STRCMP (ut->ut_line, name)) 191 if (!strcmp (ut->ut_line, name))
182 { 192 {
183 if (!rxvt_write_bsd_utmp (i, ut)) 193 if (!rxvt_write_bsd_utmp (i, ut))
184 i = 0; 194 i = 0;
185 utmp_pos = i; 195 utmp_pos = i;
186 fclose (fd0); 196 fclose (fd0);
… …
189 i++; 199 i++;
190 } 200 }
191 fclose (fd0); 201 fclose (fd0);
192 } 202 }
193# endif 203# endif
194
195 } 204 }
196#endif 205#endif
197 206
198#ifdef WTMP_SUPPORT 207#ifdef WTMP_SUPPORT
199# ifdef WTMP_ONLY_ON_LOGIN 208 if (login_shell)
200 if (Options & Opt_loginShell)
201# endif
202 { 209 {
203# ifdef HAVE_STRUCT_UTMP 210# ifdef HAVE_STRUCT_UTMP
204# ifdef HAVE_UPDWTMP 211# ifdef HAVE_UPDWTMP
205 updwtmp (RXVT_WTMP_FILE, ut); 212 updwtmp (RXVT_WTMP_FILE, ut);
206# else 213# else
207 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 214 rxvt_update_wtmp (RXVT_WTMP_FILE, ut);
208# endif 215# endif
209# endif 216# endif
210# ifdef HAVE_STRUCT_UTMPX 217# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
211 updwtmpx (RXVT_WTMPX_FILE, utx); 218 updwtmpx (RXVT_WTMPX_FILE, utx);
212# endif 219# endif
213 } 220 }
214#endif 221#endif
215#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE) 222#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE)
216 if (Options & Opt_loginShell) 223 if (login_shell)
217 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname); 224 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname);
218#endif 225#endif
219} 226}
220 227
221/* ------------------------------------------------------------------------- */ 228/* ------------------------------------------------------------------------- */
222/* 229/*
223 * remove utmp and wtmp entries 230 * remove utmp and wtmp entries
224 */ 231 */
225void 232void
226rxvt_term::cleanutent () 233rxvt_ptytty_unix::logout ()
227{ 234{
228#ifdef HAVE_STRUCT_UTMP 235 if (!cmd_pid)
229 struct utmp *ut = & (this->ut); 236 return;
230#endif 237
231#ifdef HAVE_STRUCT_UTMPX 238#ifdef HAVE_STRUCT_UTMP
239 struct utmp *tmput, *ut = &this->ut;
240#endif
241#ifdef HAVE_STRUCT_UTMPX
232 struct utmpx *tmputx, *utx = & (this->utx); 242 struct utmpx *tmputx, *utx = &this->utx;
233#endif 243#endif
234 244
235#ifdef HAVE_STRUCT_UTMP 245#ifdef HAVE_STRUCT_UTMP
236# ifdef HAVE_UTMP_PID 246# ifdef HAVE_UTMP_PID
237 MEMSET (ut, 0, sizeof (struct utmp)); 247 memset (ut, 0, sizeof (struct utmp));
238 setutent (); 248 setutent ();
239 STRNCPY (ut->ut_id, ut_id, sizeof (ut->ut_id)); 249 strncpy (ut->ut_id, this->ut_id, sizeof (ut->ut_id));
240 ut->ut_type = USER_PROCESS; 250 ut->ut_type = USER_PROCESS;
241 {
242 struct utmp *tmput = getutid (ut);
243
244 if (tmput) /* position to entry in utmp file */ 251 if ((tmput = getutid (ut))) /* position to entry in utmp file */
245 ut = tmput; 252 ut = tmput;
246 }
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, this->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 if (login_shell)
275 if (Options & Opt_loginShell)
276# endif
277 { 283 {
278# ifdef HAVE_STRUCT_UTMP 284# ifdef HAVE_STRUCT_UTMP
279# ifdef HAVE_UPDWTMP 285# ifdef HAVE_UPDWTMP
280 updwtmp (RXVT_WTMP_FILE, ut); 286 updwtmp (RXVT_WTMP_FILE, ut);
281# else 287# else
282 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 288 rxvt_update_wtmp (RXVT_WTMP_FILE, ut);
283# endif 289# endif
284# endif 290# endif
285# ifdef HAVE_STRUCT_UTMPX 291# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
286 updwtmpx (RXVT_WTMPX_FILE, utx); 292 updwtmpx (RXVT_WTMPX_FILE, utx);
287# endif 293# endif
288 } 294 }
289#endif 295#endif
290 296
… …
295# ifdef HAVE_UTMP_PID 301# ifdef HAVE_UTMP_PID
296 if (ut->ut_pid == cmd_pid) 302 if (ut->ut_pid == cmd_pid)
297 pututline (ut); 303 pututline (ut);
298 endutent (); 304 endutent ();
299# else 305# else
300 MEMSET (ut, 0, sizeof (struct utmp)); 306 memset (ut, 0, sizeof (struct utmp));
301 rxvt_write_bsd_utmp (utmp_pos, ut); 307 rxvt_write_bsd_utmp (utmp_pos, ut);
302# endif 308# endif
303#endif 309#endif
304#ifdef HAVE_STRUCT_UTMPX 310#ifdef HAVE_STRUCT_UTMPX
305 if (utx->ut_pid == cmd_pid) 311 if (utx->ut_pid == cmd_pid)
306 pututxline (utx); 312 pututxline (utx);
307 endutxent (); 313 endutxent ();
308#endif 314#endif
315
316 cmd_pid = 0;
309} 317}
310 318
311/* ------------------------------------------------------------------------- */ 319/* ------------------------------------------------------------------------- */
312/* 320/*
313 * Write a BSD style utmp entry 321 * Write a BSD style utmp entry
314 */ 322 */
315#ifdef HAVE_UTMP_H 323#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
316/* INTPROTO */ 324static int
317int
318rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu) 325rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu)
319{ 326{
320 int fd; 327 int fd;
321 328
322 if (utmp_pos <= 0 || (fd = open (RXVT_UTMP_FILE, O_WRONLY)) == -1) 329 if (utmp_pos <= 0 || (fd = open (RXVT_UTMP_FILE, O_WRONLY)) == -1)
… …
331 338
332/* ------------------------------------------------------------------------- */ 339/* ------------------------------------------------------------------------- */
333/* 340/*
334 * Update a BSD style wtmp entry 341 * Update a BSD style wtmp entry
335 */ 342 */
336#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) 343#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP)
337/* INTPROTO */ 344static void
338void
339rxvt_update_wtmp (const char *fname, const struct utmp *putmp) 345rxvt_update_wtmp (const char *fname, const struct utmp *putmp)
340{ 346{
341 int fd, gotlock, retry; 347 int fd, gotlock, retry;
342 struct flock lck; /* fcntl locking scheme */ 348 struct flock lck; /* fcntl locking scheme */
343 struct stat sbuf; 349 struct stat sbuf;
… …
374} 380}
375#endif 381#endif
376 382
377/* ------------------------------------------------------------------------- */ 383/* ------------------------------------------------------------------------- */
378#ifdef LASTLOG_SUPPORT 384#ifdef LASTLOG_SUPPORT
379/* INTPROTO */ 385static void
380void
381rxvt_update_lastlog (const char *fname, const char *pty, const char *host) 386rxvt_update_lastlog (const char *fname, const char *pty, const char *host)
382{ 387{
383# ifdef HAVE_STRUCT_LASTLOGX 388# ifdef HAVE_STRUCT_LASTLOGX
384 struct lastlogx llx; 389 struct lastlogx llx;
385# endif 390# endif
… …
391# endif 396# endif
392 struct passwd *pwent; 397 struct passwd *pwent;
393# endif 398# endif
394 399
395# ifdef HAVE_STRUCT_LASTLOGX 400# ifdef HAVE_STRUCT_LASTLOGX
396 MEMSET (&llx, 0, sizeof (llx)); 401 memset (&llx, 0, sizeof (llx));
397 llx.ll_tv.tv_sec = time (NULL); 402 llx.ll_tv.tv_sec = time (NULL);
398 llx.ll_tv.tv_usec = 0; 403 llx.ll_tv.tv_usec = 0;
399 STRNCPY (llx.ll_line, pty, sizeof (llx.ll_line)); 404 strncpy (llx.ll_line, pty, sizeof (llx.ll_line));
400 STRNCPY (llx.ll_host, host, sizeof (llx.ll_host)); 405 strncpy (llx.ll_host, host, sizeof (llx.ll_host));
401 updlastlogx (RXVT_LASTLOGX_FILE, getuid (), &llx); 406 updlastlogx (RXVT_LASTLOGX_FILE, getuid (), &llx);
402# endif 407# endif
403 408
404# ifdef HAVE_STRUCT_LASTLOG 409# ifdef HAVE_STRUCT_LASTLOG
405 pwent = getpwuid (getuid ()); 410 pwent = getpwuid (getuid ());
406 if (!pwent) 411 if (!pwent)
407 { 412 {
408 rxvt_print_error ("no entry in password file"); 413 rxvt_warn ("no entry in password file, not updating lastlog.\n");
409 return; 414 return;
410 } 415 }
416
411 MEMSET (&ll, 0, sizeof (ll)); 417 memset (&ll, 0, sizeof (ll));
412 ll.ll_time = time (NULL); 418 ll.ll_time = time (NULL);
413 STRNCPY (ll.ll_line, pty, sizeof (ll.ll_line)); 419 strncpy (ll.ll_line, pty, sizeof (ll.ll_line));
414 STRNCPY (ll.ll_host, host, sizeof (ll.ll_host)); 420 strncpy (ll.ll_host, host, sizeof (ll.ll_host));
415# ifdef LASTLOG_IS_DIR 421# ifdef LASTLOG_IS_DIR
416 sprintf (lastlogfile, "%.*s/%.*s", 422 sprintf (lastlogfile, "%.*s/%.*s",
417 sizeof (lastlogfile) - sizeof (pwent->pw_name) - 2, fname, 423 sizeof (lastlogfile) - sizeof (pwent->pw_name) - 2, fname,
418 sizeof (pwent->pw_name), 424 sizeof (pwent->pw_name),
419 (!pwent->pw_name || pwent->pw_name[0] == '\0') ? "unknown" 425 (!pwent->pw_name || pwent->pw_name[0] == '\0') ? "unknown"

Diff Legend

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