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.22 by root, Sun Jan 15 05:14:12 2006 UTC vs.
Revision 1.31 by root, Tue Jan 17 15:17:39 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"
43#include "rxvt.h" 35#include "rxvt.h"
44#include "logging.h" 36#include "ptytty.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 rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu);
50static void rxvt_update_wtmp (const char *fname, const struct utmp *putmp); 42static void rxvt_update_wtmp (const char *fname, const struct utmp *putmp);
51#endif 43#endif
… …
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) 60rxvt_ptytty_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;
… …
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 (pty->tty, STDIN_FILENO);
172
171 i = ttyslot (); 173 i = ttyslot ();
172 if (rxvt_write_bsd_utmp (i, ut)) 174 if (rxvt_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
… …
194 i++; 199 i++;
195 } 200 }
196 fclose (fd0); 201 fclose (fd0);
197 } 202 }
198# endif 203# endif
199
200 } 204 }
201#endif 205#endif
202 206
203#ifdef WTMP_SUPPORT 207#ifdef WTMP_SUPPORT
204# ifdef WTMP_ONLY_ON_LOGIN 208# ifdef WTMP_ONLY_ON_LOGIN
205 if (OPTION (Opt_loginShell)) 209 if (login_shell)
206# endif 210# endif
207 { 211 {
208# ifdef HAVE_STRUCT_UTMP 212# ifdef HAVE_STRUCT_UTMP
209# ifdef HAVE_UPDWTMP 213# ifdef HAVE_UPDWTMP
210 updwtmp (RXVT_WTMP_FILE, ut); 214 updwtmp (RXVT_WTMP_FILE, ut);
211# else 215# else
212 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 216 rxvt_update_wtmp (RXVT_WTMP_FILE, ut);
213# endif 217# endif
214# endif 218# endif
215# ifdef HAVE_STRUCT_UTMPX 219# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
216# if HAVE_UPDWTMPX
217 updwtmpx (RXVT_WTMPX_FILE, utx); 220 updwtmpx (RXVT_WTMPX_FILE, utx);
218# else
219 pututxline (utx);
220# endif
221# endif 221# endif
222 } 222 }
223#endif 223#endif
224#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE) 224#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE)
225 if (OPTION (Opt_loginShell)) 225 if (login_shell)
226 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname); 226 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname);
227#endif 227#endif
228} 228}
229 229
230/* ------------------------------------------------------------------------- */ 230/* ------------------------------------------------------------------------- */
231/* 231/*
232 * remove utmp and wtmp entries 232 * remove utmp and wtmp entries
233 */ 233 */
234void 234void
235rxvt_term::cleanutent () 235rxvt_ptytty_unix::logout ()
236{ 236{
237 if (!cmd_pid)
238 return;
239
237#ifdef HAVE_STRUCT_UTMP 240#ifdef HAVE_STRUCT_UTMP
238 struct utmp *ut = &this->ut; 241 struct utmp *tmput, *ut = &this->ut;
239#endif 242#endif
240#ifdef HAVE_STRUCT_UTMPX 243#ifdef HAVE_STRUCT_UTMPX
241 struct utmpx *tmputx, *utx = &this->utx; 244 struct utmpx *tmputx, *utx = &this->utx;
242#endif 245#endif
243 246
… …
245# ifdef HAVE_UTMP_PID 248# ifdef HAVE_UTMP_PID
246 memset (ut, 0, sizeof (struct utmp)); 249 memset (ut, 0, sizeof (struct utmp));
247 setutent (); 250 setutent ();
248 strncpy (ut->ut_id, this->ut_id, sizeof (ut->ut_id)); 251 strncpy (ut->ut_id, this->ut_id, sizeof (ut->ut_id));
249 ut->ut_type = USER_PROCESS; 252 ut->ut_type = USER_PROCESS;
250 {
251 struct utmp *tmput = getutid (ut);
252
253 if (tmput) /* position to entry in utmp file */ 253 if ((tmput = getutid (ut))) /* position to entry in utmp file */
254 ut = tmput; 254 ut = tmput;
255 }
256 ut->ut_type = DEAD_PROCESS; 255 ut->ut_type = DEAD_PROCESS;
257# else 256# else
258 memset (ut->ut_name, 0, sizeof (ut->ut_name)); 257 memset (ut->ut_name, 0, sizeof (ut->ut_name));
259# ifdef HAVE_UTMP_HOST 258# ifdef HAVE_UTMP_HOST
260 memset (ut->ut_host, 0, sizeof (ut->ut_host)); 259 memset (ut->ut_host, 0, sizeof (ut->ut_host));
… …
281 /* 280 /*
282 * Write ending wtmp entry 281 * Write ending wtmp entry
283 */ 282 */
284#ifdef WTMP_SUPPORT 283#ifdef WTMP_SUPPORT
285# ifdef WTMP_ONLY_ON_LOGIN 284# ifdef WTMP_ONLY_ON_LOGIN
286 if (OPTION (Opt_loginShell)) 285 if (login_shell)
287# endif 286# endif
288 { 287 {
289# ifdef HAVE_STRUCT_UTMP 288# ifdef HAVE_STRUCT_UTMP
290# ifdef HAVE_UPDWTMP 289# ifdef HAVE_UPDWTMP
291 updwtmp (RXVT_WTMP_FILE, ut); 290 updwtmp (RXVT_WTMP_FILE, ut);
292# else 291# else
293 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 292 rxvt_update_wtmp (RXVT_WTMP_FILE, ut);
294# endif 293# endif
295# endif 294# endif
296# ifdef HAVE_STRUCT_UTMPX 295# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
297# if HAVE_UPDWTMPX
298 updwtmpx (RXVT_WTMPX_FILE, utx); 296 updwtmpx (RXVT_WTMPX_FILE, utx);
299# else
300 pututxline (utx);
301# endif
302# endif 297# endif
303 } 298 }
304#endif 299#endif
305 300
306 /* 301 /*
… …
319#ifdef HAVE_STRUCT_UTMPX 314#ifdef HAVE_STRUCT_UTMPX
320 if (utx->ut_pid == cmd_pid) 315 if (utx->ut_pid == cmd_pid)
321 pututxline (utx); 316 pututxline (utx);
322 endutxent (); 317 endutxent ();
323#endif 318#endif
319
320 cmd_pid = 0;
324} 321}
325 322
326/* ------------------------------------------------------------------------- */ 323/* ------------------------------------------------------------------------- */
327/* 324/*
328 * Write a BSD style utmp entry 325 * Write a BSD style utmp entry

Diff Legend

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