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

Diff Legend

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