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.4 by pcg, Sat Jan 31 00:20:21 2004 UTC vs.
Revision 1.24 by root, Mon Jan 16 10:37:32 2006 UTC

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

Diff Legend

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