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.15 by root, Wed Feb 16 21:21:43 2005 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: logging.c 2 * File: logging.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
12 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 12 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
14 * - extensive modifications 14 * - extensive modifications
15 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> 15 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
16 * - lastlog support 16 * - lastlog support
17 * Copyright (c) 2004 Marc Lehmann <pcg@goof.com>
17 * 18 *
18 * This program is free software; you can redistribute it and/or modify 19 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 20 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 21 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 22 * (at your option) any later version.
… …
41#include "../config.h" /* NECESSARY */ 42#include "../config.h" /* NECESSARY */
42#include "rxvt.h" /* NECESSARY */ 43#include "rxvt.h" /* NECESSARY */
43#include "logging.h" 44#include "logging.h"
44#ifdef UTMP_SUPPORT 45#ifdef UTMP_SUPPORT
45 46
47int rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu);
48void rxvt_update_wtmp (const char *fname, const struct utmp *putmp);
49void rxvt_update_lastlog (const char *fname, const char *pty, const char *host);
50
46/* 51/*
47 * BSD style utmp entry 52 * BSD style utmp entry
48 * ut_line, ut_name, ut_host, ut_time 53 * ut_line, ut_name, ut_host, ut_time
49 * SYSV style utmp (and utmpx) entry 54 * SYSV style utmp (and utmpx) entry
50 * ut_user, ut_id, ut_line, ut_pid, ut_type, ut_exit, ut_time 55 * ut_user, ut_id, ut_line, ut_pid, ut_type, ut_exit, ut_time
… …
57 */ 62 */
58void 63void
59rxvt_term::makeutent (const char *pty, const char *hostname) 64rxvt_term::makeutent (const char *pty, const char *hostname)
60{ 65{
61#ifdef HAVE_STRUCT_UTMP 66#ifdef HAVE_STRUCT_UTMP
62 struct utmp *ut = &(this->ut); 67 struct utmp *ut = &this->ut;
63#endif 68#endif
64#ifdef HAVE_STRUCT_UTMPX 69#ifdef HAVE_STRUCT_UTMPX
65 struct utmpx *utx = &(this->utx); 70 struct utmpx *utx = &this->utx;
66#endif 71#endif
67#ifdef HAVE_UTMP_PID 72#ifdef HAVE_UTMP_PID
73 int i;
74#endif
75 struct passwd *pwent = getpwuid (getuid ());
76
77 if (!strncmp (pty, "/dev/", 5))
78 pty += 5; /* skip /dev/ prefix */
79
80#ifdef HAVE_UTMP_PID
81 if (!strncmp (pty, "pty", 3) || !strncmp (pty, "tty", 3))
82 strncpy (ut_id, pty + 3, sizeof (ut_id));
83 else if (sscanf (pty, "pts/%d", &i) == 1)
84 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */
85 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3))
86 {
87 rxvt_warn ("can't parse tty name \"%s\", not adding utmp entry.\n", pty);
88 return;
89 }
90#endif
91
92#ifdef HAVE_STRUCT_UTMP
93 memset (ut, 0, sizeof (struct utmp));
94# ifdef HAVE_UTMP_PID
95 setutent ();
96 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id));
97 ut->ut_type = DEAD_PROCESS;
98 getutid (ut); /* position to entry in utmp file */
99 strncpy (ut_id, ut_id, sizeof (ut_id));
100# endif
101#endif
102
103#ifdef HAVE_STRUCT_UTMPX
104 memset (utx, 0, sizeof (struct utmpx));
105 setutxent ();
106 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id));
107 utx->ut_type = DEAD_PROCESS;
108 getutxid (utx); /* position to entry in utmp file */
109 strncpy (ut_id, ut_id, sizeof (ut_id));
110#endif
111
112#ifdef HAVE_STRUCT_UTMP
113 strncpy (ut->ut_line, pty, sizeof (ut->ut_line));
114 ut->ut_time = time (NULL);
115# ifdef HAVE_UTMP_PID
116 strncpy (ut->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?",
117 sizeof (ut->ut_user));
118 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id));
119 ut->ut_time = time (NULL);
120 ut->ut_pid = cmd_pid;
121# ifdef HAVE_UTMP_HOST
122 strncpy (ut->ut_host, hostname, sizeof (ut->ut_host));
123# endif
124 ut->ut_type = USER_PROCESS;
125 pututline (ut);
126 endutent (); /* close the file */
127 utmp_pos = 0;
128# else
129 strncpy (ut->ut_name, (pwent && pwent->pw_name) ? pwent->pw_name : "?",
130 sizeof (ut->ut_name));
131# ifdef HAVE_UTMP_HOST
132 strncpy (ut->ut_host, hostname, sizeof (ut->ut_host));
133# endif
134# endif
135#endif
136
137#ifdef HAVE_STRUCT_UTMPX
138 strncpy (utx->ut_line, pty, sizeof (utx->ut_line));
139 strncpy (utx->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?",
140 sizeof (utx->ut_user));
141 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id));
142# if HAVE_UTMPX_SESSION
143 utx->ut_session = getsid (0);
144# endif
145 utx->ut_tv.tv_sec = time (NULL);
146 utx->ut_tv.tv_usec = 0;
147 utx->ut_pid = cmd_pid;
148# ifdef HAVE_UTMPX_HOST
149 strncpy (utx->ut_host, hostname, sizeof (utx->ut_host));
150# if 0
151 {
152 char *colon;
153
154 if ((colon = strrchr (ut->ut_host, ':')) != NULL)
155 *colon = '\0';
156 }
157# endif
158# endif
159 utx->ut_type = USER_PROCESS;
160 pututxline (utx);
161 endutxent (); /* close the file */
162 utmp_pos = 0;
163#endif
164
165#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
166
167 {
68 int i; 168 int i;
69#endif 169# ifdef HAVE_TTYSLOT
70 char ut_id[5]; 170 i = ttyslot ();
71 struct passwd *pwent = getpwuid(getuid()); 171 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; 172 utmp_pos = i;
124# else 173# 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; 174 FILE *fd0;
168 175
169 if ((fd0 = fopen(TTYTAB_FILENAME, "r")) != NULL) { 176 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL)
177 {
170 char buf[256], name[256]; 178 char buf[256], name[256];
171 179
172 buf[sizeof(buf) - 1] = '\0'; 180 buf[sizeof (buf) - 1] = '\0';
173 for (i = 1; (fgets(buf, sizeof(buf) - 1, fd0) != NULL);) { 181 for (i = 1; (fgets (buf, sizeof (buf) - 1, fd0) != NULL);)
182 {
174 if (*buf == '#' || sscanf(buf, "%s", name) != 1) 183 if (*buf == '#' || sscanf (buf, "%s", name) != 1)
175 continue; 184 continue;
176 if (!STRCMP(ut->ut_line, name)) { 185 if (!strcmp (ut->ut_line, name))
186 {
177 if (!rxvt_write_bsd_utmp(i, ut)) 187 if (!rxvt_write_bsd_utmp (i, ut))
178 i = 0; 188 i = 0;
179 utmp_pos = i; 189 utmp_pos = i;
180 fclose(fd0); 190 fclose (fd0);
181 break; 191 break;
182 } 192 }
183 i++; 193 i++;
184 } 194 }
185 fclose(fd0); 195 fclose (fd0);
186 }
187# endif
188 } 196 }
197# endif
198
199 }
189#endif 200#endif
190 201
191#ifdef WTMP_SUPPORT 202#ifdef WTMP_SUPPORT
192# ifdef WTMP_ONLY_ON_LOGIN 203# ifdef WTMP_ONLY_ON_LOGIN
193 if (Options & Opt_loginShell) 204 if (options & Opt_loginShell)
194# endif 205# endif
195 { 206 {
196# ifdef HAVE_STRUCT_UTMP 207# ifdef HAVE_STRUCT_UTMP
197# ifdef HAVE_UPDWTMP 208# ifdef HAVE_UPDWTMP
198 updwtmp(RXVT_WTMP_FILE, ut); 209 updwtmp (RXVT_WTMP_FILE, ut);
199# else 210# else
200 rxvt_update_wtmp(RXVT_WTMP_FILE, ut); 211 rxvt_update_wtmp (RXVT_WTMP_FILE, ut);
201# endif 212# endif
202# endif 213# endif
203# ifdef HAVE_STRUCT_UTMPX 214# ifdef HAVE_STRUCT_UTMPX
215# if HAVE_UPDWTMPX
204 updwtmpx(RXVT_WTMPX_FILE, utx); 216 updwtmpx (RXVT_WTMPX_FILE, utx);
217# endif
205# endif 218# endif
206 } 219 }
207#endif 220#endif
208#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE) 221#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE)
209 if (Options & Opt_loginShell) 222 if (options & Opt_loginShell)
210 rxvt_update_lastlog(RXVT_LASTLOG_FILE, pty, hostname); 223 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname);
211#endif 224#endif
212} 225}
213 226
214/* ------------------------------------------------------------------------- */ 227/* ------------------------------------------------------------------------- */
215/* 228/*
… …
217 */ 230 */
218void 231void
219rxvt_term::cleanutent () 232rxvt_term::cleanutent ()
220{ 233{
221#ifdef HAVE_STRUCT_UTMP 234#ifdef HAVE_STRUCT_UTMP
222 struct utmp *ut = &(this->ut); 235 struct utmp *ut = &this->ut;
223#endif 236#endif
224#ifdef HAVE_STRUCT_UTMPX 237#ifdef HAVE_STRUCT_UTMPX
225 struct utmpx *tmputx, *utx = &(this->utx); 238 struct utmpx *tmputx, *utx = &this->utx;
226#endif 239#endif
227 240
228#ifdef HAVE_STRUCT_UTMP 241#ifdef HAVE_STRUCT_UTMP
229# ifdef HAVE_UTMP_PID 242# ifdef HAVE_UTMP_PID
230 MEMSET(ut, 0, sizeof(struct utmp)); 243 memset (ut, 0, sizeof (struct utmp));
231 setutent(); 244 setutent ();
232 STRNCPY(ut->ut_id, ut_id, sizeof(ut->ut_id)); 245 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id));
233 ut->ut_type = USER_PROCESS; 246 ut->ut_type = USER_PROCESS;
234 { 247 {
235 struct utmp *tmput = getutid(ut); 248 struct utmp *tmput = getutid (ut);
236 249
237 if (tmput) /* position to entry in utmp file */ 250 if (tmput) /* position to entry in utmp file */
238 ut = tmput; 251 ut = tmput;
239 } 252 }
240 ut->ut_type = DEAD_PROCESS; 253 ut->ut_type = DEAD_PROCESS;
241# else 254# else
242 MEMSET(ut->ut_name, 0, sizeof(ut->ut_name)); 255 memset (ut->ut_name, 0, sizeof (ut->ut_name));
243# ifdef HAVE_UTMP_HOST 256# ifdef HAVE_UTMP_HOST
244 MEMSET(ut->ut_host, 0, sizeof(ut->ut_host)); 257 memset (ut->ut_host, 0, sizeof (ut->ut_host));
245# endif
246# endif 258# endif
259# endif
247 ut->ut_time = time(NULL); 260 ut->ut_time = time (NULL);
248#endif 261#endif
249 262
250#ifdef HAVE_STRUCT_UTMPX 263#ifdef HAVE_STRUCT_UTMPX
251 MEMSET(utx, 0, sizeof(struct utmpx)); 264 memset (utx, 0, sizeof (struct utmpx));
252 setutxent(); 265 setutxent ();
253 STRNCPY(utx->ut_id, ut_id, sizeof(utx->ut_id)); 266 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id));
254 utx->ut_type = USER_PROCESS; 267 utx->ut_type = USER_PROCESS;
255 if ((tmputx = getutxid(utx))) /* position to entry in utmp file */ 268 if ((tmputx = getutxid (utx))) /* position to entry in utmp file */
256 utx = tmputx; 269 utx = tmputx;
257 utx->ut_type = DEAD_PROCESS; 270 utx->ut_type = DEAD_PROCESS;
271# if HAVE_UTMPX_SESSION
258 utx->ut_session = getsid(0); 272 utx->ut_session = getsid (0);
273# endif
259 utx->ut_tv.tv_sec = time(NULL); 274 utx->ut_tv.tv_sec = time (NULL);
260 utx->ut_tv.tv_usec = 0; 275 utx->ut_tv.tv_usec = 0;
261#endif 276#endif
262 277
263 /* 278 /*
264 * Write ending wtmp entry 279 * Write ending wtmp entry
265 */ 280 */
266#ifdef WTMP_SUPPORT 281#ifdef WTMP_SUPPORT
267# ifdef WTMP_ONLY_ON_LOGIN 282# ifdef WTMP_ONLY_ON_LOGIN
268 if (Options & Opt_loginShell) 283 if (options & Opt_loginShell)
269# endif 284# endif
270 { 285 {
271# ifdef HAVE_STRUCT_UTMP 286# ifdef HAVE_STRUCT_UTMP
272# ifdef HAVE_UPDWTMP 287# ifdef HAVE_UPDWTMP
273 updwtmp(RXVT_WTMP_FILE, ut); 288 updwtmp (RXVT_WTMP_FILE, ut);
274# else 289# else
275 rxvt_update_wtmp(RXVT_WTMP_FILE, ut); 290 rxvt_update_wtmp (RXVT_WTMP_FILE, ut);
276# endif 291# endif
277# endif 292# endif
278# ifdef HAVE_STRUCT_UTMPX 293# ifdef HAVE_STRUCT_UTMPX
294# if HAVE_UPDWTMPX
279 updwtmpx(RXVT_WTMPX_FILE, utx); 295 updwtmpx (RXVT_WTMPX_FILE, utx);
280# endif 296# endif
281 }
282#endif 297# endif
298 }
299#endif
283 300
284 /* 301 /*
285 * Write utmp entry 302 * Write utmp entry
286 */ 303 */
287#ifdef HAVE_STRUCT_UTMP 304#ifdef HAVE_STRUCT_UTMP
288# ifdef HAVE_UTMP_PID 305# ifdef HAVE_UTMP_PID
289 if (ut->ut_pid == cmd_pid) 306 if (ut->ut_pid == cmd_pid)
290 pututline(ut); 307 pututline (ut);
291 endutent(); 308 endutent ();
292# else 309# else
293 MEMSET(ut, 0, sizeof(struct utmp)); 310 memset (ut, 0, sizeof (struct utmp));
294 rxvt_write_bsd_utmp(utmp_pos, ut); 311 rxvt_write_bsd_utmp (utmp_pos, ut);
295# endif
296#endif 312# endif
313#endif
297#ifdef HAVE_STRUCT_UTMPX 314#ifdef HAVE_STRUCT_UTMPX
298 if (utx->ut_pid == cmd_pid) 315 if (utx->ut_pid == cmd_pid)
299 pututxline(utx); 316 pututxline (utx);
300 endutxent(); 317 endutxent ();
301#endif 318#endif
302} 319}
303 320
304/* ------------------------------------------------------------------------- */ 321/* ------------------------------------------------------------------------- */
305/* 322/*
306 * Write a BSD style utmp entry 323 * Write a BSD style utmp entry
307 */ 324 */
308#ifdef HAVE_UTMP_H 325#ifdef HAVE_UTMP_H
309/* INTPROTO */ 326/* INTPROTO */
310int 327int
311rxvt_write_bsd_utmp(int utmp_pos, struct utmp *wu) 328rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu)
312{ 329{
313 int fd; 330 int fd;
314 331
315 if (utmp_pos <= 0 || (fd = open(RXVT_UTMP_FILE, O_WRONLY)) == -1) 332 if (utmp_pos <= 0 || (fd = open (RXVT_UTMP_FILE, O_WRONLY)) == -1)
316 return 0; 333 return 0;
317 334
318 if (lseek(fd, (off_t) (utmp_pos * sizeof(struct utmp)), SEEK_SET) != -1) 335 if (lseek (fd, (off_t) (utmp_pos * sizeof (struct utmp)), SEEK_SET) != -1)
319 write(fd, wu, sizeof(struct utmp)); 336 write (fd, wu, sizeof (struct utmp));
320 close(fd); 337 close (fd);
321 return 1; 338 return 1;
322} 339}
323#endif 340#endif
324 341
325/* ------------------------------------------------------------------------- */ 342/* ------------------------------------------------------------------------- */
326/* 343/*
327 * Update a BSD style wtmp entry 344 * Update a BSD style wtmp entry
328 */ 345 */
329#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) 346#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP)
330/* INTPROTO */ 347/* INTPROTO */
331void 348void
332rxvt_update_wtmp(const char *fname, const struct utmp *putmp) 349rxvt_update_wtmp (const char *fname, const struct utmp *putmp)
333{ 350{
334 int fd, gotlock, retry; 351 int fd, gotlock, retry;
335 struct flock lck; /* fcntl locking scheme */ 352 struct flock lck; /* fcntl locking scheme */
336 struct stat sbuf; 353 struct stat sbuf;
337 354
338 if ((fd = open(fname, O_WRONLY | O_APPEND, 0)) < 0) 355 if ((fd = open (fname, O_WRONLY | O_APPEND, 0)) < 0)
339 return; 356 return;
340 357
341 lck.l_whence = SEEK_END; /* start lock at current eof */ 358 lck.l_whence = SEEK_END; /* start lock at current eof */
342 lck.l_len = 0; /* end at ``largest possible eof'' */ 359 lck.l_len = 0; /* end at ``largest possible eof'' */
343 lck.l_start = 0; 360 lck.l_start = 0;
344 lck.l_type = F_WRLCK; /* we want a write lock */ 361 lck.l_type = F_WRLCK; /* we want a write lock */
345 362
346 /* attempt lock with F_SETLK; F_SETLKW would cause a deadlock! */ 363 /* attempt lock with F_SETLK; F_SETLKW would cause a deadlock! */
347 for (retry = 10, gotlock = 0; retry--;) 364 for (retry = 10, gotlock = 0; retry--;)
348 if (fcntl(fd, F_SETLK, &lck) != -1) { 365 if (fcntl (fd, F_SETLK, &lck) != -1)
366 {
349 gotlock = 1; 367 gotlock = 1;
350 break; 368 break;
369 }
351 } else if (errno != EAGAIN && errno != EACCES) 370 else if (errno != EAGAIN && errno != EACCES)
352 break; 371 break;
372 if (!gotlock)
353 if (!gotlock) { /* give it up */ 373 { /* give it up */
354 close(fd); 374 close (fd);
355 return; 375 return;
356 } 376 }
357 if (fstat(fd, &sbuf) == 0) 377 if (fstat (fd, &sbuf) == 0)
358 if (write(fd, putmp, sizeof(struct utmp)) != sizeof(struct utmp)) 378 if (write (fd, putmp, sizeof (struct utmp)) != sizeof (struct utmp))
359 ftruncate(fd, sbuf.st_size); /* remove bad writes */ 379 ftruncate (fd, sbuf.st_size); /* remove bad writes */
360 380
361 lck.l_type = F_UNLCK; /* unlocking the file */ 381 lck.l_type = F_UNLCK; /* unlocking the file */
362 fcntl(fd, F_SETLK, &lck); 382 fcntl (fd, F_SETLK, &lck);
363 close(fd); 383 close (fd);
364} 384}
365#endif 385#endif
366 386
367/* ------------------------------------------------------------------------- */ 387/* ------------------------------------------------------------------------- */
368#ifdef LASTLOG_SUPPORT 388#ifdef LASTLOG_SUPPORT
369/* INTPROTO */ 389/* INTPROTO */
370void 390void
371rxvt_update_lastlog(const char *fname, const char *pty, const char *host) 391rxvt_update_lastlog (const char *fname, const char *pty, const char *host)
372{ 392{
373# ifdef HAVE_STRUCT_LASTLOGX 393# ifdef HAVE_STRUCT_LASTLOGX
374 struct lastlogx llx; 394 struct lastlogx llx;
375# endif 395# endif
376# ifdef HAVE_STRUCT_LASTLOG 396# ifdef HAVE_STRUCT_LASTLOG
377 int fd; 397 int fd;
378 struct lastlog ll; 398 struct lastlog ll;
379# ifdef LASTLOG_IS_DIR 399# ifdef LASTLOG_IS_DIR
380 char lastlogfile[256]; 400 char lastlogfile[256];
381# endif 401# endif
382 struct passwd *pwent; 402 struct passwd *pwent;
383# endif 403# endif
384 404
385# ifdef HAVE_STRUCT_LASTLOGX 405# ifdef HAVE_STRUCT_LASTLOGX
386 MEMSET(&llx, 0, sizeof(llx)); 406 memset (&llx, 0, sizeof (llx));
387 llx.ll_tv.tv_sec = time(NULL); 407 llx.ll_tv.tv_sec = time (NULL);
388 llx.ll_tv.tv_usec = 0; 408 llx.ll_tv.tv_usec = 0;
389 STRNCPY(llx.ll_line, pty, sizeof(llx.ll_line)); 409 strncpy (llx.ll_line, pty, sizeof (llx.ll_line));
390 STRNCPY(llx.ll_host, host, sizeof(llx.ll_host)); 410 strncpy (llx.ll_host, host, sizeof (llx.ll_host));
391 updlastlogx(RXVT_LASTLOGX_FILE, getuid(), &llx); 411 updlastlogx (RXVT_LASTLOGX_FILE, getuid (), &llx);
392# endif 412# endif
393 413
394# ifdef HAVE_STRUCT_LASTLOG 414# ifdef HAVE_STRUCT_LASTLOG
395 pwent = getpwuid(getuid()); 415 pwent = getpwuid (getuid ());
396 if (!pwent) { 416 if (!pwent)
397 rxvt_print_error("no entry in password file");
398 return;
399 } 417 {
400 MEMSET(&ll, 0, sizeof(ll)); 418 rxvt_warn ("no entry in password file, not updating lastlog.\n");
419 return;
420 }
421
422 memset (&ll, 0, sizeof (ll));
401 ll.ll_time = time(NULL); 423 ll.ll_time = time (NULL);
402 STRNCPY(ll.ll_line, pty, sizeof(ll.ll_line)); 424 strncpy (ll.ll_line, pty, sizeof (ll.ll_line));
403 STRNCPY(ll.ll_host, host, sizeof(ll.ll_host)); 425 strncpy (ll.ll_host, host, sizeof (ll.ll_host));
404# ifdef LASTLOG_IS_DIR 426# ifdef LASTLOG_IS_DIR
405 sprintf(lastlogfile, "%.*s/%.*s", 427 sprintf (lastlogfile, "%.*s/%.*s",
406 sizeof(lastlogfile) - sizeof(pwent->pw_name) - 2, fname, 428 sizeof (lastlogfile) - sizeof (pwent->pw_name) - 2, fname,
407 sizeof(pwent->pw_name), 429 sizeof (pwent->pw_name),
408 (!pwent->pw_name || pwent->pw_name[0] == '\0') ? "unknown" 430 (!pwent->pw_name || pwent->pw_name[0] == '\0') ? "unknown"
409 : pwent->pw_name); 431 : pwent->pw_name);
410 if ((fd = open(lastlogfile, O_WRONLY | O_CREAT, 0644)) >= 0) { 432 if ((fd = open (lastlogfile, O_WRONLY | O_CREAT, 0644)) >= 0)
433 {
411 write(fd, &ll, sizeof(ll)); 434 write (fd, &ll, sizeof (ll));
412 close(fd); 435 close (fd);
413 } 436 }
414# else 437# else
415 if ((fd = open(fname, O_RDWR)) != -1) { 438 if ((fd = open (fname, O_RDWR)) != -1)
439 {
416 if (lseek(fd, (off_t) ((long)pwent->pw_uid * sizeof(ll)), 440 if (lseek (fd, (off_t) ((long)pwent->pw_uid * sizeof (ll)),
417 SEEK_SET) != -1) 441 SEEK_SET) != -1)
418 write(fd, &ll, sizeof(ll)); 442 write (fd, &ll, sizeof (ll));
419 close(fd); 443 close (fd);
420 } 444 }
421# endif /* LASTLOG_IS_DIR */ 445# endif /* LASTLOG_IS_DIR */
422# endif /* HAVE_STRUCT_LASTLOG */ 446# endif /* HAVE_STRUCT_LASTLOG */
423} 447}
424#endif /* LASTLOG_SUPPORT */ 448#endif /* LASTLOG_SUPPORT */

Diff Legend

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