Support more human friendly k/d/x-line duration format

[solanum.git] / ircd / wsproc.c

diff --git a/ircd/wsproc.c b/ircd/wsproc.c
index 0c511c6aa441e2d858bb71b270daa372be949d74..612a334a189c644fe0c272f51e5b81f2291ec1bd 100644 (file)
--- a/ircd/wsproc.c
+++ b/ircd/wsproc.c
@@ -233,12 +233,6 @@ start_wsockd(int count)
 {
        rb_fde_t *F1, *F2;
        rb_fde_t *P1, *P2;
-#ifdef _WIN32
-       const char *suffix = ".exe";
-#else
-       const char *suffix = "";
-#endif
-
        char fullpath[PATH_MAX + 1];
        char fdarg[6];
        const char *parv[2];
@@ -265,17 +259,16 @@ start_wsockd(int count)
 
        if(wsockd_path == NULL)
        {
-               snprintf(fullpath, sizeof(fullpath), "%s%cwsockd%s", ircd_paths[IRCD_PATH_LIBEXEC], RB_PATH_SEPARATOR, suffix);
+               snprintf(fullpath, sizeof(fullpath), "%s/wsockd", ircd_paths[IRCD_PATH_LIBEXEC]);
 
                if(access(fullpath, X_OK) == -1)
                {
-                       snprintf(fullpath, sizeof(fullpath), "%s%cbin%cwsockd%s",
-                                   ConfigFileEntry.dpath, RB_PATH_SEPARATOR, RB_PATH_SEPARATOR, suffix);
+                       snprintf(fullpath, sizeof(fullpath), "%s/bin/wsockd", ConfigFileEntry.dpath);
                        if(access(fullpath, X_OK) == -1)
                        {
                                ilog(L_MAIN,
-                                    "Unable to execute wsockd%s in %s or %s/bin",
-                                    suffix, ircd_paths[IRCD_PATH_LIBEXEC], ConfigFileEntry.dpath);
+                                    "Unable to execute wsockd in %s or %s/bin",
+                                    ircd_paths[IRCD_PATH_LIBEXEC], ConfigFileEntry.dpath);
                                return 0;
                        }
                }