From: Sebastian Harl <sh@tokkee.org>
Date: Sat, 6 Jun 2009 19:21:28 +0000 (+0200)
Subject: src/oping.c: Exit successfully when using the -h option.
X-Git-Tag: liboping-1.3.0~14
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=a121dac2b7d1c3a47d461179c8b2f59b0a7e4f18;p=liboping.git

src/oping.c: Exit successfully when using the -h option.
---

diff --git a/src/oping.c b/src/oping.c
index 0ef6ec6..a1dbade 100644
--- a/src/oping.c
+++ b/src/oping.c
@@ -107,7 +107,7 @@ static void context_destroy (ping_context_t *context)
 	free (context);
 }
 
-static void usage_exit (const char *name)
+static void usage_exit (const char *name, int status)
 {
 	int name_length;
 
@@ -128,7 +128,7 @@ static void usage_exit (const char *name)
 			"by Florian octo Forster <octo@verplant.org>\n"
 			"for contributions see `AUTHORS'\n",
 			name);
-	exit (1);
+	exit (status);
 }
 
 static int read_options (int argc, char **argv)
@@ -201,8 +201,10 @@ static int read_options (int argc, char **argv)
 			}
 
 			case 'h':
+				usage_exit (argv[0], 0);
+				break;
 			default:
-				usage_exit (argv[0]);
+				usage_exit (argv[0], 1);
 		}
 	}
 
@@ -329,7 +331,7 @@ int main (int argc, char **argv)
 	optind = read_options (argc, argv);
 
 	if ((optind >= argc) && (opt_filename == NULL)) {
-		usage_exit (argv[0]);
+		usage_exit (argv[0], 1);
 	}
 
 	if (geteuid () != 0)