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.5 by pcg, Sat Jan 31 03:27:45 2004 UTC vs.
Revision 1.31 by root, Tue Jan 17 15:17:39 2006 UTC

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

Diff Legend

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