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.27 by root, Tue Jan 17 10:14:26 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;
63
64 if (!pty || !*pty)
65 return;
66
62 this->cmd_pid = cmd_pid; 67 this->cmd_pid = cmd_pid;
63 this->login_shell = login_shell; 68 this->login_shell = login_shell;
64
65 const char *pty = name;
66 69
67#ifdef HAVE_STRUCT_UTMP 70#ifdef HAVE_STRUCT_UTMP
68 struct utmp *ut = &this->ut; 71 struct utmp *ut = &this->ut;
69#endif 72#endif
70#ifdef HAVE_STRUCT_UTMPX 73#ifdef HAVE_STRUCT_UTMPX
… …
81 strncpy (ut_id, pty + 3, sizeof (ut_id)); 84 strncpy (ut_id, pty + 3, sizeof (ut_id));
82 else if (sscanf (pty, "pts/%d", &i) == 1) 85 else if (sscanf (pty, "pts/%d", &i) == 1)
83 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */ 86 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */
84 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3)) 87 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3))
85 { 88 {
86 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);
87 return; 90 return;
88 } 91 }
89#endif 92#endif
90 93
91#ifdef HAVE_STRUCT_UTMP 94#ifdef HAVE_STRUCT_UTMP
… …
160 endutxent (); /* close the file */ 163 endutxent (); /* close the file */
161 utmp_pos = 0; 164 utmp_pos = 0;
162#endif 165#endif
163 166
164#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID) 167#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
165
166 { 168 {
167# ifdef HAVE_TTYSLOT 169# ifdef HAVE_TTYSLOT
170 int fdstdin = dup (STDIN_FILENO);
171 dup2 (tty, STDIN_FILENO);
172
168 i = ttyslot (); 173 i = ttyslot ();
169 if (rxvt_write_bsd_utmp (i, ut)) 174 if (write_bsd_utmp (i, ut))
170 utmp_pos = i; 175 utmp_pos = i;
176
177 dup2 (fdstdin, STDIN_FILENO);
178 close (fdstdin);
171# else 179# else
172 FILE *fd0; 180 FILE *fd0;
173 181
174 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL) 182 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL)
175 { 183 {
176 char buf[256], name[256]; 184 char buf[256], name[256];
177 185
… …
180 { 188 {
181 if (*buf == '#' || sscanf (buf, "%s", name) != 1) 189 if (*buf == '#' || sscanf (buf, "%s", name) != 1)
182 continue; 190 continue;
183 if (!strcmp (ut->ut_line, name)) 191 if (!strcmp (ut->ut_line, name))
184 { 192 {
185 if (!rxvt_write_bsd_utmp (i, ut)) 193 if (!write_bsd_utmp (i, ut))
186 i = 0; 194 i = 0;
187 utmp_pos = i; 195 utmp_pos = i;
188 fclose (fd0); 196 fclose (fd0);
189 break; 197 break;
190 } 198 }
… …
195# endif 203# endif
196 } 204 }
197#endif 205#endif
198 206
199#ifdef WTMP_SUPPORT 207#ifdef WTMP_SUPPORT
200# ifdef WTMP_ONLY_ON_LOGIN 208#ifdef LOG_ONLY_ON_LOGIN
201 if (login_shell) 209 if (login_shell)
202# endif 210#endif
203 { 211 {
204# ifdef HAVE_STRUCT_UTMP 212# ifdef HAVE_STRUCT_UTMP
205# ifdef HAVE_UPDWTMP 213# ifdef HAVE_UPDWTMP
206 updwtmp (RXVT_WTMP_FILE, ut); 214 updwtmp (WTMP_FILE, ut);
207# else 215# else
208 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 216 update_wtmp (WTMP_FILE, ut);
209# endif 217# endif
210# endif 218# endif
211# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX) 219# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
212 updwtmpx (RXVT_WTMPX_FILE, utx); 220 updwtmpx (WTMPX_FILE, utx);
213# endif
214 }
215#endif 221# endif
222 }
223#endif
216#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE) 224#if defined(LASTLOG_SUPPORT) && defined(LASTLOG_FILE)
225#ifdef LOG_ONLY_ON_LOGIN
217 if (login_shell) 226 if (login_shell)
227#endif
218 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname); 228 update_lastlog (LASTLOG_FILE, pty, hostname);
219#endif 229#endif
220} 230}
221 231
222/* ------------------------------------------------------------------------- */ 232/* ------------------------------------------------------------------------- */
223/* 233/*
224 * remove utmp and wtmp entries 234 * remove utmp and wtmp entries
225 */ 235 */
226void 236void
227rxvt_ptytty::logout () 237ptytty_unix::logout ()
228{ 238{
239 if (!cmd_pid)
240 return;
241
229#ifdef HAVE_STRUCT_UTMP 242#ifdef HAVE_STRUCT_UTMP
230 struct utmp *tmput, *ut = &this->ut; 243 struct utmp *tmput, *ut = &this->ut;
231#endif 244#endif
232#ifdef HAVE_STRUCT_UTMPX 245#ifdef HAVE_STRUCT_UTMPX
233 struct utmpx *tmputx, *utx = &this->utx; 246 struct utmpx *tmputx, *utx = &this->utx;
… …
268 281
269 /* 282 /*
270 * Write ending wtmp entry 283 * Write ending wtmp entry
271 */ 284 */
272#ifdef WTMP_SUPPORT 285#ifdef WTMP_SUPPORT
273# ifdef WTMP_ONLY_ON_LOGIN 286#ifdef LOG_ONLY_ON_LOGIN
274 if (login_shell) 287 if (login_shell)
275# endif 288#endif
276 { 289 {
277# ifdef HAVE_STRUCT_UTMP 290# ifdef HAVE_STRUCT_UTMP
278# ifdef HAVE_UPDWTMP 291# ifdef HAVE_UPDWTMP
279 updwtmp (RXVT_WTMP_FILE, ut); 292 updwtmp (WTMP_FILE, ut);
280# else 293# else
281 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 294 update_wtmp (WTMP_FILE, ut);
282# endif 295# endif
283# endif 296# endif
284# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX) 297# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
285 updwtmpx (RXVT_WTMPX_FILE, utx); 298 updwtmpx (WTMPX_FILE, utx);
286# endif 299# endif
287 } 300 }
288#endif 301#endif
289 302
290 /* 303 /*
… …
295 if (ut->ut_pid == cmd_pid) 308 if (ut->ut_pid == cmd_pid)
296 pututline (ut); 309 pututline (ut);
297 endutent (); 310 endutent ();
298# else 311# else
299 memset (ut, 0, sizeof (struct utmp)); 312 memset (ut, 0, sizeof (struct utmp));
300 rxvt_write_bsd_utmp (utmp_pos, ut); 313 write_bsd_utmp (utmp_pos, ut);
301# endif 314# endif
302#endif 315#endif
303#ifdef HAVE_STRUCT_UTMPX 316#ifdef HAVE_STRUCT_UTMPX
304 if (utx->ut_pid == cmd_pid) 317 if (utx->ut_pid == cmd_pid)
305 pututxline (utx); 318 pututxline (utx);
306 endutxent (); 319 endutxent ();
307#endif 320#endif
321
322 cmd_pid = 0;
308} 323}
309 324
310/* ------------------------------------------------------------------------- */ 325/* ------------------------------------------------------------------------- */
311/* 326/*
312 * Write a BSD style utmp entry 327 * Write a BSD style utmp entry
313 */ 328 */
314#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID) 329#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
315static int 330static int
316rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu) 331write_bsd_utmp (int utmp_pos, struct utmp *wu)
317{ 332{
318 int fd; 333 int fd;
319 334
320 if (utmp_pos <= 0 || (fd = open (RXVT_UTMP_FILE, O_WRONLY)) == -1) 335 if (utmp_pos <= 0 || (fd = open (UTMP_FILE, O_WRONLY)) == -1)
321 return 0; 336 return 0;
322 337
323 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)
324 write (fd, wu, sizeof (struct utmp)); 339 write (fd, wu, sizeof (struct utmp));
325 close (fd); 340 close (fd);
… …
331/* 346/*
332 * Update a BSD style wtmp entry 347 * Update a BSD style wtmp entry
333 */ 348 */
334#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP) 349#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP)
335static void 350static void
336rxvt_update_wtmp (const char *fname, const struct utmp *putmp) 351update_wtmp (const char *fname, const struct utmp *putmp)
337{ 352{
338 int fd, gotlock, retry; 353 int fd, gotlock, retry;
339 struct flock lck; /* fcntl locking scheme */ 354 struct flock lck; /* fcntl locking scheme */
340 struct stat sbuf; 355 struct stat sbuf;
341 356
… …
372#endif 387#endif
373 388
374/* ------------------------------------------------------------------------- */ 389/* ------------------------------------------------------------------------- */
375#ifdef LASTLOG_SUPPORT 390#ifdef LASTLOG_SUPPORT
376static void 391static void
377rxvt_update_lastlog (const char *fname, const char *pty, const char *host) 392update_lastlog (const char *fname, const char *pty, const char *host)
378{ 393{
379# ifdef HAVE_STRUCT_LASTLOGX 394# ifdef HAVE_STRUCT_LASTLOGX
380 struct lastlogx llx; 395 struct lastlogx llx;
381# endif 396# endif
382# ifdef HAVE_STRUCT_LASTLOG 397# ifdef HAVE_STRUCT_LASTLOG
… …
392 memset (&llx, 0, sizeof (llx)); 407 memset (&llx, 0, sizeof (llx));
393 llx.ll_tv.tv_sec = time (NULL); 408 llx.ll_tv.tv_sec = time (NULL);
394 llx.ll_tv.tv_usec = 0; 409 llx.ll_tv.tv_usec = 0;
395 strncpy (llx.ll_line, pty, sizeof (llx.ll_line)); 410 strncpy (llx.ll_line, pty, sizeof (llx.ll_line));
396 strncpy (llx.ll_host, host, sizeof (llx.ll_host)); 411 strncpy (llx.ll_host, host, sizeof (llx.ll_host));
397 updlastlogx (RXVT_LASTLOGX_FILE, getuid (), &llx); 412 updlastlogx (LASTLOGX_FILE, getuid (), &llx);
398# endif 413# endif
399 414
400# ifdef HAVE_STRUCT_LASTLOG 415# ifdef HAVE_STRUCT_LASTLOG
401 pwent = getpwuid (getuid ()); 416 pwent = getpwuid (getuid ());
402 if (!pwent) 417 if (!pwent)
403 { 418 {
404 rxvt_warn ("no entry in password file, not updating lastlog.\n"); 419 warn ("no entry in password file, not updating lastlog.\n");
405 return; 420 return;
406 } 421 }
407 422
408 memset (&ll, 0, sizeof (ll)); 423 memset (&ll, 0, sizeof (ll));
409 ll.ll_time = time (NULL); 424 ll.ll_time = time (NULL);
… …
432# endif /* HAVE_STRUCT_LASTLOG */ 447# endif /* HAVE_STRUCT_LASTLOG */
433} 448}
434#endif /* LASTLOG_SUPPORT */ 449#endif /* LASTLOG_SUPPORT */
435/* ------------------------------------------------------------------------- */ 450/* ------------------------------------------------------------------------- */
436 451
437#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