From 727d356e2c61a3e4bdf58417a3afb3a1d309c003 Mon Sep 17 00:00:00 2001
From: Charlie Fenton <charlief@example.com>
Date: Thu, 7 Jan 2010 11:29:48 +0000
Subject: [PATCH] Mac: Fix bug in backtrace code

svn path=/trunk/boinc/; revision=20090
---
 checkin_notes             | 7 +++++++
 lib/mac/mac_backtrace.cpp | 8 ++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index d10189cea0..9736fc1976 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -168,3 +168,10 @@ David  6 Jan 2010
 
     client/
         boinc_cmd.cpp
+
+Charlie  7 Jan 2010
+    - Mac: Fix bug in backtrace code which showed up only under OS 10.6.
+
+    lib/
+        mac/
+            mac_backtrace.C
diff --git a/lib/mac/mac_backtrace.cpp b/lib/mac/mac_backtrace.cpp
index cc6d79d8f3..15a948e465 100644
--- a/lib/mac/mac_backtrace.cpp
+++ b/lib/mac/mac_backtrace.cpp
@@ -178,17 +178,17 @@ void PrintBacktrace(void) {
         if (f) {
             setbuf(f, 0);
             for (i=0; i<frames; i++) {
-               fprintf(f, "%#lx\n", (long)callstack[i]);
+                fprintf(f, "%#lx\n", (long)callstack[i]);
                 PersistentFGets(pipeBuf, sizeof(pipeBuf), f);
 #ifdef __LP64__
                 fprintf(stderr, "%3d  0x%016llx  %s", i, (unsigned long long)callstack[i], pipeBuf);
 #else
                 fprintf(stderr, "%3d  0x%08lx  %s", i, (unsigned long)callstack[i], pipeBuf);
 #endif
-           }
+            }
+            pclose(f);
         }
         fprintf(stderr, "\n");
-        pclose(f);
         
         if (env) {
             setenv("NSUnbufferedIO", saved_env, 1);
@@ -251,7 +251,7 @@ static void GetNameOfAndPathToThisProcess(char *nameBuf, size_t nameBufLen, char
         return;
     PersistentFGets(nameBuf, nameBufLen, f);    // Discard header line
     PersistentFGets(nameBuf, nameBufLen, f);    // Get just the name of our application
-    fclose(f);
+    pclose(f);
 
     // Remove trailing newline if present
     p = strchr(nameBuf, '\n');