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

Diff Legend

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