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

Diff Legend

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