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

Diff Legend

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