comparison nt/cmdproxy.c @ 21733:a373669e1196

(main): Only set environment size for real shell, and provide extra directory argument, when running on Windows 95.

21732:2cd3f6e8089e

      pass_through_args[num_pass_through_args++] = *argv++;
    }
#else
  /* Probably a mistake for there to be extra args; not fatal.  */
  if (argc > 0)
    warn ("warning: extra args ignored after %s\n", argv[-1]);
#endif

  pass_through_args[num_pass_through_args] = NULL;

  /* If -c option, determine if we must spawn a real shell, or if we can

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

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

	  /* Include pass_through_args verbatim; these are just switches
             so should not need quoting.  */
	  for (argv = pass_through_args; *argv != NULL; ++argv)
	    p += wsprintf (p, " %s", *argv);

	  /* Always set environment size to something reasonable.  */
	  wsprintf(p, " /e:%d /c %s", envsize, cmdline);
	  cmdline = buf;
	}
      else
	{
	  /* Provide dir arg expected by command.com when first started
	     interactively (the "command search path").  cmd.exe does
	     not require it, but accepts it silently - presumably other
	     DOS compatible shells do the same.  To avoid potential
	     problems with spaces in command dir (which cannot be quoted
	     - command.com doesn't like it), we always use the 8.3 form.  */
	  GetShortPathName (progname, path, sizeof (path));
	  p = strrchr (path, '\\');
	  /* Trailing slash is acceptable, so always leave it.  */
	  *(++p) = '\0';

	  cmdline = p = alloca (strlen (progname) + extra_arg_space +
				strlen (path) + 13);

	  /* Quote progname in case it contains spaces.  */

	  /* Include pass_through_args verbatim; these are just switches
             so should not need quoting.  */
	  for (argv = pass_through_args; *argv != NULL; ++argv)
	    p += wsprintf (p, " %s", *argv);

	  /* Always set environment size to something reasonable - again
             cmd.exe ignores this silently.  */
	  wsprintf (p, " /e:%d", envsize);
	}
    }

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

21733:a373669e1196

      pass_through_args[num_pass_through_args++] = *argv++;
    }
#else
  /* Probably a mistake for there to be extra args; not fatal.  */
  if (argc > 0)
    warn ("warning: extra args ignored after '%s'\n", argv[-1]);
#endif

  pass_through_args[num_pass_through_args] = NULL;

  /* If -c option, determine if we must spawn a real shell, or if we can

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

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

	  /* Include pass_through_args verbatim; these are just switches
             so should not need quoting.  */
	  for (argv = pass_through_args; *argv != NULL; ++argv)
	    p += wsprintf (p, " %s", *argv);

	  if (GetVersion () & 0x80000000)
	    /* Set environment size to something reasonable on Windows 95.  */
	    wsprintf(p, " /e:%d /c %s", envsize, cmdline);
	  else
	    wsprintf(p, " /c %s", cmdline);
	  cmdline = buf;
	}
      else
	{
	  if (GetVersion () & 0x80000000)
	    {
	      /* Provide dir arg expected by command.com when first
		 started interactively (the "command search path").
		 cmd.exe does not require it, but accepts it silently -
		 presumably other DOS compatible shells do the same.  To
		 avoid potential problems with spaces in command dir
		 (which cannot be quoted - command.com doesn't like it),
		 we always use the 8.3 form.  */
	      GetShortPathName (progname, path, sizeof (path));
	      p = strrchr (path, '\\');
	      /* Trailing slash is acceptable, so always leave it.  */
	      *(++p) = '\0';
	    }
	  else
	    /* Dir arg not needed on NT.  */
	    path[0] = '\0';

	  cmdline = p = alloca (strlen (progname) + extra_arg_space +
				strlen (path) + 13);

	  /* Quote progname in case it contains spaces.  */

	  /* Include pass_through_args verbatim; these are just switches
             so should not need quoting.  */
	  for (argv = pass_through_args; *argv != NULL; ++argv)
	    p += wsprintf (p, " %s", *argv);

	  if (GetVersion () & 0x80000000)
	    /* Set environment size to something reasonable on Windows 95.  */
	    wsprintf (p, " /e:%d", envsize);
	}
    }

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