thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.0361: remote user not used for completion

Browse Source 
Problem:    Remote user not used for completion. (Stucki)
Solution:   Use $USER too. (Dominique Pelle, closes #3407)
This commit is contained in:
Bram Moolenaar
2018-09-10 19:03:05 +02:00
parent e828b7621c
commit 6b0b83f768
2 changed files with 55 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/misc1.c
View File

@@ -4716,6 +4716,25 @@ get_env_name(
# endif
}
/*
* Add a user name to the list of users in ga_users.
* Do nothing if user name is NULL or empty.
*/
static void
add_user(char_u *user, int need_copy)
{
char_u *user_copy = (user != NULL && need_copy)
? vim_strsave(user) : user;
if (user_copy == NULL || *user_copy == NUL || ga_grow(&ga_users, 1) == FAIL)
{
if (need_copy)
vim_free(user);
return;
}
((char_u **)(ga_users.ga_data))[ga_users.ga_len++] = user_copy;
}
/*
* Find all user names for user completion.
* Done only once and then cached.
@@ -4733,26 +4752,15 @@ init_users(void)
# if defined(HAVE_GETPWENT) && defined(HAVE_PWD_H)
{
char_u* user;
struct passwd* pw;
setpwent();
while ((pw = getpwent()) != NULL)
/* pw->pw_name shouldn't be NULL but just in case... */
if (pw->pw_name != NULL)
{
if (ga_grow(&ga_users, 1) == FAIL)
break;
user = vim_strsave((char_u*)pw->pw_name);
if (user == NULL)
break;
((char_u **)(ga_users.ga_data))[ga_users.ga_len++] = user;
}
add_user((char_u *)pw->pw_name, TRUE);
endpwent();
}
# elif defined(WIN3264)
{
char_u* user;
DWORD nusers = 0, ntotal = 0, i;
PUSER_INFO_0 uinfo;
@@ -4760,19 +4768,44 @@ init_users(void)
&nusers, &ntotal, NULL) == NERR_Success)
{
for (i = 0; i < nusers; i++)
{
if (ga_grow(&ga_users, 1) == FAIL)
break;
user = utf16_to_enc(uinfo[i].usri0_name, NULL);
if (user == NULL)
break;
((char_u **)(ga_users.ga_data))[ga_users.ga_len++] = user;
}
add_user(utf16_to_enc(uinfo[i].usri0_name, NULL), FALSE);
NetApiBufferFree(uinfo);
}
}
# endif
# if defined(HAVE_GETPWNAM)
{
char_u *user_env = mch_getenv((char_u *)"USER");
// The $USER environment variable may be a valid remote user name (NIS,
// LDAP) not already listed by getpwent(), as getpwent() only lists
// local user names. If $USER is not already listed, check whether it
// is a valid remote user name using getpwnam() and if it is, add it to
// the list of user names.
if (user_env != NULL && *user_env != NUL)
{
int i;
for (i = 0; i < ga_users.ga_len; i++)
{
char_u *local_user = ((char_u **)ga_users.ga_data)[i];
if (STRCMP(local_user, user_env) == 0)
break;
}
if (i == ga_users.ga_len)
{
struct passwd *pw = getpwnam((char *)user_env);
if (pw != NULL)
add_user((char_u *)pw->pw_name, TRUE);
}
}
}
# endif
}
/*

2
src/version.c
View File

@@ -794,6 +794,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
361,
/**/
360,
/**/