From 36bf9e6f11b86bb15007993ac7df5e2a651eb3e1 Mon Sep 17 00:00:00 2001
From: "Steinar H. Gunderson" <sgunderson@bigfoot.com>
Date: Fri, 12 Apr 2013 23:04:01 +0200
Subject: [PATCH] Switch option parsing to getopt.

---
 main.cpp | 54 +++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 37 insertions(+), 17 deletions(-)

diff --git a/main.cpp b/main.cpp
index eed486e..64ee29f 100644
--- a/main.cpp
+++ b/main.cpp
@@ -2,6 +2,7 @@
 #include <string.h>
 #include <stdint.h>
 #include <assert.h>
+#include <getopt.h>
 #include <arpa/inet.h>
 #include <sys/socket.h>
 #include <pthread.h>
@@ -245,14 +246,38 @@ int main(int argc, char **argv)
 {
 	fprintf(stderr, "\nCubemap " SERVER_VERSION " starting.\n");
 
+	// Parse options.
+	int state_fd = -1;
+	for ( ;; ) {
+		static const option long_options[] = {
+			{ "state", required_argument, 0, 's' },
+		};
+		int option_index = 0;
+		int c = getopt_long (argc, argv, "s:", long_options, &option_index);
+     
+		if (c == -1) {
+			break;
+		}
+		switch (c) {
+		case 's':
+			state_fd = atoi(optarg);
+			break;
+		default:
+			assert(false);
+		}
+	}
+
+	string config_filename = "cubemap.config";
+	if (optind < argc) {
+		config_filename = argv[optind++];
+	}
+
 	struct timeval serialize_start;
-	bool is_reexec = false;
 
-	string config_filename = (argc == 1) ? "cubemap.config" : argv[1];
 	Config config;
 	if (!parse_config(config_filename, &config)) {
 		exit(1);
-	}	
+	}
 
 	servers = new ServerPool(config.num_servers);
 
@@ -260,11 +285,8 @@ int main(int argc, char **argv)
 	set<string> deserialized_stream_ids;
 	map<string, Input *> deserialized_inputs;
 	map<int, Acceptor *> deserialized_acceptors;
-	if (argc == 4 && strcmp(argv[2], "-state") == 0) {
-		is_reexec = true;
-
+	if (state_fd != -1) {
 		fprintf(stderr, "Deserializing state from previous process... ");
-		int state_fd = atoi(argv[3]);
 		loaded_state = read_tempfile(state_fd);
 
 		serialize_start.tv_sec = loaded_state.serialize_start_sec();
@@ -311,13 +333,11 @@ int main(int argc, char **argv)
 	// All deserialized inputs should now have been taken care of, one way or the other.
 	assert(deserialized_inputs.empty());
 	
-	if (is_reexec) {	
-		// Put back the existing clients. It doesn't matter which server we
-		// allocate them to, so just do round-robin. However, we need to add
-		// them after the mark pools have been set up.
-		for (int i = 0; i < loaded_state.clients_size(); ++i) {
-			servers->add_client_from_serialized(loaded_state.clients(i));
-		}
+	// Put back the existing clients. It doesn't matter which server we
+	// allocate them to, so just do round-robin. However, we need to add
+	// them after the mark pools have been set up.
+	for (int i = 0; i < loaded_state.clients_size(); ++i) {
+		servers->add_client_from_serialized(loaded_state.clients(i));
 	}
 
 	// Start writing statistics.
@@ -333,7 +353,7 @@ int main(int argc, char **argv)
 	
 	struct timeval server_start;
 	gettimeofday(&server_start, NULL);
-	if (is_reexec) {
+	if (state_fd != -1) {
 		// Measure time from we started deserializing (below) to now, when basically everything
 		// is up and running. This is, in other words, a conservative estimate of how long our
 		// “glitch” period was, not counting of course reconnects if the configuration changed.
@@ -361,7 +381,7 @@ int main(int argc, char **argv)
 	servers->stop();
 
 	fprintf(stderr, "Serializing state and re-execing...\n");
-	int state_fd = make_tempfile(collect_state(
+	state_fd = make_tempfile(collect_state(
 		serialize_start, acceptors, inputs, servers));
 	delete servers;
 	 
@@ -369,7 +389,7 @@ int main(int argc, char **argv)
 	sprintf(buf, "%d", state_fd);
 
 	for ( ;; ) {
-		execlp(argv[0], argv[0], config_filename.c_str(), "-state", buf, NULL);
+		execlp(argv[0], argv[0], config_filename.c_str(), "--state", buf, NULL);
 		perror("execlp");
 		fprintf(stderr, "PANIC: re-exec of %s failed. Waiting 0.2 seconds and trying again...\n", argv[0]);
 		usleep(200000);
-- 
2.39.2