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.9 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.40 by root, Sun Jan 22 12:23:55 2006 UTC

1// This file is part of libptytty. Do not make local modifications.
2// http://software.schmorp.de/pkg/libptytty
3
1/*--------------------------------*-C-*---------------------------------* 4/*----------------------------------------------------------------------*
2 * File: logging.C 5 * File: logging.C
3 *----------------------------------------------------------------------* 6 *----------------------------------------------------------------------*
4 * 7 *
5 * All portions of code are copyright by their respective author/s. 8 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey <jdb@ukc.ac.uk> 9 * Copyright (c) 1992 John Bovey <jdb@ukc.ac.uk>
… …
12 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 15 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 16 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
14 * - extensive modifications 17 * - extensive modifications
15 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> 18 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
16 * - lastlog support 19 * - lastlog support
17 * Copyright (c) 2004 Marc Lehmann <pcg@goof.com> 20 * Copyright (c) 2004-2006 Marc Lehmann <pcg@goof.com>
21 * Copyright (c) 2006 Emanuele Giaquinta <e.giaquinta@glauco.it>
18 * 22 *
19 * This program is free software; you can redistribute it and/or modify 23 * This program is free software; you can redistribute it and/or modify
20 * it under the terms of the GNU General Public License as published by 24 * it under the terms of the GNU General Public License as published by
21 * the Free Software Foundation; either version 2 of the License, or 25 * the Free Software Foundation; either version 2 of the License, or
22 * (at your option) any later version. 26 * (at your option) any later version.
… …
28 * 32 *
29 * You should have received a copy of the GNU General Public License 33 * You should have received a copy of the GNU General Public License
30 * along with this program; if not, write to the Free Software 34 * along with this program; if not, write to the Free Software
31 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 35 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
32 *----------------------------------------------------------------------*/ 36 *----------------------------------------------------------------------*/
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 37
42#include "../config.h" /* NECESSARY */
43#include "rxvt.h" /* NECESSARY */
44#include "logging.h" 38#include "../config.h"
39
40#include <cstdio>
41
42#include <sys/types.h>
43#include <sys/stat.h>
44#include <sys/fcntl.h>
45#include <unistd.h>
46#include <time.h>
47
48#include "ptytty.h"
49
45#ifdef UTMP_SUPPORT 50#if UTMP_SUPPORT
51
52#if HAVE_STRUCT_UTMP
53static int write_bsd_utmp (int utmp_pos, struct utmp *wu);
54static void update_wtmp (const char *fname, const struct utmp *putmp);
55#endif
56
57static void update_lastlog (const char *fname, const char *pty, const char *host);
46 58
47/* 59/*
48 * BSD style utmp entry 60 * BSD style utmp entry
49 * ut_line, ut_name, ut_host, ut_time 61 * ut_line, ut_name, ut_host, ut_time
50 * SYSV style utmp (and utmpx) entry 62 * SYSV style utmp (and utmpx) entry
… …
55 67
56/* 68/*
57 * make and write utmp and wtmp entries 69 * make and write utmp and wtmp entries
58 */ 70 */
59void 71void
60rxvt_term::makeutent (const char *pty, const char *hostname) 72ptytty_unix::login (int cmd_pid, bool login_shell, const char *hostname)
61{ 73{
62#ifdef HAVE_STRUCT_UTMP 74 const char *pty = name;
63 struct utmp *ut = & (this->ut); 75
64#endif 76 if (!pty || !*pty)
77 return;
78
79 this->cmd_pid = cmd_pid;
80 this->login_shell = login_shell;
81
65#ifdef HAVE_STRUCT_UTMPX 82#ifdef HAVE_STRUCT_UTMP
83 struct utmp *ut = &this->ut;
84#endif
85#ifdef HAVE_STRUCT_UTMPX
66 struct utmpx *utx = & (this->utx); 86 struct utmpx *utx = &this->utx;
67#endif 87#endif
68#ifdef HAVE_UTMP_PID 88 int i;
69 int i;
70#endif
71 char ut_id[5];
72 struct passwd *pwent = getpwuid (getuid ()); 89 struct passwd *pwent = getpwuid (getuid ());
73 90
74 if (!STRNCMP (pty, "/dev/", 5)) 91 if (!strncmp (pty, "/dev/", 5))
75 pty += 5; /* skip /dev/ prefix */ 92 pty += 5; /* skip /dev/ prefix */
76 93
94#if defined(HAVE_UTMP_PID) || defined(HAVE_STRUCT_UTMPX)
77 if (!STRNCMP (pty, "pty", 3) || !STRNCMP (pty, "tty", 3)) 95 if (!strncmp (pty, "pty", 3) || !strncmp (pty, "tty", 3))
78 {
79 STRNCPY (ut_id, (pty + 3), sizeof (ut_id)); 96 strncpy (ut_id, pty + 3, sizeof (ut_id));
80 }
81#ifdef HAVE_UTMP_PID
82 else if (sscanf (pty, "pts/%d", &i) == 1) 97 else if (sscanf (pty, "pts/%d", &i) == 1)
83 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */ 98 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */
84#endif
85 else if (STRNCMP (pty, "pty", 3) && STRNCMP (pty, "tty", 3)) 99 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3))
86 { 100 {
87 rxvt_warn ("can't parse tty name \"%s\", not adding utmp entry.\n", pty); 101 ptytty_warn ("can't parse tty name \"%s\", not adding utmp entry.\n", pty);
88 return; 102 return;
89 } 103 }
104#endif
90 105
91#ifdef HAVE_STRUCT_UTMP 106#ifdef HAVE_STRUCT_UTMP
92 MEMSET (ut, 0, sizeof (struct utmp)); 107 memset (ut, 0, sizeof (struct utmp));
93# ifdef HAVE_UTMP_PID 108# ifdef HAVE_UTMP_PID
94 setutent (); 109 setutent ();
95 STRNCPY (ut->ut_id, ut_id, sizeof (ut->ut_id)); 110 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id));
96 ut->ut_type = DEAD_PROCESS; 111 ut->ut_type = DEAD_PROCESS;
97 getutid (ut); /* position to entry in utmp file */ 112 getutid (ut); /* position to entry in utmp file */
98 STRNCPY (ut_id, ut_id, sizeof (ut_id)); 113 strncpy (this->ut_id, ut_id, sizeof (this->ut_id));
99# endif
100#endif 114# endif
115#endif
101 116
102#ifdef HAVE_STRUCT_UTMPX 117#ifdef HAVE_STRUCT_UTMPX
103 MEMSET (utx, 0, sizeof (struct utmpx)); 118 memset (utx, 0, sizeof (struct utmpx));
104 setutxent (); 119 setutxent ();
105 STRNCPY (utx->ut_id, ut_id, sizeof (utx->ut_id)); 120 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id));
106 utx->ut_type = DEAD_PROCESS; 121 utx->ut_type = DEAD_PROCESS;
107 getutxid (utx); /* position to entry in utmp file */ 122 getutxid (utx); /* position to entry in utmp file */
108 STRNCPY (ut_id, ut_id, sizeof (ut_id)); 123 strncpy (this->ut_id, ut_id, sizeof (this->ut_id));
109#endif 124#endif
110 125
111#ifdef HAVE_STRUCT_UTMP 126#ifdef HAVE_STRUCT_UTMP
112 STRNCPY (ut->ut_line, pty, sizeof (ut->ut_line)); 127 strncpy (ut->ut_line, pty, sizeof (ut->ut_line));
113 ut->ut_time = time (NULL); 128 ut->ut_time = time (NULL);
114# ifdef HAVE_UTMP_PID 129# ifdef HAVE_UTMP_PID
115 STRNCPY (ut->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?", 130 strncpy (ut->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?",
116 sizeof (ut->ut_user)); 131 sizeof (ut->ut_user));
117 STRNCPY (ut->ut_id, ut_id, sizeof (ut->ut_id)); 132 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id));
118 ut->ut_time = time (NULL); 133 ut->ut_time = time (NULL);
119 ut->ut_pid = cmd_pid; 134 ut->ut_pid = cmd_pid;
120# ifdef HAVE_UTMP_HOST 135# ifdef HAVE_UTMP_HOST
121 STRNCPY (ut->ut_host, hostname, sizeof (ut->ut_host)); 136 strncpy (ut->ut_host, hostname, sizeof (ut->ut_host));
122# endif 137# endif
123 ut->ut_type = USER_PROCESS; 138 ut->ut_type = USER_PROCESS;
124 pututline (ut); 139 pututline (ut);
125 endutent (); /* close the file */ 140 endutent (); /* close the file */
126 utmp_pos = 0; 141 utmp_pos = 0;
127# else 142# else
128 STRNCPY (ut->ut_name, (pwent && pwent->pw_name) ? pwent->pw_name : "?", 143 strncpy (ut->ut_name, (pwent && pwent->pw_name) ? pwent->pw_name : "?",
129 sizeof (ut->ut_name)); 144 sizeof (ut->ut_name));
130# ifdef HAVE_UTMP_HOST 145# ifdef HAVE_UTMP_HOST
131 STRNCPY (ut->ut_host, hostname, sizeof (ut->ut_host)); 146 strncpy (ut->ut_host, hostname, sizeof (ut->ut_host));
132# endif
133# endif 147# endif
134#endif 148# endif
149#endif
135 150
136#ifdef HAVE_STRUCT_UTMPX 151#ifdef HAVE_STRUCT_UTMPX
137 STRNCPY (utx->ut_line, pty, sizeof (utx->ut_line)); 152 strncpy (utx->ut_line, pty, sizeof (utx->ut_line));
138 STRNCPY (utx->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?", 153 strncpy (utx->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?",
139 sizeof (utx->ut_user)); 154 sizeof (utx->ut_user));
140 STRNCPY (utx->ut_id, ut_id, sizeof (utx->ut_id)); 155 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id));
156# if HAVE_UTMPX_SESSION
141 utx->ut_session = getsid (0); 157 utx->ut_session = getsid (0);
158# endif
142 utx->ut_tv.tv_sec = time (NULL); 159 utx->ut_tv.tv_sec = time (NULL);
143 utx->ut_tv.tv_usec = 0; 160 utx->ut_tv.tv_usec = 0;
144 utx->ut_pid = cmd_pid; 161 utx->ut_pid = cmd_pid;
145# ifdef HAVE_UTMPX_HOST 162# ifdef HAVE_UTMPX_HOST
146 STRNCPY (utx->ut_host, hostname, sizeof (utx->ut_host)); 163 strncpy (utx->ut_host, hostname, sizeof (utx->ut_host));
147# if 0 164# if 0
148 { 165 {
149 char *colon; 166 char *colon;
150 167
151 if ((colon = STRRCHR (ut->ut_host, ':')) != NULL) 168 if ((colon = strrchr (ut->ut_host, ':')) != NULL)
152 *colon = '\0'; 169 *colon = '\0';
153 } 170 }
154# endif 171# endif
155# endif 172# endif
156 utx->ut_type = USER_PROCESS; 173 utx->ut_type = USER_PROCESS;
… …
158 endutxent (); /* close the file */ 175 endutxent (); /* close the file */
159 utmp_pos = 0; 176 utmp_pos = 0;
160#endif 177#endif
161 178
162#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID) 179#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
163
164 { 180 {
165 int i;
166# ifdef HAVE_TTYSLOT 181# ifdef HAVE_TTYSLOT
182 int fdstdin = dup (STDIN_FILENO);
183 dup2 (tty, STDIN_FILENO);
184
167 i = ttyslot (); 185 i = ttyslot ();
168 if (rxvt_write_bsd_utmp (i, ut)) 186 if (write_bsd_utmp (i, ut))
169 utmp_pos = i; 187 utmp_pos = i;
188
189 dup2 (fdstdin, STDIN_FILENO);
190 close (fdstdin);
170# else 191# else
171 FILE *fd0; 192 FILE *fd0;
172 193
173 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL) 194 if ((fd0 = fopen (TTYTAB_FILENAME, "r")) != NULL)
174 { 195 {
175 char buf[256], name[256]; 196 char buf[256], name[256];
176 197
177 buf[sizeof (buf) - 1] = '\0'; 198 buf[sizeof (buf) - 1] = '\0';
178 for (i = 1; (fgets (buf, sizeof (buf) - 1, fd0) != NULL);) 199 for (i = 1; (fgets (buf, sizeof (buf) - 1, fd0) != NULL);)
179 { 200 {
180 if (*buf == '#' || sscanf (buf, "%s", name) != 1) 201 if (*buf == '#' || sscanf (buf, "%s", name) != 1)
181 continue; 202 continue;
182 if (!STRCMP (ut->ut_line, name)) 203 if (!strcmp (ut->ut_line, name))
183 { 204 {
184 if (!rxvt_write_bsd_utmp (i, ut)) 205 if (!write_bsd_utmp (i, ut))
185 i = 0; 206 i = 0;
186 utmp_pos = i; 207 utmp_pos = i;
187 fclose (fd0); 208 fclose (fd0);
188 break; 209 break;
189 } 210 }
190 i++; 211 i++;
191 } 212 }
192 fclose (fd0); 213 fclose (fd0);
193 } 214 }
194# endif 215# endif
195
196 } 216 }
197#endif 217#endif
198 218
199#ifdef WTMP_SUPPORT 219#ifdef WTMP_SUPPORT
200# ifdef WTMP_ONLY_ON_LOGIN 220#ifdef LOG_ONLY_ON_LOGIN
201 if (Options & Opt_loginShell) 221 if (login_shell)
202# endif 222#endif
203 { 223 {
204# ifdef HAVE_STRUCT_UTMP 224# ifdef HAVE_STRUCT_UTMP
205# ifdef HAVE_UPDWTMP 225# ifdef HAVE_UPDWTMP
206 updwtmp (RXVT_WTMP_FILE, ut); 226 updwtmp (WTMP_FILE, ut);
207# else 227# else
208 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 228 update_wtmp (WTMP_FILE, ut);
209# endif
210# endif 229# endif
211# ifdef HAVE_STRUCT_UTMPX 230# endif
231# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
212 updwtmpx (RXVT_WTMPX_FILE, utx); 232 updwtmpx (WTMPX_FILE, utx);
213# endif
214 }
215#endif 233# endif
234 }
235#endif
216#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE) 236#if defined(LASTLOG_SUPPORT) && defined(LASTLOG_FILE)
217 if (Options & Opt_loginShell) 237#ifdef LOG_ONLY_ON_LOGIN
238 if (login_shell)
239#endif
218 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname); 240 update_lastlog (LASTLOG_FILE, pty, hostname);
219#endif 241#endif
220} 242}
221 243
222/* ------------------------------------------------------------------------- */ 244/* ------------------------------------------------------------------------- */
223/* 245/*
224 * remove utmp and wtmp entries 246 * remove utmp and wtmp entries
225 */ 247 */
226void 248void
227rxvt_term::cleanutent () 249ptytty_unix::logout ()
228{ 250{
229#ifdef HAVE_STRUCT_UTMP 251 if (!cmd_pid)
230 struct utmp *ut = & (this->ut); 252 return;
231#endif 253
232#ifdef HAVE_STRUCT_UTMPX 254#ifdef HAVE_STRUCT_UTMP
255 struct utmp *tmput, *ut = &this->ut;
256#endif
257#ifdef HAVE_STRUCT_UTMPX
233 struct utmpx *tmputx, *utx = & (this->utx); 258 struct utmpx *tmputx, *utx = &this->utx;
234#endif 259#endif
235 260
236#ifdef HAVE_STRUCT_UTMP 261#ifdef HAVE_STRUCT_UTMP
237# ifdef HAVE_UTMP_PID 262# ifdef HAVE_UTMP_PID
238 MEMSET (ut, 0, sizeof (struct utmp)); 263 memset (ut, 0, sizeof (struct utmp));
239 setutent (); 264 setutent ();
240 STRNCPY (ut->ut_id, ut_id, sizeof (ut->ut_id)); 265 strncpy (ut->ut_id, this->ut_id, sizeof (ut->ut_id));
241 ut->ut_type = USER_PROCESS; 266 ut->ut_type = USER_PROCESS;
242 {
243 struct utmp *tmput = getutid (ut);
244
245 if (tmput) /* position to entry in utmp file */ 267 if ((tmput = getutid (ut))) /* position to entry in utmp file */
246 ut = tmput; 268 ut = tmput;
247 }
248 ut->ut_type = DEAD_PROCESS; 269 ut->ut_type = DEAD_PROCESS;
249# else 270# else
250 MEMSET (ut->ut_name, 0, sizeof (ut->ut_name)); 271 memset (ut->ut_name, 0, sizeof (ut->ut_name));
251# ifdef HAVE_UTMP_HOST 272# ifdef HAVE_UTMP_HOST
252 MEMSET (ut->ut_host, 0, sizeof (ut->ut_host)); 273 memset (ut->ut_host, 0, sizeof (ut->ut_host));
253# endif 274# endif
254# endif 275# endif
255 ut->ut_time = time (NULL); 276 ut->ut_time = time (NULL);
256#endif 277#endif
257 278
258#ifdef HAVE_STRUCT_UTMPX 279#ifdef HAVE_STRUCT_UTMPX
259 MEMSET (utx, 0, sizeof (struct utmpx)); 280 memset (utx, 0, sizeof (struct utmpx));
260 setutxent (); 281 setutxent ();
261 STRNCPY (utx->ut_id, ut_id, sizeof (utx->ut_id)); 282 strncpy (utx->ut_id, this->ut_id, sizeof (utx->ut_id));
262 utx->ut_type = USER_PROCESS; 283 utx->ut_type = USER_PROCESS;
263 if ((tmputx = getutxid (utx))) /* position to entry in utmp file */ 284 if ((tmputx = getutxid (utx))) /* position to entry in utmp file */
264 utx = tmputx; 285 utx = tmputx;
265 utx->ut_type = DEAD_PROCESS; 286 utx->ut_type = DEAD_PROCESS;
287# if HAVE_UTMPX_SESSION
266 utx->ut_session = getsid (0); 288 utx->ut_session = getsid (0);
289# endif
267 utx->ut_tv.tv_sec = time (NULL); 290 utx->ut_tv.tv_sec = time (NULL);
268 utx->ut_tv.tv_usec = 0; 291 utx->ut_tv.tv_usec = 0;
269#endif 292#endif
270 293
271 /* 294 /*
272 * Write ending wtmp entry 295 * Write ending wtmp entry
273 */ 296 */
274#ifdef WTMP_SUPPORT 297#ifdef WTMP_SUPPORT
275# ifdef WTMP_ONLY_ON_LOGIN 298#ifdef LOG_ONLY_ON_LOGIN
276 if (Options & Opt_loginShell) 299 if (login_shell)
277# endif 300#endif
278 { 301 {
279# ifdef HAVE_STRUCT_UTMP 302# ifdef HAVE_STRUCT_UTMP
280# ifdef HAVE_UPDWTMP 303# ifdef HAVE_UPDWTMP
281 updwtmp (RXVT_WTMP_FILE, ut); 304 updwtmp (WTMP_FILE, ut);
282# else 305# else
283 rxvt_update_wtmp (RXVT_WTMP_FILE, ut); 306 update_wtmp (WTMP_FILE, ut);
284# endif
285# endif 307# endif
286# ifdef HAVE_STRUCT_UTMPX 308# endif
309# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX)
287 updwtmpx (RXVT_WTMPX_FILE, utx); 310 updwtmpx (WTMPX_FILE, utx);
288# endif 311# endif
289 } 312 }
290#endif 313#endif
291 314
292 /* 315 /*
… …
296# ifdef HAVE_UTMP_PID 319# ifdef HAVE_UTMP_PID
297 if (ut->ut_pid == cmd_pid) 320 if (ut->ut_pid == cmd_pid)
298 pututline (ut); 321 pututline (ut);
299 endutent (); 322 endutent ();
300# else 323# else
301 MEMSET (ut, 0, sizeof (struct utmp)); 324 memset (ut, 0, sizeof (struct utmp));
302 rxvt_write_bsd_utmp (utmp_pos, ut); 325 write_bsd_utmp (utmp_pos, ut);
303# endif 326# endif
304#endif 327#endif
305#ifdef HAVE_STRUCT_UTMPX 328#ifdef HAVE_STRUCT_UTMPX
306 if (utx->ut_pid == cmd_pid) 329 if (utx->ut_pid == cmd_pid)
307 pututxline (utx); 330 pututxline (utx);
308 endutxent (); 331 endutxent ();
309#endif 332#endif
333
334 cmd_pid = 0;
310} 335}
311 336
312/* ------------------------------------------------------------------------- */ 337/* ------------------------------------------------------------------------- */
313/* 338/*
314 * Write a BSD style utmp entry 339 * Write a BSD style utmp entry
315 */ 340 */
316#ifdef HAVE_UTMP_H 341#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
317/* INTPROTO */ 342static int
318int
319rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu) 343write_bsd_utmp (int utmp_pos, struct utmp *wu)
320{ 344{
321 int fd; 345 int fd;
322 346
323 if (utmp_pos <= 0 || (fd = open (RXVT_UTMP_FILE, O_WRONLY)) == -1) 347 if (utmp_pos <= 0 || (fd = open (UTMP_FILE, O_WRONLY)) == -1)
324 return 0; 348 return 0;
325 349
326 if (lseek (fd, (off_t) (utmp_pos * sizeof (struct utmp)), SEEK_SET) != -1) 350 if (lseek (fd, (off_t) (utmp_pos * sizeof (struct utmp)), SEEK_SET) != -1)
327 write (fd, wu, sizeof (struct utmp)); 351 write (fd, wu, sizeof (struct utmp));
328 close (fd); 352 close (fd);
… …
332 356
333/* ------------------------------------------------------------------------- */ 357/* ------------------------------------------------------------------------- */
334/* 358/*
335 * Update a BSD style wtmp entry 359 * Update a BSD style wtmp entry
336 */ 360 */
337#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) 361#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP)
338/* INTPROTO */ 362static void
339void
340rxvt_update_wtmp (const char *fname, const struct utmp *putmp) 363update_wtmp (const char *fname, const struct utmp *putmp)
341{ 364{
342 int fd, gotlock, retry; 365 int fd, gotlock, retry;
343 struct flock lck; /* fcntl locking scheme */ 366 struct flock lck; /* fcntl locking scheme */
344 struct stat sbuf; 367 struct stat sbuf;
345 368
… …
375} 398}
376#endif 399#endif
377 400
378/* ------------------------------------------------------------------------- */ 401/* ------------------------------------------------------------------------- */
379#ifdef LASTLOG_SUPPORT 402#ifdef LASTLOG_SUPPORT
380/* INTPROTO */ 403static void
381void
382rxvt_update_lastlog (const char *fname, const char *pty, const char *host) 404update_lastlog (const char *fname, const char *pty, const char *host)
383{ 405{
384# ifdef HAVE_STRUCT_LASTLOGX 406# ifdef HAVE_STRUCT_LASTLOGX
385 struct lastlogx llx; 407 struct lastlogx llx;
386# endif 408# endif
387# ifdef HAVE_STRUCT_LASTLOG 409# ifdef HAVE_STRUCT_LASTLOG
… …
392# endif 414# endif
393 struct passwd *pwent; 415 struct passwd *pwent;
394# endif 416# endif
395 417
396# ifdef HAVE_STRUCT_LASTLOGX 418# ifdef HAVE_STRUCT_LASTLOGX
397 MEMSET (&llx, 0, sizeof (llx)); 419 memset (&llx, 0, sizeof (llx));
398 llx.ll_tv.tv_sec = time (NULL); 420 llx.ll_tv.tv_sec = time (NULL);
399 llx.ll_tv.tv_usec = 0; 421 llx.ll_tv.tv_usec = 0;
400 STRNCPY (llx.ll_line, pty, sizeof (llx.ll_line)); 422 strncpy (llx.ll_line, pty, sizeof (llx.ll_line));
401 STRNCPY (llx.ll_host, host, sizeof (llx.ll_host)); 423 strncpy (llx.ll_host, host, sizeof (llx.ll_host));
402 updlastlogx (RXVT_LASTLOGX_FILE, getuid (), &llx); 424 updlastlogx (LASTLOGX_FILE, getuid (), &llx);
403# endif 425# endif
404 426
405# ifdef HAVE_STRUCT_LASTLOG 427# ifdef HAVE_STRUCT_LASTLOG
406 pwent = getpwuid (getuid ()); 428 pwent = getpwuid (getuid ());
407 if (!pwent) 429 if (!pwent)
408 { 430 {
409 rxvt_warn ("no entry in password file, not updating lastlog.\n"); 431 ptytty_warn ("no entry in password file, not updating lastlog.\n");
410 return; 432 return;
411 } 433 }
412 434
413 MEMSET (&ll, 0, sizeof (ll)); 435 memset (&ll, 0, sizeof (ll));
414 ll.ll_time = time (NULL); 436 ll.ll_time = time (NULL);
415 STRNCPY (ll.ll_line, pty, sizeof (ll.ll_line)); 437 strncpy (ll.ll_line, pty, sizeof (ll.ll_line));
416 STRNCPY (ll.ll_host, host, sizeof (ll.ll_host)); 438 strncpy (ll.ll_host, host, sizeof (ll.ll_host));
417# ifdef LASTLOG_IS_DIR 439# ifdef LASTLOG_IS_DIR
418 sprintf (lastlogfile, "%.*s/%.*s", 440 sprintf (lastlogfile, "%.*s/%.*s",
419 sizeof (lastlogfile) - sizeof (pwent->pw_name) - 2, fname, 441 sizeof (lastlogfile) - sizeof (pwent->pw_name) - 2, fname,
420 sizeof (pwent->pw_name), 442 sizeof (pwent->pw_name),
421 (!pwent->pw_name || pwent->pw_name[0] == '\0') ? "unknown" 443 (!pwent->pw_name || pwent->pw_name[0] == '\0') ? "unknown"
… …
435 } 457 }
436# endif /* LASTLOG_IS_DIR */ 458# endif /* LASTLOG_IS_DIR */
437# endif /* HAVE_STRUCT_LASTLOG */ 459# endif /* HAVE_STRUCT_LASTLOG */
438} 460}
439#endif /* LASTLOG_SUPPORT */ 461#endif /* LASTLOG_SUPPORT */
440/* ------------------------------------------------------------------------- */
441 462
442#endif /* UTMP_SUPPORT */ 463#else
464void
465ptytty_unix::login (int cmd_pid, bool login_shell, const char *hostname)
466{
467}
468#endif
469

Diff Legend

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