svn commit: r1412040 - in /commons/proper/daemon/branches/1.0.x/src/native/windows/apps: prunmgr/prunmgr.c prunsrv/prunsrv.c

[mturk]

Author: mturk
Date: Wed Nov 21 10:18:56 2012
New Revision: 1412040

URL: http://svn.apache.org/viewvc?rev=1412040&view=rev
Log:
DAEMON-252: Ensure the signal name event is the same in prunsrv and prunmgr - 
uppercase

Modified:
    
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.c
    
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.c

Modified: 
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.c
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.c?rev=1412040&r1=1412039&r2=1412040&view=diff
==============================================================================
--- 
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.c 
(original)
+++ 
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/prunmgr.c 
Wed Nov 21 10:18:56 2012
@@ -1485,8 +1485,10 @@ static void signalService(LPCWSTR szServ
     lstrlcatW(en, SIZ_DESLEN, szServiceName);
     lstrlcatW(en, SIZ_DESLEN, L"SIGNAL");
     for (i = 7; i < lstrlenW(en); i++) {
-        if (en[i] >= L'a' && en[i] <= L'z')
-            en[i] = en[i] - 32;
+        if (en[i] == L' ')
+            en[i] = L'_';
+        else
+            en[i] = towupper(en[i]);
     }
 
 

Modified: 
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.c
URL: 
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.c?rev=1412040&r1=1412039&r2=1412040&view=diff
==============================================================================
--- 
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.c 
(original)
+++ 
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/prunsrv.c 
Wed Nov 21 10:18:56 2012
@@ -1386,7 +1386,10 @@ void WINAPI serviceMain(DWORD argc, LPTS
         lstrlcatW(en, SIZ_DESLEN, _service_name);
         lstrlcatW(en, SIZ_DESLEN, PRSRV_SIGNAL);
         for (i = 7; i < lstrlenW(en); i++) {
-            en[i] = towlower(en[i]);
+            if (en[i] == L' ')
+                en[i] = L'_';
+            else
+                en[i] = towupper(en[i]);
         }
         gSignalEvent = CreateEventW(sa, TRUE, FALSE, en);
         CleanNullACL((void *)sa);