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

Diff Legend

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