m_cap: use rn_snprintf_try_append

[solanum.git] / ircd / ircd.c

diff --git a/ircd/ircd.c b/ircd/ircd.c
index 41facf74a5b055035e1634612752f6e999286ead..d68430720be145440e2d1430a89fb99d4cc29b6d 100644 (file)
--- a/ircd/ircd.c
+++ b/ircd/ircd.c
@@ -187,50 +187,6 @@ ircd_shutdown(const char *reason)
        exit(0);
 }
 
-/*
- * print_startup - print startup information
- */
-static void
-print_startup(int pid)
-{
-       int fd;
-
-#ifndef _WIN32
-       close(1);
-       fd = open("/dev/null", O_RDWR);
-       if (fd == -1) {
-               perror("open /dev/null");
-               exit(EXIT_FAILURE);
-       }
-       if (fd == 0)
-               fd = dup(fd);
-       if (fd != 1)
-               abort();
-#endif
-       inotice("now running in %s mode from %s as pid %d ...",
-              !server_state_foreground ? "background" : "foreground",
-               ConfigFileEntry.dpath, pid);
-
-#ifndef _WIN32
-       /* let the parent process know the initialization was successful
-        * -- jilles */
-       if (!server_state_foreground)
-       {
-               /* GCC complains on Linux if we don't check the value of write pedantically.
-                * Technically you're supposed to check the value, yes, but it probably can't fail.
-                * No, casting to void is of no use to shut the warning up. You HAVE to use the value.
-                * --Elizfaox
-                */
-               if(write(0, ".", 1) < 1)
-                       abort();
-       }
-       if (dup2(1, 0) == -1)
-               abort();
-       if (dup2(1, 2) == -1)
-               abort();
-#endif
-}
-
 /*
  * init_sys
  *
@@ -259,21 +215,22 @@ init_sys(void)
        maxconnections = MAXCONNECTIONS;
 }
 
+#ifndef _WIN32
 static int
 make_daemon(void)
 {
-#ifndef _WIN32
-       int pid;
-       int pip[2];
-       char c;
+       int pid, nullfd, fdx;
+
+       /* The below is approximately what daemon(1, 0) does, but
+          we need control over the parent after forking to print
+          the startup message -- Aaron */
 
-       if (pipe(pip) < 0)
+       if((nullfd = open("/dev/null", O_RDWR)) < 0)
        {
-               perror("pipe");
+               perror("open /dev/null");
                exit(EXIT_FAILURE);
        }
-       dup2(pip[1], 0);
-       close(pip[1]);
+
        if((pid = fork()) < 0)
        {
                perror("fork");
@@ -281,25 +238,24 @@ make_daemon(void)
        }
        else if(pid > 0)
        {
-               close(0);
-               /* Wait for initialization to finish, successfully or
-                * unsuccessfully. Until this point the child may still
-                * write to stdout/stderr.
-                * -- jilles */
-               if (read(pip[0], &c, 1) > 0)
-                       exit(EXIT_SUCCESS);
-               else
-                       exit(EXIT_FAILURE);
+               inotice("now running in background mode from %s as pid %d ...",
+                       ConfigFileEntry.dpath, pid);
+
+               exit(EXIT_SUCCESS);
        }
 
-       close(pip[0]);
-       setsid();
-/*     fclose(stdin);
-       fclose(stdout);
-       fclose(stderr); */
-#endif
+       for(fdx = 0; fdx <= 2; fdx++)
+               if (fdx != nullfd)
+                       (void) dup2(nullfd, fdx);
+
+       if(nullfd > 2)
+               (void) close(nullfd);
+
+       (void) setsid();
+
        return 0;
 }
+#endif
 
 static int printVersion = 0;
 
@@ -409,6 +365,7 @@ initialize_server_capabs(void)
        default_server_capabs &= ~CAP_ZIP;
 }
 
+#ifdef _WIN32
 /*
  * relocate_paths
  *
@@ -492,6 +449,7 @@ relocate_paths(void)
                inotice("  %s: %s", ircd_pathnames[i], ircd_paths[i]);
        }
 }
+#endif
 
 /*
  * write_pidfile
@@ -682,7 +640,9 @@ charybdis_main(int argc, char * const argv[])
        }
 #endif
 
+#ifdef _WIN32
        relocate_paths();
+#endif
 
        logFileName = ircd_paths[IRCD_PATH_IRCD_LOG];
        pidFileName = ircd_paths[IRCD_PATH_IRCD_PID];
@@ -765,10 +725,13 @@ charybdis_main(int argc, char * const argv[])
        {
                check_pidfile(pidFileName);
 
-               if(!server_state_foreground)
-                       make_daemon();
                inotice("starting %s ...", ircd_version);
                inotice("%s", rb_lib_version());
+
+#ifndef _WIN32
+               if(!server_state_foreground)
+                       make_daemon();
+#endif
        }
 
        /* Init the event subsystem */
@@ -803,6 +766,7 @@ charybdis_main(int argc, char * const argv[])
 
        init_authd();           /* Start up authd. */
        init_dns();             /* Start up DNS query system */
+       init_modules();         /* Start up modules system */
 
        privilegeset_set_new("default", "", 0);
 
@@ -810,8 +774,6 @@ charybdis_main(int argc, char * const argv[])
                fprintf(stderr, "\nBeginning config test\n");
        read_conf_files(true);  /* cold start init conf files */
 
-       mod_add_path(MODULE_DIR);
-       mod_add_path(MODULE_DIR "/autoload");
        load_all_modules(1);
        load_core_modules(1);
 
@@ -903,7 +865,9 @@ charybdis_main(int argc, char * const argv[])
        if(splitmode)
                check_splitmode_ev = rb_event_add("check_splitmode", check_splitmode, NULL, 5);
 
-       print_startup(getpid());
+       if(server_state_foreground)
+               inotice("now running in foreground mode from %s as pid %d ...",
+                       ConfigFileEntry.dpath, getpid());
 
        rb_lib_loop(0);