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.33 by root, Wed Jan 18 12:06:11 2006 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 * 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>
… …
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 36
34#include "../config.h" 37#include "../config.h"
35#include "rxvt.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
36#include "ptytty.h" 47#include "ptytty.h"
37 48
38#if UTMP_SUPPORT 49#if UTMP_SUPPORT
39 50
40#if HAVE_STRUCT_UTMP 51#if HAVE_STRUCT_UTMP
41static int rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu); 52static int write_bsd_utmp (int utmp_pos, struct utmp *wu);
42static void rxvt_update_wtmp (const char *fname, const struct utmp *putmp); 53static void update_wtmp (const char *fname, const struct utmp *putmp);
43#endif 54#endif
44 55
45static void rxvt_update_lastlog (const char *fname, const char *pty, const char *host); 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
… …
55 66
56/* 67/*
57 * make and write utmp and wtmp entries 68 * make and write utmp and wtmp entries
58 */ 69 */
59void 70void
60rxvt_ptytty_unix::login (int cmd_pid, bool login_shell, const char *hostname) 71ptytty_unix::login (int cmd_pid, bool login_shell, const char *hostname)
61{ 72{
62 const char *pty = name; 73 const char *pty = name;
63 74
64 if (!pty || !*pty) 75 if (!pty || !*pty)
65 return; 76 return;
… …
84 strncpy (ut_id, pty + 3, sizeof (ut_id)); 95 strncpy (ut_id, pty + 3, sizeof (ut_id));
85 else if (sscanf (pty, "pts/%d", &i) == 1) 96 else if (sscanf (pty, "pts/%d", &i) == 1)
86 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */ 97 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */
87 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3)) 98 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3))
88 { 99 {
89 rxvt_warn ("can't parse tty name \"%s\", not adding utmp entry.\n", pty); 100 ptytty_warn ("can't parse tty name \"%s\", not adding utmp entry.\n", pty);
90 return; 101 return;
91 } 102 }
92#endif 103#endif
93 104
94#ifdef HAVE_STRUCT_UTMP 105#ifdef HAVE_STRUCT_UTMP
… …
169# ifdef HAVE_TTYSLOT 180# ifdef HAVE_TTYSLOT
170 int fdstdin = dup (STDIN_FILENO); 181 int fdstdin = dup (STDIN_FILENO);
171 dup2 (tty, STDIN_FILENO); 182 dup2 (tty, STDIN_FILENO);
172 183
173 i = ttyslot (); 184 i = ttyslot ();
174 if (rxvt_write_bsd_utmp (i, ut)) 185 if (write_bsd_utmp (i, ut))
175 utmp_pos = i; 186 utmp_pos = i;
176 187
177 dup2 (fdstdin, STDIN_FILENO); 188 dup2 (fdstdin, STDIN_FILENO);
178 close (fdstdin); 189 close (fdstdin);
179# else 190# else
… …
188 { 199 {
189 if (*buf == '#' || sscanf (buf, "%s", name) != 1) 200 if (*buf == '#' || sscanf (buf, "%s", name) != 1)
190 continue; 201 continue;
191 if (!strcmp (ut->ut_line, name)) 202 if (!strcmp (ut->ut_line, name))
192 { 203 {
193 if (!rxvt_write_bsd_utmp (i, ut)) 204 if (!write_bsd_utmp (i, ut))
194 i = 0; 205 i = 0;
195 utmp_pos = i; 206 utmp_pos = i;
196 fclose (fd0); 207 fclose (fd0);
197 break; 208 break;
198 } 209 }
… …
203# endif 214# endif
204 } 215 }
205#endif 216#endif
206 217
207#ifdef WTMP_SUPPORT 218#ifdef WTMP_SUPPORT
219#ifdef LOG_ONLY_ON_LOGIN
208 if (login_shell) 220 if (login_shell)
221#endif
209 { 222 {
210# ifdef HAVE_STRUCT_UTMP 223# ifdef HAVE_STRUCT_UTMP
211# ifdef HAVE_UPDWTMP 224# ifdef HAVE_UPDWTMP
212 updwtmp (RXVT_WTMP_FILE, ut); 225 updwtmp (WTMP_FILE, ut);
213# else 226# else
214 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 227 update_wtmp (WTMP_FILE, ut);
215# endif 228# endif
216# endif 229# endif
217# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX) 230# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
218 updwtmpx (RXVT_WTMPX_FILE, utx); 231 updwtmpx (WTMPX_FILE, utx);
219# endif
220 }
221#endif 232# endif
233 }
234#endif
222#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE) 235#if defined(LASTLOG_SUPPORT) && defined(LASTLOG_FILE)
236#ifdef LOG_ONLY_ON_LOGIN
223 if (login_shell) 237 if (login_shell)
238#endif
224 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname); 239 update_lastlog (LASTLOG_FILE, pty, hostname);
225#endif 240#endif
226} 241}
227 242
228/* ------------------------------------------------------------------------- */ 243/* ------------------------------------------------------------------------- */
229/* 244/*
230 * remove utmp and wtmp entries 245 * remove utmp and wtmp entries
231 */ 246 */
232void 247void
233rxvt_ptytty_unix::logout () 248ptytty_unix::logout ()
234{ 249{
235 if (!cmd_pid) 250 if (!cmd_pid)
236 return; 251 return;
237 252
238#ifdef HAVE_STRUCT_UTMP 253#ifdef HAVE_STRUCT_UTMP
… …
277 292
278 /* 293 /*
279 * Write ending wtmp entry 294 * Write ending wtmp entry
280 */ 295 */
281#ifdef WTMP_SUPPORT 296#ifdef WTMP_SUPPORT
297#ifdef LOG_ONLY_ON_LOGIN
282 if (login_shell) 298 if (login_shell)
299#endif
283 { 300 {
284# ifdef HAVE_STRUCT_UTMP 301# ifdef HAVE_STRUCT_UTMP
285# ifdef HAVE_UPDWTMP 302# ifdef HAVE_UPDWTMP
286 updwtmp (RXVT_WTMP_FILE, ut); 303 updwtmp (WTMP_FILE, ut);
287# else 304# else
288 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 305 update_wtmp (WTMP_FILE, ut);
289# endif 306# endif
290# endif 307# endif
291# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX) 308# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
292 updwtmpx (RXVT_WTMPX_FILE, utx); 309 updwtmpx (WTMPX_FILE, utx);
293# endif 310# endif
294 } 311 }
295#endif 312#endif
296 313
297 /* 314 /*
… …
302 if (ut->ut_pid == cmd_pid) 319 if (ut->ut_pid == cmd_pid)
303 pututline (ut); 320 pututline (ut);
304 endutent (); 321 endutent ();
305# else 322# else
306 memset (ut, 0, sizeof (struct utmp)); 323 memset (ut, 0, sizeof (struct utmp));
307 rxvt_write_bsd_utmp (utmp_pos, ut); 324 write_bsd_utmp (utmp_pos, ut);
308# endif 325# endif
309#endif 326#endif
310#ifdef HAVE_STRUCT_UTMPX 327#ifdef HAVE_STRUCT_UTMPX
311 if (utx->ut_pid == cmd_pid) 328 if (utx->ut_pid == cmd_pid)
312 pututxline (utx); 329 pututxline (utx);
… …
320/* 337/*
321 * Write a BSD style utmp entry 338 * Write a BSD style utmp entry
322 */ 339 */
323#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID) 340#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
324static int 341static int
325rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu) 342write_bsd_utmp (int utmp_pos, struct utmp *wu)
326{ 343{
327 int fd; 344 int fd;
328 345
329 if (utmp_pos <= 0 || (fd = open (RXVT_UTMP_FILE, O_WRONLY)) == -1) 346 if (utmp_pos <= 0 || (fd = open (UTMP_FILE, O_WRONLY)) == -1)
330 return 0; 347 return 0;
331 348
332 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)
333 write (fd, wu, sizeof (struct utmp)); 350 write (fd, wu, sizeof (struct utmp));
334 close (fd); 351 close (fd);
… …
340/* 357/*
341 * Update a BSD style wtmp entry 358 * Update a BSD style wtmp entry
342 */ 359 */
343#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP) 360#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP)
344static void 361static void
345rxvt_update_wtmp (const char *fname, const struct utmp *putmp) 362update_wtmp (const char *fname, const struct utmp *putmp)
346{ 363{
347 int fd, gotlock, retry; 364 int fd, gotlock, retry;
348 struct flock lck; /* fcntl locking scheme */ 365 struct flock lck; /* fcntl locking scheme */
349 struct stat sbuf; 366 struct stat sbuf;
350 367
… …
381#endif 398#endif
382 399
383/* ------------------------------------------------------------------------- */ 400/* ------------------------------------------------------------------------- */
384#ifdef LASTLOG_SUPPORT 401#ifdef LASTLOG_SUPPORT
385static void 402static void
386rxvt_update_lastlog (const char *fname, const char *pty, const char *host) 403update_lastlog (const char *fname, const char *pty, const char *host)
387{ 404{
388# ifdef HAVE_STRUCT_LASTLOGX 405# ifdef HAVE_STRUCT_LASTLOGX
389 struct lastlogx llx; 406 struct lastlogx llx;
390# endif 407# endif
391# ifdef HAVE_STRUCT_LASTLOG 408# ifdef HAVE_STRUCT_LASTLOG
… …
401 memset (&llx, 0, sizeof (llx)); 418 memset (&llx, 0, sizeof (llx));
402 llx.ll_tv.tv_sec = time (NULL); 419 llx.ll_tv.tv_sec = time (NULL);
403 llx.ll_tv.tv_usec = 0; 420 llx.ll_tv.tv_usec = 0;
404 strncpy (llx.ll_line, pty, sizeof (llx.ll_line)); 421 strncpy (llx.ll_line, pty, sizeof (llx.ll_line));
405 strncpy (llx.ll_host, host, sizeof (llx.ll_host)); 422 strncpy (llx.ll_host, host, sizeof (llx.ll_host));
406 updlastlogx (RXVT_LASTLOGX_FILE, getuid (), &llx); 423 updlastlogx (LASTLOGX_FILE, getuid (), &llx);
407# endif 424# endif
408 425
409# ifdef HAVE_STRUCT_LASTLOG 426# ifdef HAVE_STRUCT_LASTLOG
410 pwent = getpwuid (getuid ()); 427 pwent = getpwuid (getuid ());
411 if (!pwent) 428 if (!pwent)
412 { 429 {
413 rxvt_warn ("no entry in password file, not updating lastlog.\n"); 430 ptytty_warn ("no entry in password file, not updating lastlog.\n");
414 return; 431 return;
415 } 432 }
416 433
417 memset (&ll, 0, sizeof (ll)); 434 memset (&ll, 0, sizeof (ll));
418 ll.ll_time = time (NULL); 435 ll.ll_time = time (NULL);
… …
439 } 456 }
440# endif /* LASTLOG_IS_DIR */ 457# endif /* LASTLOG_IS_DIR */
441# endif /* HAVE_STRUCT_LASTLOG */ 458# endif /* HAVE_STRUCT_LASTLOG */
442} 459}
443#endif /* LASTLOG_SUPPORT */ 460#endif /* LASTLOG_SUPPORT */
444/* ------------------------------------------------------------------------- */
445 461
446#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