* fhandler.h (fhandler_base): Remove obsolete _rpos and _rsize elements.

* fhandler.cc (fhandler_base::open): Ditto.
* fhandler.cc (fhandler_base::fhandler_base): Ditto.
(fhandler_base::read): Ditto.  Add more debugging output.  Don't issue a \r
when \r\n detected.
* pipe.cc (make_pipe): Streamline slightly.  Make debug output more
interesting.
* strace.cc (strace::vsprintf): Use __progname where appropriate to distinguish
strace output when exec'ing.
This commit is contained in:
Christopher Faylor
2000-10-07 18:12:11 +00:00
parent 4ea34a6850
commit 57bf29e825
5 changed files with 69 additions and 109 deletions

View File

@@ -96,6 +96,8 @@ getfunc (char *in_dst, const char *func)
return dst - in_dst;
}
extern "C" char *__progname;
/* sprintf analog for use by output routines. */
int
strace::vsprntf (char *buf, const char *func, const char *infmt, va_list ap)
@@ -105,6 +107,7 @@ strace::vsprntf (char *buf, const char *func, const char *infmt, va_list ap)
static int nonewline = FALSE;
DWORD err = GetLastError ();
const char *tn = threadname (0);
char *pn = __progname ?: myself->progname;
int microsec = microseconds ();
lmicrosec = microsec;
@@ -117,11 +120,13 @@ strace::vsprntf (char *buf, const char *func, const char *infmt, va_list ap)
count = 0;
else
{
char *p, progname[sizeof (myself->progname)];
if ((p = strrchr (myself->progname, '\\')) != NULL)
char *p, progname[MAX_PATH + 1];
if ((p = strrchr (pn, '\\')) != NULL)
p++;
else if ((p = strrchr (pn, '/')) != NULL)
p++;
else
p = myself->progname;
p = pn;
strcpy (progname, p);
if ((p = strrchr (progname, '.')) != NULL)
*p = '\000';