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.20 by root, Fri Jan 13 07:03:48 2006 UTC vs.
Revision 1.25 by root, Tue Jan 17 06:06:42 2006 UTC

… …
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 "logging.h"
45 37
46#ifdef UTMP_SUPPORT 38#ifdef UTMP_SUPPORT
47 39
48#if HAVE_STRUCT_UTMP 40#if HAVE_STRUCT_UTMP
49int rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu); 41static int rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu);
50void 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
52 44
53void rxvt_update_lastlog (const char *fname, const char *pty, const char *host); 45static void rxvt_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) 60rxvt_session::login (const char *pty, int cmd_pid, bool login_shell, const char *hostname)
69{ 61{
62 this->cmd_pid = cmd_pid;
63 this->login_shell = login_shell;
64
70#ifdef HAVE_STRUCT_UTMP 65#ifdef HAVE_STRUCT_UTMP
71 struct utmp *ut = &this->ut; 66 struct utmp *ut = &this->ut;
72#endif 67#endif
73#ifdef HAVE_STRUCT_UTMPX 68#ifdef HAVE_STRUCT_UTMPX
74 struct utmpx *utx = &this->utx; 69 struct utmpx *utx = &this->utx;
75#endif 70#endif
76#ifdef HAVE_UTMP_PID
77 int i; 71 int i;
78#endif
79 struct passwd *pwent = getpwuid (getuid ()); 72 struct passwd *pwent = getpwuid (getuid ());
80 73
81 if (!strncmp (pty, "/dev/", 5)) 74 if (!strncmp (pty, "/dev/", 5))
82 pty += 5; /* skip /dev/ prefix */ 75 pty += 5; /* skip /dev/ prefix */
83 76
84#ifdef HAVE_UTMP_PID 77#if defined(HAVE_UTMP_PID) || defined(HAVE_STRUCT_UTMPX)
85 if (!strncmp (pty, "pty", 3) || !strncmp (pty, "tty", 3)) 78 if (!strncmp (pty, "pty", 3) || !strncmp (pty, "tty", 3))
86 strncpy (ut_id, pty + 3, sizeof (ut_id)); 79 strncpy (ut_id, pty + 3, sizeof (ut_id));
87 else if (sscanf (pty, "pts/%d", &i) == 1) 80 else if (sscanf (pty, "pts/%d", &i) == 1)
88 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */ 81 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */
89 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3)) 82 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3))
… …
98# ifdef HAVE_UTMP_PID 91# ifdef HAVE_UTMP_PID
99 setutent (); 92 setutent ();
100 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id)); 93 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id));
101 ut->ut_type = DEAD_PROCESS; 94 ut->ut_type = DEAD_PROCESS;
102 getutid (ut); /* position to entry in utmp file */ 95 getutid (ut); /* position to entry in utmp file */
103 strncpy (ut_id, ut_id, sizeof (ut_id)); 96 strncpy (this->ut_id, ut_id, sizeof (this->ut_id));
104# endif 97# endif
105#endif 98#endif
106 99
107#ifdef HAVE_STRUCT_UTMPX 100#ifdef HAVE_STRUCT_UTMPX
108 memset (utx, 0, sizeof (struct utmpx)); 101 memset (utx, 0, sizeof (struct utmpx));
109 setutxent (); 102 setutxent ();
110 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id)); 103 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id));
111 utx->ut_type = DEAD_PROCESS; 104 utx->ut_type = DEAD_PROCESS;
112 getutxid (utx); /* position to entry in utmp file */ 105 getutxid (utx); /* position to entry in utmp file */
113 strncpy (ut_id, ut_id, sizeof (ut_id)); 106 strncpy (this->ut_id, ut_id, sizeof (this->ut_id));
114#endif 107#endif
115 108
116#ifdef HAVE_STRUCT_UTMP 109#ifdef HAVE_STRUCT_UTMP
117 strncpy (ut->ut_line, pty, sizeof (ut->ut_line)); 110 strncpy (ut->ut_line, pty, sizeof (ut->ut_line));
118 ut->ut_time = time (NULL); 111 ut->ut_time = time (NULL);
… …
167#endif 160#endif
168 161
169#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID) 162#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
170 163
171 { 164 {
172 int i;
173# ifdef HAVE_TTYSLOT 165# ifdef HAVE_TTYSLOT
174 i = ttyslot (); 166 i = ttyslot ();
175 if (rxvt_write_bsd_utmp (i, ut)) 167 if (rxvt_write_bsd_utmp (i, ut))
176 utmp_pos = i; 168 utmp_pos = i;
177# else 169# else
… …
197 i++; 189 i++;
198 } 190 }
199 fclose (fd0); 191 fclose (fd0);
200 } 192 }
201# endif 193# endif
202
203 } 194 }
204#endif 195#endif
205 196
206#ifdef WTMP_SUPPORT 197#ifdef WTMP_SUPPORT
207# ifdef WTMP_ONLY_ON_LOGIN 198# ifdef WTMP_ONLY_ON_LOGIN
208 if (OPTION (Opt_loginShell)) 199 if (login_shell)
209# endif 200# endif
210 { 201 {
211# ifdef HAVE_STRUCT_UTMP 202# ifdef HAVE_STRUCT_UTMP
212# ifdef HAVE_UPDWTMP 203# ifdef HAVE_UPDWTMP
213 updwtmp (RXVT_WTMP_FILE, ut); 204 updwtmp (RXVT_WTMP_FILE, ut);
214# else 205# else
215 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 206 rxvt_update_wtmp (RXVT_WTMP_FILE, ut);
216# endif 207# endif
217# endif 208# endif
218# ifdef HAVE_STRUCT_UTMPX 209# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
219# if HAVE_UPDWTMPX
220 updwtmpx (RXVT_WTMPX_FILE, utx); 210 updwtmpx (RXVT_WTMPX_FILE, utx);
221# else
222 pututxline (utx);
223# endif
224# endif 211# endif
225 } 212 }
226#endif 213#endif
227#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE) 214#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE)
228 if (OPTION (Opt_loginShell)) 215 if (login_shell)
229 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname); 216 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname);
230#endif 217#endif
231} 218}
232 219
233/* ------------------------------------------------------------------------- */ 220/* ------------------------------------------------------------------------- */
234/* 221/*
235 * remove utmp and wtmp entries 222 * remove utmp and wtmp entries
236 */ 223 */
237void 224void
238rxvt_term::cleanutent () 225rxvt_session::logout ()
239{ 226{
240#ifdef HAVE_STRUCT_UTMP 227#ifdef HAVE_STRUCT_UTMP
241 struct utmp *ut = &this->ut; 228 struct utmp *ut = &this->ut;
242#endif 229#endif
243#ifdef HAVE_STRUCT_UTMPX 230#ifdef HAVE_STRUCT_UTMPX
… …
246 233
247#ifdef HAVE_STRUCT_UTMP 234#ifdef HAVE_STRUCT_UTMP
248# ifdef HAVE_UTMP_PID 235# ifdef HAVE_UTMP_PID
249 memset (ut, 0, sizeof (struct utmp)); 236 memset (ut, 0, sizeof (struct utmp));
250 setutent (); 237 setutent ();
251 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id)); 238 strncpy (ut->ut_id, this->ut_id, sizeof (ut->ut_id));
252 ut->ut_type = USER_PROCESS; 239 ut->ut_type = USER_PROCESS;
253 { 240 {
254 struct utmp *tmput = getutid (ut); 241 struct utmp *tmput = getutid (ut);
255 242
256 if (tmput) /* position to entry in utmp file */ 243 if (tmput) /* position to entry in utmp file */
257 ut = tmput; 244 ut = tmput;
258 } 245 }
259 ut->ut_type = DEAD_PROCESS; 246 ut->ut_type = DEAD_PROCESS;
… …
267#endif 254#endif
268 255
269#ifdef HAVE_STRUCT_UTMPX 256#ifdef HAVE_STRUCT_UTMPX
270 memset (utx, 0, sizeof (struct utmpx)); 257 memset (utx, 0, sizeof (struct utmpx));
271 setutxent (); 258 setutxent ();
272 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id)); 259 strncpy (utx->ut_id, this->ut_id, sizeof (utx->ut_id));
273 utx->ut_type = USER_PROCESS; 260 utx->ut_type = USER_PROCESS;
274 if ((tmputx = getutxid (utx))) /* position to entry in utmp file */ 261 if ((tmputx = getutxid (utx))) /* position to entry in utmp file */
275 utx = tmputx; 262 utx = tmputx;
276 utx->ut_type = DEAD_PROCESS; 263 utx->ut_type = DEAD_PROCESS;
277# if HAVE_UTMPX_SESSION 264# if HAVE_UTMPX_SESSION
… …
284 /* 271 /*
285 * Write ending wtmp entry 272 * Write ending wtmp entry
286 */ 273 */
287#ifdef WTMP_SUPPORT 274#ifdef WTMP_SUPPORT
288# ifdef WTMP_ONLY_ON_LOGIN 275# ifdef WTMP_ONLY_ON_LOGIN
289 if (OPTION (Opt_loginShell)) 276 if (login_shell)
290# endif 277# endif
291 { 278 {
292# ifdef HAVE_STRUCT_UTMP 279# ifdef HAVE_STRUCT_UTMP
293# ifdef HAVE_UPDWTMP 280# ifdef HAVE_UPDWTMP
294 updwtmp (RXVT_WTMP_FILE, ut); 281 updwtmp (RXVT_WTMP_FILE, ut);
295# else 282# else
296 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 283 rxvt_update_wtmp (RXVT_WTMP_FILE, ut);
297# endif 284# endif
298# endif 285# endif
299# ifdef HAVE_STRUCT_UTMPX 286# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
300# if HAVE_UPDWTMPX
301 updwtmpx (RXVT_WTMPX_FILE, utx); 287 updwtmpx (RXVT_WTMPX_FILE, utx);
302# else
303 pututxline (utx);
304# endif
305# endif 288# endif
306 } 289 }
307#endif 290#endif
308 291
309 /* 292 /*
… …
328 311
329/* ------------------------------------------------------------------------- */ 312/* ------------------------------------------------------------------------- */
330/* 313/*
331 * Write a BSD style utmp entry 314 * Write a BSD style utmp entry
332 */ 315 */
333#ifdef HAVE_UTMP_H 316#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
334int 317static int
335rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu) 318rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu)
336{ 319{
337 int fd; 320 int fd;
338 321
339 if (utmp_pos <= 0 || (fd = open (RXVT_UTMP_FILE, O_WRONLY)) == -1) 322 if (utmp_pos <= 0 || (fd = open (RXVT_UTMP_FILE, O_WRONLY)) == -1)
… …
349/* ------------------------------------------------------------------------- */ 332/* ------------------------------------------------------------------------- */
350/* 333/*
351 * Update a BSD style wtmp entry 334 * Update a BSD style wtmp entry
352 */ 335 */
353#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP) 336#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP)
354void 337static void
355rxvt_update_wtmp (const char *fname, const struct utmp *putmp) 338rxvt_update_wtmp (const char *fname, const struct utmp *putmp)
356{ 339{
357 int fd, gotlock, retry; 340 int fd, gotlock, retry;
358 struct flock lck; /* fcntl locking scheme */ 341 struct flock lck; /* fcntl locking scheme */
359 struct stat sbuf; 342 struct stat sbuf;
… …
390} 373}
391#endif 374#endif
392 375
393/* ------------------------------------------------------------------------- */ 376/* ------------------------------------------------------------------------- */
394#ifdef LASTLOG_SUPPORT 377#ifdef LASTLOG_SUPPORT
395void 378static void
396rxvt_update_lastlog (const char *fname, const char *pty, const char *host) 379rxvt_update_lastlog (const char *fname, const char *pty, const char *host)
397{ 380{
398# ifdef HAVE_STRUCT_LASTLOGX 381# ifdef HAVE_STRUCT_LASTLOGX
399 struct lastlogx llx; 382 struct lastlogx llx;
400# endif 383# endif

Diff Legend

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