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.20 by root, Fri Jan 13 07:03:48 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
47#if HAVE_STRUCT_UTMP 48#if HAVE_STRUCT_UTMP
48int rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu); 49int rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu);
49void rxvt_update_wtmp (const char *fname, const struct utmp *putmp); 50void rxvt_update_wtmp (const char *fname, const struct utmp *putmp);
73 struct utmpx *utx = &this->utx; 74 struct utmpx *utx = &this->utx;
74#endif 75#endif
75#ifdef HAVE_UTMP_PID 76#ifdef HAVE_UTMP_PID
76 int i; 77 int i;
77#endif 78#endif
78 struct passwd *pwent = getpwuid (getuid ()); 79 struct passwd *pwent = getpwuid (getuid ());
79 80
80 if (!strncmp (pty, "/dev/", 5)) 81 if (!strncmp (pty, "/dev/", 5))
81 pty += 5; /* skip /dev/ prefix */ 82 pty += 5; /* skip /dev/ prefix */
82 83
83#ifdef HAVE_UTMP_PID 84#ifdef HAVE_UTMP_PID
176# else 177# else
177 FILE *fd0; 178 FILE *fd0;
178 179
179 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL) 180 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL)
180 { 181 {
181 char buf[256], name[256]; 182 char buf[256], name[256];
182 183
183 buf[sizeof (buf) - 1] = '\0'; 184 buf[sizeof (buf) - 1] = '\0';
184 for (i = 1; (fgets (buf, sizeof (buf) - 1, fd0) != NULL);) 185 for (i = 1; (fgets (buf, sizeof (buf) - 1, fd0) != NULL);)
185 { 186 {
186 if (*buf == '#' || sscanf (buf, "%s", name) != 1) 187 if (*buf == '#' || sscanf (buf, "%s", name) != 1)
202 } 203 }
203#endif 204#endif
204 205
205#ifdef WTMP_SUPPORT 206#ifdef WTMP_SUPPORT
206# ifdef WTMP_ONLY_ON_LOGIN 207# ifdef WTMP_ONLY_ON_LOGIN
207 if (options & Opt_loginShell) 208 if (OPTION (Opt_loginShell))
208# endif 209# endif
209 { 210 {
210# ifdef HAVE_STRUCT_UTMP 211# ifdef HAVE_STRUCT_UTMP
211# ifdef HAVE_UPDWTMP 212# ifdef HAVE_UPDWTMP
212 updwtmp (RXVT_WTMP_FILE, ut); 213 updwtmp (RXVT_WTMP_FILE, ut);
222# endif 223# endif
223# endif 224# endif
224 } 225 }
225#endif 226#endif
226#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE) 227#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE)
227 if (options & Opt_loginShell) 228 if (OPTION (Opt_loginShell))
228 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname); 229 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname);
229#endif 230#endif
230} 231}
231 232
232/* ------------------------------------------------------------------------- */ 233/* ------------------------------------------------------------------------- */
283 /* 284 /*
284 * Write ending wtmp entry 285 * Write ending wtmp entry
285 */ 286 */
286#ifdef WTMP_SUPPORT 287#ifdef WTMP_SUPPORT
287# ifdef WTMP_ONLY_ON_LOGIN 288# ifdef WTMP_ONLY_ON_LOGIN
288 if (options & Opt_loginShell) 289 if (OPTION (Opt_loginShell))
289# endif 290# endif
290 { 291 {
291# ifdef HAVE_STRUCT_UTMP 292# ifdef HAVE_STRUCT_UTMP
292# ifdef HAVE_UPDWTMP 293# ifdef HAVE_UPDWTMP
293 updwtmp (RXVT_WTMP_FILE, ut); 294 updwtmp (RXVT_WTMP_FILE, ut);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines