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.4 by pcg, Sat Jan 31 00:20:21 2004 UTC vs.
Revision 1.34 by ayin, Wed Jan 18 16:34:53 2006 UTC

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

Diff Legend

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