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.21 by root, Sat Jan 14 10:17:40 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>
… …
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>
18 * 21 *
19 * This program is free software; you can redistribute it and/or modify 22 * 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 23 * 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 24 * the Free Software Foundation; either version 2 of the License, or
22 * (at your option) any later version. 25 * (at your option) any later version.
… …
28 * 31 *
29 * You should have received a copy of the GNU General Public License 32 * You should have received a copy of the GNU General Public License
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/*----------------------------------------------------------------------*
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 36
42#include "../config.h" 37#include "../config.h"
38
43#include "rxvt.h" 39#include "ptytty.h"
44#include "logging.h"
45 40
46#ifdef UTMP_SUPPORT 41#if UTMP_SUPPORT
47 42
48#if HAVE_STRUCT_UTMP 43#if HAVE_STRUCT_UTMP
49int rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu); 44static int write_bsd_utmp (int utmp_pos, struct utmp *wu);
50void rxvt_update_wtmp (const char *fname, const struct utmp *putmp); 45static void update_wtmp (const char *fname, const struct utmp *putmp);
51#endif 46#endif
52 47
53void 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);
54 49
55/* 50/*
56 * BSD style utmp entry 51 * BSD style utmp entry
57 * ut_line, ut_name, ut_host, ut_time 52 * ut_line, ut_name, ut_host, ut_time
58 * SYSV style utmp (and utmpx) entry 53 * SYSV style utmp (and utmpx) entry
… …
63 58
64/* 59/*
65 * make and write utmp and wtmp entries 60 * make and write utmp and wtmp entries
66 */ 61 */
67void 62void
68rxvt_term::makeutent (const char *pty, const char *hostname) 63ptytty_unix::login (int cmd_pid, bool login_shell, const char *hostname)
69{ 64{
65 const char *pty = name;
66
67 if (!pty || !*pty)
68 return;
69
70 this->cmd_pid = cmd_pid;
71 this->login_shell = login_shell;
72
70#ifdef HAVE_STRUCT_UTMP 73#ifdef HAVE_STRUCT_UTMP
71 struct utmp *ut = &this->ut; 74 struct utmp *ut = &this->ut;
72#endif 75#endif
73#ifdef HAVE_STRUCT_UTMPX 76#ifdef HAVE_STRUCT_UTMPX
74 struct utmpx *utx = &this->utx; 77 struct utmpx *utx = &this->utx;
75#endif 78#endif
76#ifdef HAVE_UTMP_PID
77 int i; 79 int i;
78#endif
79 struct passwd *pwent = getpwuid (getuid ()); 80 struct passwd *pwent = getpwuid (getuid ());
80 81
81 if (!strncmp (pty, "/dev/", 5)) 82 if (!strncmp (pty, "/dev/", 5))
82 pty += 5; /* skip /dev/ prefix */ 83 pty += 5; /* skip /dev/ prefix */
83 84
84#ifdef HAVE_UTMP_PID 85#if defined(HAVE_UTMP_PID) || defined(HAVE_STRUCT_UTMPX)
85 if (!strncmp (pty, "pty", 3) || !strncmp (pty, "tty", 3)) 86 if (!strncmp (pty, "pty", 3) || !strncmp (pty, "tty", 3))
86 strncpy (ut_id, pty + 3, sizeof (ut_id)); 87 strncpy (ut_id, pty + 3, sizeof (ut_id));
87 else if (sscanf (pty, "pts/%d", &i) == 1) 88 else if (sscanf (pty, "pts/%d", &i) == 1)
88 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */ 89 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */
89 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3)) 90 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3))
90 { 91 {
91 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);
92 return; 93 return;
93 } 94 }
94#endif 95#endif
95 96
96#ifdef HAVE_STRUCT_UTMP 97#ifdef HAVE_STRUCT_UTMP
… …
165 endutxent (); /* close the file */ 166 endutxent (); /* close the file */
166 utmp_pos = 0; 167 utmp_pos = 0;
167#endif 168#endif
168 169
169#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID) 170#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
170
171 { 171 {
172 int i;
173# ifdef HAVE_TTYSLOT 172# ifdef HAVE_TTYSLOT
173 int fdstdin = dup (STDIN_FILENO);
174 dup2 (tty, STDIN_FILENO);
175
174 i = ttyslot (); 176 i = ttyslot ();
175 if (rxvt_write_bsd_utmp (i, ut)) 177 if (write_bsd_utmp (i, ut))
176 utmp_pos = i; 178 utmp_pos = i;
179
180 dup2 (fdstdin, STDIN_FILENO);
181 close (fdstdin);
177# else 182# else
178 FILE *fd0; 183 FILE *fd0;
179 184
180 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL) 185 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL)
181 { 186 {
182 char buf[256], name[256]; 187 char buf[256], name[256];
183 188
… …
186 { 191 {
187 if (*buf == '#' || sscanf (buf, "%s", name) != 1) 192 if (*buf == '#' || sscanf (buf, "%s", name) != 1)
188 continue; 193 continue;
189 if (!strcmp (ut->ut_line, name)) 194 if (!strcmp (ut->ut_line, name))
190 { 195 {
191 if (!rxvt_write_bsd_utmp (i, ut)) 196 if (!write_bsd_utmp (i, ut))
192 i = 0; 197 i = 0;
193 utmp_pos = i; 198 utmp_pos = i;
194 fclose (fd0); 199 fclose (fd0);
195 break; 200 break;
196 } 201 }
197 i++; 202 i++;
198 } 203 }
199 fclose (fd0); 204 fclose (fd0);
200 } 205 }
201# endif 206# endif
202
203 } 207 }
204#endif 208#endif
205 209
206#ifdef WTMP_SUPPORT 210#ifdef WTMP_SUPPORT
207# ifdef WTMP_ONLY_ON_LOGIN 211#ifdef LOG_ONLY_ON_LOGIN
208 if (OPTION (Opt_loginShell)) 212 if (login_shell)
209# endif 213#endif
210 { 214 {
211# ifdef HAVE_STRUCT_UTMP 215# ifdef HAVE_STRUCT_UTMP
212# ifdef HAVE_UPDWTMP 216# ifdef HAVE_UPDWTMP
213 updwtmp (RXVT_WTMP_FILE, ut); 217 updwtmp (WTMP_FILE, ut);
214# else 218# else
215 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 219 update_wtmp (WTMP_FILE, ut);
216# endif
217# endif 220# endif
218# ifdef HAVE_STRUCT_UTMPX
219# if HAVE_UPDWTMPX
220 updwtmpx (RXVT_WTMPX_FILE, utx);
221# else
222 pututxline (utx);
223# endif 221# endif
224# endif 222# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
225 } 223 updwtmpx (WTMPX_FILE, utx);
226#endif 224# endif
225 }
226#endif
227#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE) 227#if defined(LASTLOG_SUPPORT) && defined(LASTLOG_FILE)
228 if (OPTION (Opt_loginShell)) 228#ifdef LOG_ONLY_ON_LOGIN
229 if (login_shell)
230#endif
229 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname); 231 update_lastlog (LASTLOG_FILE, pty, hostname);
230#endif 232#endif
231} 233}
232 234
233/* ------------------------------------------------------------------------- */ 235/* ------------------------------------------------------------------------- */
234/* 236/*
235 * remove utmp and wtmp entries 237 * remove utmp and wtmp entries
236 */ 238 */
237void 239void
238rxvt_term::cleanutent () 240ptytty_unix::logout ()
239{ 241{
242 if (!cmd_pid)
243 return;
244
240#ifdef HAVE_STRUCT_UTMP 245#ifdef HAVE_STRUCT_UTMP
241 struct utmp *ut = &this->ut; 246 struct utmp *tmput, *ut = &this->ut;
242#endif 247#endif
243#ifdef HAVE_STRUCT_UTMPX 248#ifdef HAVE_STRUCT_UTMPX
244 struct utmpx *tmputx, *utx = &this->utx; 249 struct utmpx *tmputx, *utx = &this->utx;
245#endif 250#endif
246 251
… …
248# ifdef HAVE_UTMP_PID 253# ifdef HAVE_UTMP_PID
249 memset (ut, 0, sizeof (struct utmp)); 254 memset (ut, 0, sizeof (struct utmp));
250 setutent (); 255 setutent ();
251 strncpy (ut->ut_id, this->ut_id, sizeof (ut->ut_id)); 256 strncpy (ut->ut_id, this->ut_id, sizeof (ut->ut_id));
252 ut->ut_type = USER_PROCESS; 257 ut->ut_type = USER_PROCESS;
253 {
254 struct utmp *tmput = getutid (ut);
255
256 if (tmput) /* position to entry in utmp file */ 258 if ((tmput = getutid (ut))) /* position to entry in utmp file */
257 ut = tmput; 259 ut = tmput;
258 }
259 ut->ut_type = DEAD_PROCESS; 260 ut->ut_type = DEAD_PROCESS;
260# else 261# else
261 memset (ut->ut_name, 0, sizeof (ut->ut_name)); 262 memset (ut->ut_name, 0, sizeof (ut->ut_name));
262# ifdef HAVE_UTMP_HOST 263# ifdef HAVE_UTMP_HOST
263 memset (ut->ut_host, 0, sizeof (ut->ut_host)); 264 memset (ut->ut_host, 0, sizeof (ut->ut_host));
… …
283 284
284 /* 285 /*
285 * Write ending wtmp entry 286 * Write ending wtmp entry
286 */ 287 */
287#ifdef WTMP_SUPPORT 288#ifdef WTMP_SUPPORT
288# ifdef WTMP_ONLY_ON_LOGIN 289#ifdef LOG_ONLY_ON_LOGIN
289 if (OPTION (Opt_loginShell)) 290 if (login_shell)
290# endif 291#endif
291 { 292 {
292# ifdef HAVE_STRUCT_UTMP 293# ifdef HAVE_STRUCT_UTMP
293# ifdef HAVE_UPDWTMP 294# ifdef HAVE_UPDWTMP
294 updwtmp (RXVT_WTMP_FILE, ut); 295 updwtmp (WTMP_FILE, ut);
295# else 296# else
296 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 297 update_wtmp (WTMP_FILE, ut);
297# endif
298# endif 298# endif
299# ifdef HAVE_STRUCT_UTMPX
300# if HAVE_UPDWTMPX
301 updwtmpx (RXVT_WTMPX_FILE, utx);
302# else
303 pututxline (utx);
304# endif 299# endif
300# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
301 updwtmpx (WTMPX_FILE, utx);
305# endif 302# endif
306 } 303 }
307#endif 304#endif
308 305
309 /* 306 /*
… …
314 if (ut->ut_pid == cmd_pid) 311 if (ut->ut_pid == cmd_pid)
315 pututline (ut); 312 pututline (ut);
316 endutent (); 313 endutent ();
317# else 314# else
318 memset (ut, 0, sizeof (struct utmp)); 315 memset (ut, 0, sizeof (struct utmp));
319 rxvt_write_bsd_utmp (utmp_pos, ut); 316 write_bsd_utmp (utmp_pos, ut);
320# endif 317# endif
321#endif 318#endif
322#ifdef HAVE_STRUCT_UTMPX 319#ifdef HAVE_STRUCT_UTMPX
323 if (utx->ut_pid == cmd_pid) 320 if (utx->ut_pid == cmd_pid)
324 pututxline (utx); 321 pututxline (utx);
325 endutxent (); 322 endutxent ();
326#endif 323#endif
324
325 cmd_pid = 0;
327} 326}
328 327
329/* ------------------------------------------------------------------------- */ 328/* ------------------------------------------------------------------------- */
330/* 329/*
331 * Write a BSD style utmp entry 330 * Write a BSD style utmp entry
332 */ 331 */
333#ifdef HAVE_UTMP_H 332#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
334int 333static int
335rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu) 334write_bsd_utmp (int utmp_pos, struct utmp *wu)
336{ 335{
337 int fd; 336 int fd;
338 337
339 if (utmp_pos <= 0 || (fd = open (RXVT_UTMP_FILE, O_WRONLY)) == -1) 338 if (utmp_pos <= 0 || (fd = open (UTMP_FILE, O_WRONLY)) == -1)
340 return 0; 339 return 0;
341 340
342 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)
343 write (fd, wu, sizeof (struct utmp)); 342 write (fd, wu, sizeof (struct utmp));
344 close (fd); 343 close (fd);
… …
349/* ------------------------------------------------------------------------- */ 348/* ------------------------------------------------------------------------- */
350/* 349/*
351 * Update a BSD style wtmp entry 350 * Update a BSD style wtmp entry
352 */ 351 */
353#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP) 352#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP)
354void 353static void
355rxvt_update_wtmp (const char *fname, const struct utmp *putmp) 354update_wtmp (const char *fname, const struct utmp *putmp)
356{ 355{
357 int fd, gotlock, retry; 356 int fd, gotlock, retry;
358 struct flock lck; /* fcntl locking scheme */ 357 struct flock lck; /* fcntl locking scheme */
359 struct stat sbuf; 358 struct stat sbuf;
360 359
… …
390} 389}
391#endif 390#endif
392 391
393/* ------------------------------------------------------------------------- */ 392/* ------------------------------------------------------------------------- */
394#ifdef LASTLOG_SUPPORT 393#ifdef LASTLOG_SUPPORT
395void 394static void
396rxvt_update_lastlog (const char *fname, const char *pty, const char *host) 395update_lastlog (const char *fname, const char *pty, const char *host)
397{ 396{
398# ifdef HAVE_STRUCT_LASTLOGX 397# ifdef HAVE_STRUCT_LASTLOGX
399 struct lastlogx llx; 398 struct lastlogx llx;
400# endif 399# endif
401# ifdef HAVE_STRUCT_LASTLOG 400# ifdef HAVE_STRUCT_LASTLOG
… …
411 memset (&llx, 0, sizeof (llx)); 410 memset (&llx, 0, sizeof (llx));
412 llx.ll_tv.tv_sec = time (NULL); 411 llx.ll_tv.tv_sec = time (NULL);
413 llx.ll_tv.tv_usec = 0; 412 llx.ll_tv.tv_usec = 0;
414 strncpy (llx.ll_line, pty, sizeof (llx.ll_line)); 413 strncpy (llx.ll_line, pty, sizeof (llx.ll_line));
415 strncpy (llx.ll_host, host, sizeof (llx.ll_host)); 414 strncpy (llx.ll_host, host, sizeof (llx.ll_host));
416 updlastlogx (RXVT_LASTLOGX_FILE, getuid (), &llx); 415 updlastlogx (LASTLOGX_FILE, getuid (), &llx);
417# endif 416# endif
418 417
419# ifdef HAVE_STRUCT_LASTLOG 418# ifdef HAVE_STRUCT_LASTLOG
420 pwent = getpwuid (getuid ()); 419 pwent = getpwuid (getuid ());
421 if (!pwent) 420 if (!pwent)
422 { 421 {
423 rxvt_warn ("no entry in password file, not updating lastlog.\n"); 422 warn ("no entry in password file, not updating lastlog.\n");
424 return; 423 return;
425 } 424 }
426 425
427 memset (&ll, 0, sizeof (ll)); 426 memset (&ll, 0, sizeof (ll));
428 ll.ll_time = time (NULL); 427 ll.ll_time = time (NULL);
… …
449 } 448 }
450# endif /* LASTLOG_IS_DIR */ 449# endif /* LASTLOG_IS_DIR */
451# endif /* HAVE_STRUCT_LASTLOG */ 450# endif /* HAVE_STRUCT_LASTLOG */
452} 451}
453#endif /* LASTLOG_SUPPORT */ 452#endif /* LASTLOG_SUPPORT */
454/* ------------------------------------------------------------------------- */
455 453
456#endif /* UTMP_SUPPORT */ 454#else
455void
456ptytty_unix::login (int cmd_pid, bool login_shell, const char *hostname)
457{
458}
459#endif
460

Diff Legend

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