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

Diff Legend

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