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

Diff Legend

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