From a7d888e158104ee7993921687457dc3b4ddd6c4b Mon Sep 17 00:00:00 2001
From: "Rafael G. Martins" <rafael@rafaelmartins.eng.br>
Date: Thu, 28 Mar 2019 19:51:32 +0100
Subject: runserver: exit 1 on error

---
 src/blogc-runserver/httpd.c | 16 ++++++++--------
 src/blogc-runserver/main.c  |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/blogc-runserver/httpd.c b/src/blogc-runserver/httpd.c
index 79c5ec5..513c4b0 100644
--- a/src/blogc-runserver/httpd.c
+++ b/src/blogc-runserver/httpd.c
@@ -271,7 +271,7 @@ br_httpd_run(const char *host, const char *port, const char *docroot,
     if (0 != (err = getaddrinfo(host, port, &hints, &result))) {
         fprintf(stderr, "Failed to get host:port info: %s\n",
             gai_strerror(err));
-        return 3;
+        return 1;
     }
 
     thread_data_t threads[max_threads];
@@ -295,7 +295,7 @@ br_httpd_run(const char *host, const char *port, const char *docroot,
             if (rp->ai_next == NULL) {
                 fprintf(stderr, "Failed to open server socket (%s:%d): %s\n",
                     final_host, final_port, strerror(errno));
-                rv = 3;
+                rv = 1;
                 goto cleanup0;
             }
             continue;
@@ -307,7 +307,7 @@ br_httpd_run(const char *host, const char *port, const char *docroot,
             if (rp->ai_next == NULL) {
                 fprintf(stderr, "Failed to set socket option (%s:%d): %s\n",
                     final_host, final_port, strerror(errno));
-                rv = 3;
+                rv = 1;
                 goto cleanup;
             }
             close(server_socket);
@@ -321,7 +321,7 @@ br_httpd_run(const char *host, const char *port, const char *docroot,
             if (rp->ai_next == NULL) {
                 fprintf(stderr, "Failed to bind to server socket (%s:%d): %s\n",
                     final_host, final_port, strerror(errno));
-                rv = 3;
+                rv = 1;
                 goto cleanup;
             }
         }
@@ -332,7 +332,7 @@ br_httpd_run(const char *host, const char *port, const char *docroot,
     if (-1 == listen(server_socket, LISTEN_BACKLOG)) {
         fprintf(stderr, "Failed to listen to server socket (%s:%d): %s\n",
             final_host, final_port, strerror(errno));
-        rv = 3;
+        rv = 1;
         goto cleanup;
     }
 
@@ -369,7 +369,7 @@ br_httpd_run(const char *host, const char *port, const char *docroot,
         int client_socket = accept(server_socket, client_addr, &addrlen);
         if (client_socket == -1) {
             fprintf(stderr, "Failed to accept connection: %s\n", strerror(errno));
-            rv = 3;
+            rv = 1;
             goto cleanup;
         }
 
@@ -384,7 +384,7 @@ br_httpd_run(const char *host, const char *port, const char *docroot,
                 fprintf(stderr, "Failed to join thread\n");
                 free(arg->ip);
                 free(arg);
-                rv = 3;
+                rv = 1;
                 goto cleanup;
             }
         }
@@ -393,7 +393,7 @@ br_httpd_run(const char *host, const char *port, const char *docroot,
             handle_request, arg) != 0)
         {
             fprintf(stderr, "Failed to create thread\n");
-            rv = 3;
+            rv = 1;
             goto cleanup;
         }
 
diff --git a/src/blogc-runserver/main.c b/src/blogc-runserver/main.c
index 64383a5..1c5be29 100644
--- a/src/blogc-runserver/main.c
+++ b/src/blogc-runserver/main.c
@@ -104,7 +104,7 @@ main(int argc, char **argv)
                     print_usage();
                     fprintf(stderr, "blogc-runserver: error: invalid "
                         "argument: -%c\n", argv[i][1]);
-                    rv = 3;
+                    rv = 1;
                     goto cleanup;
             }
         }
@@ -113,7 +113,7 @@ main(int argc, char **argv)
                 print_usage();
                 fprintf(stderr, "blogc-runserver: error: only one positional "
                     "argument allowed\n");
-                rv = 3;
+                rv = 1;
                 goto cleanup;
             }
             args++;
@@ -125,7 +125,7 @@ main(int argc, char **argv)
         print_usage();
         fprintf(stderr, "blogc-runserver: error: document root directory "
             "required\n");
-        rv = 3;
+        rv = 1;
         goto cleanup;
     }
 
@@ -133,7 +133,7 @@ main(int argc, char **argv)
         print_usage();
         fprintf(stderr, "blogc-runserver: error: invalid value for -m. "
             "Must be integer > 0 and <= 1000\n");
-        rv = 3;
+        rv = 1;
         goto cleanup;
     }
 
-- 
cgit v1.2.3-18-g5258