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.28 by root, Tue Jan 17 10:19:13 2006 UTC vs.
Revision 1.36 by root, Sun Jan 22 00:48:13 2006 UTC

… …
12 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 12 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
14 * - extensive modifications 14 * - extensive modifications
15 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> 15 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
16 * - lastlog support 16 * - lastlog support
17 * Copyright (c) 2004 Marc Lehmann <pcg@goof.com> 17 * Copyright (c) 2004-2006 Marc Lehmann <pcg@goof.com>
18 * 18 *
19 * This program is free software; you can redistribute it and/or modify 19 * 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 20 * 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 21 * the Free Software Foundation; either version 2 of the License, or
22 * (at your option) any later version. 22 * (at your option) any later version.
… …
30 * along with this program; if not, write to the Free Software 30 * along with this program; if not, write to the Free Software
31 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 31 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
32 *----------------------------------------------------------------------*/ 32 *----------------------------------------------------------------------*/
33 33
34#include "../config.h" 34#include "../config.h"
35#include "rxvt.h" 35
36#include "ptytty.h" 36#include "ptytty.h"
37 37
38#if UTMP_SUPPORT 38#if UTMP_SUPPORT
39 39
40#if HAVE_STRUCT_UTMP 40#if HAVE_STRUCT_UTMP
41static int rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu); 41static int write_bsd_utmp (int utmp_pos, struct utmp *wu);
42static void rxvt_update_wtmp (const char *fname, const struct utmp *putmp); 42static void update_wtmp (const char *fname, const struct utmp *putmp);
43#endif 43#endif
44 44
45static void rxvt_update_lastlog (const char *fname, const char *pty, const char *host); 45static void update_lastlog (const char *fname, const char *pty, const char *host);
46 46
47/* 47/*
48 * BSD style utmp entry 48 * BSD style utmp entry
49 * ut_line, ut_name, ut_host, ut_time 49 * ut_line, ut_name, ut_host, ut_time
50 * SYSV style utmp (and utmpx) entry 50 * SYSV style utmp (and utmpx) entry
… …
55 55
56/* 56/*
57 * make and write utmp and wtmp entries 57 * make and write utmp and wtmp entries
58 */ 58 */
59void 59void
60rxvt_ptytty::login (int cmd_pid, bool login_shell, const char *hostname) 60ptytty_unix::login (int cmd_pid, bool login_shell, const char *hostname)
61{ 61{
62 const char *pty = name; 62 const char *pty = name;
63 63
64 if (!pty || !*pty) 64 if (!pty || !*pty)
65 return; 65 return;
… …
84 strncpy (ut_id, pty + 3, sizeof (ut_id)); 84 strncpy (ut_id, pty + 3, sizeof (ut_id));
85 else if (sscanf (pty, "pts/%d", &i) == 1) 85 else if (sscanf (pty, "pts/%d", &i) == 1)
86 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */ 86 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */
87 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3)) 87 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3))
88 { 88 {
89 rxvt_warn ("can't parse tty name \"%s\", not adding utmp entry.\n", pty); 89 warn ("can't parse tty name \"%s\", not adding utmp entry.\n", pty);
90 return; 90 return;
91 } 91 }
92#endif 92#endif
93 93
94#ifdef HAVE_STRUCT_UTMP 94#ifdef HAVE_STRUCT_UTMP
… …
163 endutxent (); /* close the file */ 163 endutxent (); /* close the file */
164 utmp_pos = 0; 164 utmp_pos = 0;
165#endif 165#endif
166 166
167#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID) 167#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
168
169 { 168 {
170# ifdef HAVE_TTYSLOT 169# ifdef HAVE_TTYSLOT
170 int fdstdin = dup (STDIN_FILENO);
171 dup2 (tty, STDIN_FILENO);
172
171 i = ttyslot (); 173 i = ttyslot ();
172 if (rxvt_write_bsd_utmp (i, ut)) 174 if (write_bsd_utmp (i, ut))
173 utmp_pos = i; 175 utmp_pos = i;
176
177 dup2 (fdstdin, STDIN_FILENO);
178 close (fdstdin);
174# else 179# else
175 FILE *fd0; 180 FILE *fd0;
176 181
177 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL) 182 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL)
178 { 183 {
179 char buf[256], name[256]; 184 char buf[256], name[256];
180 185
… …
183 { 188 {
184 if (*buf == '#' || sscanf (buf, "%s", name) != 1) 189 if (*buf == '#' || sscanf (buf, "%s", name) != 1)
185 continue; 190 continue;
186 if (!strcmp (ut->ut_line, name)) 191 if (!strcmp (ut->ut_line, name))
187 { 192 {
188 if (!rxvt_write_bsd_utmp (i, ut)) 193 if (!write_bsd_utmp (i, ut))
189 i = 0; 194 i = 0;
190 utmp_pos = i; 195 utmp_pos = i;
191 fclose (fd0); 196 fclose (fd0);
192 break; 197 break;
193 } 198 }
… …
198# endif 203# endif
199 } 204 }
200#endif 205#endif
201 206
202#ifdef WTMP_SUPPORT 207#ifdef WTMP_SUPPORT
203# ifdef WTMP_ONLY_ON_LOGIN 208#ifdef LOG_ONLY_ON_LOGIN
204 if (login_shell) 209 if (login_shell)
205# endif 210#endif
206 { 211 {
207# ifdef HAVE_STRUCT_UTMP 212# ifdef HAVE_STRUCT_UTMP
208# ifdef HAVE_UPDWTMP 213# ifdef HAVE_UPDWTMP
209 updwtmp (RXVT_WTMP_FILE, ut); 214 updwtmp (WTMP_FILE, ut);
210# else 215# else
211 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 216 update_wtmp (WTMP_FILE, ut);
212# endif 217# endif
213# endif 218# endif
214# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX) 219# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
215 updwtmpx (RXVT_WTMPX_FILE, utx); 220 updwtmpx (WTMPX_FILE, utx);
216# endif
217 }
218#endif 221# endif
222 }
223#endif
219#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE) 224#if defined(LASTLOG_SUPPORT) && defined(LASTLOG_FILE)
225#ifdef LOG_ONLY_ON_LOGIN
220 if (login_shell) 226 if (login_shell)
227#endif
221 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname); 228 update_lastlog (LASTLOG_FILE, pty, hostname);
222#endif 229#endif
223} 230}
224 231
225/* ------------------------------------------------------------------------- */ 232/* ------------------------------------------------------------------------- */
226/* 233/*
227 * remove utmp and wtmp entries 234 * remove utmp and wtmp entries
228 */ 235 */
229void 236void
230rxvt_ptytty::logout () 237ptytty_unix::logout ()
231{ 238{
232 if (!cmd_pid) 239 if (!cmd_pid)
233 return; 240 return;
234 241
235#ifdef HAVE_STRUCT_UTMP 242#ifdef HAVE_STRUCT_UTMP
… …
274 281
275 /* 282 /*
276 * Write ending wtmp entry 283 * Write ending wtmp entry
277 */ 284 */
278#ifdef WTMP_SUPPORT 285#ifdef WTMP_SUPPORT
279# ifdef WTMP_ONLY_ON_LOGIN 286#ifdef LOG_ONLY_ON_LOGIN
280 if (login_shell) 287 if (login_shell)
281# endif 288#endif
282 { 289 {
283# ifdef HAVE_STRUCT_UTMP 290# ifdef HAVE_STRUCT_UTMP
284# ifdef HAVE_UPDWTMP 291# ifdef HAVE_UPDWTMP
285 updwtmp (RXVT_WTMP_FILE, ut); 292 updwtmp (WTMP_FILE, ut);
286# else 293# else
287 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 294 update_wtmp (WTMP_FILE, ut);
288# endif 295# endif
289# endif 296# endif
290# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX) 297# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
291 updwtmpx (RXVT_WTMPX_FILE, utx); 298 updwtmpx (WTMPX_FILE, utx);
292# endif 299# endif
293 } 300 }
294#endif 301#endif
295 302
296 /* 303 /*
… …
301 if (ut->ut_pid == cmd_pid) 308 if (ut->ut_pid == cmd_pid)
302 pututline (ut); 309 pututline (ut);
303 endutent (); 310 endutent ();
304# else 311# else
305 memset (ut, 0, sizeof (struct utmp)); 312 memset (ut, 0, sizeof (struct utmp));
306 rxvt_write_bsd_utmp (utmp_pos, ut); 313 write_bsd_utmp (utmp_pos, ut);
307# endif 314# endif
308#endif 315#endif
309#ifdef HAVE_STRUCT_UTMPX 316#ifdef HAVE_STRUCT_UTMPX
310 if (utx->ut_pid == cmd_pid) 317 if (utx->ut_pid == cmd_pid)
311 pututxline (utx); 318 pututxline (utx);
… …
319/* 326/*
320 * Write a BSD style utmp entry 327 * Write a BSD style utmp entry
321 */ 328 */
322#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID) 329#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
323static int 330static int
324rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu) 331write_bsd_utmp (int utmp_pos, struct utmp *wu)
325{ 332{
326 int fd; 333 int fd;
327 334
328 if (utmp_pos <= 0 || (fd = open (RXVT_UTMP_FILE, O_WRONLY)) == -1) 335 if (utmp_pos <= 0 || (fd = open (UTMP_FILE, O_WRONLY)) == -1)
329 return 0; 336 return 0;
330 337
331 if (lseek (fd, (off_t) (utmp_pos * sizeof (struct utmp)), SEEK_SET) != -1) 338 if (lseek (fd, (off_t) (utmp_pos * sizeof (struct utmp)), SEEK_SET) != -1)
332 write (fd, wu, sizeof (struct utmp)); 339 write (fd, wu, sizeof (struct utmp));
333 close (fd); 340 close (fd);
… …
339/* 346/*
340 * Update a BSD style wtmp entry 347 * Update a BSD style wtmp entry
341 */ 348 */
342#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP) 349#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP)
343static void 350static void
344rxvt_update_wtmp (const char *fname, const struct utmp *putmp) 351update_wtmp (const char *fname, const struct utmp *putmp)
345{ 352{
346 int fd, gotlock, retry; 353 int fd, gotlock, retry;
347 struct flock lck; /* fcntl locking scheme */ 354 struct flock lck; /* fcntl locking scheme */
348 struct stat sbuf; 355 struct stat sbuf;
349 356
… …
380#endif 387#endif
381 388
382/* ------------------------------------------------------------------------- */ 389/* ------------------------------------------------------------------------- */
383#ifdef LASTLOG_SUPPORT 390#ifdef LASTLOG_SUPPORT
384static void 391static void
385rxvt_update_lastlog (const char *fname, const char *pty, const char *host) 392update_lastlog (const char *fname, const char *pty, const char *host)
386{ 393{
387# ifdef HAVE_STRUCT_LASTLOGX 394# ifdef HAVE_STRUCT_LASTLOGX
388 struct lastlogx llx; 395 struct lastlogx llx;
389# endif 396# endif
390# ifdef HAVE_STRUCT_LASTLOG 397# ifdef HAVE_STRUCT_LASTLOG
… …
400 memset (&llx, 0, sizeof (llx)); 407 memset (&llx, 0, sizeof (llx));
401 llx.ll_tv.tv_sec = time (NULL); 408 llx.ll_tv.tv_sec = time (NULL);
402 llx.ll_tv.tv_usec = 0; 409 llx.ll_tv.tv_usec = 0;
403 strncpy (llx.ll_line, pty, sizeof (llx.ll_line)); 410 strncpy (llx.ll_line, pty, sizeof (llx.ll_line));
404 strncpy (llx.ll_host, host, sizeof (llx.ll_host)); 411 strncpy (llx.ll_host, host, sizeof (llx.ll_host));
405 updlastlogx (RXVT_LASTLOGX_FILE, getuid (), &llx); 412 updlastlogx (LASTLOGX_FILE, getuid (), &llx);
406# endif 413# endif
407 414
408# ifdef HAVE_STRUCT_LASTLOG 415# ifdef HAVE_STRUCT_LASTLOG
409 pwent = getpwuid (getuid ()); 416 pwent = getpwuid (getuid ());
410 if (!pwent) 417 if (!pwent)
411 { 418 {
412 rxvt_warn ("no entry in password file, not updating lastlog.\n"); 419 warn ("no entry in password file, not updating lastlog.\n");
413 return; 420 return;
414 } 421 }
415 422
416 memset (&ll, 0, sizeof (ll)); 423 memset (&ll, 0, sizeof (ll));
417 ll.ll_time = time (NULL); 424 ll.ll_time = time (NULL);
… …
440# endif /* HAVE_STRUCT_LASTLOG */ 447# endif /* HAVE_STRUCT_LASTLOG */
441} 448}
442#endif /* LASTLOG_SUPPORT */ 449#endif /* LASTLOG_SUPPORT */
443/* ------------------------------------------------------------------------- */ 450/* ------------------------------------------------------------------------- */
444 451
445#endif /* UTMP_SUPPORT */ 452#else
453
454void
455ptytty_unix::login (int cmd_pid, bool login_shell, const char *hostname)
456{
457}
458
459#endif
460

Diff Legend

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