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

Diff Legend

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