From 118828e772e84c472e7ef4fb738f9366457a8778 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Axel=20D=C3=B6rfler?= <axeld@pinc-software.de>
Date: Wed, 11 Jan 2006 23:17:40 +0000
Subject: [PATCH] shutdown now defaults to returning to the caller (ie. runs
 asynchronously), as it does in BeOS. If you want it to wait until the
 shutdown process fails (or the system is actually shut down), use the new
 "-s" option.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15923 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/bin/shutdown.cpp | 40 +++++++++++++++++-----------------------
 1 file changed, 17 insertions(+), 23 deletions(-)

diff --git a/src/bin/shutdown.cpp b/src/bin/shutdown.cpp
index fc90bede99..7b3467a91c 100644
--- a/src/bin/shutdown.cpp
+++ b/src/bin/shutdown.cpp
@@ -1,24 +1,12 @@
-// ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
-//
-//  Copyright (c) 2002-2005, Haiku
-//
-//  This software is part of the Haiku distribution and is covered 
-//  by the MIT license.
-//
-//  File:        shutdown.cpp
-//  Author:      Francois Revol (mmu_man@users.sf.net)
-//  Description: shuts down the system, either halting or rebooting.
-//
-//  Notes:
-//  This program behaves identically as the BeOS R5 version, with these 
-//  added arguments:
-//  
-//  -a asks the user to confirm the shutdown
-//  -c cancels any running shutdown
-//
-//  Some code from Shard's Archiver from BeBits (was BSD/MIT too :).
-//
-// ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
+/*
+ * Copyright 2002-2005, Haiku.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Francois Revol (mmu_man@users.sf.net)
+ */
+
+/*!	Shuts down the system, either halting or rebooting. */
 
 #include <syscalls.h>
 
@@ -84,6 +72,7 @@ usage(const char *arg0)
 		"\t-q quick shutdown (don't broadcast apps),\n"
 		"\t-a ask user to confirm the shutdown (ignored when -q is given),\n"
 		"\t-c cancel a running shutdown,\n"
+		"\t-s run shutdown synchronously (only returns if shutdown is cancelled)\n"
 		"\t-d delay shutdown by <time> seconds.\n", program);
 	exit(1);
 }
@@ -94,6 +83,7 @@ main(int argc, char **argv)
 {
 	bool askUser = false;
 	bool quick = false;
+	bool async = true;
 
 	for (int32 i = 1; i < argc; i++) {
 		char *arg = argv[i];
@@ -112,6 +102,9 @@ main(int argc, char **argv)
 					case 'r':
 						gReboot = true;
 						break;
+					case 's':
+						async = false;
+						break;
 					case 'c':
 					{
 						// find all running shutdown command and signal its shutdown thread
@@ -174,8 +167,9 @@ main(int argc, char **argv)
 	} else {
 		BRoster roster;
 		BRoster::Private rosterPrivate(roster);
-		status_t error = rosterPrivate.ShutDown(gReboot, askUser, true);
-		fprintf(stderr, "Shutdown failed: %s\n", strerror(error));
+		status_t error = rosterPrivate.ShutDown(gReboot, askUser, !async);
+		if (error != B_OK)
+			fprintf(stderr, "Shutdown failed: %s\n", strerror(error));
 		return 2;
 	}