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.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.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.
… …
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
… …
58 */ 62 */
59void 63void
60rxvt_term::makeutent (const char *pty, const char *hostname) 64rxvt_term::makeutent (const char *pty, const char *hostname)
61{ 65{
62#ifdef HAVE_STRUCT_UTMP 66#ifdef HAVE_STRUCT_UTMP
63 struct utmp *ut = &(this->ut); 67 struct utmp *ut = &this->ut;
64#endif 68#endif
65#ifdef HAVE_STRUCT_UTMPX 69#ifdef HAVE_STRUCT_UTMPX
66 struct utmpx *utx = &(this->utx); 70 struct utmpx *utx = &this->utx;
67#endif 71#endif
68#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 {
69 int i; 168 int i;
70#endif 169# ifdef HAVE_TTYSLOT
71 char ut_id[5]; 170 i = ttyslot ();
72 struct passwd *pwent = getpwuid(getuid()); 171 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; 172 utmp_pos = i;
125# else 173# else
126 STRNCPY(ut->ut_name, (pwent && pwent->pw_name) ? pwent->pw_name : "?",
127 sizeof(ut->ut_name));
128# ifdef HAVE_UTMP_HOST
129 STRNCPY(ut->ut_host, hostname, sizeof(ut->ut_host));
130# endif
131# endif
132#endif
133
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 }
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; 174 FILE *fd0;
169 175
170 if ((fd0 = fopen(TTYTAB_FILENAME, "r")) != NULL) { 176 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL)
177 {
171 char buf[256], name[256]; 178 char buf[256], name[256];
172 179
173 buf[sizeof(buf) - 1] = '\0'; 180 buf[sizeof (buf) - 1] = '\0';
174 for (i = 1; (fgets(buf, sizeof(buf) - 1, fd0) != NULL);) { 181 for (i = 1; (fgets (buf, sizeof (buf) - 1, fd0) != NULL);)
182 {
175 if (*buf == '#' || sscanf(buf, "%s", name) != 1) 183 if (*buf == '#' || sscanf (buf, "%s", name) != 1)
176 continue; 184 continue;
177 if (!STRCMP(ut->ut_line, name)) { 185 if (!strcmp (ut->ut_line, name))
186 {
178 if (!rxvt_write_bsd_utmp(i, ut)) 187 if (!rxvt_write_bsd_utmp (i, ut))
179 i = 0; 188 i = 0;
180 utmp_pos = i; 189 utmp_pos = i;
181 fclose(fd0); 190 fclose (fd0);
182 break; 191 break;
183 } 192 }
184 i++; 193 i++;
185 } 194 }
186 fclose(fd0); 195 fclose (fd0);
187 }
188# endif
189 } 196 }
197# endif
198
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 (options & 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 212# endif
203# endif 213# endif
204# ifdef HAVE_STRUCT_UTMPX 214# ifdef HAVE_STRUCT_UTMPX
215# if HAVE_UPDWTMPX
205 updwtmpx(RXVT_WTMPX_FILE, utx); 216 updwtmpx (RXVT_WTMPX_FILE, utx);
217# endif
206# endif 218# endif
207 } 219 }
208#endif 220#endif
209#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE) 221#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE)
210 if (Options & Opt_loginShell) 222 if (options & Opt_loginShell)
211 rxvt_update_lastlog(RXVT_LASTLOG_FILE, pty, hostname); 223 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname);
212#endif 224#endif
213} 225}
214 226
215/* ------------------------------------------------------------------------- */ 227/* ------------------------------------------------------------------------- */
216/* 228/*
… …
218 */ 230 */
219void 231void
220rxvt_term::cleanutent () 232rxvt_term::cleanutent ()
221{ 233{
222#ifdef HAVE_STRUCT_UTMP 234#ifdef HAVE_STRUCT_UTMP
223 struct utmp *ut = &(this->ut); 235 struct utmp *ut = &this->ut;
224#endif 236#endif
225#ifdef HAVE_STRUCT_UTMPX 237#ifdef HAVE_STRUCT_UTMPX
226 struct utmpx *tmputx, *utx = &(this->utx); 238 struct utmpx *tmputx, *utx = &this->utx;
227#endif 239#endif
228 240
229#ifdef HAVE_STRUCT_UTMP 241#ifdef HAVE_STRUCT_UTMP
230# ifdef HAVE_UTMP_PID 242# ifdef HAVE_UTMP_PID
231 MEMSET(ut, 0, sizeof(struct utmp)); 243 memset (ut, 0, sizeof (struct utmp));
232 setutent(); 244 setutent ();
233 STRNCPY(ut->ut_id, ut_id, sizeof(ut->ut_id)); 245 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id));
234 ut->ut_type = USER_PROCESS; 246 ut->ut_type = USER_PROCESS;
235 { 247 {
236 struct utmp *tmput = getutid(ut); 248 struct utmp *tmput = getutid (ut);
237 249
238 if (tmput) /* position to entry in utmp file */ 250 if (tmput) /* position to entry in utmp file */
239 ut = tmput; 251 ut = tmput;
240 } 252 }
241 ut->ut_type = DEAD_PROCESS; 253 ut->ut_type = DEAD_PROCESS;
242# else 254# else
243 MEMSET(ut->ut_name, 0, sizeof(ut->ut_name)); 255 memset (ut->ut_name, 0, sizeof (ut->ut_name));
244# ifdef HAVE_UTMP_HOST 256# ifdef HAVE_UTMP_HOST
245 MEMSET(ut->ut_host, 0, sizeof(ut->ut_host)); 257 memset (ut->ut_host, 0, sizeof (ut->ut_host));
246# endif
247# endif 258# endif
259# endif
248 ut->ut_time = time(NULL); 260 ut->ut_time = time (NULL);
249#endif 261#endif
250 262
251#ifdef HAVE_STRUCT_UTMPX 263#ifdef HAVE_STRUCT_UTMPX
252 MEMSET(utx, 0, sizeof(struct utmpx)); 264 memset (utx, 0, sizeof (struct utmpx));
253 setutxent(); 265 setutxent ();
254 STRNCPY(utx->ut_id, ut_id, sizeof(utx->ut_id)); 266 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id));
255 utx->ut_type = USER_PROCESS; 267 utx->ut_type = USER_PROCESS;
256 if ((tmputx = getutxid(utx))) /* position to entry in utmp file */ 268 if ((tmputx = getutxid (utx))) /* position to entry in utmp file */
257 utx = tmputx; 269 utx = tmputx;
258 utx->ut_type = DEAD_PROCESS; 270 utx->ut_type = DEAD_PROCESS;
271# if HAVE_UTMPX_SESSION
259 utx->ut_session = getsid(0); 272 utx->ut_session = getsid (0);
273# endif
260 utx->ut_tv.tv_sec = time(NULL); 274 utx->ut_tv.tv_sec = time (NULL);
261 utx->ut_tv.tv_usec = 0; 275 utx->ut_tv.tv_usec = 0;
262#endif 276#endif
263 277
264 /* 278 /*
265 * Write ending wtmp entry 279 * Write ending wtmp entry
266 */ 280 */
267#ifdef WTMP_SUPPORT 281#ifdef WTMP_SUPPORT
268# ifdef WTMP_ONLY_ON_LOGIN 282# ifdef WTMP_ONLY_ON_LOGIN
269 if (Options & Opt_loginShell) 283 if (options & Opt_loginShell)
270# endif 284# endif
271 { 285 {
272# ifdef HAVE_STRUCT_UTMP 286# ifdef HAVE_STRUCT_UTMP
273# ifdef HAVE_UPDWTMP 287# ifdef HAVE_UPDWTMP
274 updwtmp(RXVT_WTMP_FILE, ut); 288 updwtmp (RXVT_WTMP_FILE, ut);
275# else 289# else
276 rxvt_update_wtmp(RXVT_WTMP_FILE, ut); 290 rxvt_update_wtmp (RXVT_WTMP_FILE, ut);
277# endif 291# endif
278# endif 292# endif
279# ifdef HAVE_STRUCT_UTMPX 293# ifdef HAVE_STRUCT_UTMPX
294# if HAVE_UPDWTMPX
280 updwtmpx(RXVT_WTMPX_FILE, utx); 295 updwtmpx (RXVT_WTMPX_FILE, utx);
281# endif 296# endif
282 }
283#endif 297# endif
298 }
299#endif
284 300
285 /* 301 /*
286 * Write utmp entry 302 * Write utmp entry
287 */ 303 */
288#ifdef HAVE_STRUCT_UTMP 304#ifdef HAVE_STRUCT_UTMP
289# ifdef HAVE_UTMP_PID 305# ifdef HAVE_UTMP_PID
290 if (ut->ut_pid == cmd_pid) 306 if (ut->ut_pid == cmd_pid)
291 pututline(ut); 307 pututline (ut);
292 endutent(); 308 endutent ();
293# else 309# else
294 MEMSET(ut, 0, sizeof(struct utmp)); 310 memset (ut, 0, sizeof (struct utmp));
295 rxvt_write_bsd_utmp(utmp_pos, ut); 311 rxvt_write_bsd_utmp (utmp_pos, ut);
296# endif
297#endif 312# endif
313#endif
298#ifdef HAVE_STRUCT_UTMPX 314#ifdef HAVE_STRUCT_UTMPX
299 if (utx->ut_pid == cmd_pid) 315 if (utx->ut_pid == cmd_pid)
300 pututxline(utx); 316 pututxline (utx);
301 endutxent(); 317 endutxent ();
302#endif 318#endif
303} 319}
304 320
305/* ------------------------------------------------------------------------- */ 321/* ------------------------------------------------------------------------- */
306/* 322/*
307 * Write a BSD style utmp entry 323 * Write a BSD style utmp entry
308 */ 324 */
309#ifdef HAVE_UTMP_H 325#ifdef HAVE_UTMP_H
310/* INTPROTO */ 326/* INTPROTO */
311int 327int
312rxvt_write_bsd_utmp(int utmp_pos, struct utmp *wu) 328rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu)
313{ 329{
314 int fd; 330 int fd;
315 331
316 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)
317 return 0; 333 return 0;
318 334
319 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)
320 write(fd, wu, sizeof(struct utmp)); 336 write (fd, wu, sizeof (struct utmp));
321 close(fd); 337 close (fd);
322 return 1; 338 return 1;
323} 339}
324#endif 340#endif
325 341
326/* ------------------------------------------------------------------------- */ 342/* ------------------------------------------------------------------------- */
327/* 343/*
328 * Update a BSD style wtmp entry 344 * Update a BSD style wtmp entry
329 */ 345 */
330#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) 346#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP)
331/* INTPROTO */ 347/* INTPROTO */
332void 348void
333rxvt_update_wtmp(const char *fname, const struct utmp *putmp) 349rxvt_update_wtmp (const char *fname, const struct utmp *putmp)
334{ 350{
335 int fd, gotlock, retry; 351 int fd, gotlock, retry;
336 struct flock lck; /* fcntl locking scheme */ 352 struct flock lck; /* fcntl locking scheme */
337 struct stat sbuf; 353 struct stat sbuf;
338 354
339 if ((fd = open(fname, O_WRONLY | O_APPEND, 0)) < 0) 355 if ((fd = open (fname, O_WRONLY | O_APPEND, 0)) < 0)
340 return; 356 return;
341 357
342 lck.l_whence = SEEK_END; /* start lock at current eof */ 358 lck.l_whence = SEEK_END; /* start lock at current eof */
343 lck.l_len = 0; /* end at ``largest possible eof'' */ 359 lck.l_len = 0; /* end at ``largest possible eof'' */
344 lck.l_start = 0; 360 lck.l_start = 0;
345 lck.l_type = F_WRLCK; /* we want a write lock */ 361 lck.l_type = F_WRLCK; /* we want a write lock */
346 362
347 /* attempt lock with F_SETLK; F_SETLKW would cause a deadlock! */ 363 /* attempt lock with F_SETLK; F_SETLKW would cause a deadlock! */
348 for (retry = 10, gotlock = 0; retry--;) 364 for (retry = 10, gotlock = 0; retry--;)
349 if (fcntl(fd, F_SETLK, &lck) != -1) { 365 if (fcntl (fd, F_SETLK, &lck) != -1)
366 {
350 gotlock = 1; 367 gotlock = 1;
351 break; 368 break;
369 }
352 } else if (errno != EAGAIN && errno != EACCES) 370 else if (errno != EAGAIN && errno != EACCES)
353 break; 371 break;
372 if (!gotlock)
354 if (!gotlock) { /* give it up */ 373 { /* give it up */
355 close(fd); 374 close (fd);
356 return; 375 return;
357 } 376 }
358 if (fstat(fd, &sbuf) == 0) 377 if (fstat (fd, &sbuf) == 0)
359 if (write(fd, putmp, sizeof(struct utmp)) != sizeof(struct utmp)) 378 if (write (fd, putmp, sizeof (struct utmp)) != sizeof (struct utmp))
360 ftruncate(fd, sbuf.st_size); /* remove bad writes */ 379 ftruncate (fd, sbuf.st_size); /* remove bad writes */
361 380
362 lck.l_type = F_UNLCK; /* unlocking the file */ 381 lck.l_type = F_UNLCK; /* unlocking the file */
363 fcntl(fd, F_SETLK, &lck); 382 fcntl (fd, F_SETLK, &lck);
364 close(fd); 383 close (fd);
365} 384}
366#endif 385#endif
367 386
368/* ------------------------------------------------------------------------- */ 387/* ------------------------------------------------------------------------- */
369#ifdef LASTLOG_SUPPORT 388#ifdef LASTLOG_SUPPORT
370/* INTPROTO */ 389/* INTPROTO */
371void 390void
372rxvt_update_lastlog(const char *fname, const char *pty, const char *host) 391rxvt_update_lastlog (const char *fname, const char *pty, const char *host)
373{ 392{
374# ifdef HAVE_STRUCT_LASTLOGX 393# ifdef HAVE_STRUCT_LASTLOGX
375 struct lastlogx llx; 394 struct lastlogx llx;
376# endif 395# endif
377# ifdef HAVE_STRUCT_LASTLOG 396# ifdef HAVE_STRUCT_LASTLOG
378 int fd; 397 int fd;
379 struct lastlog ll; 398 struct lastlog ll;
380# ifdef LASTLOG_IS_DIR 399# ifdef LASTLOG_IS_DIR
381 char lastlogfile[256]; 400 char lastlogfile[256];
382# endif 401# endif
383 struct passwd *pwent; 402 struct passwd *pwent;
384# endif 403# endif
385 404
386# ifdef HAVE_STRUCT_LASTLOGX 405# ifdef HAVE_STRUCT_LASTLOGX
387 MEMSET(&llx, 0, sizeof(llx)); 406 memset (&llx, 0, sizeof (llx));
388 llx.ll_tv.tv_sec = time(NULL); 407 llx.ll_tv.tv_sec = time (NULL);
389 llx.ll_tv.tv_usec = 0; 408 llx.ll_tv.tv_usec = 0;
390 STRNCPY(llx.ll_line, pty, sizeof(llx.ll_line)); 409 strncpy (llx.ll_line, pty, sizeof (llx.ll_line));
391 STRNCPY(llx.ll_host, host, sizeof(llx.ll_host)); 410 strncpy (llx.ll_host, host, sizeof (llx.ll_host));
392 updlastlogx(RXVT_LASTLOGX_FILE, getuid(), &llx); 411 updlastlogx (RXVT_LASTLOGX_FILE, getuid (), &llx);
393# endif 412# endif
394 413
395# ifdef HAVE_STRUCT_LASTLOG 414# ifdef HAVE_STRUCT_LASTLOG
396 pwent = getpwuid(getuid()); 415 pwent = getpwuid (getuid ());
397 if (!pwent) { 416 if (!pwent)
398 rxvt_print_error("no entry in password file");
399 return;
400 } 417 {
401 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));
402 ll.ll_time = time(NULL); 423 ll.ll_time = time (NULL);
403 STRNCPY(ll.ll_line, pty, sizeof(ll.ll_line)); 424 strncpy (ll.ll_line, pty, sizeof (ll.ll_line));
404 STRNCPY(ll.ll_host, host, sizeof(ll.ll_host)); 425 strncpy (ll.ll_host, host, sizeof (ll.ll_host));
405# ifdef LASTLOG_IS_DIR 426# ifdef LASTLOG_IS_DIR
406 sprintf(lastlogfile, "%.*s/%.*s", 427 sprintf (lastlogfile, "%.*s/%.*s",
407 sizeof(lastlogfile) - sizeof(pwent->pw_name) - 2, fname, 428 sizeof (lastlogfile) - sizeof (pwent->pw_name) - 2, fname,
408 sizeof(pwent->pw_name), 429 sizeof (pwent->pw_name),
409 (!pwent->pw_name || pwent->pw_name[0] == '\0') ? "unknown" 430 (!pwent->pw_name || pwent->pw_name[0] == '\0') ? "unknown"
410 : pwent->pw_name); 431 : pwent->pw_name);
411 if ((fd = open(lastlogfile, O_WRONLY | O_CREAT, 0644)) >= 0) { 432 if ((fd = open (lastlogfile, O_WRONLY | O_CREAT, 0644)) >= 0)
433 {
412 write(fd, &ll, sizeof(ll)); 434 write (fd, &ll, sizeof (ll));
413 close(fd); 435 close (fd);
414 } 436 }
415# else 437# else
416 if ((fd = open(fname, O_RDWR)) != -1) { 438 if ((fd = open (fname, O_RDWR)) != -1)
439 {
417 if (lseek(fd, (off_t) ((long)pwent->pw_uid * sizeof(ll)), 440 if (lseek (fd, (off_t) ((long)pwent->pw_uid * sizeof (ll)),
418 SEEK_SET) != -1) 441 SEEK_SET) != -1)
419 write(fd, &ll, sizeof(ll)); 442 write (fd, &ll, sizeof (ll));
420 close(fd); 443 close (fd);
421 } 444 }
422# endif /* LASTLOG_IS_DIR */ 445# endif /* LASTLOG_IS_DIR */
423# endif /* HAVE_STRUCT_LASTLOG */ 446# endif /* HAVE_STRUCT_LASTLOG */
424} 447}
425#endif /* LASTLOG_SUPPORT */ 448#endif /* LASTLOG_SUPPORT */

Diff Legend

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