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

Diff Legend

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