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.25 by root, Tue Jan 17 06:06:42 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 */ 34#include "../config.h"
43#include "rxvt.h" /* NECESSARY */ 35#include "rxvt.h"
44#include "logging.h" 36#include "logging.h"
37
45#ifdef UTMP_SUPPORT 38#ifdef UTMP_SUPPORT
46 39
40#if HAVE_STRUCT_UTMP
47int rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu); 41static int rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu);
48void rxvt_update_wtmp (const char *fname, const struct utmp *putmp); 42static void rxvt_update_wtmp (const char *fname, const struct utmp *putmp);
43#endif
44
49void 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);
50 46
51/* 47/*
52 * BSD style utmp entry 48 * BSD style utmp entry
53 * ut_line, ut_name, ut_host, ut_time 49 * ut_line, ut_name, ut_host, ut_time
54 * SYSV style utmp (and utmpx) entry 50 * SYSV style utmp (and utmpx) entry
… …
59 55
60/* 56/*
61 * make and write utmp and wtmp entries 57 * make and write utmp and wtmp entries
62 */ 58 */
63void 59void
64rxvt_term::makeutent (const char *pty, const char *hostname) 60rxvt_session::login (const char *pty, int cmd_pid, bool login_shell, const char *hostname)
65{ 61{
62 this->cmd_pid = cmd_pid;
63 this->login_shell = login_shell;
64
66#ifdef HAVE_STRUCT_UTMP 65#ifdef HAVE_STRUCT_UTMP
67 struct utmp *ut = &this->ut; 66 struct utmp *ut = &this->ut;
68#endif 67#endif
69#ifdef HAVE_STRUCT_UTMPX 68#ifdef HAVE_STRUCT_UTMPX
70 struct utmpx *utx = &this->utx; 69 struct utmpx *utx = &this->utx;
71#endif 70#endif
72#ifdef HAVE_UTMP_PID
73 int i; 71 int i;
74#endif
75 struct passwd *pwent = getpwuid (getuid ()); 72 struct passwd *pwent = getpwuid (getuid ());
76 73
77 if (!strncmp (pty, "/dev/", 5)) 74 if (!strncmp (pty, "/dev/", 5))
78 pty += 5; /* skip /dev/ prefix */ 75 pty += 5; /* skip /dev/ prefix */
79 76
80#ifdef HAVE_UTMP_PID 77#if defined(HAVE_UTMP_PID) || defined(HAVE_STRUCT_UTMPX)
81 if (!strncmp (pty, "pty", 3) || !strncmp (pty, "tty", 3)) 78 if (!strncmp (pty, "pty", 3) || !strncmp (pty, "tty", 3))
82 strncpy (ut_id, pty + 3, sizeof (ut_id)); 79 strncpy (ut_id, pty + 3, sizeof (ut_id));
83 else if (sscanf (pty, "pts/%d", &i) == 1) 80 else if (sscanf (pty, "pts/%d", &i) == 1)
84 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */ 81 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */
85 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3)) 82 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3))
… …
94# ifdef HAVE_UTMP_PID 91# ifdef HAVE_UTMP_PID
95 setutent (); 92 setutent ();
96 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id)); 93 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id));
97 ut->ut_type = DEAD_PROCESS; 94 ut->ut_type = DEAD_PROCESS;
98 getutid (ut); /* position to entry in utmp file */ 95 getutid (ut); /* position to entry in utmp file */
99 strncpy (ut_id, ut_id, sizeof (ut_id)); 96 strncpy (this->ut_id, ut_id, sizeof (this->ut_id));
100# endif 97# endif
101#endif 98#endif
102 99
103#ifdef HAVE_STRUCT_UTMPX 100#ifdef HAVE_STRUCT_UTMPX
104 memset (utx, 0, sizeof (struct utmpx)); 101 memset (utx, 0, sizeof (struct utmpx));
105 setutxent (); 102 setutxent ();
106 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id)); 103 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id));
107 utx->ut_type = DEAD_PROCESS; 104 utx->ut_type = DEAD_PROCESS;
108 getutxid (utx); /* position to entry in utmp file */ 105 getutxid (utx); /* position to entry in utmp file */
109 strncpy (ut_id, ut_id, sizeof (ut_id)); 106 strncpy (this->ut_id, ut_id, sizeof (this->ut_id));
110#endif 107#endif
111 108
112#ifdef HAVE_STRUCT_UTMP 109#ifdef HAVE_STRUCT_UTMP
113 strncpy (ut->ut_line, pty, sizeof (ut->ut_line)); 110 strncpy (ut->ut_line, pty, sizeof (ut->ut_line));
114 ut->ut_time = time (NULL); 111 ut->ut_time = time (NULL);
… …
137#ifdef HAVE_STRUCT_UTMPX 134#ifdef HAVE_STRUCT_UTMPX
138 strncpy (utx->ut_line, pty, sizeof (utx->ut_line)); 135 strncpy (utx->ut_line, pty, sizeof (utx->ut_line));
139 strncpy (utx->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?", 136 strncpy (utx->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?",
140 sizeof (utx->ut_user)); 137 sizeof (utx->ut_user));
141 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id)); 138 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id));
139# if HAVE_UTMPX_SESSION
142 utx->ut_session = getsid (0); 140 utx->ut_session = getsid (0);
141# endif
143 utx->ut_tv.tv_sec = time (NULL); 142 utx->ut_tv.tv_sec = time (NULL);
144 utx->ut_tv.tv_usec = 0; 143 utx->ut_tv.tv_usec = 0;
145 utx->ut_pid = cmd_pid; 144 utx->ut_pid = cmd_pid;
146# ifdef HAVE_UTMPX_HOST 145# ifdef HAVE_UTMPX_HOST
147 strncpy (utx->ut_host, hostname, sizeof (utx->ut_host)); 146 strncpy (utx->ut_host, hostname, sizeof (utx->ut_host));
… …
161#endif 160#endif
162 161
163#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID) 162#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
164 163
165 { 164 {
166 int i;
167# ifdef HAVE_TTYSLOT 165# ifdef HAVE_TTYSLOT
168 i = ttyslot (); 166 i = ttyslot ();
169 if (rxvt_write_bsd_utmp (i, ut)) 167 if (rxvt_write_bsd_utmp (i, ut))
170 utmp_pos = i; 168 utmp_pos = i;
171# else 169# else
172 FILE *fd0; 170 FILE *fd0;
173 171
174 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL) 172 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL)
175 { 173 {
176 char buf[256], name[256]; 174 char buf[256], name[256];
177 175
178 buf[sizeof (buf) - 1] = '\0'; 176 buf[sizeof (buf) - 1] = '\0';
179 for (i = 1; (fgets (buf, sizeof (buf) - 1, fd0) != NULL);) 177 for (i = 1; (fgets (buf, sizeof (buf) - 1, fd0) != NULL);)
180 { 178 {
181 if (*buf == '#' || sscanf (buf, "%s", name) != 1) 179 if (*buf == '#' || sscanf (buf, "%s", name) != 1)
… …
191 i++; 189 i++;
192 } 190 }
193 fclose (fd0); 191 fclose (fd0);
194 } 192 }
195# endif 193# endif
196
197 } 194 }
198#endif 195#endif
199 196
200#ifdef WTMP_SUPPORT 197#ifdef WTMP_SUPPORT
201# ifdef WTMP_ONLY_ON_LOGIN 198# ifdef WTMP_ONLY_ON_LOGIN
202 if (options & Opt_loginShell) 199 if (login_shell)
203# endif 200# endif
204 { 201 {
205# ifdef HAVE_STRUCT_UTMP 202# ifdef HAVE_STRUCT_UTMP
206# ifdef HAVE_UPDWTMP 203# ifdef HAVE_UPDWTMP
207 updwtmp (RXVT_WTMP_FILE, ut); 204 updwtmp (RXVT_WTMP_FILE, ut);
208# else 205# else
209 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 206 rxvt_update_wtmp (RXVT_WTMP_FILE, ut);
210# endif 207# endif
211# endif 208# endif
212# ifdef HAVE_STRUCT_UTMPX 209# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
213 updwtmpx (RXVT_WTMPX_FILE, utx); 210 updwtmpx (RXVT_WTMPX_FILE, utx);
214# endif 211# endif
215 } 212 }
216#endif 213#endif
217#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE) 214#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE)
218 if (options & Opt_loginShell) 215 if (login_shell)
219 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname); 216 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname);
220#endif 217#endif
221} 218}
222 219
223/* ------------------------------------------------------------------------- */ 220/* ------------------------------------------------------------------------- */
224/* 221/*
225 * remove utmp and wtmp entries 222 * remove utmp and wtmp entries
226 */ 223 */
227void 224void
228rxvt_term::cleanutent () 225rxvt_session::logout ()
229{ 226{
230#ifdef HAVE_STRUCT_UTMP 227#ifdef HAVE_STRUCT_UTMP
231 struct utmp *ut = &this->ut; 228 struct utmp *ut = &this->ut;
232#endif 229#endif
233#ifdef HAVE_STRUCT_UTMPX 230#ifdef HAVE_STRUCT_UTMPX
… …
236 233
237#ifdef HAVE_STRUCT_UTMP 234#ifdef HAVE_STRUCT_UTMP
238# ifdef HAVE_UTMP_PID 235# ifdef HAVE_UTMP_PID
239 memset (ut, 0, sizeof (struct utmp)); 236 memset (ut, 0, sizeof (struct utmp));
240 setutent (); 237 setutent ();
241 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id)); 238 strncpy (ut->ut_id, this->ut_id, sizeof (ut->ut_id));
242 ut->ut_type = USER_PROCESS; 239 ut->ut_type = USER_PROCESS;
243 { 240 {
244 struct utmp *tmput = getutid (ut); 241 struct utmp *tmput = getutid (ut);
245 242
246 if (tmput) /* position to entry in utmp file */ 243 if (tmput) /* position to entry in utmp file */
247 ut = tmput; 244 ut = tmput;
248 } 245 }
249 ut->ut_type = DEAD_PROCESS; 246 ut->ut_type = DEAD_PROCESS;
… …
257#endif 254#endif
258 255
259#ifdef HAVE_STRUCT_UTMPX 256#ifdef HAVE_STRUCT_UTMPX
260 memset (utx, 0, sizeof (struct utmpx)); 257 memset (utx, 0, sizeof (struct utmpx));
261 setutxent (); 258 setutxent ();
262 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id)); 259 strncpy (utx->ut_id, this->ut_id, sizeof (utx->ut_id));
263 utx->ut_type = USER_PROCESS; 260 utx->ut_type = USER_PROCESS;
264 if ((tmputx = getutxid (utx))) /* position to entry in utmp file */ 261 if ((tmputx = getutxid (utx))) /* position to entry in utmp file */
265 utx = tmputx; 262 utx = tmputx;
266 utx->ut_type = DEAD_PROCESS; 263 utx->ut_type = DEAD_PROCESS;
264# if HAVE_UTMPX_SESSION
267 utx->ut_session = getsid (0); 265 utx->ut_session = getsid (0);
266# endif
268 utx->ut_tv.tv_sec = time (NULL); 267 utx->ut_tv.tv_sec = time (NULL);
269 utx->ut_tv.tv_usec = 0; 268 utx->ut_tv.tv_usec = 0;
270#endif 269#endif
271 270
272 /* 271 /*
273 * Write ending wtmp entry 272 * Write ending wtmp entry
274 */ 273 */
275#ifdef WTMP_SUPPORT 274#ifdef WTMP_SUPPORT
276# ifdef WTMP_ONLY_ON_LOGIN 275# ifdef WTMP_ONLY_ON_LOGIN
277 if (options & Opt_loginShell) 276 if (login_shell)
278# endif 277# endif
279 { 278 {
280# ifdef HAVE_STRUCT_UTMP 279# ifdef HAVE_STRUCT_UTMP
281# ifdef HAVE_UPDWTMP 280# ifdef HAVE_UPDWTMP
282 updwtmp (RXVT_WTMP_FILE, ut); 281 updwtmp (RXVT_WTMP_FILE, ut);
283# else 282# else
284 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 283 rxvt_update_wtmp (RXVT_WTMP_FILE, ut);
285# endif 284# endif
286# endif 285# endif
287# ifdef HAVE_STRUCT_UTMPX 286# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
288 updwtmpx (RXVT_WTMPX_FILE, utx); 287 updwtmpx (RXVT_WTMPX_FILE, utx);
289# endif 288# endif
290 } 289 }
291#endif 290#endif
292 291
… …
312 311
313/* ------------------------------------------------------------------------- */ 312/* ------------------------------------------------------------------------- */
314/* 313/*
315 * Write a BSD style utmp entry 314 * Write a BSD style utmp entry
316 */ 315 */
317#ifdef HAVE_UTMP_H 316#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
318/* INTPROTO */ 317static int
319int
320rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu) 318rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu)
321{ 319{
322 int fd; 320 int fd;
323 321
324 if (utmp_pos <= 0 || (fd = open (RXVT_UTMP_FILE, O_WRONLY)) == -1) 322 if (utmp_pos <= 0 || (fd = open (RXVT_UTMP_FILE, O_WRONLY)) == -1)
… …
333 331
334/* ------------------------------------------------------------------------- */ 332/* ------------------------------------------------------------------------- */
335/* 333/*
336 * Update a BSD style wtmp entry 334 * Update a BSD style wtmp entry
337 */ 335 */
338#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) 336#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP)
339/* INTPROTO */ 337static void
340void
341rxvt_update_wtmp (const char *fname, const struct utmp *putmp) 338rxvt_update_wtmp (const char *fname, const struct utmp *putmp)
342{ 339{
343 int fd, gotlock, retry; 340 int fd, gotlock, retry;
344 struct flock lck; /* fcntl locking scheme */ 341 struct flock lck; /* fcntl locking scheme */
345 struct stat sbuf; 342 struct stat sbuf;
… …
376} 373}
377#endif 374#endif
378 375
379/* ------------------------------------------------------------------------- */ 376/* ------------------------------------------------------------------------- */
380#ifdef LASTLOG_SUPPORT 377#ifdef LASTLOG_SUPPORT
381/* INTPROTO */ 378static void
382void
383rxvt_update_lastlog (const char *fname, const char *pty, const char *host) 379rxvt_update_lastlog (const char *fname, const char *pty, const char *host)
384{ 380{
385# ifdef HAVE_STRUCT_LASTLOGX 381# ifdef HAVE_STRUCT_LASTLOGX
386 struct lastlogx llx; 382 struct lastlogx llx;
387# endif 383# endif

Diff Legend

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