summaryrefslogtreecommitdiff
path: root/source/ap/vim/patches/7.3.450
blob: 7112668f421ca33944f8d576727b0048ee50b2d6 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
To: vim_dev@googlegroups.com
Subject: Patch 7.3.450
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.3.450 (after 7.3.448)
Problem:    Win32: Still a problem with "!start /b".
Solution:   Fix pointer use. (Yasuhiro Matsumoto)
Files:	    src/os_win32.c


*** ../vim-7.3.449/src/os_win32.c	2012-02-22 13:07:02.000000000 +0100
--- src/os_win32.c	2012-02-22 15:29:56.000000000 +0100
***************
*** 4008,4028 ****
  	    if (flags != CREATE_NEW_CONSOLE)
  	    {
  		char_u	*subcmd;
! 		char_u	*cmd_shell = default_shell();
  
  		subcmd = vim_strsave_escaped_ext(cmdbase, "|", '^', FALSE);
  		if (subcmd != NULL)
  		{
  		    /* make "cmd.exe /c arguments" */
  		    cmdlen = STRLEN(cmd_shell) + STRLEN(subcmd) + 5;
- 		    vim_free(subcmd);
- 
  		    newcmd = lalloc(cmdlen, TRUE);
  		    if (newcmd != NULL)
  			vim_snprintf((char *)newcmd, cmdlen, "%s /c %s",
! 						       default_shell, subcmd);
  		    else
  			newcmd = cmdbase;
  		}
  	    }
  
--- 4008,4030 ----
  	    if (flags != CREATE_NEW_CONSOLE)
  	    {
  		char_u	*subcmd;
! 		char_u	*cmd_shell = mch_getenv("COMSPEC");
! 
! 		if (cmd_shell == NULL || *cmd_shell == NUL)
! 		    cmd_shell = default_shell();
  
  		subcmd = vim_strsave_escaped_ext(cmdbase, "|", '^', FALSE);
  		if (subcmd != NULL)
  		{
  		    /* make "cmd.exe /c arguments" */
  		    cmdlen = STRLEN(cmd_shell) + STRLEN(subcmd) + 5;
  		    newcmd = lalloc(cmdlen, TRUE);
  		    if (newcmd != NULL)
  			vim_snprintf((char *)newcmd, cmdlen, "%s /c %s",
! 						       cmd_shell, subcmd);
  		    else
  			newcmd = cmdbase;
+ 		    vim_free(subcmd);
  		}
  	    }
  
*** ../vim-7.3.449/src/version.c	2012-02-22 14:58:24.000000000 +0100
--- src/version.c	2012-02-22 15:33:53.000000000 +0100
***************
*** 716,717 ****
--- 716,719 ----
  {   /* Add new patch number below this line */
+ /**/
+     450,
  /**/

-- 
You are only young once, but you can stay immature indefinitely.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///