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

Diff Legend

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