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.24 by root, Mon Jan 16 10:37:32 2006 UTC vs.
Revision 1.39 by root, Sun Jan 22 12:21:47 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 * 7 *
5 * All portions of code are copyright by their respective author/s. 8 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey <jdb@ukc.ac.uk> 9 * Copyright (c) 1992 John Bovey <jdb@ukc.ac.uk>
… …
12 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 15 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 16 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
14 * - extensive modifications 17 * - extensive modifications
15 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> 18 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
16 * - lastlog support 19 * - lastlog support
17 * Copyright (c) 2004 Marc Lehmann <pcg@goof.com> 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" 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
43#include "rxvt.h" 48#include "ptytty.h"
44#include "logging.h"
45 49
46#ifdef UTMP_SUPPORT 50#if UTMP_SUPPORT
47 51
48#if HAVE_STRUCT_UTMP 52#if HAVE_STRUCT_UTMP
49static int rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu); 53static int write_bsd_utmp (int utmp_pos, struct utmp *wu);
50static void rxvt_update_wtmp (const char *fname, const struct utmp *putmp); 54static void update_wtmp (const char *fname, const struct utmp *putmp);
51#endif 55#endif
52 56
53static void rxvt_update_lastlog (const char *fname, const char *pty, const char *host); 57static void update_lastlog (const char *fname, const char *pty, const char *host);
54 58
55/* 59/*
56 * BSD style utmp entry 60 * BSD style utmp entry
57 * ut_line, ut_name, ut_host, ut_time 61 * ut_line, ut_name, ut_host, ut_time
58 * SYSV style utmp (and utmpx) entry 62 * SYSV style utmp (and utmpx) entry
… …
63 67
64/* 68/*
65 * make and write utmp and wtmp entries 69 * make and write utmp and wtmp entries
66 */ 70 */
67void 71void
68rxvt_term::makeutent (const char *pty, const char *hostname) 72ptytty_unix::login (int cmd_pid, bool login_shell, const char *hostname)
69{ 73{
74 const char *pty = name;
75
76 if (!pty || !*pty)
77 return;
78
79 this->cmd_pid = cmd_pid;
80 this->login_shell = login_shell;
81
70#ifdef HAVE_STRUCT_UTMP 82#ifdef HAVE_STRUCT_UTMP
71 struct utmp *ut = &this->ut; 83 struct utmp *ut = &this->ut;
72#endif 84#endif
73#ifdef HAVE_STRUCT_UTMPX 85#ifdef HAVE_STRUCT_UTMPX
74 struct utmpx *utx = &this->utx; 86 struct utmpx *utx = &this->utx;
… …
84 strncpy (ut_id, pty + 3, sizeof (ut_id)); 96 strncpy (ut_id, pty + 3, sizeof (ut_id));
85 else if (sscanf (pty, "pts/%d", &i) == 1) 97 else if (sscanf (pty, "pts/%d", &i) == 1)
86 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */ 98 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */
87 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3)) 99 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3))
88 { 100 {
89 rxvt_warn ("can't parse tty name \"%s\", not adding utmp entry.\n", pty); 101 ptytty_warn ("can't parse tty name \"%s\", not adding utmp entry.\n", pty);
90 return; 102 return;
91 } 103 }
92#endif 104#endif
93 105
94#ifdef HAVE_STRUCT_UTMP 106#ifdef HAVE_STRUCT_UTMP
… …
163 endutxent (); /* close the file */ 175 endutxent (); /* close the file */
164 utmp_pos = 0; 176 utmp_pos = 0;
165#endif 177#endif
166 178
167#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID) 179#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
168
169 { 180 {
170# ifdef HAVE_TTYSLOT 181# ifdef HAVE_TTYSLOT
182 int fdstdin = dup (STDIN_FILENO);
183 dup2 (tty, STDIN_FILENO);
184
171 i = ttyslot (); 185 i = ttyslot ();
172 if (rxvt_write_bsd_utmp (i, ut)) 186 if (write_bsd_utmp (i, ut))
173 utmp_pos = i; 187 utmp_pos = i;
188
189 dup2 (fdstdin, STDIN_FILENO);
190 close (fdstdin);
174# else 191# else
175 FILE *fd0; 192 FILE *fd0;
176 193
177 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL) 194 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL)
178 { 195 {
179 char buf[256], name[256]; 196 char buf[256], name[256];
180 197
… …
183 { 200 {
184 if (*buf == '#' || sscanf (buf, "%s", name) != 1) 201 if (*buf == '#' || sscanf (buf, "%s", name) != 1)
185 continue; 202 continue;
186 if (!strcmp (ut->ut_line, name)) 203 if (!strcmp (ut->ut_line, name))
187 { 204 {
188 if (!rxvt_write_bsd_utmp (i, ut)) 205 if (!write_bsd_utmp (i, ut))
189 i = 0; 206 i = 0;
190 utmp_pos = i; 207 utmp_pos = i;
191 fclose (fd0); 208 fclose (fd0);
192 break; 209 break;
193 } 210 }
… …
198# endif 215# endif
199 } 216 }
200#endif 217#endif
201 218
202#ifdef WTMP_SUPPORT 219#ifdef WTMP_SUPPORT
203# ifdef WTMP_ONLY_ON_LOGIN 220#ifdef LOG_ONLY_ON_LOGIN
204 if (OPTION (Opt_loginShell)) 221 if (login_shell)
205# endif 222#endif
206 { 223 {
207# ifdef HAVE_STRUCT_UTMP 224# ifdef HAVE_STRUCT_UTMP
208# ifdef HAVE_UPDWTMP 225# ifdef HAVE_UPDWTMP
209 updwtmp (RXVT_WTMP_FILE, ut); 226 updwtmp (WTMP_FILE, ut);
210# else 227# else
211 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 228 update_wtmp (WTMP_FILE, ut);
212# endif 229# endif
213# endif 230# endif
214# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX) 231# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
215 updwtmpx (RXVT_WTMPX_FILE, utx); 232 updwtmpx (WTMPX_FILE, utx);
216# endif
217 }
218#endif 233# endif
234 }
235#endif
219#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE) 236#if defined(LASTLOG_SUPPORT) && defined(LASTLOG_FILE)
220 if (OPTION (Opt_loginShell)) 237#ifdef LOG_ONLY_ON_LOGIN
238 if (login_shell)
239#endif
221 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname); 240 update_lastlog (LASTLOG_FILE, pty, hostname);
222#endif 241#endif
223} 242}
224 243
225/* ------------------------------------------------------------------------- */ 244/* ------------------------------------------------------------------------- */
226/* 245/*
227 * remove utmp and wtmp entries 246 * remove utmp and wtmp entries
228 */ 247 */
229void 248void
230rxvt_term::cleanutent () 249ptytty_unix::logout ()
231{ 250{
251 if (!cmd_pid)
252 return;
253
232#ifdef HAVE_STRUCT_UTMP 254#ifdef HAVE_STRUCT_UTMP
233 struct utmp *ut = &this->ut; 255 struct utmp *tmput, *ut = &this->ut;
234#endif 256#endif
235#ifdef HAVE_STRUCT_UTMPX 257#ifdef HAVE_STRUCT_UTMPX
236 struct utmpx *tmputx, *utx = &this->utx; 258 struct utmpx *tmputx, *utx = &this->utx;
237#endif 259#endif
238 260
… …
240# ifdef HAVE_UTMP_PID 262# ifdef HAVE_UTMP_PID
241 memset (ut, 0, sizeof (struct utmp)); 263 memset (ut, 0, sizeof (struct utmp));
242 setutent (); 264 setutent ();
243 strncpy (ut->ut_id, this->ut_id, sizeof (ut->ut_id)); 265 strncpy (ut->ut_id, this->ut_id, sizeof (ut->ut_id));
244 ut->ut_type = USER_PROCESS; 266 ut->ut_type = USER_PROCESS;
245 {
246 struct utmp *tmput = getutid (ut);
247
248 if (tmput) /* position to entry in utmp file */ 267 if ((tmput = getutid (ut))) /* position to entry in utmp file */
249 ut = tmput; 268 ut = tmput;
250 }
251 ut->ut_type = DEAD_PROCESS; 269 ut->ut_type = DEAD_PROCESS;
252# else 270# else
253 memset (ut->ut_name, 0, sizeof (ut->ut_name)); 271 memset (ut->ut_name, 0, sizeof (ut->ut_name));
254# ifdef HAVE_UTMP_HOST 272# ifdef HAVE_UTMP_HOST
255 memset (ut->ut_host, 0, sizeof (ut->ut_host)); 273 memset (ut->ut_host, 0, sizeof (ut->ut_host));
… …
275 293
276 /* 294 /*
277 * Write ending wtmp entry 295 * Write ending wtmp entry
278 */ 296 */
279#ifdef WTMP_SUPPORT 297#ifdef WTMP_SUPPORT
280# ifdef WTMP_ONLY_ON_LOGIN 298#ifdef LOG_ONLY_ON_LOGIN
281 if (OPTION (Opt_loginShell)) 299 if (login_shell)
282# endif 300#endif
283 { 301 {
284# ifdef HAVE_STRUCT_UTMP 302# ifdef HAVE_STRUCT_UTMP
285# ifdef HAVE_UPDWTMP 303# ifdef HAVE_UPDWTMP
286 updwtmp (RXVT_WTMP_FILE, ut); 304 updwtmp (WTMP_FILE, ut);
287# else 305# else
288 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 306 update_wtmp (WTMP_FILE, ut);
289# endif 307# endif
290# endif 308# endif
291# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX) 309# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
292 updwtmpx (RXVT_WTMPX_FILE, utx); 310 updwtmpx (WTMPX_FILE, utx);
293# endif 311# endif
294 } 312 }
295#endif 313#endif
296 314
297 /* 315 /*
… …
302 if (ut->ut_pid == cmd_pid) 320 if (ut->ut_pid == cmd_pid)
303 pututline (ut); 321 pututline (ut);
304 endutent (); 322 endutent ();
305# else 323# else
306 memset (ut, 0, sizeof (struct utmp)); 324 memset (ut, 0, sizeof (struct utmp));
307 rxvt_write_bsd_utmp (utmp_pos, ut); 325 write_bsd_utmp (utmp_pos, ut);
308# endif 326# endif
309#endif 327#endif
310#ifdef HAVE_STRUCT_UTMPX 328#ifdef HAVE_STRUCT_UTMPX
311 if (utx->ut_pid == cmd_pid) 329 if (utx->ut_pid == cmd_pid)
312 pututxline (utx); 330 pututxline (utx);
313 endutxent (); 331 endutxent ();
314#endif 332#endif
333
334 cmd_pid = 0;
315} 335}
316 336
317/* ------------------------------------------------------------------------- */ 337/* ------------------------------------------------------------------------- */
318/* 338/*
319 * Write a BSD style utmp entry 339 * Write a BSD style utmp entry
320 */ 340 */
321#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID) 341#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
322static int 342static int
323rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu) 343write_bsd_utmp (int utmp_pos, struct utmp *wu)
324{ 344{
325 int fd; 345 int fd;
326 346
327 if (utmp_pos <= 0 || (fd = open (RXVT_UTMP_FILE, O_WRONLY)) == -1) 347 if (utmp_pos <= 0 || (fd = open (UTMP_FILE, O_WRONLY)) == -1)
328 return 0; 348 return 0;
329 349
330 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)
331 write (fd, wu, sizeof (struct utmp)); 351 write (fd, wu, sizeof (struct utmp));
332 close (fd); 352 close (fd);
… …
338/* 358/*
339 * Update a BSD style wtmp entry 359 * Update a BSD style wtmp entry
340 */ 360 */
341#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP) 361#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP)
342static void 362static void
343rxvt_update_wtmp (const char *fname, const struct utmp *putmp) 363update_wtmp (const char *fname, const struct utmp *putmp)
344{ 364{
345 int fd, gotlock, retry; 365 int fd, gotlock, retry;
346 struct flock lck; /* fcntl locking scheme */ 366 struct flock lck; /* fcntl locking scheme */
347 struct stat sbuf; 367 struct stat sbuf;
348 368
… …
379#endif 399#endif
380 400
381/* ------------------------------------------------------------------------- */ 401/* ------------------------------------------------------------------------- */
382#ifdef LASTLOG_SUPPORT 402#ifdef LASTLOG_SUPPORT
383static void 403static void
384rxvt_update_lastlog (const char *fname, const char *pty, const char *host) 404update_lastlog (const char *fname, const char *pty, const char *host)
385{ 405{
386# ifdef HAVE_STRUCT_LASTLOGX 406# ifdef HAVE_STRUCT_LASTLOGX
387 struct lastlogx llx; 407 struct lastlogx llx;
388# endif 408# endif
389# ifdef HAVE_STRUCT_LASTLOG 409# ifdef HAVE_STRUCT_LASTLOG
… …
399 memset (&llx, 0, sizeof (llx)); 419 memset (&llx, 0, sizeof (llx));
400 llx.ll_tv.tv_sec = time (NULL); 420 llx.ll_tv.tv_sec = time (NULL);
401 llx.ll_tv.tv_usec = 0; 421 llx.ll_tv.tv_usec = 0;
402 strncpy (llx.ll_line, pty, sizeof (llx.ll_line)); 422 strncpy (llx.ll_line, pty, sizeof (llx.ll_line));
403 strncpy (llx.ll_host, host, sizeof (llx.ll_host)); 423 strncpy (llx.ll_host, host, sizeof (llx.ll_host));
404 updlastlogx (RXVT_LASTLOGX_FILE, getuid (), &llx); 424 updlastlogx (LASTLOGX_FILE, getuid (), &llx);
405# endif 425# endif
406 426
407# ifdef HAVE_STRUCT_LASTLOG 427# ifdef HAVE_STRUCT_LASTLOG
408 pwent = getpwuid (getuid ()); 428 pwent = getpwuid (getuid ());
409 if (!pwent) 429 if (!pwent)
410 { 430 {
411 rxvt_warn ("no entry in password file, not updating lastlog.\n"); 431 ptytty_warn ("no entry in password file, not updating lastlog.\n");
412 return; 432 return;
413 } 433 }
414 434
415 memset (&ll, 0, sizeof (ll)); 435 memset (&ll, 0, sizeof (ll));
416 ll.ll_time = time (NULL); 436 ll.ll_time = time (NULL);
… …
437 } 457 }
438# endif /* LASTLOG_IS_DIR */ 458# endif /* LASTLOG_IS_DIR */
439# endif /* HAVE_STRUCT_LASTLOG */ 459# endif /* HAVE_STRUCT_LASTLOG */
440} 460}
441#endif /* LASTLOG_SUPPORT */ 461#endif /* LASTLOG_SUPPORT */
442/* ------------------------------------------------------------------------- */
443 462
444#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