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