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

Diff Legend

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