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.14 by root, Wed Feb 16 20:32:05 2005 UTC vs.
Revision 1.23 by root, Mon Jan 16 09:10:16 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);
… …
137#ifdef HAVE_STRUCT_UTMPX 139#ifdef HAVE_STRUCT_UTMPX
138 strncpy (utx->ut_line, pty, sizeof (utx->ut_line)); 140 strncpy (utx->ut_line, pty, sizeof (utx->ut_line));
139 strncpy (utx->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?", 141 strncpy (utx->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?",
140 sizeof (utx->ut_user)); 142 sizeof (utx->ut_user));
141 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id)); 143 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id));
144# if HAVE_UTMPX_SESSION
142 utx->ut_session = getsid (0); 145 utx->ut_session = getsid (0);
146# endif
143 utx->ut_tv.tv_sec = time (NULL); 147 utx->ut_tv.tv_sec = time (NULL);
144 utx->ut_tv.tv_usec = 0; 148 utx->ut_tv.tv_usec = 0;
145 utx->ut_pid = cmd_pid; 149 utx->ut_pid = cmd_pid;
146# ifdef HAVE_UTMPX_HOST 150# ifdef HAVE_UTMPX_HOST
147 strncpy (utx->ut_host, hostname, sizeof (utx->ut_host)); 151 strncpy (utx->ut_host, hostname, sizeof (utx->ut_host));
… …
161#endif 165#endif
162 166
163#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID) 167#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
164 168
165 { 169 {
166 int i;
167# ifdef HAVE_TTYSLOT 170# ifdef HAVE_TTYSLOT
168 i = ttyslot (); 171 i = ttyslot ();
169 if (rxvt_write_bsd_utmp (i, ut)) 172 if (rxvt_write_bsd_utmp (i, ut))
170 utmp_pos = i; 173 utmp_pos = i;
171# else 174# else
172 FILE *fd0; 175 FILE *fd0;
173 176
174 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL) 177 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL)
175 { 178 {
176 char buf[256], name[256]; 179 char buf[256], name[256];
177 180
178 buf[sizeof (buf) - 1] = '\0'; 181 buf[sizeof (buf) - 1] = '\0';
179 for (i = 1; (fgets (buf, sizeof (buf) - 1, fd0) != NULL);) 182 for (i = 1; (fgets (buf, sizeof (buf) - 1, fd0) != NULL);)
180 { 183 {
181 if (*buf == '#' || sscanf (buf, "%s", name) != 1) 184 if (*buf == '#' || sscanf (buf, "%s", name) != 1)
… …
191 i++; 194 i++;
192 } 195 }
193 fclose (fd0); 196 fclose (fd0);
194 } 197 }
195# endif 198# endif
196
197 } 199 }
198#endif 200#endif
199 201
200#ifdef WTMP_SUPPORT 202#ifdef WTMP_SUPPORT
201# ifdef WTMP_ONLY_ON_LOGIN 203# ifdef WTMP_ONLY_ON_LOGIN
202 if (options & Opt_loginShell) 204 if (OPTION (Opt_loginShell))
203# endif 205# endif
204 { 206 {
205# ifdef HAVE_STRUCT_UTMP 207# ifdef HAVE_STRUCT_UTMP
206# ifdef HAVE_UPDWTMP 208# ifdef HAVE_UPDWTMP
207 updwtmp (RXVT_WTMP_FILE, ut); 209 updwtmp (RXVT_WTMP_FILE, ut);
208# else 210# else
209 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 211 rxvt_update_wtmp (RXVT_WTMP_FILE, ut);
210# endif 212# endif
211# endif 213# endif
212# ifdef HAVE_STRUCT_UTMPX 214# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
213 updwtmpx (RXVT_WTMPX_FILE, utx); 215 updwtmpx (RXVT_WTMPX_FILE, utx);
214# endif 216# endif
215 } 217 }
216#endif 218#endif
217#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE) 219#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE)
218 if (options & Opt_loginShell) 220 if (OPTION (Opt_loginShell))
219 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname); 221 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname);
220#endif 222#endif
221} 223}
222 224
223/* ------------------------------------------------------------------------- */ 225/* ------------------------------------------------------------------------- */
… …
236 238
237#ifdef HAVE_STRUCT_UTMP 239#ifdef HAVE_STRUCT_UTMP
238# ifdef HAVE_UTMP_PID 240# ifdef HAVE_UTMP_PID
239 memset (ut, 0, sizeof (struct utmp)); 241 memset (ut, 0, sizeof (struct utmp));
240 setutent (); 242 setutent ();
241 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id)); 243 strncpy (ut->ut_id, this->ut_id, sizeof (ut->ut_id));
242 ut->ut_type = USER_PROCESS; 244 ut->ut_type = USER_PROCESS;
243 { 245 {
244 struct utmp *tmput = getutid (ut); 246 struct utmp *tmput = getutid (ut);
245 247
246 if (tmput) /* position to entry in utmp file */ 248 if (tmput) /* position to entry in utmp file */
… …
257#endif 259#endif
258 260
259#ifdef HAVE_STRUCT_UTMPX 261#ifdef HAVE_STRUCT_UTMPX
260 memset (utx, 0, sizeof (struct utmpx)); 262 memset (utx, 0, sizeof (struct utmpx));
261 setutxent (); 263 setutxent ();
262 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id)); 264 strncpy (utx->ut_id, this->ut_id, sizeof (utx->ut_id));
263 utx->ut_type = USER_PROCESS; 265 utx->ut_type = USER_PROCESS;
264 if ((tmputx = getutxid (utx))) /* position to entry in utmp file */ 266 if ((tmputx = getutxid (utx))) /* position to entry in utmp file */
265 utx = tmputx; 267 utx = tmputx;
266 utx->ut_type = DEAD_PROCESS; 268 utx->ut_type = DEAD_PROCESS;
269# if HAVE_UTMPX_SESSION
267 utx->ut_session = getsid (0); 270 utx->ut_session = getsid (0);
271# endif
268 utx->ut_tv.tv_sec = time (NULL); 272 utx->ut_tv.tv_sec = time (NULL);
269 utx->ut_tv.tv_usec = 0; 273 utx->ut_tv.tv_usec = 0;
270#endif 274#endif
271 275
272 /* 276 /*
273 * Write ending wtmp entry 277 * Write ending wtmp entry
274 */ 278 */
275#ifdef WTMP_SUPPORT 279#ifdef WTMP_SUPPORT
276# ifdef WTMP_ONLY_ON_LOGIN 280# ifdef WTMP_ONLY_ON_LOGIN
277 if (options & Opt_loginShell) 281 if (OPTION (Opt_loginShell))
278# endif 282# endif
279 { 283 {
280# ifdef HAVE_STRUCT_UTMP 284# ifdef HAVE_STRUCT_UTMP
281# ifdef HAVE_UPDWTMP 285# ifdef HAVE_UPDWTMP
282 updwtmp (RXVT_WTMP_FILE, ut); 286 updwtmp (RXVT_WTMP_FILE, ut);
283# else 287# else
284 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 288 rxvt_update_wtmp (RXVT_WTMP_FILE, ut);
285# endif 289# endif
286# endif 290# endif
287# ifdef HAVE_STRUCT_UTMPX 291# ifdef HAVE_STRUCT_UTMPX
292# if HAVE_UPDWTMPX
288 updwtmpx (RXVT_WTMPX_FILE, utx); 293 updwtmpx (RXVT_WTMPX_FILE, utx);
294# else
295 pututxline (utx);
296# endif
289# endif 297# endif
290 } 298 }
291#endif 299#endif
292 300
293 /* 301 /*
… …
312 320
313/* ------------------------------------------------------------------------- */ 321/* ------------------------------------------------------------------------- */
314/* 322/*
315 * Write a BSD style utmp entry 323 * Write a BSD style utmp entry
316 */ 324 */
317#ifdef HAVE_UTMP_H 325#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
318/* INTPROTO */ 326static int
319int
320rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu) 327rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu)
321{ 328{
322 int fd; 329 int fd;
323 330
324 if (utmp_pos <= 0 || (fd = open (RXVT_UTMP_FILE, O_WRONLY)) == -1) 331 if (utmp_pos <= 0 || (fd = open (RXVT_UTMP_FILE, O_WRONLY)) == -1)
… …
333 340
334/* ------------------------------------------------------------------------- */ 341/* ------------------------------------------------------------------------- */
335/* 342/*
336 * Update a BSD style wtmp entry 343 * Update a BSD style wtmp entry
337 */ 344 */
338#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) 345#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP)
339/* INTPROTO */ 346static void
340void
341rxvt_update_wtmp (const char *fname, const struct utmp *putmp) 347rxvt_update_wtmp (const char *fname, const struct utmp *putmp)
342{ 348{
343 int fd, gotlock, retry; 349 int fd, gotlock, retry;
344 struct flock lck; /* fcntl locking scheme */ 350 struct flock lck; /* fcntl locking scheme */
345 struct stat sbuf; 351 struct stat sbuf;
… …
376} 382}
377#endif 383#endif
378 384
379/* ------------------------------------------------------------------------- */ 385/* ------------------------------------------------------------------------- */
380#ifdef LASTLOG_SUPPORT 386#ifdef LASTLOG_SUPPORT
381/* INTPROTO */ 387static void
382void
383rxvt_update_lastlog (const char *fname, const char *pty, const char *host) 388rxvt_update_lastlog (const char *fname, const char *pty, const char *host)
384{ 389{
385# ifdef HAVE_STRUCT_LASTLOGX 390# ifdef HAVE_STRUCT_LASTLOGX
386 struct lastlogx llx; 391 struct lastlogx llx;
387# endif 392# endif

Diff Legend

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