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.17 by root, Thu Feb 17 15:07:48 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
47#if HAVE_STRUCT_UTMP 40#if HAVE_STRUCT_UTMP
48int rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu); 41static int rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu);
49void rxvt_update_wtmp (const char *fname, const struct utmp *putmp); 42static void rxvt_update_wtmp (const char *fname, const struct utmp *putmp);
50#endif 43#endif
51 44
52void 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);
53 46
54/* 47/*
55 * BSD style utmp entry 48 * BSD style utmp entry
56 * ut_line, ut_name, ut_host, ut_time 49 * ut_line, ut_name, ut_host, ut_time
57 * SYSV style utmp (and utmpx) entry 50 * SYSV style utmp (and utmpx) entry
… …
62 55
63/* 56/*
64 * make and write utmp and wtmp entries 57 * make and write utmp and wtmp entries
65 */ 58 */
66void 59void
67rxvt_term::makeutent (const char *pty, const char *hostname) 60rxvt_ptytty::login (int cmd_pid, bool login_shell, const char *hostname)
68{ 61{
62 this->cmd_pid = cmd_pid;
63 this->login_shell = login_shell;
64
65 const char *pty = name;
66
69#ifdef HAVE_STRUCT_UTMP 67#ifdef HAVE_STRUCT_UTMP
70 struct utmp *ut = &this->ut; 68 struct utmp *ut = &this->ut;
71#endif 69#endif
72#ifdef HAVE_STRUCT_UTMPX 70#ifdef HAVE_STRUCT_UTMPX
73 struct utmpx *utx = &this->utx; 71 struct utmpx *utx = &this->utx;
74#endif 72#endif
75#ifdef HAVE_UTMP_PID
76 int i; 73 int i;
77#endif
78 struct passwd *pwent = getpwuid (getuid ()); 74 struct passwd *pwent = getpwuid (getuid ());
79 75
80 if (!strncmp (pty, "/dev/", 5)) 76 if (!strncmp (pty, "/dev/", 5))
81 pty += 5; /* skip /dev/ prefix */ 77 pty += 5; /* skip /dev/ prefix */
82 78
83#ifdef HAVE_UTMP_PID 79#if defined(HAVE_UTMP_PID) || defined(HAVE_STRUCT_UTMPX)
84 if (!strncmp (pty, "pty", 3) || !strncmp (pty, "tty", 3)) 80 if (!strncmp (pty, "pty", 3) || !strncmp (pty, "tty", 3))
85 strncpy (ut_id, pty + 3, sizeof (ut_id)); 81 strncpy (ut_id, pty + 3, sizeof (ut_id));
86 else if (sscanf (pty, "pts/%d", &i) == 1) 82 else if (sscanf (pty, "pts/%d", &i) == 1)
87 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */ 83 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */
88 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3)) 84 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3))
… …
97# ifdef HAVE_UTMP_PID 93# ifdef HAVE_UTMP_PID
98 setutent (); 94 setutent ();
99 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id)); 95 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id));
100 ut->ut_type = DEAD_PROCESS; 96 ut->ut_type = DEAD_PROCESS;
101 getutid (ut); /* position to entry in utmp file */ 97 getutid (ut); /* position to entry in utmp file */
102 strncpy (ut_id, ut_id, sizeof (ut_id)); 98 strncpy (this->ut_id, ut_id, sizeof (this->ut_id));
103# endif 99# endif
104#endif 100#endif
105 101
106#ifdef HAVE_STRUCT_UTMPX 102#ifdef HAVE_STRUCT_UTMPX
107 memset (utx, 0, sizeof (struct utmpx)); 103 memset (utx, 0, sizeof (struct utmpx));
108 setutxent (); 104 setutxent ();
109 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id)); 105 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id));
110 utx->ut_type = DEAD_PROCESS; 106 utx->ut_type = DEAD_PROCESS;
111 getutxid (utx); /* position to entry in utmp file */ 107 getutxid (utx); /* position to entry in utmp file */
112 strncpy (ut_id, ut_id, sizeof (ut_id)); 108 strncpy (this->ut_id, ut_id, sizeof (this->ut_id));
113#endif 109#endif
114 110
115#ifdef HAVE_STRUCT_UTMP 111#ifdef HAVE_STRUCT_UTMP
116 strncpy (ut->ut_line, pty, sizeof (ut->ut_line)); 112 strncpy (ut->ut_line, pty, sizeof (ut->ut_line));
117 ut->ut_time = time (NULL); 113 ut->ut_time = time (NULL);
… …
166#endif 162#endif
167 163
168#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID) 164#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
169 165
170 { 166 {
171 int i;
172# ifdef HAVE_TTYSLOT 167# ifdef HAVE_TTYSLOT
173 i = ttyslot (); 168 i = ttyslot ();
174 if (rxvt_write_bsd_utmp (i, ut)) 169 if (rxvt_write_bsd_utmp (i, ut))
175 utmp_pos = i; 170 utmp_pos = i;
176# else 171# else
177 FILE *fd0; 172 FILE *fd0;
178 173
179 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL) 174 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL)
180 { 175 {
181 char buf[256], name[256]; 176 char buf[256], name[256];
182 177
183 buf[sizeof (buf) - 1] = '\0'; 178 buf[sizeof (buf) - 1] = '\0';
184 for (i = 1; (fgets (buf, sizeof (buf) - 1, fd0) != NULL);) 179 for (i = 1; (fgets (buf, sizeof (buf) - 1, fd0) != NULL);)
185 { 180 {
186 if (*buf == '#' || sscanf (buf, "%s", name) != 1) 181 if (*buf == '#' || sscanf (buf, "%s", name) != 1)
… …
196 i++; 191 i++;
197 } 192 }
198 fclose (fd0); 193 fclose (fd0);
199 } 194 }
200# endif 195# endif
201
202 } 196 }
203#endif 197#endif
204 198
205#ifdef WTMP_SUPPORT 199#ifdef WTMP_SUPPORT
206# ifdef WTMP_ONLY_ON_LOGIN 200# ifdef WTMP_ONLY_ON_LOGIN
207 if (options & Opt_loginShell) 201 if (login_shell)
208# endif 202# endif
209 { 203 {
210# ifdef HAVE_STRUCT_UTMP 204# ifdef HAVE_STRUCT_UTMP
211# ifdef HAVE_UPDWTMP 205# ifdef HAVE_UPDWTMP
212 updwtmp (RXVT_WTMP_FILE, ut); 206 updwtmp (RXVT_WTMP_FILE, ut);
213# else 207# else
214 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 208 rxvt_update_wtmp (RXVT_WTMP_FILE, ut);
215# endif 209# endif
216# endif 210# endif
217# ifdef HAVE_STRUCT_UTMPX 211# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
218# if HAVE_UPDWTMPX
219 updwtmpx (RXVT_WTMPX_FILE, utx); 212 updwtmpx (RXVT_WTMPX_FILE, utx);
220# else
221 pututxline (utx);
222# endif
223# endif 213# endif
224 } 214 }
225#endif 215#endif
226#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE) 216#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE)
227 if (options & Opt_loginShell) 217 if (login_shell)
228 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname); 218 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname);
229#endif 219#endif
230} 220}
231 221
232/* ------------------------------------------------------------------------- */ 222/* ------------------------------------------------------------------------- */
233/* 223/*
234 * remove utmp and wtmp entries 224 * remove utmp and wtmp entries
235 */ 225 */
236void 226void
237rxvt_term::cleanutent () 227rxvt_ptytty::logout ()
238{ 228{
239#ifdef HAVE_STRUCT_UTMP 229#ifdef HAVE_STRUCT_UTMP
240 struct utmp *ut = &this->ut; 230 struct utmp *tmput, *ut = &this->ut;
241#endif 231#endif
242#ifdef HAVE_STRUCT_UTMPX 232#ifdef HAVE_STRUCT_UTMPX
243 struct utmpx *tmputx, *utx = &this->utx; 233 struct utmpx *tmputx, *utx = &this->utx;
244#endif 234#endif
245 235
246#ifdef HAVE_STRUCT_UTMP 236#ifdef HAVE_STRUCT_UTMP
247# ifdef HAVE_UTMP_PID 237# ifdef HAVE_UTMP_PID
248 memset (ut, 0, sizeof (struct utmp)); 238 memset (ut, 0, sizeof (struct utmp));
249 setutent (); 239 setutent ();
250 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id)); 240 strncpy (ut->ut_id, this->ut_id, sizeof (ut->ut_id));
251 ut->ut_type = USER_PROCESS; 241 ut->ut_type = USER_PROCESS;
252 {
253 struct utmp *tmput = getutid (ut);
254
255 if (tmput) /* position to entry in utmp file */ 242 if ((tmput = getutid (ut))) /* position to entry in utmp file */
256 ut = tmput; 243 ut = tmput;
257 }
258 ut->ut_type = DEAD_PROCESS; 244 ut->ut_type = DEAD_PROCESS;
259# else 245# else
260 memset (ut->ut_name, 0, sizeof (ut->ut_name)); 246 memset (ut->ut_name, 0, sizeof (ut->ut_name));
261# ifdef HAVE_UTMP_HOST 247# ifdef HAVE_UTMP_HOST
262 memset (ut->ut_host, 0, sizeof (ut->ut_host)); 248 memset (ut->ut_host, 0, sizeof (ut->ut_host));
… …
266#endif 252#endif
267 253
268#ifdef HAVE_STRUCT_UTMPX 254#ifdef HAVE_STRUCT_UTMPX
269 memset (utx, 0, sizeof (struct utmpx)); 255 memset (utx, 0, sizeof (struct utmpx));
270 setutxent (); 256 setutxent ();
271 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id)); 257 strncpy (utx->ut_id, this->ut_id, sizeof (utx->ut_id));
272 utx->ut_type = USER_PROCESS; 258 utx->ut_type = USER_PROCESS;
273 if ((tmputx = getutxid (utx))) /* position to entry in utmp file */ 259 if ((tmputx = getutxid (utx))) /* position to entry in utmp file */
274 utx = tmputx; 260 utx = tmputx;
275 utx->ut_type = DEAD_PROCESS; 261 utx->ut_type = DEAD_PROCESS;
276# if HAVE_UTMPX_SESSION 262# if HAVE_UTMPX_SESSION
… …
283 /* 269 /*
284 * Write ending wtmp entry 270 * Write ending wtmp entry
285 */ 271 */
286#ifdef WTMP_SUPPORT 272#ifdef WTMP_SUPPORT
287# ifdef WTMP_ONLY_ON_LOGIN 273# ifdef WTMP_ONLY_ON_LOGIN
288 if (options & Opt_loginShell) 274 if (login_shell)
289# endif 275# endif
290 { 276 {
291# ifdef HAVE_STRUCT_UTMP 277# ifdef HAVE_STRUCT_UTMP
292# ifdef HAVE_UPDWTMP 278# ifdef HAVE_UPDWTMP
293 updwtmp (RXVT_WTMP_FILE, ut); 279 updwtmp (RXVT_WTMP_FILE, ut);
294# else 280# else
295 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 281 rxvt_update_wtmp (RXVT_WTMP_FILE, ut);
296# endif 282# endif
297# endif 283# endif
298# ifdef HAVE_STRUCT_UTMPX 284# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
299# if HAVE_UPDWTMPX
300 updwtmpx (RXVT_WTMPX_FILE, utx); 285 updwtmpx (RXVT_WTMPX_FILE, utx);
301# else
302 pututxline (utx);
303# endif
304# endif 286# endif
305 } 287 }
306#endif 288#endif
307 289
308 /* 290 /*
… …
327 309
328/* ------------------------------------------------------------------------- */ 310/* ------------------------------------------------------------------------- */
329/* 311/*
330 * Write a BSD style utmp entry 312 * Write a BSD style utmp entry
331 */ 313 */
332#ifdef HAVE_UTMP_H 314#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
333int 315static int
334rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu) 316rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu)
335{ 317{
336 int fd; 318 int fd;
337 319
338 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)
… …
348/* ------------------------------------------------------------------------- */ 330/* ------------------------------------------------------------------------- */
349/* 331/*
350 * Update a BSD style wtmp entry 332 * Update a BSD style wtmp entry
351 */ 333 */
352#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP) 334#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP)
353void 335static void
354rxvt_update_wtmp (const char *fname, const struct utmp *putmp) 336rxvt_update_wtmp (const char *fname, const struct utmp *putmp)
355{ 337{
356 int fd, gotlock, retry; 338 int fd, gotlock, retry;
357 struct flock lck; /* fcntl locking scheme */ 339 struct flock lck; /* fcntl locking scheme */
358 struct stat sbuf; 340 struct stat sbuf;
… …
389} 371}
390#endif 372#endif
391 373
392/* ------------------------------------------------------------------------- */ 374/* ------------------------------------------------------------------------- */
393#ifdef LASTLOG_SUPPORT 375#ifdef LASTLOG_SUPPORT
394void 376static void
395rxvt_update_lastlog (const char *fname, const char *pty, const char *host) 377rxvt_update_lastlog (const char *fname, const char *pty, const char *host)
396{ 378{
397# ifdef HAVE_STRUCT_LASTLOGX 379# ifdef HAVE_STRUCT_LASTLOGX
398 struct lastlogx llx; 380 struct lastlogx llx;
399# endif 381# endif

Diff Legend

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