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.35 by root, Sun Jan 22 00:36:59 2006 UTC vs.
Revision 1.37 by root, Sun Jan 22 01:00:46 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
36#include "ptytty.h" 39#include "ptytty.h"
37 40
38#if UTMP_SUPPORT 41#if UTMP_SUPPORT
39 42
40#if HAVE_STRUCT_UTMP 43#if HAVE_STRUCT_UTMP
41static int rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu); 44static int write_bsd_utmp (int utmp_pos, struct utmp *wu);
42static void rxvt_update_wtmp (const char *fname, const struct utmp *putmp); 45static void update_wtmp (const char *fname, const struct utmp *putmp);
43#endif 46#endif
44 47
45static void rxvt_update_lastlog (const char *fname, const char *pty, const char *host); 48static void update_lastlog (const char *fname, const char *pty, const char *host);
46 49
47/* 50/*
48 * BSD style utmp entry 51 * BSD style utmp entry
49 * ut_line, ut_name, ut_host, ut_time 52 * ut_line, ut_name, ut_host, ut_time
50 * SYSV style utmp (and utmpx) entry 53 * SYSV style utmp (and utmpx) entry
… …
55 58
56/* 59/*
57 * make and write utmp and wtmp entries 60 * make and write utmp and wtmp entries
58 */ 61 */
59void 62void
60rxvt_ptytty_unix::login (int cmd_pid, bool login_shell, const char *hostname) 63ptytty_unix::login (int cmd_pid, bool login_shell, const char *hostname)
61{ 64{
62 const char *pty = name; 65 const char *pty = name;
63 66
64 if (!pty || !*pty) 67 if (!pty || !*pty)
65 return; 68 return;
… …
84 strncpy (ut_id, pty + 3, sizeof (ut_id)); 87 strncpy (ut_id, pty + 3, sizeof (ut_id));
85 else if (sscanf (pty, "pts/%d", &i) == 1) 88 else if (sscanf (pty, "pts/%d", &i) == 1)
86 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */ 89 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */
87 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3)) 90 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3))
88 { 91 {
89 rxvt_warn ("can't parse tty name \"%s\", not adding utmp entry.\n", pty); 92 warn ("can't parse tty name \"%s\", not adding utmp entry.\n", pty);
90 return; 93 return;
91 } 94 }
92#endif 95#endif
93 96
94#ifdef HAVE_STRUCT_UTMP 97#ifdef HAVE_STRUCT_UTMP
… …
169# ifdef HAVE_TTYSLOT 172# ifdef HAVE_TTYSLOT
170 int fdstdin = dup (STDIN_FILENO); 173 int fdstdin = dup (STDIN_FILENO);
171 dup2 (tty, STDIN_FILENO); 174 dup2 (tty, STDIN_FILENO);
172 175
173 i = ttyslot (); 176 i = ttyslot ();
174 if (rxvt_write_bsd_utmp (i, ut)) 177 if (write_bsd_utmp (i, ut))
175 utmp_pos = i; 178 utmp_pos = i;
176 179
177 dup2 (fdstdin, STDIN_FILENO); 180 dup2 (fdstdin, STDIN_FILENO);
178 close (fdstdin); 181 close (fdstdin);
179# else 182# else
… …
188 { 191 {
189 if (*buf == '#' || sscanf (buf, "%s", name) != 1) 192 if (*buf == '#' || sscanf (buf, "%s", name) != 1)
190 continue; 193 continue;
191 if (!strcmp (ut->ut_line, name)) 194 if (!strcmp (ut->ut_line, name))
192 { 195 {
193 if (!rxvt_write_bsd_utmp (i, ut)) 196 if (!write_bsd_utmp (i, ut))
194 i = 0; 197 i = 0;
195 utmp_pos = i; 198 utmp_pos = i;
196 fclose (fd0); 199 fclose (fd0);
197 break; 200 break;
198 } 201 }
… …
209 if (login_shell) 212 if (login_shell)
210#endif 213#endif
211 { 214 {
212# ifdef HAVE_STRUCT_UTMP 215# ifdef HAVE_STRUCT_UTMP
213# ifdef HAVE_UPDWTMP 216# ifdef HAVE_UPDWTMP
214 updwtmp (RXVT_WTMP_FILE, ut); 217 updwtmp (WTMP_FILE, ut);
215# else 218# else
216 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 219 update_wtmp (WTMP_FILE, ut);
217# endif 220# endif
218# endif 221# endif
219# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX) 222# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
220 updwtmpx (RXVT_WTMPX_FILE, utx); 223 updwtmpx (WTMPX_FILE, utx);
221# endif
222 }
223#endif 224# endif
225 }
226#endif
224#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE) 227#if defined(LASTLOG_SUPPORT) && defined(LASTLOG_FILE)
225#ifdef LOG_ONLY_ON_LOGIN 228#ifdef LOG_ONLY_ON_LOGIN
226 if (login_shell) 229 if (login_shell)
227#endif 230#endif
228 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname); 231 update_lastlog (LASTLOG_FILE, pty, hostname);
229#endif 232#endif
230} 233}
231 234
232/* ------------------------------------------------------------------------- */ 235/* ------------------------------------------------------------------------- */
233/* 236/*
234 * remove utmp and wtmp entries 237 * remove utmp and wtmp entries
235 */ 238 */
236void 239void
237rxvt_ptytty_unix::logout () 240ptytty_unix::logout ()
238{ 241{
239 if (!cmd_pid) 242 if (!cmd_pid)
240 return; 243 return;
241 244
242#ifdef HAVE_STRUCT_UTMP 245#ifdef HAVE_STRUCT_UTMP
… …
287 if (login_shell) 290 if (login_shell)
288#endif 291#endif
289 { 292 {
290# ifdef HAVE_STRUCT_UTMP 293# ifdef HAVE_STRUCT_UTMP
291# ifdef HAVE_UPDWTMP 294# ifdef HAVE_UPDWTMP
292 updwtmp (RXVT_WTMP_FILE, ut); 295 updwtmp (WTMP_FILE, ut);
293# else 296# else
294 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 297 update_wtmp (WTMP_FILE, ut);
295# endif 298# endif
296# endif 299# endif
297# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX) 300# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
298 updwtmpx (RXVT_WTMPX_FILE, utx); 301 updwtmpx (WTMPX_FILE, utx);
299# endif 302# endif
300 } 303 }
301#endif 304#endif
302 305
303 /* 306 /*
… …
308 if (ut->ut_pid == cmd_pid) 311 if (ut->ut_pid == cmd_pid)
309 pututline (ut); 312 pututline (ut);
310 endutent (); 313 endutent ();
311# else 314# else
312 memset (ut, 0, sizeof (struct utmp)); 315 memset (ut, 0, sizeof (struct utmp));
313 rxvt_write_bsd_utmp (utmp_pos, ut); 316 write_bsd_utmp (utmp_pos, ut);
314# endif 317# endif
315#endif 318#endif
316#ifdef HAVE_STRUCT_UTMPX 319#ifdef HAVE_STRUCT_UTMPX
317 if (utx->ut_pid == cmd_pid) 320 if (utx->ut_pid == cmd_pid)
318 pututxline (utx); 321 pututxline (utx);
… …
326/* 329/*
327 * Write a BSD style utmp entry 330 * Write a BSD style utmp entry
328 */ 331 */
329#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID) 332#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
330static int 333static int
331rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu) 334write_bsd_utmp (int utmp_pos, struct utmp *wu)
332{ 335{
333 int fd; 336 int fd;
334 337
335 if (utmp_pos <= 0 || (fd = open (RXVT_UTMP_FILE, O_WRONLY)) == -1) 338 if (utmp_pos <= 0 || (fd = open (UTMP_FILE, O_WRONLY)) == -1)
336 return 0; 339 return 0;
337 340
338 if (lseek (fd, (off_t) (utmp_pos * sizeof (struct utmp)), SEEK_SET) != -1) 341 if (lseek (fd, (off_t) (utmp_pos * sizeof (struct utmp)), SEEK_SET) != -1)
339 write (fd, wu, sizeof (struct utmp)); 342 write (fd, wu, sizeof (struct utmp));
340 close (fd); 343 close (fd);
… …
346/* 349/*
347 * Update a BSD style wtmp entry 350 * Update a BSD style wtmp entry
348 */ 351 */
349#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP) 352#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP)
350static void 353static void
351rxvt_update_wtmp (const char *fname, const struct utmp *putmp) 354update_wtmp (const char *fname, const struct utmp *putmp)
352{ 355{
353 int fd, gotlock, retry; 356 int fd, gotlock, retry;
354 struct flock lck; /* fcntl locking scheme */ 357 struct flock lck; /* fcntl locking scheme */
355 struct stat sbuf; 358 struct stat sbuf;
356 359
… …
387#endif 390#endif
388 391
389/* ------------------------------------------------------------------------- */ 392/* ------------------------------------------------------------------------- */
390#ifdef LASTLOG_SUPPORT 393#ifdef LASTLOG_SUPPORT
391static void 394static void
392rxvt_update_lastlog (const char *fname, const char *pty, const char *host) 395update_lastlog (const char *fname, const char *pty, const char *host)
393{ 396{
394# ifdef HAVE_STRUCT_LASTLOGX 397# ifdef HAVE_STRUCT_LASTLOGX
395 struct lastlogx llx; 398 struct lastlogx llx;
396# endif 399# endif
397# ifdef HAVE_STRUCT_LASTLOG 400# ifdef HAVE_STRUCT_LASTLOG
… …
407 memset (&llx, 0, sizeof (llx)); 410 memset (&llx, 0, sizeof (llx));
408 llx.ll_tv.tv_sec = time (NULL); 411 llx.ll_tv.tv_sec = time (NULL);
409 llx.ll_tv.tv_usec = 0; 412 llx.ll_tv.tv_usec = 0;
410 strncpy (llx.ll_line, pty, sizeof (llx.ll_line)); 413 strncpy (llx.ll_line, pty, sizeof (llx.ll_line));
411 strncpy (llx.ll_host, host, sizeof (llx.ll_host)); 414 strncpy (llx.ll_host, host, sizeof (llx.ll_host));
412 updlastlogx (RXVT_LASTLOGX_FILE, getuid (), &llx); 415 updlastlogx (LASTLOGX_FILE, getuid (), &llx);
413# endif 416# endif
414 417
415# ifdef HAVE_STRUCT_LASTLOG 418# ifdef HAVE_STRUCT_LASTLOG
416 pwent = getpwuid (getuid ()); 419 pwent = getpwuid (getuid ());
417 if (!pwent) 420 if (!pwent)
418 { 421 {
419 rxvt_warn ("no entry in password file, not updating lastlog.\n"); 422 warn ("no entry in password file, not updating lastlog.\n");
420 return; 423 return;
421 } 424 }
422 425
423 memset (&ll, 0, sizeof (ll)); 426 memset (&ll, 0, sizeof (ll));
424 ll.ll_time = time (NULL); 427 ll.ll_time = time (NULL);
… …
445 } 448 }
446# endif /* LASTLOG_IS_DIR */ 449# endif /* LASTLOG_IS_DIR */
447# endif /* HAVE_STRUCT_LASTLOG */ 450# endif /* HAVE_STRUCT_LASTLOG */
448} 451}
449#endif /* LASTLOG_SUPPORT */ 452#endif /* LASTLOG_SUPPORT */
450/* ------------------------------------------------------------------------- */
451 453
452#else 454#else
453void 455void
454rxvt_ptytty_unix::login (int cmd_pid, bool login_shell, const char *hostname) 456ptytty_unix::login (int cmd_pid, bool login_shell, const char *hostname)
455{ 457{
456} 458}
457#endif /* UTMP_SUPPORT */ 459#endif
460

Diff Legend

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