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