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

Diff Legend

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