Put command-line arguments related functions in a separate file

4 files changed, 179 insertions, 114 deletions

diff --git a/other/bootstrap_daemon/Makefile.inc b/other/bootstrap_daemon/Makefile.inc
index 5dce910e..b278e3f0 100644
--- a/other/bootstrap_daemon/Makefile.inc
+++ b/other/bootstrap_daemon/Makefile.inc
@@ -10,7 +10,9 @@ tox_bootstrapd_SOURCES = \
                         ../other/bootstrap_daemon/src/config.c \
                         ../other/bootstrap_daemon/src/config_defaults.h \
                         ../other/bootstrap_node_packets.h \
-                        ../other/bootstrap_node_packets.c
+                        ../other/bootstrap_node_packets.c \
+                        ../other/bootstrap_daemon/src/command_line_arguments.h \
+                        ../other/bootstrap_daemon/src/command_line_arguments.c
 
 tox_bootstrapd_CFLAGS = \
                         -I$(top_srcdir)/other/bootstrap_daemon \
diff --git a/other/bootstrap_daemon/src/command_line_arguments.c b/other/bootstrap_daemon/src/command_line_arguments.c
new file mode 100644
index 00000000..9b3b2e8c
--- /dev/null
+++ b/other/bootstrap_daemon/src/command_line_arguments.c
@@ -0,0 +1,141 @@
+/* command_line_arguments.c
+ *
+ * Tox DHT bootstrap daemon.
+ *
+ *  Copyright (C) 2015 Tox project All Rights Reserved.
+ *
+ *  This file is part of Tox.
+ *
+ *  Tox is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Tox is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Tox.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "command_line_arguments.h"
+
+#include "global.h"
+
+#include <getopt.h>
+
+#include <stdlib.h>
+#include <string.h>
+
+// Prints --help message
+
+void print_help()
+{
+    // 2 space ident
+    // make sure all lines fit into 80 columns
+    // make sure options are listed in alphabetical order
+    write_log(LOG_LEVEL_INFO,
+           "Usage: tox-bootstrapd [OPTION]... --config=FILE_PATH\n"
+           "\n"
+           "Options:\n"
+           "  --config=FILE_PATH     Specify path to the config file.\n"
+           "                         This is a required option.\n"
+           "                         Set FILE_PATH to a path to an empty file in order to\n"
+           "                         use default settings.\n"
+           "  --foreground           Run the daemon in foreground. The daemon won't fork\n"
+           "                         (detach from the terminal) and won't use the PID file.\n"
+           "  --help                 Print this help message.\n"
+           "  --log-backend=BACKEND  Specify which logging backend to use.\n"
+           "                         Valid BACKEND values (case sensetive):\n"
+           "                           syslog Writes log messages to syslog.\n"
+           "                                  Default option when no --log-backend is\n"
+           "                                  specified.\n"
+           "                           stdout Writes log messages to stdout/stderr.\n"
+           "  --version              Print version information.\n");
+}
+
+void handle_command_line_arguments(int argc, char *argv[], char **cfg_file_path, LOG_BACKEND *log_backend, bool *run_in_foreground)
+{
+    if (argc < 2) {
+        write_log(LOG_LEVEL_ERROR, "Error: No arguments provided.\n\n");
+        print_help();
+        exit(1);
+    }
+
+    opterr = 0;
+
+    static struct option long_options[] = {
+        {"help",        no_argument,       0, 'h'},
+        {"config",      required_argument, 0, 'c'}, // required option
+        {"foreground",  no_argument,       0, 'f'},
+        {"log-backend", required_argument, 0, 'l'}, // optional, defaults to syslog
+        {"version",     no_argument,       0, 'v'},
+        {0,             0,                 0,  0 }
+    };
+
+    bool cfg_file_path_set = false;
+    bool log_backend_set   = false;
+
+    *run_in_foreground = false;
+
+    int opt;
+
+    while ((opt = getopt_long(argc, argv, ":", long_options, NULL)) != -1) {
+
+        switch (opt) {
+            case 'h':
+                print_help();
+                exit(0);
+
+            case 'c':
+                *cfg_file_path = optarg;
+                cfg_file_path_set = true;
+                break;
+
+            case 'f':
+                *run_in_foreground = true;
+                break;
+
+            case 'l':
+                if (strcmp(optarg, "syslog") == 0) {
+                    *log_backend = LOG_BACKEND_SYSLOG;
+                    log_backend_set = true;
+                } else if (strcmp(optarg, "stdout") == 0) {
+                    *log_backend = LOG_BACKEND_STDOUT;
+                    log_backend_set = true;
+                } else {
+                    write_log(LOG_LEVEL_ERROR, "Error: Invalid BACKEND value for --log-backend option passed: %s\n\n", optarg);
+                    print_help();
+                    exit(1);
+                }
+                break;
+
+            case 'v':
+                write_log(LOG_LEVEL_INFO, "Version: %lu\n", DAEMON_VERSION_NUMBER);
+                exit(0);
+
+            case '?':
+                write_log(LOG_LEVEL_ERROR, "Error: Unrecognized option %s\n\n", argv[optind-1]);
+                print_help();
+                exit(1);
+
+            case ':':
+                write_log(LOG_LEVEL_ERROR, "Error: No argument provided for option %s\n\n", argv[optind-1]);
+                print_help();
+                exit(1);
+        }
+    }
+
+    if (!log_backend_set) {
+        *log_backend = LOG_BACKEND_SYSLOG;
+    }
+
+    if (!cfg_file_path_set) {
+        write_log(LOG_LEVEL_ERROR, "Error: The required --config option wasn't specified\n\n");
+        print_help();
+        exit(1);
+    }
+}
diff --git a/other/bootstrap_daemon/src/command_line_arguments.h b/other/bootstrap_daemon/src/command_line_arguments.h
new file mode 100644
index 00000000..1581278f
--- /dev/null
+++ b/other/bootstrap_daemon/src/command_line_arguments.h
@@ -0,0 +1,34 @@
+/* command_line_arguments.h
+ *
+ * Tox DHT bootstrap daemon.
+ *
+ *  Copyright (C) 2015 Tox project All Rights Reserved.
+ *
+ *  This file is part of Tox.
+ *
+ *  Tox is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Tox is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Tox.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef COMMAND_LINE_ARGUMENTS_H
+#define COMMAND_LINE_ARGUMENTS_H
+
+#include "log.h"
+
+// Handles command line arguments, setting cfg_file_path and log_backend.
+// Terminates the application if incorrect arguments are specified.
+
+void handle_command_line_arguments(int argc, char *argv[], char **cfg_file_path, LOG_BACKEND *log_backend, bool *run_in_foreground);
+
+#endif // COMMAND_LINE_ARGUMENTS_H
diff --git a/other/bootstrap_daemon/src/tox-bootstrapd.c b/other/bootstrap_daemon/src/tox-bootstrapd.c
index d4191e80..8ffef009 100644
--- a/other/bootstrap_daemon/src/tox-bootstrapd.c
+++ b/other/bootstrap_daemon/src/tox-bootstrapd.c
@@ -49,6 +49,7 @@
 #include "../bootstrap_node_packets.h"
 #include "../../testing/misc_tools.c"
 
+#include "command_line_arguments.h"
 #include "config.h"
 #include "global.h"
 #include "log.h"
@@ -122,119 +123,6 @@ void print_public_key(const uint8_t *public_key)
     return;
 }
 
-// Prints --help message
-
-bool print_help()
-{
-    // 2 space ident
-    // make sure all lines fit into 80 columns
-    // make sure options are listed in alphabetical order
-    write_log(LOG_LEVEL_INFO,
-           "Usage: tox-bootstrapd [OPTION]... --config=FILE_PATH\n"
-           "\n"
-           "Options:\n"
-           "  --config=FILE_PATH     Specify path to the config file.\n"
-           "                         This is a required option.\n"
-           "                         Set FILE_PATH to a path to an empty file in order to\n"
-           "                         use default settings.\n"
-           "  --foreground           Run the daemon in foreground. The daemon won't fork\n"
-           "                         (detach from the terminal) and won't use the PID file.\n"
-           "  --help                 Print this help message.\n"
-           "  --log-backend=BACKEND  Specify which logging backend to use.\n"
-           "                         Valid BACKEND values (case sensetive):\n"
-           "                           syslog Writes log messages to syslog.\n"
-           "                                  Default option when no --log-backend is\n"
-           "                                  specified.\n"
-           "                           stdout Writes log messages to stdout/stderr.\n"
-           "  --version              Print version information.\n");
-}
-
-// Handels command line arguments, setting cfg_file_path and log_backend.
-// Terminates the application if incorrect arguments are specified.
-
-void handle_command_line_arguments(int argc, char *argv[], char **cfg_file_path, LOG_BACKEND *log_backend, bool *run_in_foreground)
-{
-    if (argc < 2) {
-        write_log(LOG_LEVEL_ERROR, "Error: No arguments provided.\n\n");
-        print_help();
-        exit(1);
-    }
-
-    opterr = 0;
-
-    static struct option long_options[] = {
-        {"help",        no_argument,       0, 'h'},
-        {"config",      required_argument, 0, 'c'}, // required option
-        {"foreground",  no_argument,       0, 'f'},
-        {"log-backend", required_argument, 0, 'l'}, // optional, defaults to syslog
-        {"version",     no_argument,       0, 'v'},
-        {0,             0,                 0,  0 }
-    };
-
-    bool cfg_file_path_set = false;
-    bool log_backend_set   = false;
-
-    *run_in_foreground = false;
-
-    int opt;
-
-    while ((opt = getopt_long(argc, argv, ":", long_options, NULL)) != -1) {
-
-        switch (opt) {
-            case 'h':
-                print_help();
-                exit(0);
-
-            case 'c':
-                *cfg_file_path = optarg;
-                cfg_file_path_set = true;
-                break;
-
-            case 'f':
-                *run_in_foreground = true;
-                break;
-
-            case 'l':
-                if (strcmp(optarg, "syslog") == 0) {
-                    *log_backend = LOG_BACKEND_SYSLOG;
-                    log_backend_set = true;
-                } else if (strcmp(optarg, "stdout") == 0) {
-                    *log_backend = LOG_BACKEND_STDOUT;
-                    log_backend_set = true;
-                } else {
-                    write_log(LOG_LEVEL_ERROR, "Error: Invalid BACKEND value for --log-backend option passed: %s\n\n", optarg);
-                    print_help();
-                    exit(1);
-                }
-                break;
-
-            case 'v':
-                write_log(LOG_LEVEL_INFO, "Version: %lu\n", DAEMON_VERSION_NUMBER);
-                exit(0);
-
-            case '?':
-                write_log(LOG_LEVEL_ERROR, "Error: Unrecognized option %s\n\n", argv[optind-1]);
-                print_help();
-                exit(1);
-
-            case ':':
-                write_log(LOG_LEVEL_ERROR, "Error: No argument provided for option %s\n\n", argv[optind-1]);
-                print_help();
-                exit(1);
-        }
-    }
-
-    if (!log_backend_set) {
-        *log_backend = LOG_BACKEND_SYSLOG;
-    }
-
-    if (!cfg_file_path_set) {
-        write_log(LOG_LEVEL_ERROR, "Error: The required --config option wasn't specified\n\n");
-        print_help();
-        exit(1);
-    }
-}
-
 // Demonizes the process, appending PID to the PID file and closing file descriptors based on log backend
 // Terminates the application if the daemonization fails.