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

Diff Legend

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