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.12 by root, Wed Jan 19 15:20:47 2005 UTC vs.
Revision 1.27 by root, Tue Jan 17 10:14:26 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::login (int cmd_pid, bool login_shell, const char *hostname)
61{ 61{
62 this->cmd_pid = cmd_pid;
63 this->login_shell = login_shell;
64
65 const char *pty = name;
66
62#ifdef HAVE_STRUCT_UTMP 67#ifdef HAVE_STRUCT_UTMP
63 struct utmp *ut = &this->ut; 68 struct utmp *ut = &this->ut;
64#endif 69#endif
65#ifdef HAVE_STRUCT_UTMPX 70#ifdef HAVE_STRUCT_UTMPX
66 struct utmpx *utx = &this->utx; 71 struct utmpx *utx = &this->utx;
67#endif 72#endif
68#ifdef HAVE_UTMP_PID
69 int i; 73 int i;
70#endif
71 struct passwd *pwent = getpwuid (getuid ()); 74 struct passwd *pwent = getpwuid (getuid ());
72 75
73 if (!strncmp (pty, "/dev/", 5)) 76 if (!strncmp (pty, "/dev/", 5))
74 pty += 5; /* skip /dev/ prefix */ 77 pty += 5; /* skip /dev/ prefix */
75 78
79#if defined(HAVE_UTMP_PID) || defined(HAVE_STRUCT_UTMPX)
76 if (!strncmp (pty, "pty", 3) || !strncmp (pty, "tty", 3)) 80 if (!strncmp (pty, "pty", 3) || !strncmp (pty, "tty", 3))
77 strncpy (ut_id, (pty + 3), sizeof (ut_id)); 81 strncpy (ut_id, pty + 3, sizeof (ut_id));
78#ifdef HAVE_UTMP_PID
79 else if (sscanf (pty, "pts/%d", &i) == 1) 82 else if (sscanf (pty, "pts/%d", &i) == 1)
80 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */ 83 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */
81#endif
82 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3)) 84 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3))
83 { 85 {
84 rxvt_warn ("can't parse tty name \"%s\", not adding utmp entry.\n", pty); 86 rxvt_warn ("can't parse tty name \"%s\", not adding utmp entry.\n", pty);
85 return; 87 return;
86 } 88 }
89#endif
87 90
88#ifdef HAVE_STRUCT_UTMP 91#ifdef HAVE_STRUCT_UTMP
89 memset (ut, 0, sizeof (struct utmp)); 92 memset (ut, 0, sizeof (struct utmp));
90# ifdef HAVE_UTMP_PID 93# ifdef HAVE_UTMP_PID
91 setutent (); 94 setutent ();
92 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id)); 95 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id));
93 ut->ut_type = DEAD_PROCESS; 96 ut->ut_type = DEAD_PROCESS;
94 getutid (ut); /* position to entry in utmp file */ 97 getutid (ut); /* position to entry in utmp file */
95 strncpy (ut_id, ut_id, sizeof (ut_id)); 98 strncpy (this->ut_id, ut_id, sizeof (this->ut_id));
96# endif 99# endif
97#endif 100#endif
98 101
99#ifdef HAVE_STRUCT_UTMPX 102#ifdef HAVE_STRUCT_UTMPX
100 memset (utx, 0, sizeof (struct utmpx)); 103 memset (utx, 0, sizeof (struct utmpx));
101 setutxent (); 104 setutxent ();
102 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id)); 105 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id));
103 utx->ut_type = DEAD_PROCESS; 106 utx->ut_type = DEAD_PROCESS;
104 getutxid (utx); /* position to entry in utmp file */ 107 getutxid (utx); /* position to entry in utmp file */
105 strncpy (ut_id, ut_id, sizeof (ut_id)); 108 strncpy (this->ut_id, ut_id, sizeof (this->ut_id));
106#endif 109#endif
107 110
108#ifdef HAVE_STRUCT_UTMP 111#ifdef HAVE_STRUCT_UTMP
109 strncpy (ut->ut_line, pty, sizeof (ut->ut_line)); 112 strncpy (ut->ut_line, pty, sizeof (ut->ut_line));
110 ut->ut_time = time (NULL); 113 ut->ut_time = time (NULL);
… …
133#ifdef HAVE_STRUCT_UTMPX 136#ifdef HAVE_STRUCT_UTMPX
134 strncpy (utx->ut_line, pty, sizeof (utx->ut_line)); 137 strncpy (utx->ut_line, pty, sizeof (utx->ut_line));
135 strncpy (utx->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?", 138 strncpy (utx->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?",
136 sizeof (utx->ut_user)); 139 sizeof (utx->ut_user));
137 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id)); 140 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id));
141# if HAVE_UTMPX_SESSION
138 utx->ut_session = getsid (0); 142 utx->ut_session = getsid (0);
143# endif
139 utx->ut_tv.tv_sec = time (NULL); 144 utx->ut_tv.tv_sec = time (NULL);
140 utx->ut_tv.tv_usec = 0; 145 utx->ut_tv.tv_usec = 0;
141 utx->ut_pid = cmd_pid; 146 utx->ut_pid = cmd_pid;
142# ifdef HAVE_UTMPX_HOST 147# ifdef HAVE_UTMPX_HOST
143 strncpy (utx->ut_host, hostname, sizeof (utx->ut_host)); 148 strncpy (utx->ut_host, hostname, sizeof (utx->ut_host));
… …
157#endif 162#endif
158 163
159#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID) 164#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
160 165
161 { 166 {
162 int i;
163# ifdef HAVE_TTYSLOT 167# ifdef HAVE_TTYSLOT
164 i = ttyslot (); 168 i = ttyslot ();
165 if (rxvt_write_bsd_utmp (i, ut)) 169 if (rxvt_write_bsd_utmp (i, ut))
166 utmp_pos = i; 170 utmp_pos = i;
167# else 171# else
168 FILE *fd0; 172 FILE *fd0;
169 173
170 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL) 174 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL)
171 { 175 {
172 char buf[256], name[256]; 176 char buf[256], name[256];
173 177
174 buf[sizeof (buf) - 1] = '\0'; 178 buf[sizeof (buf) - 1] = '\0';
175 for (i = 1; (fgets (buf, sizeof (buf) - 1, fd0) != NULL);) 179 for (i = 1; (fgets (buf, sizeof (buf) - 1, fd0) != NULL);)
176 { 180 {
177 if (*buf == '#' || sscanf (buf, "%s", name) != 1) 181 if (*buf == '#' || sscanf (buf, "%s", name) != 1)
… …
187 i++; 191 i++;
188 } 192 }
189 fclose (fd0); 193 fclose (fd0);
190 } 194 }
191# endif 195# endif
192
193 } 196 }
194#endif 197#endif
195 198
196#ifdef WTMP_SUPPORT 199#ifdef WTMP_SUPPORT
197# ifdef WTMP_ONLY_ON_LOGIN 200# ifdef WTMP_ONLY_ON_LOGIN
198 if (options & Opt_loginShell) 201 if (login_shell)
199# endif 202# endif
200 { 203 {
201# ifdef HAVE_STRUCT_UTMP 204# ifdef HAVE_STRUCT_UTMP
202# ifdef HAVE_UPDWTMP 205# ifdef HAVE_UPDWTMP
203 updwtmp (RXVT_WTMP_FILE, ut); 206 updwtmp (RXVT_WTMP_FILE, ut);
204# else 207# else
205 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 208 rxvt_update_wtmp (RXVT_WTMP_FILE, ut);
206# endif 209# endif
207# endif 210# endif
208# ifdef HAVE_STRUCT_UTMPX 211# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
209 updwtmpx (RXVT_WTMPX_FILE, utx); 212 updwtmpx (RXVT_WTMPX_FILE, utx);
210# endif 213# endif
211 } 214 }
212#endif 215#endif
213#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE) 216#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE)
214 if (options & Opt_loginShell) 217 if (login_shell)
215 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname); 218 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname);
216#endif 219#endif
217} 220}
218 221
219/* ------------------------------------------------------------------------- */ 222/* ------------------------------------------------------------------------- */
220/* 223/*
221 * remove utmp and wtmp entries 224 * remove utmp and wtmp entries
222 */ 225 */
223void 226void
224rxvt_term::cleanutent () 227rxvt_ptytty::logout ()
225{ 228{
226#ifdef HAVE_STRUCT_UTMP 229#ifdef HAVE_STRUCT_UTMP
227 struct utmp *ut = &this->ut; 230 struct utmp *tmput, *ut = &this->ut;
228#endif 231#endif
229#ifdef HAVE_STRUCT_UTMPX 232#ifdef HAVE_STRUCT_UTMPX
230 struct utmpx *tmputx, *utx = &this->utx; 233 struct utmpx *tmputx, *utx = &this->utx;
231#endif 234#endif
232 235
233#ifdef HAVE_STRUCT_UTMP 236#ifdef HAVE_STRUCT_UTMP
234# ifdef HAVE_UTMP_PID 237# ifdef HAVE_UTMP_PID
235 memset (ut, 0, sizeof (struct utmp)); 238 memset (ut, 0, sizeof (struct utmp));
236 setutent (); 239 setutent ();
237 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id)); 240 strncpy (ut->ut_id, this->ut_id, sizeof (ut->ut_id));
238 ut->ut_type = USER_PROCESS; 241 ut->ut_type = USER_PROCESS;
239 {
240 struct utmp *tmput = getutid (ut);
241
242 if (tmput) /* position to entry in utmp file */ 242 if ((tmput = getutid (ut))) /* position to entry in utmp file */
243 ut = tmput; 243 ut = tmput;
244 }
245 ut->ut_type = DEAD_PROCESS; 244 ut->ut_type = DEAD_PROCESS;
246# else 245# else
247 memset (ut->ut_name, 0, sizeof (ut->ut_name)); 246 memset (ut->ut_name, 0, sizeof (ut->ut_name));
248# ifdef HAVE_UTMP_HOST 247# ifdef HAVE_UTMP_HOST
249 memset (ut->ut_host, 0, sizeof (ut->ut_host)); 248 memset (ut->ut_host, 0, sizeof (ut->ut_host));
… …
253#endif 252#endif
254 253
255#ifdef HAVE_STRUCT_UTMPX 254#ifdef HAVE_STRUCT_UTMPX
256 memset (utx, 0, sizeof (struct utmpx)); 255 memset (utx, 0, sizeof (struct utmpx));
257 setutxent (); 256 setutxent ();
258 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id)); 257 strncpy (utx->ut_id, this->ut_id, sizeof (utx->ut_id));
259 utx->ut_type = USER_PROCESS; 258 utx->ut_type = USER_PROCESS;
260 if ((tmputx = getutxid (utx))) /* position to entry in utmp file */ 259 if ((tmputx = getutxid (utx))) /* position to entry in utmp file */
261 utx = tmputx; 260 utx = tmputx;
262 utx->ut_type = DEAD_PROCESS; 261 utx->ut_type = DEAD_PROCESS;
262# if HAVE_UTMPX_SESSION
263 utx->ut_session = getsid (0); 263 utx->ut_session = getsid (0);
264# endif
264 utx->ut_tv.tv_sec = time (NULL); 265 utx->ut_tv.tv_sec = time (NULL);
265 utx->ut_tv.tv_usec = 0; 266 utx->ut_tv.tv_usec = 0;
266#endif 267#endif
267 268
268 /* 269 /*
269 * Write ending wtmp entry 270 * Write ending wtmp entry
270 */ 271 */
271#ifdef WTMP_SUPPORT 272#ifdef WTMP_SUPPORT
272# ifdef WTMP_ONLY_ON_LOGIN 273# ifdef WTMP_ONLY_ON_LOGIN
273 if (options & Opt_loginShell) 274 if (login_shell)
274# endif 275# endif
275 { 276 {
276# ifdef HAVE_STRUCT_UTMP 277# ifdef HAVE_STRUCT_UTMP
277# ifdef HAVE_UPDWTMP 278# ifdef HAVE_UPDWTMP
278 updwtmp (RXVT_WTMP_FILE, ut); 279 updwtmp (RXVT_WTMP_FILE, ut);
279# else 280# else
280 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 281 rxvt_update_wtmp (RXVT_WTMP_FILE, ut);
281# endif 282# endif
282# endif 283# endif
283# ifdef HAVE_STRUCT_UTMPX 284# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
284 updwtmpx (RXVT_WTMPX_FILE, utx); 285 updwtmpx (RXVT_WTMPX_FILE, utx);
285# endif 286# endif
286 } 287 }
287#endif 288#endif
288 289
… …
308 309
309/* ------------------------------------------------------------------------- */ 310/* ------------------------------------------------------------------------- */
310/* 311/*
311 * Write a BSD style utmp entry 312 * Write a BSD style utmp entry
312 */ 313 */
313#ifdef HAVE_UTMP_H 314#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
314/* INTPROTO */ 315static int
315int
316rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu) 316rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu)
317{ 317{
318 int fd; 318 int fd;
319 319
320 if (utmp_pos <= 0 || (fd = open (RXVT_UTMP_FILE, O_WRONLY)) == -1) 320 if (utmp_pos <= 0 || (fd = open (RXVT_UTMP_FILE, O_WRONLY)) == -1)
… …
329 329
330/* ------------------------------------------------------------------------- */ 330/* ------------------------------------------------------------------------- */
331/* 331/*
332 * Update a BSD style wtmp entry 332 * Update a BSD style wtmp entry
333 */ 333 */
334#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) 334#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP)
335/* INTPROTO */ 335static void
336void
337rxvt_update_wtmp (const char *fname, const struct utmp *putmp) 336rxvt_update_wtmp (const char *fname, const struct utmp *putmp)
338{ 337{
339 int fd, gotlock, retry; 338 int fd, gotlock, retry;
340 struct flock lck; /* fcntl locking scheme */ 339 struct flock lck; /* fcntl locking scheme */
341 struct stat sbuf; 340 struct stat sbuf;
… …
372} 371}
373#endif 372#endif
374 373
375/* ------------------------------------------------------------------------- */ 374/* ------------------------------------------------------------------------- */
376#ifdef LASTLOG_SUPPORT 375#ifdef LASTLOG_SUPPORT
377/* INTPROTO */ 376static void
378void
379rxvt_update_lastlog (const char *fname, const char *pty, const char *host) 377rxvt_update_lastlog (const char *fname, const char *pty, const char *host)
380{ 378{
381# ifdef HAVE_STRUCT_LASTLOGX 379# ifdef HAVE_STRUCT_LASTLOGX
382 struct lastlogx llx; 380 struct lastlogx llx;
383# endif 381# endif

Diff Legend

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