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

Diff Legend

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