0
0
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00

updated for version 7.0052

This commit is contained in:
Bram Moolenaar
2005-02-26 23:04:13 +00:00
parent 5313dcb75a
commit 05159a0c6a
57 changed files with 9098 additions and 348 deletions

View File

@@ -1374,8 +1374,8 @@ vim_stristr(s1, s2)
/*
* Version of strchr() and strrchr() that handle unsigned char strings
* with characters above 128 correctly. Also it doesn't return a pointer to
* the NUL at the end of the string.
* with characters from 128 to 255 correctly. It also doesn't return a
* pointer to the NUL at the end of the string.
*/
char_u *
vim_strchr(string, c)
@@ -1430,10 +1430,31 @@ vim_strchr(string, c)
return NULL;
}
/*
* Version of strchr() that only works for bytes and handles unsigned char
* strings with characters above 128 correctly. It also doesn't return a
* pointer to the NUL at the end of the string.
*/
char_u *
vim_strbyte(string, c)
char_u *string;
int c;
{
char_u *p = string;
while (*p != NUL)
{
if (*p == c)
return p;
++p;
}
return NULL;
}
/*
* Search for last occurrence of "c" in "string".
* return NULL if not found.
* Does not handle multi-byte!
* Does not handle multi-byte char for "c"!
*/
char_u *
vim_strrchr(string, c)
@@ -1441,12 +1462,13 @@ vim_strrchr(string, c)
int c;
{
char_u *retval = NULL;
char_u *p = string;
while (*string)
while (*p)
{
if (*string == c)
retval = string;
mb_ptr_adv(string);
if (*p == c)
retval = p;
mb_ptr_adv(p);
}
return retval;
}
@@ -2549,6 +2571,9 @@ call_shell(cmd, opt)
{
char_u *ncmd;
int retval;
#ifdef FEAT_PROFILE
proftime_T wait_time;
#endif
if (p_verbose > 3)
{
@@ -2558,6 +2583,11 @@ call_shell(cmd, opt)
cursor_on();
}
#ifdef FEAT_PROFILE
if (do_profiling)
prof_child_enter(&wait_time);
#endif
if (*p_sh == NUL)
{
EMSG(_(e_shellempty));
@@ -2603,6 +2633,10 @@ call_shell(cmd, opt)
#ifdef FEAT_EVAL
set_vim_var_nr(VV_SHELL_ERROR, (long)retval);
# ifdef FEAT_PROFILE
if (do_profiling)
prof_child_exit(&wait_time);
# endif
#endif
return retval;