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.2 by pcg, Mon Nov 24 17:31:27 2003 UTC vs.
Revision 1.27 by root, Tue Jan 17 10:14:26 2006 UTC

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

Diff Legend

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