comparison nt/cmdproxy.c @ 21598:235f717e6916

(fail): Exit with a negative return value. (spawn): Return subprocess return code as an argument. Explicitly copy environment block. (main): Update to use return value argument with spawn. Retry if spawn failed when a subshell was not tried.

21597:409211e285bc

  va_start (args, msg);
  vfprintf (stderr, msg, args);
  va_end (args);

  exit (1);
}

void
warn (char * msg, ...)
{

#endif
    }
  return TRUE;
}

int
spawn (char * progname, char * cmdline)
{
  DWORD rc = 0xff;
  SECURITY_ATTRIBUTES sec_attrs;
  STARTUPINFO start;
  char * envblock = GetEnvironmentStrings ();

  sec_attrs.nLength = sizeof (sec_attrs);
  sec_attrs.lpSecurityDescriptor = NULL;
  sec_attrs.bInheritHandle = FALSE;

  start.cb = sizeof (start);

  if (CreateProcess (progname, cmdline, &sec_attrs, NULL, TRUE,
		     0, envblock, NULL, &start, &child))
  {
    /* wait for completion and pass on return code */
    WaitForSingleObject (child.hProcess, INFINITE);
    GetExitCodeProcess (child.hProcess, &rc);
    CloseHandle (child.hThread);
    CloseHandle (child.hProcess);
    child.hProcess = NULL;
  }

  FreeEnvironmentStrings (envblock);

  return (int) rc;
}

/* Return size of current environment block.  */
int
get_env_size ()

      || stricmp (modname, path) != 0)
    {
      /* We are being used as a helper to run a DOS app; just pass
	 command line to DOS app without change.  */
      /* TODO: fill in progname.  */
      return spawn (NULL, GetCommandLine ());
    }

  /* Process command line.  If running interactively (-c or /c not
     specified) then spawn a real command shell, passing it the command
     line arguments.

	  if (progname != NULL)
	    need_shell = FALSE;
	}
    }

  if (need_shell)
    {
      char * p;
      int    extra_arg_space = 0;

    fail ("Internal error: program name not defined\n");

  if (!cmdline)
    cmdline = progname;

  rc = spawn (progname, cmdline);

  return rc;
}

21598:235f717e6916

  va_start (args, msg);
  vfprintf (stderr, msg, args);
  va_end (args);

  exit (-1);
}

void
warn (char * msg, ...)
{

#endif
    }
  return TRUE;
}

/* Change from normal usage; return value indicates whether spawn
   succeeded or failed - program return code is returned separately.  */
int
spawn (char * progname, char * cmdline, int * retcode)
{
  BOOL success = FALSE;
  SECURITY_ATTRIBUTES sec_attrs;
  STARTUPINFO start;
  /* In theory, passing NULL for the environment block to CreateProcess
     is the same as passing the value of GetEnvironmentStrings, but
     doing this explicitly seems to cure problems running DOS programs
     in some cases.  */
  char * envblock = GetEnvironmentStrings ();

  sec_attrs.nLength = sizeof (sec_attrs);
  sec_attrs.lpSecurityDescriptor = NULL;
  sec_attrs.bInheritHandle = FALSE;

  start.cb = sizeof (start);

  if (CreateProcess (progname, cmdline, &sec_attrs, NULL, TRUE,
		     0, envblock, NULL, &start, &child))
  {
    success = TRUE;
    /* wait for completion and pass on return code */
    WaitForSingleObject (child.hProcess, INFINITE);
    if (retcode)
      GetExitCodeProcess (child.hProcess, (DWORD *)retcode);
    CloseHandle (child.hThread);
    CloseHandle (child.hProcess);
    child.hProcess = NULL;
  }

  FreeEnvironmentStrings (envblock);

  return success;
}

/* Return size of current environment block.  */
int
get_env_size ()

      || stricmp (modname, path) != 0)
    {
      /* We are being used as a helper to run a DOS app; just pass
	 command line to DOS app without change.  */
      /* TODO: fill in progname.  */
      if (spawn (NULL, GetCommandLine (), &rc))
	return rc;
      fail ("Could not run %s\n", GetCommandLine ());
    }

  /* Process command line.  If running interactively (-c or /c not
     specified) then spawn a real command shell, passing it the command
     line arguments.

	  if (progname != NULL)
	    need_shell = FALSE;
	}
    }

pass_to_shell:
  if (need_shell)
    {
      char * p;
      int    extra_arg_space = 0;

    fail ("Internal error: program name not defined\n");

  if (!cmdline)
    cmdline = progname;

  if (spawn (progname, cmdline, &rc))
    return rc;

  if (!need_shell)
    {
      need_shell = TRUE;
      goto pass_to_shell;
    }

  fail ("Could not run %s\n", progname);

  return 0;
}