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.29 by root, Tue Jan 17 10:59:32 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
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_ptytty_unix::login (int cmd_pid, bool login_shell, const char *hostname)
65{ 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
66#ifdef HAVE_STRUCT_UTMP 70#ifdef HAVE_STRUCT_UTMP
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 (login_shell)
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 (login_shell)
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/* ------------------------------------------------------------------------- */
224/* 226/*
225 * remove utmp and wtmp entries 227 * remove utmp and wtmp entries
226 */ 228 */
227void 229void
228rxvt_term::cleanutent () 230rxvt_ptytty_unix::logout ()
229{ 231{
232 if (!cmd_pid)
233 return;
234
230#ifdef HAVE_STRUCT_UTMP 235#ifdef HAVE_STRUCT_UTMP
231 struct utmp *ut = &this->ut; 236 struct utmp *tmput, *ut = &this->ut;
232#endif 237#endif
233#ifdef HAVE_STRUCT_UTMPX 238#ifdef HAVE_STRUCT_UTMPX
234 struct utmpx *tmputx, *utx = &this->utx; 239 struct utmpx *tmputx, *utx = &this->utx;
235#endif 240#endif
236 241
237#ifdef HAVE_STRUCT_UTMP 242#ifdef HAVE_STRUCT_UTMP
238# ifdef HAVE_UTMP_PID 243# ifdef HAVE_UTMP_PID
239 memset (ut, 0, sizeof (struct utmp)); 244 memset (ut, 0, sizeof (struct utmp));
240 setutent (); 245 setutent ();
241 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id)); 246 strncpy (ut->ut_id, this->ut_id, sizeof (ut->ut_id));
242 ut->ut_type = USER_PROCESS; 247 ut->ut_type = USER_PROCESS;
243 {
244 struct utmp *tmput = getutid (ut);
245
246 if (tmput) /* position to entry in utmp file */ 248 if ((tmput = getutid (ut))) /* position to entry in utmp file */
247 ut = tmput; 249 ut = tmput;
248 }
249 ut->ut_type = DEAD_PROCESS; 250 ut->ut_type = DEAD_PROCESS;
250# else 251# else
251 memset (ut->ut_name, 0, sizeof (ut->ut_name)); 252 memset (ut->ut_name, 0, sizeof (ut->ut_name));
252# ifdef HAVE_UTMP_HOST 253# ifdef HAVE_UTMP_HOST
253 memset (ut->ut_host, 0, sizeof (ut->ut_host)); 254 memset (ut->ut_host, 0, sizeof (ut->ut_host));
… …
257#endif 258#endif
258 259
259#ifdef HAVE_STRUCT_UTMPX 260#ifdef HAVE_STRUCT_UTMPX
260 memset (utx, 0, sizeof (struct utmpx)); 261 memset (utx, 0, sizeof (struct utmpx));
261 setutxent (); 262 setutxent ();
262 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id)); 263 strncpy (utx->ut_id, this->ut_id, sizeof (utx->ut_id));
263 utx->ut_type = USER_PROCESS; 264 utx->ut_type = USER_PROCESS;
264 if ((tmputx = getutxid (utx))) /* position to entry in utmp file */ 265 if ((tmputx = getutxid (utx))) /* position to entry in utmp file */
265 utx = tmputx; 266 utx = tmputx;
266 utx->ut_type = DEAD_PROCESS; 267 utx->ut_type = DEAD_PROCESS;
268# if HAVE_UTMPX_SESSION
267 utx->ut_session = getsid (0); 269 utx->ut_session = getsid (0);
270# endif
268 utx->ut_tv.tv_sec = time (NULL); 271 utx->ut_tv.tv_sec = time (NULL);
269 utx->ut_tv.tv_usec = 0; 272 utx->ut_tv.tv_usec = 0;
270#endif 273#endif
271 274
272 /* 275 /*
273 * Write ending wtmp entry 276 * Write ending wtmp entry
274 */ 277 */
275#ifdef WTMP_SUPPORT 278#ifdef WTMP_SUPPORT
276# ifdef WTMP_ONLY_ON_LOGIN 279# ifdef WTMP_ONLY_ON_LOGIN
277 if (options & Opt_loginShell) 280 if (login_shell)
278# endif 281# endif
279 { 282 {
280# ifdef HAVE_STRUCT_UTMP 283# ifdef HAVE_STRUCT_UTMP
281# ifdef HAVE_UPDWTMP 284# ifdef HAVE_UPDWTMP
282 updwtmp (RXVT_WTMP_FILE, ut); 285 updwtmp (RXVT_WTMP_FILE, ut);
283# else 286# else
284 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 287 rxvt_update_wtmp (RXVT_WTMP_FILE, ut);
285# endif 288# endif
286# endif 289# endif
287# ifdef HAVE_STRUCT_UTMPX 290# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
288 updwtmpx (RXVT_WTMPX_FILE, utx); 291 updwtmpx (RXVT_WTMPX_FILE, utx);
289# endif 292# endif
290 } 293 }
291#endif 294#endif
292 295
… …
306#ifdef HAVE_STRUCT_UTMPX 309#ifdef HAVE_STRUCT_UTMPX
307 if (utx->ut_pid == cmd_pid) 310 if (utx->ut_pid == cmd_pid)
308 pututxline (utx); 311 pututxline (utx);
309 endutxent (); 312 endutxent ();
310#endif 313#endif
314
315 cmd_pid = 0;
311} 316}
312 317
313/* ------------------------------------------------------------------------- */ 318/* ------------------------------------------------------------------------- */
314/* 319/*
315 * Write a BSD style utmp entry 320 * Write a BSD style utmp entry
316 */ 321 */
317#ifdef HAVE_UTMP_H 322#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
318/* INTPROTO */ 323static int
319int
320rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu) 324rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu)
321{ 325{
322 int fd; 326 int fd;
323 327
324 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)
… …
333 337
334/* ------------------------------------------------------------------------- */ 338/* ------------------------------------------------------------------------- */
335/* 339/*
336 * Update a BSD style wtmp entry 340 * Update a BSD style wtmp entry
337 */ 341 */
338#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) 342#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP)
339/* INTPROTO */ 343static void
340void
341rxvt_update_wtmp (const char *fname, const struct utmp *putmp) 344rxvt_update_wtmp (const char *fname, const struct utmp *putmp)
342{ 345{
343 int fd, gotlock, retry; 346 int fd, gotlock, retry;
344 struct flock lck; /* fcntl locking scheme */ 347 struct flock lck; /* fcntl locking scheme */
345 struct stat sbuf; 348 struct stat sbuf;
… …
376} 379}
377#endif 380#endif
378 381
379/* ------------------------------------------------------------------------- */ 382/* ------------------------------------------------------------------------- */
380#ifdef LASTLOG_SUPPORT 383#ifdef LASTLOG_SUPPORT
381/* INTPROTO */ 384static void
382void
383rxvt_update_lastlog (const char *fname, const char *pty, const char *host) 385rxvt_update_lastlog (const char *fname, const char *pty, const char *host)
384{ 386{
385# ifdef HAVE_STRUCT_LASTLOGX 387# ifdef HAVE_STRUCT_LASTLOGX
386 struct lastlogx llx; 388 struct lastlogx llx;
387# endif 389# endif

Diff Legend

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