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

Diff Legend

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