From c73ddecbe57fbff6aa071fd3ddb9c2afdb7000ec Mon Sep 17 00:00:00 2001
From: Razvan Deaconescu <razvan.deaconescu@cs.pub.ro>
Date: Thu, 11 Nov 2010 17:06:18 +0200
Subject: [PATCH] test-socket-signal: add help option; fix long option
 arguments

---
 Utils/test-socket-signal/peer.c     | 10 ++++++++--
 Utils/test-socket-signal/receiver.c | 14 ++++++++++----
 Utils/test-socket-signal/sender.c   | 14 ++++++++++----
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/Utils/test-socket-signal/peer.c b/Utils/test-socket-signal/peer.c
index 8895c19..aa743a6 100644
--- a/Utils/test-socket-signal/peer.c
+++ b/Utils/test-socket-signal/peer.c
@@ -231,7 +231,7 @@ static void print_buffer_meta(const char *buf, size_t len)
 
 static void usage(const char *argv0)
 {
-	fprintf(stderr, "Usage: %s [-l | --leader] [-p | --port <listen-port>] [-b | --buffer-size <buffer-size>] [-e | --peer_buffer_size <buffer-size>] [-f | --frequency <frequency>] <peer-host> <peer-port>\n", argv0);
+	fprintf(stderr, "Usage: %s [-h | --help] [-l | --leader] [-p | --port <listen-port>] [-b | --buffer-size <buffer-size>] [-e | --peer_buffer_size <buffer-size>] [-f | --frequency <frequency>] <peer-host> <peer-port>\n", argv0);
 }
 
 static void print_args(void)
@@ -269,10 +269,11 @@ static void parse_args(int argc, char **argv)
 			{"buffer-size", 1, NULL, 0},
 			{"peer-buffer-size", 1, NULL, 0},
 			{"frequency", 1, NULL, 0},
+			{"help", 0, NULL, 'h'},
 			{0, 0, 0, 0}
 		};
 
-		c = getopt_long(argc, argv, "lp:b:e:f:",
+		c = getopt_long(argc, argv, "hlp:b:e:f:",
 				long_options, &option_index);
 		if (c == -1)
 			break;
@@ -309,6 +310,11 @@ static void parse_args(int argc, char **argv)
 			cmd_args.frequency = atoi(optarg);
 			break;
 
+		case 'h':
+			usage(argv[0]);
+			exit(EXIT_SUCCESS);
+			break;
+
 		case '?':
 			break;
 
diff --git a/Utils/test-socket-signal/receiver.c b/Utils/test-socket-signal/receiver.c
index dcce1e6..d744a49 100644
--- a/Utils/test-socket-signal/receiver.c
+++ b/Utils/test-socket-signal/receiver.c
@@ -143,7 +143,7 @@ static void print_buffer_meta(const char *buf, size_t len)
 
 static void usage(const char *argv0)
 {
-	fprintf(stderr, "Usage: %s [-p | --port <listen-port>] [-b | --buffer-size <buffer-size>]\n", argv0);
+	fprintf(stderr, "Usage: %s [-h | --help] [-p | --port <listen-port>] [-b | --buffer-size <buffer-size>]\n", argv0);
 }
 
 static void print_args(void)
@@ -159,12 +159,13 @@ static void parse_args(int argc, char **argv)
 	while (1) {
 		int option_index = 0;
 		static struct option long_options[] = {
-			{"port", 1, NULL, 0},
-			{"buffer-size", 1, NULL, 0},
+			{"port", 1, NULL, 'p'},
+			{"buffer-size", 1, NULL, 'b'},
+			{"help", 0, NULL, 'h'},
 			{0, 0, 0, 0}
 		};
 
-		c = getopt_long(argc, argv, "p:b:",
+		c = getopt_long(argc, argv, "hp:b:",
 				long_options, &option_index);
 		if (c == -1)
 			break;
@@ -187,6 +188,11 @@ static void parse_args(int argc, char **argv)
 			cmd_args.buffer_size = atoi(optarg);
 			break;
 
+		case 'h':
+			usage(argv[0]);
+			exit(EXIT_SUCCESS);
+			break;
+
 		case '?':
 			break;
 
diff --git a/Utils/test-socket-signal/sender.c b/Utils/test-socket-signal/sender.c
index a18699f..1b265b9 100644
--- a/Utils/test-socket-signal/sender.c
+++ b/Utils/test-socket-signal/sender.c
@@ -126,7 +126,7 @@ static void delay_packet(void)
 
 static void usage(const char *argv0)
 {
-	fprintf(stderr, "Usage: %s [-b | --buffer-size <buffer-size>] [-d | --delay <packet-delay>] <server-host> <server-port>\n", argv0);
+	fprintf(stderr, "Usage: %s [-h | --help] [-b | --buffer-size <buffer-size>] [-d | --delay <packet-delay>] <server-host> <server-port>\n", argv0);
 }
 
 static void print_args(void)
@@ -144,12 +144,13 @@ static void parse_args(int argc, char **argv)
 	while (1) {
 		int option_index = 0;
 		static struct option long_options[] = {
-			{"buffer-size", 1, NULL, 0},
-			{"packet-delay", 1, NULL, 0},
+			{"buffer-size", 1, NULL, 'b'},
+			{"packet-delay", 1, NULL, 'd'},
+			{"help", 0, NULL, 'h'},
 			{0, 0, 0, 0}
 		};
 
-		c = getopt_long(argc, argv, "b:d:",
+		c = getopt_long(argc, argv, "hb:d:",
 				long_options, &option_index);
 		if (c == -1)
 			break;
@@ -172,6 +173,11 @@ static void parse_args(int argc, char **argv)
 			cmd_args.packet_delay = atoi(optarg);
 			break;
 
+		case 'h':
+			usage(argv[0]);
+			exit(EXIT_SUCCESS);
+			break;
+
 		case '?':
 			break;
 
-- 
2.20.1