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

Diff Legend

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