ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/logging.C
(Generate patch)

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

Diff Legend

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