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.3 by pcg, Tue Nov 25 11:52:42 2003 UTC vs.
Revision 1.19 by root, Sat Dec 31 17:16:17 2005 UTC

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

Diff Legend

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