Merge branch 'pan/win_erlsrv_stop/OTP-9344' into dev

* pan/win_erlsrv_stop/OTP-9344:
  Move init of smp rw mutex from init to sys_args to make sure that it is initialized before the first erts_sys_getenv call
  Move erts_sys_env_init() to erts_sys_pre_init()
  Remove _DEBUG from start_erl.c
  Spelling correction in erlsrv doc
  Convert windows start_erl to take rootdir on command line
  Add command start_disabled to erlsrv
  Add global lock for erlsrv to avoid races
  Change start order so that service_event gets initialized before it's used

3 files changed, 218 insertions, 132 deletions

diff --git a/erts/etc/win32/erlsrv/erlsrv_interactive.c b/erts/etc/win32/erlsrv/erlsrv_interactive.c
index 13e029b364..4c990a694d 100644
--- a/erts/etc/win32/erlsrv/erlsrv_interactive.c
+++ b/erts/etc/win32/erlsrv/erlsrv_interactive.c
@@ -135,7 +135,12 @@ void print_last_error(void){
     fprintf(stderr,"Error: %s",mes);
     LocalFree(mes);
 }
-    
+
+static int get_last_error(void)
+{
+  return (last_error) ? last_error : GetLastError();
+}
+
 static BOOL install_service(void){
   SC_HANDLE scm;
   SC_HANDLE service;
@@ -508,7 +513,7 @@ int do_usage(char *arg0){
 	 "\t[{-sn[ame] | -n[ame]} [<nodename>]]\n"
 	 "\t[-d[ebugtype] [{new|reuse|console}]]\n"
 	 "\t[-ar[gs] [<limited erl arguments>]]\n\n"
-	 "%s {start | stop | disable | enable} <servicename>\n\n"
+	 "%s {start | start_disabled | stop | disable | enable} <servicename>\n\n"
 	 "%s remove <servicename>\n\n"
 	 "%s rename <servicename> <servicename>\n\n"
 	 "%s list [<servicename>]\n\n"
@@ -561,6 +566,45 @@ int do_manage(int argc,char **argv){
       return 0;
     }
   }
+  if(!_stricmp(action,"start_disabled")){
+    if(!enable_service()){
+      fprintf(stderr,"%s: Failed to enable service %s.\n",
+	      argv[0],service_name);
+      print_last_error();
+      return 1;
+    } 
+    if(!start_service() && get_last_error() != ERROR_SERVICE_ALREADY_RUNNING){
+      fprintf(stderr,"%s: Failed to start service %s.\n",
+	      argv[0],service_name);
+      print_last_error();
+      goto failure_starting;
+    }
+    
+    if(!wait_service_trans(SERVICE_STOPPED, SERVICE_START_PENDING,
+			   SERVICE_RUNNING, 60)){
+      fprintf(stderr,"%s: Failed to start service %s.\n",
+	      argv[0],service_name);
+      print_last_error();
+      goto failure_starting;
+    }
+
+    if(!disable_service()){
+      fprintf(stderr,"%s: Failed to disable service %s.\n",
+	      argv[0],service_name);
+      print_last_error();
+      return 1;
+    } 
+    printf("%s: Service %s started.\n",
+	   argv[0],service_name);
+    return 0;
+  failure_starting:
+    if(!disable_service()){
+      fprintf(stderr,"%s: Failed to disable service %s.\n",
+	      argv[0],service_name);
+      print_last_error();
+    } 
+    return 1;
+  }
   if(!_stricmp(action,"stop")){
     if(!stop_service()){
       fprintf(stderr,"%s: Failed to stop service %s.\n",
@@ -841,6 +885,7 @@ int do_add_or_set(int argc, char **argv){
 	   argv[0], service_name);
   return 0;
 }
+
 int do_rename(int argc, char **argv){
   RegEntry *current = empty_reg_tab();
   RegEntry *dummy = empty_reg_tab();
@@ -1129,35 +1174,131 @@ void read_arguments(int *pargc, char ***pargv){
     *pargc = argc;
     *pargv = argv;
 }
+
+/* Create a free-for-all ACL to set on the semaphore */
+PACL get_acl(PSECURITY_DESCRIPTOR secdescp)  
+{
+  DWORD acl_length = 0;  
+  PSID auth_users_sidp = NULL;  
+  PACL aclp = NULL;  
+  SID_IDENTIFIER_AUTHORITY ntauth = SECURITY_NT_AUTHORITY;  
+  
+  if(!InitializeSecurityDescriptor(secdescp, SECURITY_DESCRIPTOR_REVISION)) {
+    return NULL;
+  }
+  
+  if(!AllocateAndInitializeSid(&ntauth, 
+			       1, 
+			       SECURITY_AUTHENTICATED_USER_RID, 
+			       0, 0, 0, 0, 0, 0, 0, 
+			       &auth_users_sidp)) {
+    return NULL;
+  }
+  
+  acl_length =   sizeof(ACL) +  
+    sizeof(ACCESS_ALLOWED_ACE) - sizeof(DWORD) +  
+    GetLengthSid(auth_users_sidp);  
+  
+  if((aclp = (PACL) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, acl_length)) == NULL) {
+    FreeSid(auth_users_sidp);  
+    return NULL;
+  }
+  
+  if(!InitializeAcl(aclp, acl_length, ACL_REVISION)) {
+    FreeSid(auth_users_sidp);  
+    HeapFree(GetProcessHeap(), 0, aclp);
+    return NULL;
+  }
+  
+  if(!AddAccessAllowedAce(aclp, ACL_REVISION, SEMAPHORE_ALL_ACCESS, auth_users_sidp)) {
+    FreeSid(auth_users_sidp);  
+    HeapFree(GetProcessHeap(), 0, aclp);
+    return NULL;
+  }
+  
+  if(!SetSecurityDescriptorDacl(secdescp, TRUE, aclp, FALSE)) {
+    FreeSid(auth_users_sidp);  
+    HeapFree(GetProcessHeap(), 0, aclp);
+    return NULL;
+  }
+  return aclp;  
+} 
+
+static HANDLE lock_semaphore = NULL;
+
+int take_lock(void) {
+  SECURITY_ATTRIBUTES attr;  
+  PACL aclp;  
+  SECURITY_DESCRIPTOR secdesc;  
+  
+  if ((aclp = get_acl(&secdesc)) == NULL) {
+    return -1;
+  }
+  
+  memset(&attr,0,sizeof(attr));
+  attr.nLength = sizeof(attr);  
+  attr.lpSecurityDescriptor = &secdesc;  
+  attr.bInheritHandle = FALSE;  
+  
+  if ((lock_semaphore = CreateSemaphore(&attr, 1, 1, ERLSRV_INTERACTIVE_GLOBAL_SEMAPHORE)) == NULL) {
+    return -1;
+  }
+  
+  if (WaitForSingleObject(lock_semaphore,INFINITE) != WAIT_OBJECT_0) {
+    return -1;
+  }
+  
+  HeapFree(GetProcessHeap(), 0, aclp);
+  return 0;
+}
+
+void release_lock(void) {
+  ReleaseSemaphore(lock_semaphore,1,NULL);
+}
     
 
+
 int interactive_main(int argc, char **argv){
   char *action = argv[1];
-
+  int res;
+  
+  if (take_lock() != 0) {
+    fprintf(stderr,"%s: unable to acquire global lock (%s).\n",argv[0],
+	    ERLSRV_INTERACTIVE_GLOBAL_SEMAPHORE);
+    return 1;
+  }
+  
   if(!_stricmp(action,"readargs")){
-      read_arguments(&argc,&argv);
-      action = argv[1];
+    read_arguments(&argc,&argv);
+    action = argv[1];
   }
   if(!_stricmp(action,"set") || !_stricmp(action,"add"))
-    return do_add_or_set(argc,argv);
-  if(!_stricmp(action,"rename"))
-    return do_rename(argc,argv);
-  if(!_stricmp(action,"remove"))
-    return do_remove(argc,argv);
-  if(!_stricmp(action,"list"))
-    return do_list(argc,argv);
-  if(!_stricmp(action,"start") ||
-     !_stricmp(action,"stop") ||
-     !_stricmp(action,"enable") ||
-     !_stricmp(action,"disable"))
-    return do_manage(argc,argv);
-  if(_stricmp(action,"?") &&
-     _stricmp(action,"/?") &&
-     _stricmp(action,"-?") &&
-     *action != 'h' &&
-     *action != 'H')
+    res = do_add_or_set(argc,argv);
+  else if(!_stricmp(action,"rename"))
+    res = do_rename(argc,argv);
+  else if(!_stricmp(action,"remove"))
+    res = do_remove(argc,argv);
+  else if(!_stricmp(action,"list"))
+    res = do_list(argc,argv);
+  else if(!_stricmp(action,"start") ||
+	  !_stricmp(action,"start_disabled") ||
+	  !_stricmp(action,"stop") ||
+	  !_stricmp(action,"enable") ||
+	  !_stricmp(action,"disable"))
+    res =  do_manage(argc,argv);
+  else if(_stricmp(action,"?") &&
+	  _stricmp(action,"/?") &&
+	  _stricmp(action,"-?") &&
+	  *action != 'h' &&
+	  *action != 'H') {
     fprintf(stderr,"%s: action %s not implemented.\n",argv[0],action);
-  do_usage(argv[0]);
-  return 1;
+    do_usage(argv[0]);
+    res = 1;
+  } else {
+    do_usage(argv[0]);
+    res = 0;
+  }
+  release_lock();
+  return res;
 }
 
diff --git a/erts/etc/win32/erlsrv/erlsrv_interactive.h b/erts/etc/win32/erlsrv/erlsrv_interactive.h
index deacf81899..602da24575 100644
--- a/erts/etc/win32/erlsrv/erlsrv_interactive.h
+++ b/erts/etc/win32/erlsrv/erlsrv_interactive.h
@@ -19,6 +19,8 @@
 #ifndef _ERLSRV_INTERACTIVE_H
 #define _ERLSRV_INTERACTIVE_H
 
+#define ERLSRV_INTERACTIVE_GLOBAL_SEMAPHORE "{468d6954-e355-415f-968f-d257cb0feef4}"
+
 int interactive_main(int argc, char **argv);
 
 #endif /* _ERLSRV_INTERACTIVE_H */
diff --git a/erts/etc/win32/start_erl.c b/erts/etc/win32/start_erl.c
index dcf8c8b281..6ca7dd9b99 100644
--- a/erts/etc/win32/start_erl.c
+++ b/erts/etc/win32/start_erl.c
@@ -44,6 +44,8 @@ char *progname;
 #endif
 
 #define RELEASE_SUBDIR "\\releases"
+#define ERTS_SUBDIR_PREFIX "\\erts-"
+#define BIN_SUBDIR "\\bin"
 #define REGISTRY_BASE "Software\\Ericsson\\Erlang\\"
 #define DEFAULT_DATAFILE "start_erl.data"
 
@@ -101,7 +103,8 @@ void exit_help(char *err)
     printf("Usage:\n%s\n"
 	   "      [<erlang options>] ++\n"
 	   "      [-data <datafile>]\n"
-	   "      [-reldir <releasedir>]\n"
+	   "      {-rootdir <erlang root directory> | \n"
+	   "       -reldir <releasedir>}\n"
 	   "      [-bootflags <bootflagsfile>]\n"
 	   "      [-noconfig]\n", progname);
 
@@ -177,8 +180,9 @@ void split_commandline(void)
  */
 char * unquote_optionarg(char *str, char **strp)
 {
-    char	*newstr = (char *)malloc(strlen(str)+1);  /* This one is realloc:ed later */
-    int		i=0, inquote=0;
+    char	*newstr = (char *)malloc(strlen(str)+1);  /* This one is 
+							     realloc:ed later */
+    int		i = 0, inquote = 0;
 
     assert(newstr);
     assert(str);
@@ -223,8 +227,8 @@ char * unquote_optionarg(char *str, char **strp)
 
 
 /*
- *	Parses MyCommandLine and tries to fill in all the required option variables
- *	(one way or another).
+ * Parses MyCommandLine and tries to fill in all the required option 
+ * variables (in one way or another).
  */
 void parse_commandline(void)
 {
@@ -237,6 +241,11 @@ void parse_commandline(void)
 	    *cmdline++;
 	    if( strnicmp(cmdline, "data", 4) == 0) {
 		DataFileName = unquote_optionarg(cmdline+4, &cmdline);
+	    } else if( strnicmp(cmdline, "rootdir", 7) == 0) {
+		RootDir = unquote_optionarg(cmdline+7, &cmdline);
+#ifdef _DEBUG
+		fprintf(stderr, "RootDir: '%s'\n", RootDir);
+#endif
 	    } else if( strnicmp(cmdline, "reldir", 6) == 0) {
 		RelDir = unquote_optionarg(cmdline+6, &cmdline);
 #ifdef _DEBUG
@@ -266,8 +275,8 @@ void parse_commandline(void)
  * Read the data file specified and get the version and release number
  * from it.
  *
- * This function also construct the correct RegistryKey from the version information
- * retrieved.
+ * This function also construct the correct RegistryKey from the version 
+ * information retrieved.
  */
 void read_datafile(void)
 {
@@ -325,88 +334,6 @@ void read_datafile(void)
 
 
 /*
- * Read the registry keys we need
- */
-void read_registry_keys(void)
-{
-    HKEY	hReg;
-    ULONG	lLen;
-
-    /* Create the RegistryKey name */
-    RegistryKey = (char *) malloc(strlen(REGISTRY_BASE) + 
-				  strlen(Version) + 1);
-    assert(RegistryKey);
-    sprintf(RegistryKey, REGISTRY_BASE "%s", Version);
-
-    /* We always need to find BinDir */
-    if( (RegOpenKeyEx(HKEY_LOCAL_MACHINE, 
-		      RegistryKey, 
-		      0, 
-		      KEY_READ, 
-		      &hReg)) != ERROR_SUCCESS ) {
-	exit_help("Could not open registry key.");
-    }
-
-    /* First query size of data */
-    if( (RegQueryValueEx(hReg, 
-			 "Bindir", 
-			 NULL, 
-			 NULL, 
-			 NULL, 
-			 &lLen)) != ERROR_SUCCESS) {
-	exit_help("Failed to query BinDir of release.\n");
-    }
-
-    /* Allocate enough space */
-    BinDir = (char *)malloc(lLen+1);
-    assert(BinDir);
-    /* Retrieve the value */
-    if( (RegQueryValueEx(hReg, 
-			 "Bindir", 
-			 NULL, 
-			 NULL, 
-			 (unsigned char *) BinDir, 
-			 &lLen)) != ERROR_SUCCESS) {
-	exit_help("Failed to query BinDir of release (2).\n");
-    }
-
-#ifdef _DEBUG
-    fprintf(stderr, "Bindir: '%s'\n", BinDir);
-#endif
-
-    /* We also need the rootdir, in case we need to build RelDir later */
-	
-    /* First query size of data */
-    if( (RegQueryValueEx(hReg, 
-			 "Rootdir", 
-			 NULL, 
-			 NULL, 
-			 NULL, 
-			 &lLen)) != ERROR_SUCCESS) {
-	exit_help("Failed to query RootDir of release.\n");
-    }
-
-    /* Allocate enough space */
-    RootDir = (char *) malloc(lLen+1);
-    assert(RootDir);
-    /* Retrieve the value */
-    if( (RegQueryValueEx(hReg, 
-			 "Rootdir", 
-			 NULL, 
-			 NULL, 
-			 (unsigned char *) RootDir, 
-			 &lLen)) != ERROR_SUCCESS) {
-	exit_help("Failed to query RootDir of release (2).\n");
-    }
-
-#ifdef _DEBUG
-    fprintf(stderr, "Rootdir: '%s'\n", RootDir);
-#endif
-
-    RegCloseKey(hReg);
-}
-
-/*
  * Read the bootflags. This file contains extra command line options to erl.exe
  */
 void read_bootflags(void)
@@ -424,7 +351,8 @@ void read_bootflags(void)
 		exit_help("Need -reldir when -bootflags "
 			  "filename has relative path.");
 	    } else {
-		newname = (char *)malloc(strlen(BootFlagsFile)+strlen(RelDir)+strlen(Release)+3);
+		newname = (char *)malloc(strlen(BootFlagsFile)+
+					 strlen(RelDir)+strlen(Release)+3);
 		assert(newname);
 		sprintf(newname, "%s\\%s\\%s", RelDir, Release, BootFlagsFile);
 		free(BootFlagsFile);
@@ -436,8 +364,6 @@ void read_bootflags(void)
 	fprintf(stderr, "BootFlagsFile: '%s'\n", BootFlagsFile);
 #endif
 	
-	
-	
 	if( (fp=fopen(BootFlagsFile, "rb")) == NULL) {
 	    exit_help("Could not open BootFlags file.");
 	}
@@ -605,32 +531,49 @@ void complete_options(void)
 		sz = nsz;
 	}
 	if (RelDir == NULL) {
-	    if(DataFileName){
-		/* Needs to be absolute for this to work, but we
-		   can try... */
-		read_datafile();
-		read_registry_keys();
-	    } else {
-		/* Impossible to find all data... */
-		exit_help("Need either Release directory or an absolute "
-			  "datafile name.");
-	    }
-	    /* Ok, construct our own RelDir from RootDir */
-	    RelDir = (char *) malloc(strlen(RootDir)+strlen(RELEASE_SUBDIR)+1);
-	    assert(RelDir);
-	    sprintf(RelDir, "%s" RELEASE_SUBDIR, RootDir);
+	  if (!RootDir) {
+	    /* Impossible to find all data... */
+	    exit_help("Need either Root directory nor Release directory.");
+	  }
+	  /* Ok, construct our own RelDir from RootDir */
+	  RelDir = (char *) malloc(strlen(RootDir)+strlen(RELEASE_SUBDIR)+1);
+	  assert(RelDir);
+	  sprintf(RelDir, "%s" RELEASE_SUBDIR, RootDir);
+	  read_datafile();
 	} else {
 	    read_datafile();
-	    read_registry_keys();
 	}
     } else {
 	read_datafile();
-	read_registry_keys();
     }
+    if( !RootDir ) {
+	/* Try to construct RootDir from RelDir */
+	char *p;
+	RootDir = malloc(strlen(RelDir)+1);
+	strcpy(RootDir,RelDir);
+	p = RootDir+strlen(RootDir)-1;
+	if (p >= RootDir && (*p == '/' || *p == '\\'))
+	    --p;
+	while (p >= RootDir && *p != '/' &&  *p != '\\')
+	    --p;
+	if (p <= RootDir) { /* Empty RootDir is also an error */
+	    exit_help("Cannot determine Root directory from "
+		      "Release directory.");
+	}
+	*p = '\0';
+    }
+	    
+    
+    BinDir = (char *) malloc(strlen(RootDir)+strlen(ERTS_SUBDIR_PREFIX)+
+			     strlen(Version)+strlen(BIN_SUBDIR)+1);
+    assert(BinDir);
+    sprintf(BinDir, "%s" ERTS_SUBDIR_PREFIX "%s" BIN_SUBDIR, RootDir, Version);
+
     read_bootflags();
     
 #ifdef _DEBUG
     fprintf(stderr, "RelDir: '%s'\n", RelDir);
+    fprintf(stderr, "BinDir: '%s'\n", BinDir);
 #endif
 }