mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-23 19:48:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactored logic from init_users() into mch_get_usernames()

Browse Source
This commit is contained in:
Stefan Hoffmann
2014-03-06 21:55:17 +01:00
committed by Thiago de Arruda
parent f6ace9962d
commit 6fd9f090fc
4 changed files with 116 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/misc1.c
View File

@@ -3256,34 +3256,17 @@ char_u *get_env_name(expand_T *xp, int idx)
* Find all user names for user completion.
* Done only once and then cached.
*/
static void init_users(void) {
static void init_users(void)
{
static int lazy_init_done = FALSE;
if (lazy_init_done)
if (lazy_init_done) {
return;
}
lazy_init_done = TRUE;
ga_init2(&ga_users, sizeof(char_u *), 20);
# 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;
}
endpwent();
}
# endif
mch_get_usernames(&ga_users);
}
/*

1
src/os/os.h
View File

@@ -13,5 +13,6 @@ int mch_can_exe(const char_u *name);
const char *mch_getenv(const char *name);
int mch_setenv(const char *name, const char *value, int overwrite);
char *mch_getenvname_at_index(size_t index);
int mch_get_usernames(garray_T *usernames);
#endif

57
src/os/users.c Normal file
View File

@@ -0,0 +1,57 @@
/* vi:set ts=2 sts=2 sw=2:
*
* VIM - Vi IMproved by Bram Moolenaar
*
* Do ":help uganda" in Vim to read copying and usage conditions.
* Do ":help credits" in Vim to see a list of people who contributed.
* See README.txt for an overview of the Vim source code.
*/
/*
* users.c -- operating system user information
*/
#include <uv.h>
#include "os.h"
#include "../garray.h"
#include "../misc2.h"
#ifdef HAVE_PWD_H
# include <pwd.h>
#endif
/*
* Initialize users garray and fill it with os usernames.
* Return Ok for success, FAIL for failure.
*/
int mch_get_usernames(garray_T *users)
{
if (users == NULL) {
return FALSE;
}
ga_init2(users, sizeof(char *), 20);
# if defined(HAVE_GETPWENT) && defined(HAVE_PWD_H)
char *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(users, 1) == FAIL) {
return FAIL;
}
user = (char *)vim_strsave((char_u*)pw->pw_name);
if (user == NULL) {
return FAIL;
}
((char **)(users->ga_data))[users->ga_len++] = user;
}
}
endpwent();
# endif
return OK;
}