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

Diff Legend

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