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.4 by pcg, Sat Jan 31 00:20:21 2004 UTC vs.
Revision 1.12 by root, Wed Jan 19 15:20:47 2005 UTC

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

Diff Legend

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