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.9 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.13 by root, Fri Feb 4 04:16:05 2005 UTC

… …
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; 69 int i;
70#endif 70#endif
71 char ut_id[5];
72 struct passwd *pwent = getpwuid (getuid ()); 71 struct passwd *pwent = getpwuid (getuid ());
73 72
74 if (!STRNCMP (pty, "/dev/", 5)) 73 if (!strncmp (pty, "/dev/", 5))
75 pty += 5; /* skip /dev/ prefix */ 74 pty += 5; /* skip /dev/ prefix */
76 75
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 76#ifdef HAVE_UTMP_PID
77 if (!strncmp (pty, "pty", 3) || !strncmp (pty, "tty", 3))
78 strncpy (ut_id, pty + 3, sizeof (ut_id));
82 else if (sscanf (pty, "pts/%d", &i) == 1) 79 else if (sscanf (pty, "pts/%d", &i) == 1)
83 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */ 80 sprintf (ut_id, "vt%02x", (i & 0xff)); /* sysv naming */
84#endif
85 else if (STRNCMP (pty, "pty", 3) && STRNCMP (pty, "tty", 3)) 81 else if (strncmp (pty, "pty", 3) && strncmp (pty, "tty", 3))
86 { 82 {
87 rxvt_warn ("can't parse tty name \"%s\", not adding utmp entry.\n", pty); 83 rxvt_warn ("can't parse tty name \"%s\", not adding utmp entry.\n", pty);
88 return; 84 return;
89 } 85 }
86#endif
90 87
91#ifdef HAVE_STRUCT_UTMP 88#ifdef HAVE_STRUCT_UTMP
92 MEMSET (ut, 0, sizeof (struct utmp)); 89 memset (ut, 0, sizeof (struct utmp));
93# ifdef HAVE_UTMP_PID 90# ifdef HAVE_UTMP_PID
94 setutent (); 91 setutent ();
95 STRNCPY (ut->ut_id, ut_id, sizeof (ut->ut_id)); 92 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id));
96 ut->ut_type = DEAD_PROCESS; 93 ut->ut_type = DEAD_PROCESS;
97 getutid (ut); /* position to entry in utmp file */ 94 getutid (ut); /* position to entry in utmp file */
98 STRNCPY (ut_id, ut_id, sizeof (ut_id)); 95 strncpy (ut_id, ut_id, sizeof (ut_id));
99# endif
100#endif 96# endif
97#endif
101 98
102#ifdef HAVE_STRUCT_UTMPX 99#ifdef HAVE_STRUCT_UTMPX
103 MEMSET (utx, 0, sizeof (struct utmpx)); 100 memset (utx, 0, sizeof (struct utmpx));
104 setutxent (); 101 setutxent ();
105 STRNCPY (utx->ut_id, ut_id, sizeof (utx->ut_id)); 102 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id));
106 utx->ut_type = DEAD_PROCESS; 103 utx->ut_type = DEAD_PROCESS;
107 getutxid (utx); /* position to entry in utmp file */ 104 getutxid (utx); /* position to entry in utmp file */
108 STRNCPY (ut_id, ut_id, sizeof (ut_id)); 105 strncpy (ut_id, ut_id, sizeof (ut_id));
109#endif 106#endif
110 107
111#ifdef HAVE_STRUCT_UTMP 108#ifdef HAVE_STRUCT_UTMP
112 STRNCPY (ut->ut_line, pty, sizeof (ut->ut_line)); 109 strncpy (ut->ut_line, pty, sizeof (ut->ut_line));
113 ut->ut_time = time (NULL); 110 ut->ut_time = time (NULL);
114# ifdef HAVE_UTMP_PID 111# ifdef HAVE_UTMP_PID
115 STRNCPY (ut->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?", 112 strncpy (ut->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?",
116 sizeof (ut->ut_user)); 113 sizeof (ut->ut_user));
117 STRNCPY (ut->ut_id, ut_id, sizeof (ut->ut_id)); 114 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id));
118 ut->ut_time = time (NULL); 115 ut->ut_time = time (NULL);
119 ut->ut_pid = cmd_pid; 116 ut->ut_pid = cmd_pid;
120# ifdef HAVE_UTMP_HOST 117# ifdef HAVE_UTMP_HOST
121 STRNCPY (ut->ut_host, hostname, sizeof (ut->ut_host)); 118 strncpy (ut->ut_host, hostname, sizeof (ut->ut_host));
122# endif 119# endif
123 ut->ut_type = USER_PROCESS; 120 ut->ut_type = USER_PROCESS;
124 pututline (ut); 121 pututline (ut);
125 endutent (); /* close the file */ 122 endutent (); /* close the file */
126 utmp_pos = 0; 123 utmp_pos = 0;
127# else 124# else
128 STRNCPY (ut->ut_name, (pwent && pwent->pw_name) ? pwent->pw_name : "?", 125 strncpy (ut->ut_name, (pwent && pwent->pw_name) ? pwent->pw_name : "?",
129 sizeof (ut->ut_name)); 126 sizeof (ut->ut_name));
130# ifdef HAVE_UTMP_HOST 127# ifdef HAVE_UTMP_HOST
131 STRNCPY (ut->ut_host, hostname, sizeof (ut->ut_host)); 128 strncpy (ut->ut_host, hostname, sizeof (ut->ut_host));
132# endif
133# endif 129# endif
134#endif 130# endif
131#endif
135 132
136#ifdef HAVE_STRUCT_UTMPX 133#ifdef HAVE_STRUCT_UTMPX
137 STRNCPY (utx->ut_line, pty, sizeof (utx->ut_line)); 134 strncpy (utx->ut_line, pty, sizeof (utx->ut_line));
138 STRNCPY (utx->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?", 135 strncpy (utx->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?",
139 sizeof (utx->ut_user)); 136 sizeof (utx->ut_user));
140 STRNCPY (utx->ut_id, ut_id, sizeof (utx->ut_id)); 137 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id));
141 utx->ut_session = getsid (0); 138 utx->ut_session = getsid (0);
142 utx->ut_tv.tv_sec = time (NULL); 139 utx->ut_tv.tv_sec = time (NULL);
143 utx->ut_tv.tv_usec = 0; 140 utx->ut_tv.tv_usec = 0;
144 utx->ut_pid = cmd_pid; 141 utx->ut_pid = cmd_pid;
145# ifdef HAVE_UTMPX_HOST 142# ifdef HAVE_UTMPX_HOST
146 STRNCPY (utx->ut_host, hostname, sizeof (utx->ut_host)); 143 strncpy (utx->ut_host, hostname, sizeof (utx->ut_host));
147# if 0 144# if 0
148 { 145 {
149 char *colon; 146 char *colon;
150 147
151 if ((colon = STRRCHR (ut->ut_host, ':')) != NULL) 148 if ((colon = strrchr (ut->ut_host, ':')) != NULL)
152 *colon = '\0'; 149 *colon = '\0';
153 } 150 }
154# endif 151# endif
155# endif 152# endif
156 utx->ut_type = USER_PROCESS; 153 utx->ut_type = USER_PROCESS;
… …
177 buf[sizeof (buf) - 1] = '\0'; 174 buf[sizeof (buf) - 1] = '\0';
178 for (i = 1; (fgets (buf, sizeof (buf) - 1, fd0) != NULL);) 175 for (i = 1; (fgets (buf, sizeof (buf) - 1, fd0) != NULL);)
179 { 176 {
180 if (*buf == '#' || sscanf (buf, "%s", name) != 1) 177 if (*buf == '#' || sscanf (buf, "%s", name) != 1)
181 continue; 178 continue;
182 if (!STRCMP (ut->ut_line, name)) 179 if (!strcmp (ut->ut_line, name))
183 { 180 {
184 if (!rxvt_write_bsd_utmp (i, ut)) 181 if (!rxvt_write_bsd_utmp (i, ut))
185 i = 0; 182 i = 0;
186 utmp_pos = i; 183 utmp_pos = i;
187 fclose (fd0); 184 fclose (fd0);
… …
196 } 193 }
197#endif 194#endif
198 195
199#ifdef WTMP_SUPPORT 196#ifdef WTMP_SUPPORT
200# ifdef WTMP_ONLY_ON_LOGIN 197# ifdef WTMP_ONLY_ON_LOGIN
201 if (Options & Opt_loginShell) 198 if (options & Opt_loginShell)
202# endif 199# endif
203 { 200 {
204# ifdef HAVE_STRUCT_UTMP 201# ifdef HAVE_STRUCT_UTMP
205# ifdef HAVE_UPDWTMP 202# ifdef HAVE_UPDWTMP
206 updwtmp (RXVT_WTMP_FILE, ut); 203 updwtmp (RXVT_WTMP_FILE, ut);
… …
212 updwtmpx (RXVT_WTMPX_FILE, utx); 209 updwtmpx (RXVT_WTMPX_FILE, utx);
213# endif 210# endif
214 } 211 }
215#endif 212#endif
216#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE) 213#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE)
217 if (Options & Opt_loginShell) 214 if (options & Opt_loginShell)
218 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname); 215 rxvt_update_lastlog (RXVT_LASTLOG_FILE, pty, hostname);
219#endif 216#endif
220} 217}
221 218
222/* ------------------------------------------------------------------------- */ 219/* ------------------------------------------------------------------------- */
… …
225 */ 222 */
226void 223void
227rxvt_term::cleanutent () 224rxvt_term::cleanutent ()
228{ 225{
229#ifdef HAVE_STRUCT_UTMP 226#ifdef HAVE_STRUCT_UTMP
230 struct utmp *ut = & (this->ut); 227 struct utmp *ut = &this->ut;
231#endif 228#endif
232#ifdef HAVE_STRUCT_UTMPX 229#ifdef HAVE_STRUCT_UTMPX
233 struct utmpx *tmputx, *utx = & (this->utx); 230 struct utmpx *tmputx, *utx = &this->utx;
234#endif 231#endif
235 232
236#ifdef HAVE_STRUCT_UTMP 233#ifdef HAVE_STRUCT_UTMP
237# ifdef HAVE_UTMP_PID 234# ifdef HAVE_UTMP_PID
238 MEMSET (ut, 0, sizeof (struct utmp)); 235 memset (ut, 0, sizeof (struct utmp));
239 setutent (); 236 setutent ();
240 STRNCPY (ut->ut_id, ut_id, sizeof (ut->ut_id)); 237 strncpy (ut->ut_id, ut_id, sizeof (ut->ut_id));
241 ut->ut_type = USER_PROCESS; 238 ut->ut_type = USER_PROCESS;
242 { 239 {
243 struct utmp *tmput = getutid (ut); 240 struct utmp *tmput = getutid (ut);
244 241
245 if (tmput) /* position to entry in utmp file */ 242 if (tmput) /* position to entry in utmp file */
246 ut = tmput; 243 ut = tmput;
247 } 244 }
248 ut->ut_type = DEAD_PROCESS; 245 ut->ut_type = DEAD_PROCESS;
249# else 246# else
250 MEMSET (ut->ut_name, 0, sizeof (ut->ut_name)); 247 memset (ut->ut_name, 0, sizeof (ut->ut_name));
251# ifdef HAVE_UTMP_HOST 248# ifdef HAVE_UTMP_HOST
252 MEMSET (ut->ut_host, 0, sizeof (ut->ut_host)); 249 memset (ut->ut_host, 0, sizeof (ut->ut_host));
253# endif 250# endif
254# endif 251# endif
255 ut->ut_time = time (NULL); 252 ut->ut_time = time (NULL);
256#endif 253#endif
257 254
258#ifdef HAVE_STRUCT_UTMPX 255#ifdef HAVE_STRUCT_UTMPX
259 MEMSET (utx, 0, sizeof (struct utmpx)); 256 memset (utx, 0, sizeof (struct utmpx));
260 setutxent (); 257 setutxent ();
261 STRNCPY (utx->ut_id, ut_id, sizeof (utx->ut_id)); 258 strncpy (utx->ut_id, ut_id, sizeof (utx->ut_id));
262 utx->ut_type = USER_PROCESS; 259 utx->ut_type = USER_PROCESS;
263 if ((tmputx = getutxid (utx))) /* position to entry in utmp file */ 260 if ((tmputx = getutxid (utx))) /* position to entry in utmp file */
264 utx = tmputx; 261 utx = tmputx;
265 utx->ut_type = DEAD_PROCESS; 262 utx->ut_type = DEAD_PROCESS;
266 utx->ut_session = getsid (0); 263 utx->ut_session = getsid (0);
… …
271 /* 268 /*
272 * Write ending wtmp entry 269 * Write ending wtmp entry
273 */ 270 */
274#ifdef WTMP_SUPPORT 271#ifdef WTMP_SUPPORT
275# ifdef WTMP_ONLY_ON_LOGIN 272# ifdef WTMP_ONLY_ON_LOGIN
276 if (Options & Opt_loginShell) 273 if (options & Opt_loginShell)
277# endif 274# endif
278 { 275 {
279# ifdef HAVE_STRUCT_UTMP 276# ifdef HAVE_STRUCT_UTMP
280# ifdef HAVE_UPDWTMP 277# ifdef HAVE_UPDWTMP
281 updwtmp (RXVT_WTMP_FILE, ut); 278 updwtmp (RXVT_WTMP_FILE, ut);
… …
296# ifdef HAVE_UTMP_PID 293# ifdef HAVE_UTMP_PID
297 if (ut->ut_pid == cmd_pid) 294 if (ut->ut_pid == cmd_pid)
298 pututline (ut); 295 pututline (ut);
299 endutent (); 296 endutent ();
300# else 297# else
301 MEMSET (ut, 0, sizeof (struct utmp)); 298 memset (ut, 0, sizeof (struct utmp));
302 rxvt_write_bsd_utmp (utmp_pos, ut); 299 rxvt_write_bsd_utmp (utmp_pos, ut);
303# endif 300# endif
304#endif 301#endif
305#ifdef HAVE_STRUCT_UTMPX 302#ifdef HAVE_STRUCT_UTMPX
306 if (utx->ut_pid == cmd_pid) 303 if (utx->ut_pid == cmd_pid)
… …
392# endif 389# endif
393 struct passwd *pwent; 390 struct passwd *pwent;
394# endif 391# endif
395 392
396# ifdef HAVE_STRUCT_LASTLOGX 393# ifdef HAVE_STRUCT_LASTLOGX
397 MEMSET (&llx, 0, sizeof (llx)); 394 memset (&llx, 0, sizeof (llx));
398 llx.ll_tv.tv_sec = time (NULL); 395 llx.ll_tv.tv_sec = time (NULL);
399 llx.ll_tv.tv_usec = 0; 396 llx.ll_tv.tv_usec = 0;
400 STRNCPY (llx.ll_line, pty, sizeof (llx.ll_line)); 397 strncpy (llx.ll_line, pty, sizeof (llx.ll_line));
401 STRNCPY (llx.ll_host, host, sizeof (llx.ll_host)); 398 strncpy (llx.ll_host, host, sizeof (llx.ll_host));
402 updlastlogx (RXVT_LASTLOGX_FILE, getuid (), &llx); 399 updlastlogx (RXVT_LASTLOGX_FILE, getuid (), &llx);
403# endif 400# endif
404 401
405# ifdef HAVE_STRUCT_LASTLOG 402# ifdef HAVE_STRUCT_LASTLOG
406 pwent = getpwuid (getuid ()); 403 pwent = getpwuid (getuid ());
… …
408 { 405 {
409 rxvt_warn ("no entry in password file, not updating lastlog.\n"); 406 rxvt_warn ("no entry in password file, not updating lastlog.\n");
410 return; 407 return;
411 } 408 }
412 409
413 MEMSET (&ll, 0, sizeof (ll)); 410 memset (&ll, 0, sizeof (ll));
414 ll.ll_time = time (NULL); 411 ll.ll_time = time (NULL);
415 STRNCPY (ll.ll_line, pty, sizeof (ll.ll_line)); 412 strncpy (ll.ll_line, pty, sizeof (ll.ll_line));
416 STRNCPY (ll.ll_host, host, sizeof (ll.ll_host)); 413 strncpy (ll.ll_host, host, sizeof (ll.ll_host));
417# ifdef LASTLOG_IS_DIR 414# ifdef LASTLOG_IS_DIR
418 sprintf (lastlogfile, "%.*s/%.*s", 415 sprintf (lastlogfile, "%.*s/%.*s",
419 sizeof (lastlogfile) - sizeof (pwent->pw_name) - 2, fname, 416 sizeof (lastlogfile) - sizeof (pwent->pw_name) - 2, fname,
420 sizeof (pwent->pw_name), 417 sizeof (pwent->pw_name),
421 (!pwent->pw_name || pwent->pw_name[0] == '\0') ? "unknown" 418 (!pwent->pw_name || pwent->pw_name[0] == '\0') ? "unknown"

Diff Legend

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