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.5 by pcg, Sat Jan 31 03:27:45 2004 UTC vs.
Revision 1.19 by root, Sat Dec 31 17:16:17 2005 UTC

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

Diff Legend

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