vim: src/os_unix.c comparison

comparison src/os_unix.c @ 1508:c89903e16772 v7.1.223

updated for version 7.1-223

author	vimboss
date	Sun, 13 Jan 2008 12:54:11 +0000
parents	ae7e29b64923
children	56fb4ab9f62f

comparison

equal deleted inserted replaced

-:a6776e2c9f01
+:c89903e16772
 int		i;
 size_t	len;
 char_u	*p;
 int		dir;
 #ifdef __EMX__
+/*
+* This is the OS/2 implementation.
+*/
 # define EXPL_ALLOC_INC	16
 char_u	**expl_files;
 size_t	files_alloced, files_free;
 char_u	*buf;
 int		has_wildcard;
 	}
 }
 return OK;
 #else /* __EMX__ */
+/*
+* This is the non-OS/2 implementation (really Unix).
+*/
 int		j;
 char_u	*tempname;
 char_u	*command;
 FILE	*fd;
 char_u	*buffer;
-#define STYLE_ECHO  0	    /* use "echo" to expand */
+#define STYLE_ECHO	0	/* use "echo", the default */
-#define STYLE_GLOB  1	    /* use "glob" to expand, for csh */
+#define STYLE_GLOB	1	/* use "glob", for csh */
-#define STYLE_PRINT 2	    /* use "print -N" to expand, for zsh */
+#define STYLE_VIMGLOB	2	/* use "vimglob", for Posix sh */
-#define STYLE_BT    3	    /* `cmd` expansion, execute the pattern directly */
+#define STYLE_PRINT	3	/* use "print -N", for zsh */
+#define STYLE_BT	4	/* `cmd` expansion, execute the pattern
+				 * directly */
 int		shell_style = STYLE_ECHO;
 int		check_spaces;
 static int	did_find_nul = FALSE;
 int		ampersent = FALSE;
+		/* vimglob() function to define for Posix shell */
+static char *sh_vimglob_func = "vimglob() { while [ $# -ge 1 ]; do echo -n \"$1\"; echo; shift; done }; vimglob >";
 *num_file = 0;	/* default: no files found */
 *file = NULL;
 /*
 	return FAIL;
 }
 /*
 * Let the shell expand the patterns and write the result into the temp
-* file.  if expanding `cmd` execute it directly.
+* file.
-* If we use csh, glob will work better than echo.
+* STYLE_BT:	NL separated
-* If we use zsh, print -N will work better than glob.
+*	    If expanding `cmd` execute it directly.
+* STYLE_GLOB:	NUL separated
+*	    If we use *csh, "glob" will work better than "echo".
+* STYLE_PRINT:	NL or NUL separated
+*	    If we use *zsh, "print -N" will work better than "glob".
+* STYLE_VIMGLOB:	NL separated
+*	    If we use *sh*, we define "vimglob()".
+* STYLE_ECHO:	space separated.
+*	    A shell we don't know, stay safe and use "echo".
 */
 if (num_pat == 1 && *pat[0] == '`'
 	    && (len = STRLEN(pat[0])) > 2
 	    && *(pat[0] + len - 1) == '`')
 	shell_style = STYLE_BT;
 	if (STRCMP(p_sh + len - 3, "csh") == 0)
 	    shell_style = STYLE_GLOB;
 	else if (STRCMP(p_sh + len - 3, "zsh") == 0)
 	    shell_style = STYLE_PRINT;
 }
+if (shell_style == STYLE_ECHO && strstr((char *)gettail(p_sh),
-/* "unset nonomatch; print -N >" plus two is 29 */
+								"sh") != NULL)
+	shell_style = STYLE_VIMGLOB;
+/* Compute the length of the command.  We need 2 extra bytes: for the
+* optional '&' and for the NUL.
+* Worst case: "unset nonomatch; print -N >" plus two is 29 */
 len = STRLEN(tempname) + 29;
+if (shell_style == STYLE_VIMGLOB)
+	len += STRLEN(sh_vimglob_func);
 for (i = 0; i < num_pat; ++i)
 {
 	/* Count the length of the patterns in the same way as they are put in
 	 * "command" below. */
 #ifdef USE_SYSTEM
 	    STRCPY(command, "unset nonomatch; ");
 	if (shell_style == STYLE_GLOB)
 	    STRCAT(command, "glob >");
 	else if (shell_style == STYLE_PRINT)
 	    STRCAT(command, "print -N >");
+	else if (shell_style == STYLE_VIMGLOB)
+	    STRCAT(command, sh_vimglob_func);
 	else
 	    STRCAT(command, "echo >");
 }
 STRCAT(command, tempname);
 if (shell_style != STYLE_BT)
 	for (i = 0; i < num_pat; ++i)
 	{
 	    /* When using system() always add extra quotes, because the shell
 	     * is started twice.  Otherwise put a backslash before special
 #endif
 	}
 if (flags & EW_SILENT)
 	show_shell_mess = FALSE;
 if (ampersent)
-	STRCAT(command, "&");		/* put the '&' back after the
+	STRCAT(command, "&");		/* put the '&' after the redirection */
-					   redirection */
 /*
 * Using zsh -G: If a pattern has no matches, it is just deleted from
 * the argument list, otherwise zsh gives an error message and doesn't
 * expand any other pattern.
 extra_shell_arg = NULL;		/* cleanup */
 show_shell_mess = TRUE;
 vim_free(command);
-if (i)				/* mch_call_shell() failed */
+if (i != 0)				/* mch_call_shell() failed */
 {
 	mch_remove(tempname);
 	vim_free(tempname);
 	/*
 	 * With interactive completion, the error message is not printed.
 	vim_free(buffer);
 	return FAIL;
 }
 vim_free(tempname);
-#if defined(__CYGWIN__) || defined(__CYGWIN32__)
+# if defined(__CYGWIN__) || defined(__CYGWIN32__)
 /* Translate <CR><NL> into <NL>.  Caution, buffer may contain NUL. */
 p = buffer;
 for (i = 0; i < len; ++i)
 	if (!(buffer[i] == CAR && buffer[i + 1] == NL))
 	    *p++ = buffer[i];
 		++p;
 	    p = skipwhite(p);		/* skip to next entry */
 	}
 }
 /* file names are separated with NL */
-else if (shell_style == STYLE_BT)
+else if (shell_style == STYLE_BT || shell_style == STYLE_VIMGLOB)
 {
 	buffer[len] = NUL;		/* make sure the buffer ends in NUL */
 	p = buffer;
 	for (i = 0; *p != NUL; ++i)	/* count number of entries */
 	{
 p = buffer;
 for (i = 0; i < *num_file; ++i)
 {
 	(*file)[i] = p;
 	/* Space or NL separates */
-	if (shell_style == STYLE_ECHO || shell_style == STYLE_BT)
+	if (shell_style == STYLE_ECHO || shell_style == STYLE_BT
+					      || shell_style == STYLE_VIMGLOB)
 	{
 	    while (!(shell_style == STYLE_ECHO && *p == ' ')
 						   && *p != '\n' && *p != NUL)
 		++p;
 	    if (p == buffer + len)		/* last entry */

Mercurial > vim

comparison src/os_unix.c @ 1508:c89903e16772 v7.1.223