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

Diff Legend

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