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

Diff Legend

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