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.6 by pcg, Sun Feb 1 01:34:41 2004 UTC vs.
Revision 1.7 by pcg, Fri Feb 13 12:16:21 2004 UTC

… …
57 */ 57 */
58void 58void
59rxvt_term::makeutent (const char *pty, const char *hostname) 59rxvt_term::makeutent (const char *pty, const char *hostname)
60{ 60{
61#ifdef HAVE_STRUCT_UTMP 61#ifdef HAVE_STRUCT_UTMP
62 struct utmp *ut = &(this->ut); 62 struct utmp *ut = & (this->ut);
63#endif 63#endif
64#ifdef HAVE_STRUCT_UTMPX 64#ifdef HAVE_STRUCT_UTMPX
65 struct utmpx *utx = &(this->utx); 65 struct utmpx *utx = & (this->utx);
66#endif 66#endif
67#ifdef HAVE_UTMP_PID 67#ifdef HAVE_UTMP_PID
68 int i; 68 int i;
69#endif 69#endif
70 char ut_id[5]; 70 char ut_id[5];
71 struct passwd *pwent = getpwuid(getuid()); 71 struct passwd *pwent = getpwuid (getuid ());
72 72
73 if (!STRNCMP(pty, "/dev/", 5)) 73 if (!STRNCMP (pty, "/dev/", 5))
74 pty += 5; /* skip /dev/ prefix */ 74 pty += 5; /* skip /dev/ prefix */
75 75
76 if (!STRNCMP(pty, "pty", 3) || !STRNCMP(pty, "tty", 3)) 76 if (!STRNCMP (pty, "pty", 3) || !STRNCMP (pty, "tty", 3))
77 { 77 {
78 STRNCPY(ut_id, (pty + 3), sizeof(ut_id)); 78 STRNCPY (ut_id, (pty + 3), sizeof (ut_id));
79 } 79 }
80#ifdef HAVE_UTMP_PID 80#ifdef HAVE_UTMP_PID
81 else if (sscanf(pty, "pts/%d", &i) == 1) 81 else if (sscanf (pty, "pts/%d", &i) == 1)
82 sprintf(ut_id, "vt%02x", (i & 0xff)); /* sysv naming */ 82 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */
83#endif 83#endif
84 else if (STRNCMP(pty, "pty", 3) && STRNCMP(pty, "tty", 3)) 84 else if (STRNCMP (pty, "pty", 3) && STRNCMP (pty, "tty", 3))
85 { 85 {
86 rxvt_print_error("can't parse tty name \"%s\"", pty); 86 rxvt_print_error ("can't parse tty name \"%s\"", pty);
87 return; 87 return;
88 } 88 }
89 89
90#ifdef HAVE_STRUCT_UTMP 90#ifdef HAVE_STRUCT_UTMP
91 MEMSET(ut, 0, sizeof(struct utmp)); 91 MEMSET (ut, 0, sizeof (struct utmp));
92# ifdef HAVE_UTMP_PID 92# ifdef HAVE_UTMP_PID
93 setutent(); 93 setutent ();
94 STRNCPY(ut->ut_id, ut_id, sizeof(ut->ut_id)); 94 STRNCPY (ut->ut_id, ut_id, sizeof (ut->ut_id));
95 ut->ut_type = DEAD_PROCESS; 95 ut->ut_type = DEAD_PROCESS;
96 getutid(ut); /* position to entry in utmp file */ 96 getutid (ut); /* position to entry in utmp file */
97 STRNCPY(ut_id, ut_id, sizeof(ut_id)); 97 STRNCPY (ut_id, ut_id, sizeof (ut_id));
98# endif
99#endif 98# endif
99#endif
100 100
101#ifdef HAVE_STRUCT_UTMPX 101#ifdef HAVE_STRUCT_UTMPX
102 MEMSET(utx, 0, sizeof(struct utmpx)); 102 MEMSET (utx, 0, sizeof (struct utmpx));
103 setutxent(); 103 setutxent ();
104 STRNCPY(utx->ut_id, ut_id, sizeof(utx->ut_id)); 104 STRNCPY (utx->ut_id, ut_id, sizeof (utx->ut_id));
105 utx->ut_type = DEAD_PROCESS; 105 utx->ut_type = DEAD_PROCESS;
106 getutxid(utx); /* position to entry in utmp file */ 106 getutxid (utx); /* position to entry in utmp file */
107 STRNCPY(ut_id, ut_id, sizeof(ut_id)); 107 STRNCPY (ut_id, ut_id, sizeof (ut_id));
108#endif 108#endif
109 109
110#ifdef HAVE_STRUCT_UTMP 110#ifdef HAVE_STRUCT_UTMP
111 STRNCPY(ut->ut_line, pty, sizeof(ut->ut_line)); 111 STRNCPY (ut->ut_line, pty, sizeof (ut->ut_line));
112 ut->ut_time = time(NULL); 112 ut->ut_time = time (NULL);
113# ifdef HAVE_UTMP_PID 113# ifdef HAVE_UTMP_PID
114 STRNCPY(ut->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?", 114 STRNCPY (ut->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?",
115 sizeof(ut->ut_user)); 115 sizeof (ut->ut_user));
116 STRNCPY(ut->ut_id, ut_id, sizeof(ut->ut_id)); 116 STRNCPY (ut->ut_id, ut_id, sizeof (ut->ut_id));
117 ut->ut_time = time(NULL); 117 ut->ut_time = time (NULL);
118 ut->ut_pid = cmd_pid; 118 ut->ut_pid = cmd_pid;
119# ifdef HAVE_UTMP_HOST 119# ifdef HAVE_UTMP_HOST
120 STRNCPY(ut->ut_host, hostname, sizeof(ut->ut_host)); 120 STRNCPY (ut->ut_host, hostname, sizeof (ut->ut_host));
121# endif 121# endif
122 ut->ut_type = USER_PROCESS; 122 ut->ut_type = USER_PROCESS;
123 pututline(ut); 123 pututline (ut);
124 endutent(); /* close the file */ 124 endutent (); /* close the file */
125 utmp_pos = 0; 125 utmp_pos = 0;
126# else 126# else
127 STRNCPY(ut->ut_name, (pwent && pwent->pw_name) ? pwent->pw_name : "?", 127 STRNCPY (ut->ut_name, (pwent && pwent->pw_name) ? pwent->pw_name : "?",
128 sizeof(ut->ut_name)); 128 sizeof (ut->ut_name));
129# ifdef HAVE_UTMP_HOST 129# ifdef HAVE_UTMP_HOST
130 STRNCPY(ut->ut_host, hostname, sizeof(ut->ut_host)); 130 STRNCPY (ut->ut_host, hostname, sizeof (ut->ut_host));
131# endif
132# endif 131# endif
133#endif 132# endif
133#endif
134 134
135#ifdef HAVE_STRUCT_UTMPX 135#ifdef HAVE_STRUCT_UTMPX
136 STRNCPY(utx->ut_line, pty, sizeof(utx->ut_line)); 136 STRNCPY (utx->ut_line, pty, sizeof (utx->ut_line));
137 STRNCPY(utx->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?", 137 STRNCPY (utx->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?",
138 sizeof(utx->ut_user)); 138 sizeof (utx->ut_user));
139 STRNCPY(utx->ut_id, ut_id, sizeof(utx->ut_id)); 139 STRNCPY (utx->ut_id, ut_id, sizeof (utx->ut_id));
140 utx->ut_session = getsid(0); 140 utx->ut_session = getsid (0);
141 utx->ut_tv.tv_sec = time(NULL); 141 utx->ut_tv.tv_sec = time (NULL);
142 utx->ut_tv.tv_usec = 0; 142 utx->ut_tv.tv_usec = 0;
143 utx->ut_pid = cmd_pid; 143 utx->ut_pid = cmd_pid;
144# ifdef HAVE_UTMPX_HOST 144# ifdef HAVE_UTMPX_HOST
145 STRNCPY(utx->ut_host, hostname, sizeof(utx->ut_host)); 145 STRNCPY (utx->ut_host, hostname, sizeof (utx->ut_host));
146# if 0 146# if 0
147 { 147 {
148 char *colon; 148 char *colon;
149 149
150 if ((colon = STRRCHR(ut->ut_host, ':')) != NULL) 150 if ((colon = STRRCHR (ut->ut_host, ':')) != NULL)
151 *colon = '\0'; 151 *colon = '\0';
152 } 152 }
153# endif 153# endif
154# endif 154# endif
155 utx->ut_type = USER_PROCESS; 155 utx->ut_type = USER_PROCESS;
156 pututxline(utx); 156 pututxline (utx);
157 endutxent(); /* close the file */ 157 endutxent (); /* close the file */
158 utmp_pos = 0; 158 utmp_pos = 0;
159#endif 159#endif
160 160
161#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID) 161#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
162 162
163 { 163 {
164 int i; 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);
187 break; 187 break;
188 } 188 }
189 i++; 189 i++;
190 } 190 }
191 fclose(fd0); 191 fclose (fd0);
192 } 192 }
193# endif 193# endif
194 194
195 } 195 }
196#endif 196#endif
… …
200 if (Options & Opt_loginShell) 200 if (Options & Opt_loginShell)
201# endif 201# endif
202 { 202 {
203# ifdef HAVE_STRUCT_UTMP 203# ifdef HAVE_STRUCT_UTMP
204# ifdef HAVE_UPDWTMP 204# ifdef HAVE_UPDWTMP
205 updwtmp(RXVT_WTMP_FILE, ut); 205 updwtmp (RXVT_WTMP_FILE, ut);
206# else 206# else
207 rxvt_update_wtmp(RXVT_WTMP_FILE, ut); 207 rxvt_update_wtmp (RXVT_WTMP_FILE, ut);
208# endif 208# endif
209# endif 209# endif
210# ifdef HAVE_STRUCT_UTMPX 210# ifdef HAVE_STRUCT_UTMPX
211 updwtmpx(RXVT_WTMPX_FILE, utx); 211 updwtmpx (RXVT_WTMPX_FILE, utx);
212# endif 212# endif
213 } 213 }
214#endif 214#endif
215#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE) 215#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE)
216 if (Options & Opt_loginShell) 216 if (Options & Opt_loginShell)
217 rxvt_update_lastlog(RXVT_LASTLOG_FILE, pty, hostname); 217 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname);
218#endif 218#endif
219} 219}
220 220
221/* ------------------------------------------------------------------------- */ 221/* ------------------------------------------------------------------------- */
222/* 222/*
… …
224 */ 224 */
225void 225void
226rxvt_term::cleanutent () 226rxvt_term::cleanutent ()
227{ 227{
228#ifdef HAVE_STRUCT_UTMP 228#ifdef HAVE_STRUCT_UTMP
229 struct utmp *ut = &(this->ut); 229 struct utmp *ut = & (this->ut);
230#endif 230#endif
231#ifdef HAVE_STRUCT_UTMPX 231#ifdef HAVE_STRUCT_UTMPX
232 struct utmpx *tmputx, *utx = &(this->utx); 232 struct utmpx *tmputx, *utx = & (this->utx);
233#endif 233#endif
234 234
235#ifdef HAVE_STRUCT_UTMP 235#ifdef HAVE_STRUCT_UTMP
236# ifdef HAVE_UTMP_PID 236# ifdef HAVE_UTMP_PID
237 MEMSET(ut, 0, sizeof(struct utmp)); 237 MEMSET (ut, 0, sizeof (struct utmp));
238 setutent(); 238 setutent ();
239 STRNCPY(ut->ut_id, ut_id, sizeof(ut->ut_id)); 239 STRNCPY (ut->ut_id, ut_id, sizeof (ut->ut_id));
240 ut->ut_type = USER_PROCESS; 240 ut->ut_type = USER_PROCESS;
241 { 241 {
242 struct utmp *tmput = getutid(ut); 242 struct utmp *tmput = getutid (ut);
243 243
244 if (tmput) /* position to entry in utmp file */ 244 if (tmput) /* position to entry in utmp file */
245 ut = tmput; 245 ut = tmput;
246 } 246 }
247 ut->ut_type = DEAD_PROCESS; 247 ut->ut_type = DEAD_PROCESS;
248# else 248# else
249 MEMSET(ut->ut_name, 0, sizeof(ut->ut_name)); 249 MEMSET (ut->ut_name, 0, sizeof (ut->ut_name));
250# ifdef HAVE_UTMP_HOST 250# ifdef HAVE_UTMP_HOST
251 MEMSET(ut->ut_host, 0, sizeof(ut->ut_host)); 251 MEMSET (ut->ut_host, 0, sizeof (ut->ut_host));
252# endif
253# endif 252# endif
253# endif
254 ut->ut_time = time(NULL); 254 ut->ut_time = time (NULL);
255#endif 255#endif
256 256
257#ifdef HAVE_STRUCT_UTMPX 257#ifdef HAVE_STRUCT_UTMPX
258 MEMSET(utx, 0, sizeof(struct utmpx)); 258 MEMSET (utx, 0, sizeof (struct utmpx));
259 setutxent(); 259 setutxent ();
260 STRNCPY(utx->ut_id, ut_id, sizeof(utx->ut_id)); 260 STRNCPY (utx->ut_id, ut_id, sizeof (utx->ut_id));
261 utx->ut_type = USER_PROCESS; 261 utx->ut_type = USER_PROCESS;
262 if ((tmputx = getutxid(utx))) /* position to entry in utmp file */ 262 if ((tmputx = getutxid (utx))) /* position to entry in utmp file */
263 utx = tmputx; 263 utx = tmputx;
264 utx->ut_type = DEAD_PROCESS; 264 utx->ut_type = DEAD_PROCESS;
265 utx->ut_session = getsid(0); 265 utx->ut_session = getsid (0);
266 utx->ut_tv.tv_sec = time(NULL); 266 utx->ut_tv.tv_sec = time (NULL);
267 utx->ut_tv.tv_usec = 0; 267 utx->ut_tv.tv_usec = 0;
268#endif 268#endif
269 269
270 /* 270 /*
271 * Write ending wtmp entry 271 * Write ending wtmp entry
… …
275 if (Options & Opt_loginShell) 275 if (Options & Opt_loginShell)
276# endif 276# endif
277 { 277 {
278# ifdef HAVE_STRUCT_UTMP 278# ifdef HAVE_STRUCT_UTMP
279# ifdef HAVE_UPDWTMP 279# ifdef HAVE_UPDWTMP
280 updwtmp(RXVT_WTMP_FILE, ut); 280 updwtmp (RXVT_WTMP_FILE, ut);
281# else 281# else
282 rxvt_update_wtmp(RXVT_WTMP_FILE, ut); 282 rxvt_update_wtmp (RXVT_WTMP_FILE, ut);
283# endif 283# endif
284# endif 284# endif
285# ifdef HAVE_STRUCT_UTMPX 285# ifdef HAVE_STRUCT_UTMPX
286 updwtmpx(RXVT_WTMPX_FILE, utx); 286 updwtmpx (RXVT_WTMPX_FILE, utx);
287# endif 287# endif
288 } 288 }
289#endif 289#endif
290 290
291 /* 291 /*
292 * Write utmp entry 292 * Write utmp entry
293 */ 293 */
294#ifdef HAVE_STRUCT_UTMP 294#ifdef HAVE_STRUCT_UTMP
295# ifdef HAVE_UTMP_PID 295# ifdef HAVE_UTMP_PID
296 if (ut->ut_pid == cmd_pid) 296 if (ut->ut_pid == cmd_pid)
297 pututline(ut); 297 pututline (ut);
298 endutent(); 298 endutent ();
299# else 299# else
300 MEMSET(ut, 0, sizeof(struct utmp)); 300 MEMSET (ut, 0, sizeof (struct utmp));
301 rxvt_write_bsd_utmp(utmp_pos, ut); 301 rxvt_write_bsd_utmp (utmp_pos, ut);
302# endif 302# endif
303#endif 303#endif
304#ifdef HAVE_STRUCT_UTMPX 304#ifdef HAVE_STRUCT_UTMPX
305 if (utx->ut_pid == cmd_pid) 305 if (utx->ut_pid == cmd_pid)
306 pututxline(utx); 306 pututxline (utx);
307 endutxent(); 307 endutxent ();
308#endif 308#endif
309} 309}
310 310
311/* ------------------------------------------------------------------------- */ 311/* ------------------------------------------------------------------------- */
312/* 312/*
313 * Write a BSD style utmp entry 313 * Write a BSD style utmp entry
314 */ 314 */
315#ifdef HAVE_UTMP_H 315#ifdef HAVE_UTMP_H
316/* INTPROTO */ 316/* INTPROTO */
317int 317int
318rxvt_write_bsd_utmp(int utmp_pos, struct utmp *wu) 318rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu)
319{ 319{
320 int fd; 320 int fd;
321 321
322 if (utmp_pos <= 0 || (fd = open(RXVT_UTMP_FILE, O_WRONLY)) == -1) 322 if (utmp_pos <= 0 || (fd = open (RXVT_UTMP_FILE, O_WRONLY)) == -1)
323 return 0; 323 return 0;
324 324
325 if (lseek(fd, (off_t) (utmp_pos * sizeof(struct utmp)), SEEK_SET) != -1) 325 if (lseek (fd, (off_t) (utmp_pos * sizeof (struct utmp)), SEEK_SET) != -1)
326 write(fd, wu, sizeof(struct utmp)); 326 write (fd, wu, sizeof (struct utmp));
327 close(fd); 327 close (fd);
328 return 1; 328 return 1;
329} 329}
330#endif 330#endif
331 331
332/* ------------------------------------------------------------------------- */ 332/* ------------------------------------------------------------------------- */
… …
334 * Update a BSD style wtmp entry 334 * Update a BSD style wtmp entry
335 */ 335 */
336#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) 336#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP)
337/* INTPROTO */ 337/* INTPROTO */
338void 338void
339rxvt_update_wtmp(const char *fname, const struct utmp *putmp) 339rxvt_update_wtmp (const char *fname, const struct utmp *putmp)
340{ 340{
341 int fd, gotlock, retry; 341 int fd, gotlock, retry;
342 struct flock lck; /* fcntl locking scheme */ 342 struct flock lck; /* fcntl locking scheme */
343 struct stat sbuf; 343 struct stat sbuf;
344 344
345 if ((fd = open(fname, O_WRONLY | O_APPEND, 0)) < 0) 345 if ((fd = open (fname, O_WRONLY | O_APPEND, 0)) < 0)
346 return; 346 return;
347 347
348 lck.l_whence = SEEK_END; /* start lock at current eof */ 348 lck.l_whence = SEEK_END; /* start lock at current eof */
349 lck.l_len = 0; /* end at ``largest possible eof'' */ 349 lck.l_len = 0; /* end at ``largest possible eof'' */
350 lck.l_start = 0; 350 lck.l_start = 0;
351 lck.l_type = F_WRLCK; /* we want a write lock */ 351 lck.l_type = F_WRLCK; /* we want a write lock */
352 352
353 /* attempt lock with F_SETLK; F_SETLKW would cause a deadlock! */ 353 /* attempt lock with F_SETLK; F_SETLKW would cause a deadlock! */
354 for (retry = 10, gotlock = 0; retry--;) 354 for (retry = 10, gotlock = 0; retry--;)
355 if (fcntl(fd, F_SETLK, &lck) != -1) 355 if (fcntl (fd, F_SETLK, &lck) != -1)
356 { 356 {
357 gotlock = 1; 357 gotlock = 1;
358 break; 358 break;
359 } 359 }
360 else if (errno != EAGAIN && errno != EACCES) 360 else if (errno != EAGAIN && errno != EACCES)
361 break; 361 break;
362 if (!gotlock) 362 if (!gotlock)
363 { /* give it up */ 363 { /* give it up */
364 close(fd); 364 close (fd);
365 return; 365 return;
366 } 366 }
367 if (fstat(fd, &sbuf) == 0) 367 if (fstat (fd, &sbuf) == 0)
368 if (write(fd, putmp, sizeof(struct utmp)) != sizeof(struct utmp)) 368 if (write (fd, putmp, sizeof (struct utmp)) != sizeof (struct utmp))
369 ftruncate(fd, sbuf.st_size); /* remove bad writes */ 369 ftruncate (fd, sbuf.st_size); /* remove bad writes */
370 370
371 lck.l_type = F_UNLCK; /* unlocking the file */ 371 lck.l_type = F_UNLCK; /* unlocking the file */
372 fcntl(fd, F_SETLK, &lck); 372 fcntl (fd, F_SETLK, &lck);
373 close(fd); 373 close (fd);
374} 374}
375#endif 375#endif
376 376
377/* ------------------------------------------------------------------------- */ 377/* ------------------------------------------------------------------------- */
378#ifdef LASTLOG_SUPPORT 378#ifdef LASTLOG_SUPPORT
379/* INTPROTO */ 379/* INTPROTO */
380void 380void
381rxvt_update_lastlog(const char *fname, const char *pty, const char *host) 381rxvt_update_lastlog (const char *fname, const char *pty, const char *host)
382{ 382{
383# ifdef HAVE_STRUCT_LASTLOGX 383# ifdef HAVE_STRUCT_LASTLOGX
384 struct lastlogx llx; 384 struct lastlogx llx;
385# endif 385# endif
386# ifdef HAVE_STRUCT_LASTLOG 386# ifdef HAVE_STRUCT_LASTLOG
… …
391# endif 391# endif
392 struct passwd *pwent; 392 struct passwd *pwent;
393# endif 393# endif
394 394
395# ifdef HAVE_STRUCT_LASTLOGX 395# ifdef HAVE_STRUCT_LASTLOGX
396 MEMSET(&llx, 0, sizeof(llx)); 396 MEMSET (&llx, 0, sizeof (llx));
397 llx.ll_tv.tv_sec = time(NULL); 397 llx.ll_tv.tv_sec = time (NULL);
398 llx.ll_tv.tv_usec = 0; 398 llx.ll_tv.tv_usec = 0;
399 STRNCPY(llx.ll_line, pty, sizeof(llx.ll_line)); 399 STRNCPY (llx.ll_line, pty, sizeof (llx.ll_line));
400 STRNCPY(llx.ll_host, host, sizeof(llx.ll_host)); 400 STRNCPY (llx.ll_host, host, sizeof (llx.ll_host));
401 updlastlogx(RXVT_LASTLOGX_FILE, getuid(), &llx); 401 updlastlogx (RXVT_LASTLOGX_FILE, getuid (), &llx);
402# endif 402# endif
403 403
404# ifdef HAVE_STRUCT_LASTLOG 404# ifdef HAVE_STRUCT_LASTLOG
405 pwent = getpwuid(getuid()); 405 pwent = getpwuid (getuid ());
406 if (!pwent) 406 if (!pwent)
407 { 407 {
408 rxvt_print_error("no entry in password file"); 408 rxvt_print_error ("no entry in password file");
409 return; 409 return;
410 } 410 }
411 MEMSET(&ll, 0, sizeof(ll)); 411 MEMSET (&ll, 0, sizeof (ll));
412 ll.ll_time = time(NULL); 412 ll.ll_time = time (NULL);
413 STRNCPY(ll.ll_line, pty, sizeof(ll.ll_line)); 413 STRNCPY (ll.ll_line, pty, sizeof (ll.ll_line));
414 STRNCPY(ll.ll_host, host, sizeof(ll.ll_host)); 414 STRNCPY (ll.ll_host, host, sizeof (ll.ll_host));
415# ifdef LASTLOG_IS_DIR 415# ifdef LASTLOG_IS_DIR
416 sprintf(lastlogfile, "%.*s/%.*s", 416 sprintf (lastlogfile, "%.*s/%.*s",
417 sizeof(lastlogfile) - sizeof(pwent->pw_name) - 2, fname, 417 sizeof (lastlogfile) - sizeof (pwent->pw_name) - 2, fname,
418 sizeof(pwent->pw_name), 418 sizeof (pwent->pw_name),
419 (!pwent->pw_name || pwent->pw_name[0] == '\0') ? "unknown" 419 (!pwent->pw_name || pwent->pw_name[0] == '\0') ? "unknown"
420 : pwent->pw_name); 420 : pwent->pw_name);
421 if ((fd = open(lastlogfile, O_WRONLY | O_CREAT, 0644)) >= 0) 421 if ((fd = open (lastlogfile, O_WRONLY | O_CREAT, 0644)) >= 0)
422 { 422 {
423 write(fd, &ll, sizeof(ll)); 423 write (fd, &ll, sizeof (ll));
424 close(fd); 424 close (fd);
425 } 425 }
426# else 426# else
427 if ((fd = open(fname, O_RDWR)) != -1) 427 if ((fd = open (fname, O_RDWR)) != -1)
428 { 428 {
429 if (lseek(fd, (off_t) ((long)pwent->pw_uid * sizeof(ll)), 429 if (lseek (fd, (off_t) ((long)pwent->pw_uid * sizeof (ll)),
430 SEEK_SET) != -1) 430 SEEK_SET) != -1)
431 write(fd, &ll, sizeof(ll)); 431 write (fd, &ll, sizeof (ll));
432 close(fd); 432 close (fd);
433 } 433 }
434# endif /* LASTLOG_IS_DIR */ 434# endif /* LASTLOG_IS_DIR */
435# endif /* HAVE_STRUCT_LASTLOG */ 435# endif /* HAVE_STRUCT_LASTLOG */
436} 436}
437#endif /* LASTLOG_SUPPORT */ 437#endif /* LASTLOG_SUPPORT */

Diff Legend

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