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

Diff Legend

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