TLS/SSL support: core files.

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

diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
index d839618fefb8174de42c96fd008318efe6e56cd2..97e5733b512069cf943fb2efea36e7ded2202239 100644 (file)
--- a/src/ngircd/ngircd.c
+++ b/src/ngircd/ngircd.c
@@ -34,6 +34,10 @@
 #include <pwd.h>
 #include <grp.h>
 
+#if defined(DEBUG) && defined(HAVE_MTRACE)
+#include <mcheck.h>
+#endif
+
 #include "defines.h"
 #include "resolve.h"
 #include "conn.h"
@@ -84,6 +88,12 @@ main( int argc, const char *argv[] )
        int i;
        size_t n;
 
+#if defined(DEBUG) && defined(HAVE_MTRACE)
+       /* enable GNU libc memory tracing when running in debug mode
+        * and functionality available */
+       mtrace();
+#endif
+
        umask( 0077 );
 
        NGIRCd_SignalQuit = NGIRCd_SignalRestart = NGIRCd_SignalRehash = false;
@@ -166,14 +176,12 @@ main( int argc, const char *argv[] )
                        {
                                ok = false;
 #ifdef DEBUG
-                               if( argv[i][n] == 'd' )
-                               {
+                               if (argv[i][n] == 'd') {
                                        NGIRCd_Debug = true;
                                        ok = true;
                                }
 #endif
-                               if( argv[i][n] == 'f' )
-                               {
+                               if (argv[i][n] == 'f') {
                                        if(( ! argv[i][n + 1] ) && ( i + 1 < argc ))
                                        {
                                                /* Ok, next character is a blank */
@@ -185,31 +193,38 @@ main( int argc, const char *argv[] )
                                                ok = true;
                                        }
                                }
-                               if( argv[i][n] == 'n' )
-                               {
+
+                               if (argv[i][n] == 'h') {
+                                       Show_Version();
+                                       puts(""); Show_Help(); puts("");
+                                       exit(1);
+                               }
+
+                               if (argv[i][n] == 'n') {
                                        NGIRCd_NoDaemon = true;
                                        ok = true;
                                }
-                               if( argv[i][n] == 'p' )
-                               {
+                               if (argv[i][n] == 'p') {
                                        NGIRCd_Passive = true;
                                        ok = true;
                                }
 #ifdef SNIFFER
-                               if( argv[i][n] == 's' )
-                               {
+                               if (argv[i][n] == 's') {
                                        NGIRCd_Sniffer = true;
                                        ok = true;
                                }
 #endif
-                               if( argv[i][n] == 't' )
-                               {
+                               if (argv[i][n] == 't') {
                                        configtest = true;
                                        ok = true;
                                }
 
-                               if( ! ok )
-                               {
+                               if (argv[i][n] == 'V') {
+                                       Show_Version();
+                                       exit(1);
+                               }
+
+                               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 );
@@ -577,8 +592,8 @@ Show_Help( void )
        puts( "  -s, --sniffer      enable network sniffer and display all IRC traffic" );
 #endif
        puts( "  -t, --configtest   read, validate and display configuration; then exit" );
-       puts( "      --version      output version information and exit" );
-       puts( "      --help         display this help and exit" );
+       puts( "  -V, --version      output version information and exit" );
+       puts( "  -h, --help         display this help and exit" );
 } /* Show_Help */
 
 
@@ -779,7 +794,11 @@ NGIRCd_Init( bool NGIRCd_NoDaemon )
                }
 
                /* New child process */
+#ifndef NeXT
                (void)setsid( );
+#else
+               setpgrp(0, getpid());
+#endif
                chdir( "/" );
 
                /* Detach stdin, stdout and stderr */