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