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.11 by root, Sun Aug 15 22:09:24 2004 UTC

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

Diff Legend

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