diff --git a/checkin_notes b/checkin_notes
index 756eda10f1..d3f91dd3c4 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -3164,3 +3164,13 @@ David 5 Apr 2007
lib/
browser.C
prefs.C
+
+Charlie 5 Apr 2007
+ - CC: on Mac/UNIX/Linux systems, fix ACTIVE_TASK::handle_exited_app()
+ error code display by sign-extending the signed byte status code.
+ For example, ERR_SIGNAL_CATCH is -125, so the status code was 0x83,
+ which was being incorrectly reported as "131 (0x83)." It now
+ correctly displays "-125 (0xff83).
+
+ client/
+ app_control.C
diff --git a/client/app_control.C b/client/app_control.C
index 4326807495..1acaec63fe 100644
--- a/client/app_control.C
+++ b/client/app_control.C
@@ -247,14 +247,15 @@ void ACTIVE_TASK::handle_exited_app(int stat) {
}
#else
if (WIFEXITED(stat)) {
- result->exit_status = WEXITSTATUS(stat);
+ // Exit code is a signed byte - sign extend it to a full int.
+ result->exit_status = (int)((char)(WEXITSTATUS(stat) & 0xff));
if (result->exit_status) {
set_task_state(PROCESS_EXITED, "handle_exited_app");
gstate.report_result_error(
*result,
"process exited with code %d (0x%x)",
- result->exit_status, result->exit_status
+ result->exit_status, (result->exit_status & 0xffff)
);
} else {
if (finish_file_present()) {
diff --git a/mac_build/English.lproj/InfoPlist.strings b/mac_build/English.lproj/InfoPlist.strings
index bceb280b15..a2e8fde374 100755
--- a/mac_build/English.lproj/InfoPlist.strings
+++ b/mac_build/English.lproj/InfoPlist.strings
@@ -1,5 +1,5 @@
/* Localized versions of Info.plist keys */
CFBundleName = "BOINC";
-CFBundleShortVersionString = "BOINC version 5.9.2";
-CFBundleGetInfoString = "BOINC version 5.9.2, Copyright 2006 University of California.";
+CFBundleShortVersionString = "BOINC version 5.9.3";
+CFBundleGetInfoString = "BOINC version 5.9.3, Copyright 2006 University of California.";
diff --git a/mac_build/Info.plist b/mac_build/Info.plist
index 53cedf002a..cc64363ba0 100644
--- a/mac_build/Info.plist
+++ b/mac_build/Info.plist
@@ -17,6 +17,6 @@
CFBundleSignature
BNC!
CFBundleVersion
- 5.9.2
+ 5.9.3
diff --git a/mac_build/Installer-Info.plist b/mac_build/Installer-Info.plist
index 5ac0646c81..86922663ab 100644
--- a/mac_build/Installer-Info.plist
+++ b/mac_build/Installer-Info.plist
@@ -15,6 +15,6 @@
CFBundleSignature
????
CFBundleVersion
- 5.9.2
+ 5.9.3
diff --git a/mac_build/PostInstall-Info.plist b/mac_build/PostInstall-Info.plist
index b76face3a1..d95f46e0fb 100644
--- a/mac_build/PostInstall-Info.plist
+++ b/mac_build/PostInstall-Info.plist
@@ -15,6 +15,6 @@
CFBundleSignature
????
CFBundleVersion
- 5.9.2
+ 5.9.3
diff --git a/mac_build/ScreenSaver-Info.plist b/mac_build/ScreenSaver-Info.plist
index aabf70ee5a..59d54dd430 100644
--- a/mac_build/ScreenSaver-Info.plist
+++ b/mac_build/ScreenSaver-Info.plist
@@ -17,7 +17,7 @@
CFBundleSignature
????
CFBundleVersion
- 5.9.2
+ 5.9.3
NSPrincipalClass
BOINC_Saver_ModuleView
diff --git a/mac_build/SystemMenu-Info.plist b/mac_build/SystemMenu-Info.plist
index 1159a652c1..5c08c4eb67 100644
--- a/mac_build/SystemMenu-Info.plist
+++ b/mac_build/SystemMenu-Info.plist
@@ -15,6 +15,6 @@
CFBundleSignature
????
CFBundleVersion
- 5.9.2
+ 5.9.3