hal: Branch 'master'

[David Zeuthen]

 tools/umount-hal.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

New commits:
diff-tree fd62ece9c0bce992d3b7ef09ab5ed74105ee25b7 (from 184afb9acb61816203c852ab3559a849248362d3)
Author: David Zeuthen <davidz at redhat.com>
Date:   Tue Feb 20 02:58:22 2007 -0500

    make umount.hal work when options like -v are passed to umount

diff --git a/tools/umount-hal.c b/tools/umount-hal.c
index 60f7231..e16b96d 100644
--- a/tools/umount-hal.c
+++ b/tools/umount-hal.c
@@ -48,11 +48,15 @@ main (int argc, char *argv[])
 
 	ret = 1;
 
-	if (argc != 2) {
-		fprintf (stderr, "%s: program is supposed to be called with only one argument.", argv[0]);
+	if (argc < 2) {
+		fprintf (stderr, "%s: this program is only supposed to be invoked by umount(8).\n", argv[0]);
 		goto out;
 	}
 
+	/* it appears the device file is always the first argument.
+	 * TODO XXX FIXME: we ought to honor umount(8) options like
+	 * -v for verbose.
+	 */
 	device_file = argv[1];
 
 	dbus_error_init (&error);