[PATCH 09/10] debugger.c: correct return type from getppid() (Solaris support)

diff --git a/6b/2e2f0b2c9d0e7a8d97a9cc5c4b3de15c4bd613 b/6b/2e2f0b2c9d0e7a8d97a9cc5c4b3de15c4bd613
new file mode 100644 (file)
index 0000000..1e46399
--- /dev/null
+++ b/6b/2e2f0b2c9d0e7a8d97a9cc5c4b3de15c4bd613
@@ -0,0 +1,79 @@
+Return-Path: <blakej@foo.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 84898431FB6\r
+       for <notmuch@notmuchmail.org>; Sat,  3 Nov 2012 20:24:17 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id feFoUzfVAB27 for <notmuch@notmuchmail.org>;\r
+       Sat,  3 Nov 2012 20:24:17 -0700 (PDT)\r
+X-Greylist: delayed 489 seconds by postgrey-1.32 at olra;\r
+       Sat, 03 Nov 2012 20:24:16 PDT\r
+Received: from foo.net (70-36-235-136.dsl.static.sonic.net [70.36.235.136])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id F36CD431FAE\r
+       for <notmuch@notmuchmail.org>; Sat,  3 Nov 2012 20:24:16 -0700 (PDT)\r
+Received: from foo.net (localhost [127.0.0.1])\r
+       by foo.net (8.14.5+Sun/8.14.5) with ESMTP id qA43GHpQ025708;\r
+       Sat, 3 Nov 2012 20:16:17 -0700 (PDT)\r
+Received: (from blakej@localhost)\r
+       by foo.net (8.14.5+Sun/8.14.5/Submit) id qA43GHDw025707;\r
+       Sat, 3 Nov 2012 20:16:17 -0700 (PDT)\r
+From: Blake Jones <blakej@foo.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 09/10] debugger.c: correct return type from getppid() (Solaris\r
+       support)\r
+Date: Sat,  3 Nov 2012 20:16:01 -0700\r
+Message-Id: <1351998962-25135-10-git-send-email-blakej@foo.net>\r
+X-Mailer: git-send-email 1.7.3.2\r
+In-Reply-To: <1351998962-25135-1-git-send-email-blakej@foo.net>\r
+References: <1351998962-25135-1-git-send-email-blakej@foo.net>\r
+X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.0.2\r
+       (foo.net [127.0.0.1]); Sat, 03 Nov 2012 20:16:17 -0700 (PDT)\r
+X-Mailman-Approved-At: Sun, 04 Nov 2012 01:30:19 -0800\r
+Cc: Blake Jones <blakej@foo.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 04 Nov 2012 03:24:17 -0000\r
+\r
+Cast the return value of getppid() to "int" from "pid_t" in debugger.c,\r
+since it is being passed to sprintf("%d"), which wants an "int"\r
+argument.  On Solaris, "pid_t" is a "long" for 32-bit programs.\r
+---\r
+ debugger.c |    2 +-\r
+ 1 file changed, 1 insertion(+), 1 deletion(-)\r
+\r
+diff --git a/debugger.c b/debugger.c\r
+index e8b9378..8ff13d6 100644\r
+--- a/debugger.c\r
++++ b/debugger.c\r
+@@ -36,7 +36,7 @@ debugger_is_active (void)\r
+     if (RUNNING_ON_VALGRIND)\r
+       return TRUE;\r
+ \r
+-    sprintf (buf, "/proc/%d/exe", getppid ());\r
++    sprintf (buf, "/proc/%d/exe", (int) getppid ());\r
+     if (readlink (buf, buf, sizeof (buf)) != -1 &&\r
+       strncmp (basename (buf), "gdb", 3) == 0)\r
+     {\r
+-- \r
+1.7.9.2\r
+\r