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.1 by pcg, Mon Nov 24 17:28:08 2003 UTC vs.
Revision 1.40 by root, Sun Jan 22 12:23:55 2006 UTC

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

Diff Legend

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