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.35 by root, Sun Jan 22 00:36:59 2006 UTC vs.
Revision 1.36 by root, Sun Jan 22 00:48:13 2006 UTC

… …
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 33
34#include "../config.h" 34#include "../config.h"
35#include "rxvt.h" 35
36#include "ptytty.h" 36#include "ptytty.h"
37 37
38#if UTMP_SUPPORT 38#if UTMP_SUPPORT
39 39
40#if HAVE_STRUCT_UTMP 40#if HAVE_STRUCT_UTMP
41static int rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu); 41static int write_bsd_utmp (int utmp_pos, struct utmp *wu);
42static void rxvt_update_wtmp (const char *fname, const struct utmp *putmp); 42static void update_wtmp (const char *fname, const struct utmp *putmp);
43#endif 43#endif
44 44
45static void rxvt_update_lastlog (const char *fname, const char *pty, const char *host); 45static void 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_ptytty_unix::login (int cmd_pid, bool login_shell, const char *hostname) 60ptytty_unix::login (int cmd_pid, bool login_shell, const char *hostname)
61{ 61{
62 const char *pty = name; 62 const char *pty = name;
63 63
64 if (!pty || !*pty) 64 if (!pty || !*pty)
65 return; 65 return;
… …
84 strncpy (ut_id, pty + 3, sizeof (ut_id)); 84 strncpy (ut_id, pty + 3, sizeof (ut_id));
85 else if (sscanf (pty, "pts/%d", &i) == 1) 85 else if (sscanf (pty, "pts/%d", &i) == 1)
86 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */ 86 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */
87 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3)) 87 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3))
88 { 88 {
89 rxvt_warn ("can't parse tty name \"%s\", not adding utmp entry.\n", pty); 89 warn ("can't parse tty name \"%s\", not adding utmp entry.\n", pty);
90 return; 90 return;
91 } 91 }
92#endif 92#endif
93 93
94#ifdef HAVE_STRUCT_UTMP 94#ifdef HAVE_STRUCT_UTMP
… …
169# ifdef HAVE_TTYSLOT 169# ifdef HAVE_TTYSLOT
170 int fdstdin = dup (STDIN_FILENO); 170 int fdstdin = dup (STDIN_FILENO);
171 dup2 (tty, STDIN_FILENO); 171 dup2 (tty, STDIN_FILENO);
172 172
173 i = ttyslot (); 173 i = ttyslot ();
174 if (rxvt_write_bsd_utmp (i, ut)) 174 if (write_bsd_utmp (i, ut))
175 utmp_pos = i; 175 utmp_pos = i;
176 176
177 dup2 (fdstdin, STDIN_FILENO); 177 dup2 (fdstdin, STDIN_FILENO);
178 close (fdstdin); 178 close (fdstdin);
179# else 179# else
… …
188 { 188 {
189 if (*buf == '#' || sscanf (buf, "%s", name) != 1) 189 if (*buf == '#' || sscanf (buf, "%s", name) != 1)
190 continue; 190 continue;
191 if (!strcmp (ut->ut_line, name)) 191 if (!strcmp (ut->ut_line, name))
192 { 192 {
193 if (!rxvt_write_bsd_utmp (i, ut)) 193 if (!write_bsd_utmp (i, ut))
194 i = 0; 194 i = 0;
195 utmp_pos = i; 195 utmp_pos = i;
196 fclose (fd0); 196 fclose (fd0);
197 break; 197 break;
198 } 198 }
… …
209 if (login_shell) 209 if (login_shell)
210#endif 210#endif
211 { 211 {
212# ifdef HAVE_STRUCT_UTMP 212# ifdef HAVE_STRUCT_UTMP
213# ifdef HAVE_UPDWTMP 213# ifdef HAVE_UPDWTMP
214 updwtmp (RXVT_WTMP_FILE, ut); 214 updwtmp (WTMP_FILE, ut);
215# else 215# else
216 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 216 update_wtmp (WTMP_FILE, ut);
217# endif 217# endif
218# endif 218# endif
219# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX) 219# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
220 updwtmpx (RXVT_WTMPX_FILE, utx); 220 updwtmpx (WTMPX_FILE, utx);
221# endif
222 }
223#endif 221# endif
222 }
223#endif
224#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE) 224#if defined(LASTLOG_SUPPORT) && defined(LASTLOG_FILE)
225#ifdef LOG_ONLY_ON_LOGIN 225#ifdef LOG_ONLY_ON_LOGIN
226 if (login_shell) 226 if (login_shell)
227#endif 227#endif
228 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname); 228 update_lastlog (LASTLOG_FILE, pty, hostname);
229#endif 229#endif
230} 230}
231 231
232/* ------------------------------------------------------------------------- */ 232/* ------------------------------------------------------------------------- */
233/* 233/*
234 * remove utmp and wtmp entries 234 * remove utmp and wtmp entries
235 */ 235 */
236void 236void
237rxvt_ptytty_unix::logout () 237ptytty_unix::logout ()
238{ 238{
239 if (!cmd_pid) 239 if (!cmd_pid)
240 return; 240 return;
241 241
242#ifdef HAVE_STRUCT_UTMP 242#ifdef HAVE_STRUCT_UTMP
… …
287 if (login_shell) 287 if (login_shell)
288#endif 288#endif
289 { 289 {
290# ifdef HAVE_STRUCT_UTMP 290# ifdef HAVE_STRUCT_UTMP
291# ifdef HAVE_UPDWTMP 291# ifdef HAVE_UPDWTMP
292 updwtmp (RXVT_WTMP_FILE, ut); 292 updwtmp (WTMP_FILE, ut);
293# else 293# else
294 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 294 update_wtmp (WTMP_FILE, ut);
295# endif 295# endif
296# endif 296# endif
297# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX) 297# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
298 updwtmpx (RXVT_WTMPX_FILE, utx); 298 updwtmpx (WTMPX_FILE, utx);
299# endif 299# endif
300 } 300 }
301#endif 301#endif
302 302
303 /* 303 /*
… …
308 if (ut->ut_pid == cmd_pid) 308 if (ut->ut_pid == cmd_pid)
309 pututline (ut); 309 pututline (ut);
310 endutent (); 310 endutent ();
311# else 311# else
312 memset (ut, 0, sizeof (struct utmp)); 312 memset (ut, 0, sizeof (struct utmp));
313 rxvt_write_bsd_utmp (utmp_pos, ut); 313 write_bsd_utmp (utmp_pos, ut);
314# endif 314# endif
315#endif 315#endif
316#ifdef HAVE_STRUCT_UTMPX 316#ifdef HAVE_STRUCT_UTMPX
317 if (utx->ut_pid == cmd_pid) 317 if (utx->ut_pid == cmd_pid)
318 pututxline (utx); 318 pututxline (utx);
… …
326/* 326/*
327 * Write a BSD style utmp entry 327 * Write a BSD style utmp entry
328 */ 328 */
329#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID) 329#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
330static int 330static int
331rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu) 331write_bsd_utmp (int utmp_pos, struct utmp *wu)
332{ 332{
333 int fd; 333 int fd;
334 334
335 if (utmp_pos <= 0 || (fd = open (RXVT_UTMP_FILE, O_WRONLY)) == -1) 335 if (utmp_pos <= 0 || (fd = open (UTMP_FILE, O_WRONLY)) == -1)
336 return 0; 336 return 0;
337 337
338 if (lseek (fd, (off_t) (utmp_pos * sizeof (struct utmp)), SEEK_SET) != -1) 338 if (lseek (fd, (off_t) (utmp_pos * sizeof (struct utmp)), SEEK_SET) != -1)
339 write (fd, wu, sizeof (struct utmp)); 339 write (fd, wu, sizeof (struct utmp));
340 close (fd); 340 close (fd);
… …
346/* 346/*
347 * Update a BSD style wtmp entry 347 * Update a BSD style wtmp entry
348 */ 348 */
349#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP) 349#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP)
350static void 350static void
351rxvt_update_wtmp (const char *fname, const struct utmp *putmp) 351update_wtmp (const char *fname, const struct utmp *putmp)
352{ 352{
353 int fd, gotlock, retry; 353 int fd, gotlock, retry;
354 struct flock lck; /* fcntl locking scheme */ 354 struct flock lck; /* fcntl locking scheme */
355 struct stat sbuf; 355 struct stat sbuf;
356 356
… …
387#endif 387#endif
388 388
389/* ------------------------------------------------------------------------- */ 389/* ------------------------------------------------------------------------- */
390#ifdef LASTLOG_SUPPORT 390#ifdef LASTLOG_SUPPORT
391static void 391static void
392rxvt_update_lastlog (const char *fname, const char *pty, const char *host) 392update_lastlog (const char *fname, const char *pty, const char *host)
393{ 393{
394# ifdef HAVE_STRUCT_LASTLOGX 394# ifdef HAVE_STRUCT_LASTLOGX
395 struct lastlogx llx; 395 struct lastlogx llx;
396# endif 396# endif
397# ifdef HAVE_STRUCT_LASTLOG 397# ifdef HAVE_STRUCT_LASTLOG
… …
407 memset (&llx, 0, sizeof (llx)); 407 memset (&llx, 0, sizeof (llx));
408 llx.ll_tv.tv_sec = time (NULL); 408 llx.ll_tv.tv_sec = time (NULL);
409 llx.ll_tv.tv_usec = 0; 409 llx.ll_tv.tv_usec = 0;
410 strncpy (llx.ll_line, pty, sizeof (llx.ll_line)); 410 strncpy (llx.ll_line, pty, sizeof (llx.ll_line));
411 strncpy (llx.ll_host, host, sizeof (llx.ll_host)); 411 strncpy (llx.ll_host, host, sizeof (llx.ll_host));
412 updlastlogx (RXVT_LASTLOGX_FILE, getuid (), &llx); 412 updlastlogx (LASTLOGX_FILE, getuid (), &llx);
413# endif 413# endif
414 414
415# ifdef HAVE_STRUCT_LASTLOG 415# ifdef HAVE_STRUCT_LASTLOG
416 pwent = getpwuid (getuid ()); 416 pwent = getpwuid (getuid ());
417 if (!pwent) 417 if (!pwent)
418 { 418 {
419 rxvt_warn ("no entry in password file, not updating lastlog.\n"); 419 warn ("no entry in password file, not updating lastlog.\n");
420 return; 420 return;
421 } 421 }
422 422
423 memset (&ll, 0, sizeof (ll)); 423 memset (&ll, 0, sizeof (ll));
424 ll.ll_time = time (NULL); 424 ll.ll_time = time (NULL);
… …
448} 448}
449#endif /* LASTLOG_SUPPORT */ 449#endif /* LASTLOG_SUPPORT */
450/* ------------------------------------------------------------------------- */ 450/* ------------------------------------------------------------------------- */
451 451
452#else 452#else
453
453void 454void
454rxvt_ptytty_unix::login (int cmd_pid, bool login_shell, const char *hostname) 455ptytty_unix::login (int cmd_pid, bool login_shell, const char *hostname)
455{ 456{
456} 457}
457#endif /* UTMP_SUPPORT */ 458
459#endif
460

Diff Legend

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