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.9 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.26 by ayin, Tue Jan 17 09:31:24 2006 UTC

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