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

Diff Legend

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