Enhance handling of command line errors, and "--help" & "--version"

[ngircd-alex.git] / src / ngircd / ngircd.c

diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
index f73aa50508cfb8549ba8df1b62d815dcf1c4dbf7..68b34cb6b5d5e2df3a3501fa13165ca14f198d5b 100644 (file)
--- a/src/ngircd/ngircd.c
+++ b/src/ngircd/ngircd.c
@@ -125,7 +125,7 @@ main(int argc, const char *argv[])
                        if (strcmp(argv[i], "--help") == 0) {
                                Show_Version();
                                puts(""); Show_Help( ); puts( "" );
-                               exit(1);
+                               exit(0);
                        }
                        if (strcmp(argv[i], "--nodaemon") == 0) {
                                NGIRCd_NoDaemon = true;
@@ -143,7 +143,7 @@ main(int argc, const char *argv[])
 #endif
                        if (strcmp(argv[i], "--version") == 0) {
                                Show_Version();
-                               exit(1);
+                               exit(0);
                        }
                }
                else if(argv[i][0] == '-' && argv[i][1] != '-') {
@@ -200,21 +200,23 @@ main(int argc, const char *argv[])
                                }
 
                                if (!ok) {
-                                       printf("%s: invalid option \"-%c\"!\n",
-                                              PACKAGE_NAME, argv[i][n]);
-                                       printf("Try \"%s --help\" for more information.\n",
-                                              PACKAGE_NAME);
-                                       exit(1);
+                                       fprintf(stderr,
+                                               "%s: invalid option \"-%c\"!\n",
+                                               PACKAGE_NAME, argv[i][n]);
+                                       fprintf(stderr,
+                                               "Try \"%s --help\" for more information.\n",
+                                               PACKAGE_NAME);
+                                       exit(2);
                                }
                        }
 
                }
                if (!ok) {
-                       printf("%s: invalid option \"%s\"!\n",
-                              PACKAGE_NAME, argv[i]);
-                       printf("Try \"%s --help\" for more information.\n",
-                              PACKAGE_NAME);
-                       exit(1);
+                       fprintf(stderr, "%s: invalid option \"%s\"!\n",
+                               PACKAGE_NAME, argv[i]);
+                       fprintf(stderr, "Try \"%s --help\" for more information.\n",
+                               PACKAGE_NAME);
+                       exit(2);
                }
        }
 
@@ -246,26 +248,18 @@ main(int argc, const char *argv[])
                NGIRCd_SignalRestart = false;
                NGIRCd_SignalQuit = false;
 
-               /* Initialize modules, part I */
                Log_Init(!NGIRCd_NoDaemon);
                Random_Init();
                Conf_Init();
                Log_ReInit();
 
-               /* Initialize the "main program": chroot environment, user and
-                * group ID, ... */
+               /* Initialize the "main program":
+                * chroot environment, user and group ID, ... */
                if (!NGIRCd_Init(NGIRCd_NoDaemon)) {
                        Log(LOG_ALERT, "Fatal: Initialization failed, exiting!");
                        exit(1);
                }
 
-               /* Initialize modules, part II: these functions are eventually
-                * called with already dropped privileges ... */
-               Channel_Init();
-               Client_Init();
-               Conn_Init();
-               Class_Init();
-
                if (!io_library_init(CONNECTION_POOL)) {
                        Log(LOG_ALERT,
                            "Fatal: Could not initialize IO routines: %s",
@@ -280,6 +274,11 @@ main(int argc, const char *argv[])
                        exit(1);
                }
 
+               Channel_Init();
+               Conn_Init();
+               Class_Init();
+               Client_Init();
+
                /* Create protocol and server identification. The syntax
                 * used by ngIRCd in PASS commands and the known "extended
                 * flags" are described in doc/Protocol.txt. */