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.15 by root, Wed Feb 16 21:21:43 2005 UTC vs.
Revision 1.22 by root, Sun Jan 15 05:14:12 2006 UTC

… …
37 * 37 *
38 * Private: 38 * Private:
39 * rxvt_update_wtmp (); 39 * rxvt_update_wtmp ();
40 *----------------------------------------------------------------------*/ 40 *----------------------------------------------------------------------*/
41 41
42#include "../config.h" /* NECESSARY */ 42#include "../config.h"
43#include "rxvt.h" /* NECESSARY */ 43#include "rxvt.h"
44#include "logging.h" 44#include "logging.h"
45
45#ifdef UTMP_SUPPORT 46#ifdef UTMP_SUPPORT
46 47
48#if HAVE_STRUCT_UTMP
47int rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu); 49static int rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu);
48void rxvt_update_wtmp (const char *fname, const struct utmp *putmp); 50static void rxvt_update_wtmp (const char *fname, const struct utmp *putmp);
51#endif
52
49void rxvt_update_lastlog (const char *fname, const char *pty, const char *host); 53static void rxvt_update_lastlog (const char *fname, const char *pty, const char *host);
50 54
51/* 55/*
52 * BSD style utmp entry 56 * BSD style utmp entry
53 * ut_line, ut_name, ut_host, ut_time 57 * ut_line, ut_name, ut_host, ut_time
54 * SYSV style utmp (and utmpx) entry 58 * SYSV style utmp (and utmpx) entry
… …
67 struct utmp *ut = &this->ut; 71 struct utmp *ut = &this->ut;
68#endif 72#endif
69#ifdef HAVE_STRUCT_UTMPX 73#ifdef HAVE_STRUCT_UTMPX
70 struct utmpx *utx = &this->utx; 74 struct utmpx *utx = &this->utx;
71#endif 75#endif
72#ifdef HAVE_UTMP_PID
73 int i; 76 int i;
74#endif
75 struct passwd *pwent = getpwuid (getuid ()); 77 struct passwd *pwent = getpwuid (getuid ());
76 78
77 if (!strncmp (pty, "/dev/", 5)) 79 if (!strncmp (pty, "/dev/", 5))
78 pty += 5; /* skip /dev/ prefix */ 80 pty += 5; /* skip /dev/ prefix */
79 81
80#ifdef HAVE_UTMP_PID 82#if defined(HAVE_UTMP_PID) || defined(HAVE_STRUCT_UTMPX)
81 if (!strncmp (pty, "pty", 3) || !strncmp (pty, "tty", 3)) 83 if (!strncmp (pty, "pty", 3) || !strncmp (pty, "tty", 3))
82 strncpy (ut_id, pty + 3, sizeof (ut_id)); 84 strncpy (ut_id, pty + 3, sizeof (ut_id));
83 else if (sscanf (pty, "pts/%d", &i) == 1) 85 else if (sscanf (pty, "pts/%d", &i) == 1)
84 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */ 86 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */
85 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3)) 87 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3))
… …
94# ifdef HAVE_UTMP_PID 96# ifdef HAVE_UTMP_PID
95 setutent (); 97 setutent ();
96 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id)); 98 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id));
97 ut->ut_type = DEAD_PROCESS; 99 ut->ut_type = DEAD_PROCESS;
98 getutid (ut); /* position to entry in utmp file */ 100 getutid (ut); /* position to entry in utmp file */
99 strncpy (ut_id, ut_id, sizeof (ut_id)); 101 strncpy (this->ut_id, ut_id, sizeof (this->ut_id));
100# endif 102# endif
101#endif 103#endif
102 104
103#ifdef HAVE_STRUCT_UTMPX 105#ifdef HAVE_STRUCT_UTMPX
104 memset (utx, 0, sizeof (struct utmpx)); 106 memset (utx, 0, sizeof (struct utmpx));
105 setutxent (); 107 setutxent ();
106 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id)); 108 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id));
107 utx->ut_type = DEAD_PROCESS; 109 utx->ut_type = DEAD_PROCESS;
108 getutxid (utx); /* position to entry in utmp file */ 110 getutxid (utx); /* position to entry in utmp file */
109 strncpy (ut_id, ut_id, sizeof (ut_id)); 111 strncpy (this->ut_id, ut_id, sizeof (this->ut_id));
110#endif 112#endif
111 113
112#ifdef HAVE_STRUCT_UTMP 114#ifdef HAVE_STRUCT_UTMP
113 strncpy (ut->ut_line, pty, sizeof (ut->ut_line)); 115 strncpy (ut->ut_line, pty, sizeof (ut->ut_line));
114 ut->ut_time = time (NULL); 116 ut->ut_time = time (NULL);
… …
163#endif 165#endif
164 166
165#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID) 167#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
166 168
167 { 169 {
168 int i;
169# ifdef HAVE_TTYSLOT 170# ifdef HAVE_TTYSLOT
170 i = ttyslot (); 171 i = ttyslot ();
171 if (rxvt_write_bsd_utmp (i, ut)) 172 if (rxvt_write_bsd_utmp (i, ut))
172 utmp_pos = i; 173 utmp_pos = i;
173# else 174# else
174 FILE *fd0; 175 FILE *fd0;
175 176
176 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL) 177 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL)
177 { 178 {
178 char buf[256], name[256]; 179 char buf[256], name[256];
179 180
180 buf[sizeof (buf) - 1] = '\0'; 181 buf[sizeof (buf) - 1] = '\0';
181 for (i = 1; (fgets (buf, sizeof (buf) - 1, fd0) != NULL);) 182 for (i = 1; (fgets (buf, sizeof (buf) - 1, fd0) != NULL);)
182 { 183 {
183 if (*buf == '#' || sscanf (buf, "%s", name) != 1) 184 if (*buf == '#' || sscanf (buf, "%s", name) != 1)
… …
199 } 200 }
200#endif 201#endif
201 202
202#ifdef WTMP_SUPPORT 203#ifdef WTMP_SUPPORT
203# ifdef WTMP_ONLY_ON_LOGIN 204# ifdef WTMP_ONLY_ON_LOGIN
204 if (options & Opt_loginShell) 205 if (OPTION (Opt_loginShell))
205# endif 206# endif
206 { 207 {
207# ifdef HAVE_STRUCT_UTMP 208# ifdef HAVE_STRUCT_UTMP
208# ifdef HAVE_UPDWTMP 209# ifdef HAVE_UPDWTMP
209 updwtmp (RXVT_WTMP_FILE, ut); 210 updwtmp (RXVT_WTMP_FILE, ut);
… …
212# endif 213# endif
213# endif 214# endif
214# ifdef HAVE_STRUCT_UTMPX 215# ifdef HAVE_STRUCT_UTMPX
215# if HAVE_UPDWTMPX 216# if HAVE_UPDWTMPX
216 updwtmpx (RXVT_WTMPX_FILE, utx); 217 updwtmpx (RXVT_WTMPX_FILE, utx);
218# else
219 pututxline (utx);
217# endif 220# endif
218# endif 221# endif
219 } 222 }
220#endif 223#endif
221#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE) 224#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE)
222 if (options & Opt_loginShell) 225 if (OPTION (Opt_loginShell))
223 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname); 226 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname);
224#endif 227#endif
225} 228}
226 229
227/* ------------------------------------------------------------------------- */ 230/* ------------------------------------------------------------------------- */
… …
240 243
241#ifdef HAVE_STRUCT_UTMP 244#ifdef HAVE_STRUCT_UTMP
242# ifdef HAVE_UTMP_PID 245# ifdef HAVE_UTMP_PID
243 memset (ut, 0, sizeof (struct utmp)); 246 memset (ut, 0, sizeof (struct utmp));
244 setutent (); 247 setutent ();
245 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id)); 248 strncpy (ut->ut_id, this->ut_id, sizeof (ut->ut_id));
246 ut->ut_type = USER_PROCESS; 249 ut->ut_type = USER_PROCESS;
247 { 250 {
248 struct utmp *tmput = getutid (ut); 251 struct utmp *tmput = getutid (ut);
249 252
250 if (tmput) /* position to entry in utmp file */ 253 if (tmput) /* position to entry in utmp file */
… …
261#endif 264#endif
262 265
263#ifdef HAVE_STRUCT_UTMPX 266#ifdef HAVE_STRUCT_UTMPX
264 memset (utx, 0, sizeof (struct utmpx)); 267 memset (utx, 0, sizeof (struct utmpx));
265 setutxent (); 268 setutxent ();
266 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id)); 269 strncpy (utx->ut_id, this->ut_id, sizeof (utx->ut_id));
267 utx->ut_type = USER_PROCESS; 270 utx->ut_type = USER_PROCESS;
268 if ((tmputx = getutxid (utx))) /* position to entry in utmp file */ 271 if ((tmputx = getutxid (utx))) /* position to entry in utmp file */
269 utx = tmputx; 272 utx = tmputx;
270 utx->ut_type = DEAD_PROCESS; 273 utx->ut_type = DEAD_PROCESS;
271# if HAVE_UTMPX_SESSION 274# if HAVE_UTMPX_SESSION
… …
278 /* 281 /*
279 * Write ending wtmp entry 282 * Write ending wtmp entry
280 */ 283 */
281#ifdef WTMP_SUPPORT 284#ifdef WTMP_SUPPORT
282# ifdef WTMP_ONLY_ON_LOGIN 285# ifdef WTMP_ONLY_ON_LOGIN
283 if (options & Opt_loginShell) 286 if (OPTION (Opt_loginShell))
284# endif 287# endif
285 { 288 {
286# ifdef HAVE_STRUCT_UTMP 289# ifdef HAVE_STRUCT_UTMP
287# ifdef HAVE_UPDWTMP 290# ifdef HAVE_UPDWTMP
288 updwtmp (RXVT_WTMP_FILE, ut); 291 updwtmp (RXVT_WTMP_FILE, ut);
… …
291# endif 294# endif
292# endif 295# endif
293# ifdef HAVE_STRUCT_UTMPX 296# ifdef HAVE_STRUCT_UTMPX
294# if HAVE_UPDWTMPX 297# if HAVE_UPDWTMPX
295 updwtmpx (RXVT_WTMPX_FILE, utx); 298 updwtmpx (RXVT_WTMPX_FILE, utx);
299# else
300 pututxline (utx);
296# endif 301# endif
297# endif 302# endif
298 } 303 }
299#endif 304#endif
300 305
… …
320 325
321/* ------------------------------------------------------------------------- */ 326/* ------------------------------------------------------------------------- */
322/* 327/*
323 * Write a BSD style utmp entry 328 * Write a BSD style utmp entry
324 */ 329 */
325#ifdef HAVE_UTMP_H 330#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
326/* INTPROTO */ 331static int
327int
328rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu) 332rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu)
329{ 333{
330 int fd; 334 int fd;
331 335
332 if (utmp_pos <= 0 || (fd = open (RXVT_UTMP_FILE, O_WRONLY)) == -1) 336 if (utmp_pos <= 0 || (fd = open (RXVT_UTMP_FILE, O_WRONLY)) == -1)
… …
341 345
342/* ------------------------------------------------------------------------- */ 346/* ------------------------------------------------------------------------- */
343/* 347/*
344 * Update a BSD style wtmp entry 348 * Update a BSD style wtmp entry
345 */ 349 */
346#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) 350#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP)
347/* INTPROTO */ 351static void
348void
349rxvt_update_wtmp (const char *fname, const struct utmp *putmp) 352rxvt_update_wtmp (const char *fname, const struct utmp *putmp)
350{ 353{
351 int fd, gotlock, retry; 354 int fd, gotlock, retry;
352 struct flock lck; /* fcntl locking scheme */ 355 struct flock lck; /* fcntl locking scheme */
353 struct stat sbuf; 356 struct stat sbuf;
… …
384} 387}
385#endif 388#endif
386 389
387/* ------------------------------------------------------------------------- */ 390/* ------------------------------------------------------------------------- */
388#ifdef LASTLOG_SUPPORT 391#ifdef LASTLOG_SUPPORT
389/* INTPROTO */ 392static void
390void
391rxvt_update_lastlog (const char *fname, const char *pty, const char *host) 393rxvt_update_lastlog (const char *fname, const char *pty, const char *host)
392{ 394{
393# ifdef HAVE_STRUCT_LASTLOGX 395# ifdef HAVE_STRUCT_LASTLOGX
394 struct lastlogx llx; 396 struct lastlogx llx;
395# endif 397# endif

Diff Legend

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