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.24 by root, Mon Jan 16 10:37:32 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.
… …
28 * 28 *
29 * You should have received a copy of the GNU General Public License 29 * You should have received a copy of the GNU General Public License
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/*----------------------------------------------------------------------*
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 33
42#include "../config.h" 34#include "../config.h"
35
43#include "rxvt.h" 36#include "ptytty.h"
44#include "logging.h"
45 37
46#ifdef UTMP_SUPPORT 38#if UTMP_SUPPORT
47 39
48#if HAVE_STRUCT_UTMP 40#if HAVE_STRUCT_UTMP
49static int rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu); 41static int write_bsd_utmp (int utmp_pos, struct utmp *wu);
50static void rxvt_update_wtmp (const char *fname, const struct utmp *putmp); 42static void update_wtmp (const char *fname, const struct utmp *putmp);
51#endif 43#endif
52 44
53static 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);
54 46
55/* 47/*
56 * BSD style utmp entry 48 * BSD style utmp entry
57 * ut_line, ut_name, ut_host, ut_time 49 * ut_line, ut_name, ut_host, ut_time
58 * SYSV style utmp (and utmpx) entry 50 * SYSV style utmp (and utmpx) entry
… …
63 55
64/* 56/*
65 * make and write utmp and wtmp entries 57 * make and write utmp and wtmp entries
66 */ 58 */
67void 59void
68rxvt_term::makeutent (const char *pty, const char *hostname) 60ptytty_unix::login (int cmd_pid, bool login_shell, const char *hostname)
69{ 61{
62 const char *pty = name;
63
64 if (!pty || !*pty)
65 return;
66
67 this->cmd_pid = cmd_pid;
68 this->login_shell = login_shell;
69
70#ifdef HAVE_STRUCT_UTMP 70#ifdef HAVE_STRUCT_UTMP
71 struct utmp *ut = &this->ut; 71 struct utmp *ut = &this->ut;
72#endif 72#endif
73#ifdef HAVE_STRUCT_UTMPX 73#ifdef HAVE_STRUCT_UTMPX
74 struct utmpx *utx = &this->utx; 74 struct utmpx *utx = &this->utx;
… …
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 (OPTION (Opt_loginShell)) 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)
220 if (OPTION (Opt_loginShell)) 225#ifdef LOG_ONLY_ON_LOGIN
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_term::cleanutent () 237ptytty_unix::logout ()
231{ 238{
239 if (!cmd_pid)
240 return;
241
232#ifdef HAVE_STRUCT_UTMP 242#ifdef HAVE_STRUCT_UTMP
233 struct utmp *ut = &this->ut; 243 struct utmp *tmput, *ut = &this->ut;
234#endif 244#endif
235#ifdef HAVE_STRUCT_UTMPX 245#ifdef HAVE_STRUCT_UTMPX
236 struct utmpx *tmputx, *utx = &this->utx; 246 struct utmpx *tmputx, *utx = &this->utx;
237#endif 247#endif
238 248
… …
240# ifdef HAVE_UTMP_PID 250# ifdef HAVE_UTMP_PID
241 memset (ut, 0, sizeof (struct utmp)); 251 memset (ut, 0, sizeof (struct utmp));
242 setutent (); 252 setutent ();
243 strncpy (ut->ut_id, this->ut_id, sizeof (ut->ut_id)); 253 strncpy (ut->ut_id, this->ut_id, sizeof (ut->ut_id));
244 ut->ut_type = USER_PROCESS; 254 ut->ut_type = USER_PROCESS;
245 {
246 struct utmp *tmput = getutid (ut);
247
248 if (tmput) /* position to entry in utmp file */ 255 if ((tmput = getutid (ut))) /* position to entry in utmp file */
249 ut = tmput; 256 ut = tmput;
250 }
251 ut->ut_type = DEAD_PROCESS; 257 ut->ut_type = DEAD_PROCESS;
252# else 258# else
253 memset (ut->ut_name, 0, sizeof (ut->ut_name)); 259 memset (ut->ut_name, 0, sizeof (ut->ut_name));
254# ifdef HAVE_UTMP_HOST 260# ifdef HAVE_UTMP_HOST
255 memset (ut->ut_host, 0, sizeof (ut->ut_host)); 261 memset (ut->ut_host, 0, sizeof (ut->ut_host));
… …
275 281
276 /* 282 /*
277 * Write ending wtmp entry 283 * Write ending wtmp entry
278 */ 284 */
279#ifdef WTMP_SUPPORT 285#ifdef WTMP_SUPPORT
280# ifdef WTMP_ONLY_ON_LOGIN 286#ifdef LOG_ONLY_ON_LOGIN
281 if (OPTION (Opt_loginShell)) 287 if (login_shell)
282# endif 288#endif
283 { 289 {
284# ifdef HAVE_STRUCT_UTMP 290# ifdef HAVE_STRUCT_UTMP
285# ifdef HAVE_UPDWTMP 291# ifdef HAVE_UPDWTMP
286 updwtmp (RXVT_WTMP_FILE, ut); 292 updwtmp (WTMP_FILE, ut);
287# else 293# else
288 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 294 update_wtmp (WTMP_FILE, ut);
289# endif 295# endif
290# endif 296# endif
291# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX) 297# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
292 updwtmpx (RXVT_WTMPX_FILE, utx); 298 updwtmpx (WTMPX_FILE, utx);
293# endif 299# endif
294 } 300 }
295#endif 301#endif
296 302
297 /* 303 /*
… …
302 if (ut->ut_pid == cmd_pid) 308 if (ut->ut_pid == cmd_pid)
303 pututline (ut); 309 pututline (ut);
304 endutent (); 310 endutent ();
305# else 311# else
306 memset (ut, 0, sizeof (struct utmp)); 312 memset (ut, 0, sizeof (struct utmp));
307 rxvt_write_bsd_utmp (utmp_pos, ut); 313 write_bsd_utmp (utmp_pos, ut);
308# endif 314# endif
309#endif 315#endif
310#ifdef HAVE_STRUCT_UTMPX 316#ifdef HAVE_STRUCT_UTMPX
311 if (utx->ut_pid == cmd_pid) 317 if (utx->ut_pid == cmd_pid)
312 pututxline (utx); 318 pututxline (utx);
313 endutxent (); 319 endutxent ();
314#endif 320#endif
321
322 cmd_pid = 0;
315} 323}
316 324
317/* ------------------------------------------------------------------------- */ 325/* ------------------------------------------------------------------------- */
318/* 326/*
319 * Write a BSD style utmp entry 327 * Write a BSD style utmp entry
320 */ 328 */
321#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID) 329#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
322static int 330static int
323rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu) 331write_bsd_utmp (int utmp_pos, struct utmp *wu)
324{ 332{
325 int fd; 333 int fd;
326 334
327 if (utmp_pos <= 0 || (fd = open (RXVT_UTMP_FILE, O_WRONLY)) == -1) 335 if (utmp_pos <= 0 || (fd = open (UTMP_FILE, O_WRONLY)) == -1)
328 return 0; 336 return 0;
329 337
330 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)
331 write (fd, wu, sizeof (struct utmp)); 339 write (fd, wu, sizeof (struct utmp));
332 close (fd); 340 close (fd);
… …
338/* 346/*
339 * Update a BSD style wtmp entry 347 * Update a BSD style wtmp entry
340 */ 348 */
341#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP) 349#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP)
342static void 350static void
343rxvt_update_wtmp (const char *fname, const struct utmp *putmp) 351update_wtmp (const char *fname, const struct utmp *putmp)
344{ 352{
345 int fd, gotlock, retry; 353 int fd, gotlock, retry;
346 struct flock lck; /* fcntl locking scheme */ 354 struct flock lck; /* fcntl locking scheme */
347 struct stat sbuf; 355 struct stat sbuf;
348 356
… …
379#endif 387#endif
380 388
381/* ------------------------------------------------------------------------- */ 389/* ------------------------------------------------------------------------- */
382#ifdef LASTLOG_SUPPORT 390#ifdef LASTLOG_SUPPORT
383static void 391static void
384rxvt_update_lastlog (const char *fname, const char *pty, const char *host) 392update_lastlog (const char *fname, const char *pty, const char *host)
385{ 393{
386# ifdef HAVE_STRUCT_LASTLOGX 394# ifdef HAVE_STRUCT_LASTLOGX
387 struct lastlogx llx; 395 struct lastlogx llx;
388# endif 396# endif
389# ifdef HAVE_STRUCT_LASTLOG 397# ifdef HAVE_STRUCT_LASTLOG
… …
399 memset (&llx, 0, sizeof (llx)); 407 memset (&llx, 0, sizeof (llx));
400 llx.ll_tv.tv_sec = time (NULL); 408 llx.ll_tv.tv_sec = time (NULL);
401 llx.ll_tv.tv_usec = 0; 409 llx.ll_tv.tv_usec = 0;
402 strncpy (llx.ll_line, pty, sizeof (llx.ll_line)); 410 strncpy (llx.ll_line, pty, sizeof (llx.ll_line));
403 strncpy (llx.ll_host, host, sizeof (llx.ll_host)); 411 strncpy (llx.ll_host, host, sizeof (llx.ll_host));
404 updlastlogx (RXVT_LASTLOGX_FILE, getuid (), &llx); 412 updlastlogx (LASTLOGX_FILE, getuid (), &llx);
405# endif 413# endif
406 414
407# ifdef HAVE_STRUCT_LASTLOG 415# ifdef HAVE_STRUCT_LASTLOG
408 pwent = getpwuid (getuid ()); 416 pwent = getpwuid (getuid ());
409 if (!pwent) 417 if (!pwent)
410 { 418 {
411 rxvt_warn ("no entry in password file, not updating lastlog.\n"); 419 warn ("no entry in password file, not updating lastlog.\n");
412 return; 420 return;
413 } 421 }
414 422
415 memset (&ll, 0, sizeof (ll)); 423 memset (&ll, 0, sizeof (ll));
416 ll.ll_time = time (NULL); 424 ll.ll_time = time (NULL);
… …
439# endif /* HAVE_STRUCT_LASTLOG */ 447# endif /* HAVE_STRUCT_LASTLOG */
440} 448}
441#endif /* LASTLOG_SUPPORT */ 449#endif /* LASTLOG_SUPPORT */
442/* ------------------------------------------------------------------------- */ 450/* ------------------------------------------------------------------------- */
443 451
444#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