* strace.cc (strace::vsprntf): Avoid printing a zero pid.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 59e1f023bdd4ec8dfc7599020669a6c8bb8b4749..f58ed1ed91a083525911d9cd44b7b6e221526c29 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-27  Christopher Faylor  <cgf@timesys.com>
+
+       * strace.cc (strace::vsprntf): Avoid printing a zero pid.
+
 2005-09-27  Corinna Vinschen  <corinna@vinschen.de>
 
        * init.cc (dll_entry): Call IsWow64Process with GetCurrentProcess

diff --git a/winsup/cygwin/strace.cc b/winsup/cygwin/strace.cc
index 104be711b2f9ab2993d9e6e95c1fcf61388f7a10..54fab722a49f3d7232b4a051ac87fad4d3064976 100644 (file)
--- a/winsup/cygwin/strace.cc
+++ b/winsup/cygwin/strace.cc
@@ -149,7 +149,7 @@ strace::vsprntf (char *buf, const char *func, const char *infmt, va_list ap)
        *p = '\000';
       p = progname;
       count = __small_sprintf (buf, fmt, p && *p ? p : "?",
-                             myself ? myself->pid : GetCurrentProcessId (),
+                             (myself && myself->pid) ? myself->pid : GetCurrentProcessId (),
                               execing ? "!" : "");
       if (func)
        count += getfunc (buf + count, func);