From: William A. Rowe Jr <wrowe@apache.org>
Date: Fri, 14 Jun 2002 08:04:14 +0000 (+0000)
Subject:   Don't pass args at StartService, there is no point.
X-Git-Tag: 2.0.38~44
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d07c89cb19594c7e06c6ea17952d2872eb1e985;p=apache

  Don't pass args at StartService, there is no point.

PR:9858
Submitted by:	Mladen Turk <mturk@mappingsoft.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95667 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/support/win32/ApacheMonitor.c b/support/win32/ApacheMonitor.c
index dcc7d1e112..4f50814170 100644
--- a/support/win32/ApacheMonitor.c
+++ b/support/win32/ApacheMonitor.c
@@ -667,7 +667,6 @@ BOOL ApacheManageService(LPCSTR szServiceName, LPCSTR szImagePath, LPSTR szCompu
     SC_HANDLE schService;
     SC_HANDLE schSCManager;    
     SERVICE_STATUS schSStatus;
-    LPSTR     *args;
     int       ticks;
 
     if (g_dwOSVersion == OS_VERSION_WIN9X)
@@ -717,17 +716,6 @@ BOOL ApacheManageService(LPCSTR szServiceName, LPCSTR szImagePath, LPSTR szCompu
     }
     else
     {
-        /* Apache 2.0 uses '-k runservice' as cmdline parameter */
-        sPos = strstr(szImagePath, "--ntservice");
-        if (!sPos)
-        {
-            sPos = strstr(szImagePath, "-k runservice");
-            serviceFlag = FALSE;
-        }
-        if (sPos)
-            lstrcpyn(szBuf, szImagePath, sPos - szImagePath);
-        else
-            return FALSE;
         schSCManager = OpenSCManager(
             szComputerName,
             NULL,
@@ -771,16 +759,8 @@ BOOL ApacheManageService(LPCSTR szServiceName, LPCSTR szImagePath, LPSTR szCompu
                 case SERVICE_CONTROL_CONTINUE:
                     sprintf(szMsg, g_lpMsg[IDS_MSG_SRVSTART-IDS_MSG_FIRST], szServiceName);
                     addListBoxString(g_hwndStdoutList, szMsg);
-                    args = (char **)malloc(3 * sizeof(char*));
-                    args[0] = szBuf;
-                    if (serviceFlag)
-                        args[1] = "--ntservice";
-                    else
-                    {
-                        args[1] = "-k";
-                        args[2] = "runservice";
-                    }
-                    if (StartService(schService, serviceFlag ? 2 : 3, args)) 
+
+                    if (StartService(schService, 0, NULL)) 
                     {
                         Sleep(1000);
                         while (QueryServiceStatus(schService, &schSStatus)) 
@@ -800,8 +780,6 @@ BOOL ApacheManageService(LPCSTR szServiceName, LPCSTR szImagePath, LPSTR szCompu
                             addListBoxString(g_hwndStdoutList, szMsg);
                         }
                     }
-                    /* is this OK to do? */
-                    free(args);
                 break;                
                 case SERVICE_APACHE_RESTART:
                     sprintf(szMsg, g_lpMsg[IDS_MSG_SRVRESTART-IDS_MSG_FIRST], szServiceName);