nuttx/nuttx-mirror
1
2
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2025-01-13 05:08:41 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

libc/passwd: add pw_gecos field(userinfo)

Browse source 
The pw_gecos field is not specified in POSIX, but is
present on most implementations.
passwd file format:
name:uid:gid:gecos:dir:shell
ex: gdm❌127:133:Gnome Display Manager:/var/lib/gdm3:/bin/false

Signed-off-by: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
This commit is contained in:
dongjiuzhu1 2022-11-16 12:32:32 +08:00 committed by Xiang Xiao
parent 8f05661a53
commit 5826e8eeb1
9 changed files with 51 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/pwd.h
View file

@ -49,6 +49,7 @@ struct passwd
FAR char *pw_name;
uid_t pw_uid;
gid_t pw_gid;
FAR char *pw_gecos;
FAR char *pw_dir;
FAR char *pw_shell;
};

22
libs/libc/pwd/lib_find_pwdfile.c
View file

@ -219,7 +219,27 @@ static int pwd_foreach(pwd_foreach_match_t match, uintptr_t arg,
*ptr++ = '\0';
entry->pw_gid = (gid_t)atoi(save);
entry->pw_dir = ptr;
save = ptr;
/* Skip to the end of the user information and properly terminate it.
* The user information must be terminated with the field delimiter
* ':'.
*/
for (; *ptr != '\n' && *ptr != '\0' && *ptr != ':'; ptr++)
{
}
if (*ptr == '\n' || *ptr == '\0')
{
/* Bad line format? */
continue;
}
*ptr++ = '\0';
entry->pw_gecos = save;
entry->pw_dir = ptr;
/* Skip to the end of the home directory and properly terminate it.
* The home directory must be the last thing on the line.

9
libs/libc/pwd/lib_getpwbuf.c
View file

@ -54,6 +54,7 @@ static FAR struct passwd *g_pwd;
* uid - Value to set the passwd structure's pw_uid field to.
* gid - Value to set the passwd structure's pw_gid field to.
* name - Value to set the passwd structure's pw_name field to.
* geocs - Value to set the passwd structure's pw_gecos field to.
* dir - Value to set the passwd structure's pw_dir field to.
* shell - Value to set the passwd structure's pw_shell field to.
*
@ -64,14 +65,16 @@ static FAR struct passwd *g_pwd;
****************************************************************************/
FAR struct passwd *getpwbuf(uid_t uid, gid_t gid, FAR const char *name,
FAR const char *dir, FAR const char *shell)
FAR const char *gecos, FAR const char *dir,
FAR const char *shell)
{
FAR struct passwd *result;
FAR char *newbuf;
size_t buflen;
int err;
buflen = strlen(name) + 1 + strlen(dir) + 1 + strlen(shell) + 1;
buflen = strlen(name) + 1 + strlen(gecos) + 1 + strlen(dir) + 1 +
strlen(shell) + 1;
newbuf = (FAR char *)lib_realloc(g_buf, buflen);
@ -94,7 +97,7 @@ FAR struct passwd *getpwbuf(uid_t uid, gid_t gid, FAR const char *name,
goto error;
}
err = getpwbuf_r(uid, gid, name, dir, shell,
err = getpwbuf_r(uid, gid, name, gecos, dir, shell,
g_pwd, g_buf, buflen, &result);
if (err)

16
libs/libc/pwd/lib_getpwbufr.c
View file

@ -47,6 +47,7 @@
* uid - Value to set the passwd structure's pw_uid field to.
* gid - Value to set the passwd structure's pw_gid field to.
* name - Value to set the passwd structure's pw_name field to.
* gecos - Value to set the passwd structure's pw_gecos field to.
* dir - Value to set the passwd structure's pw_dir field to.
* shell - Value to set the passwd structure's pw_shell field to.
* pwd - Pointer to the space to store the retrieved passwd structure
@ -63,13 +64,14 @@
****************************************************************************/
int getpwbuf_r(uid_t uid, gid_t gid, FAR const char *name,
FAR const char *dir, FAR const char *shell,
FAR struct passwd *pwd, FAR char *buf, size_t buflen,
FAR struct passwd **result)
FAR const char *gecos, FAR const char *dir,
FAR const char *shell, FAR struct passwd *pwd,
FAR char *buf, size_t buflen, FAR struct passwd **result)
{
size_t reqdlen;
reqdlen = strlen(name) + 1 + strlen(dir) + 1 + strlen(shell) + 1;
reqdlen = strlen(name) + 1 + strlen(gecos) + 1 + strlen(dir) + 1 +
strlen(shell) + 1;
if (buflen < reqdlen)
{
@ -80,12 +82,14 @@ int getpwbuf_r(uid_t uid, gid_t gid, FAR const char *name,
}
pwd->pw_name = buf;
pwd->pw_dir = &buf[strlen(name) + 1];
pwd->pw_shell = &buf[strlen(name) + 1 + strlen(dir) + 1];
pwd->pw_gecos = &buf[strlen(name) + 1];
pwd->pw_dir = &buf[strlen(name) + strlen(gecos) + 2];
pwd->pw_shell = &buf[strlen(name) + strlen(gecos) + strlen(dir) + 3];
pwd->pw_uid = uid;
pwd->pw_gid = gid;
strcpy(pwd->pw_name, name);
strcpy(pwd->pw_gecos, gecos);
strcpy(pwd->pw_dir, dir);
strcpy(pwd->pw_shell, shell);

3
libs/libc/pwd/lib_getpwnam.c
View file

@ -71,6 +71,7 @@ FAR struct passwd *getpwnam(FAR const char *name)
return NULL;
}
return getpwbuf(ROOT_UID, ROOT_GID, ROOT_NAME, ROOT_DIR, ROOT_SHELL);
return getpwbuf(ROOT_UID, ROOT_GID, ROOT_NAME, ROOT_NAME, ROOT_DIR,
ROOT_SHELL);
#endif
}

4
libs/libc/pwd/lib_getpwnamr.c
View file

@ -82,7 +82,7 @@ int getpwnam_r(FAR const char *name, FAR struct passwd *pwd, FAR char *buf,
return 0;
}
return getpwbuf_r(ROOT_UID, ROOT_GID, ROOT_NAME, ROOT_DIR, ROOT_SHELL, pwd,
buf, buflen, result);
return getpwbuf_r(ROOT_UID, ROOT_GID, ROOT_NAME, ROOT_NAME, ROOT_DIR,
ROOT_SHELL, pwd, buf, buflen, result);
#endif
}

3
libs/libc/pwd/lib_getpwuid.c
View file

@ -70,6 +70,7 @@ FAR struct passwd *getpwuid(uid_t uid)
return NULL;
}
return getpwbuf(ROOT_UID, ROOT_GID, ROOT_NAME, ROOT_DIR, ROOT_SHELL);
return getpwbuf(ROOT_UID, ROOT_GID, ROOT_NAME, ROOT_NAME, ROOT_DIR,
ROOT_SHELL);
#endif
}

4
libs/libc/pwd/lib_getpwuidr.c
View file

@ -81,7 +81,7 @@ int getpwuid_r(uid_t uid, FAR struct passwd *pwd, FAR char *buf,
return 0;
}
return getpwbuf_r(ROOT_UID, ROOT_GID, ROOT_NAME, ROOT_DIR, ROOT_SHELL, pwd,
buf, buflen, result);
return getpwbuf_r(ROOT_UID, ROOT_GID, ROOT_NAME, ROOT_NAME, ROOT_DIR,
ROOT_SHELL, pwd, buf, buflen, result);
#endif
}

9
libs/libc/pwd/lib_pwd.h
View file

@ -63,11 +63,12 @@ EXTERN char g_passwd_buffer[CONFIG_LIBC_PASSWD_LINESIZE];
****************************************************************************/
FAR struct passwd *getpwbuf(uid_t uid, gid_t gid, FAR const char *name,
FAR const char *dir, FAR const char *shell);
FAR const char *gecos, FAR const char *dir,
FAR const char *shell);
int getpwbuf_r(uid_t uid, gid_t gid, FAR const char *name,
FAR const char *dir, FAR const char *shell,
FAR struct passwd *pwd, FAR char *buf, size_t buflen,
FAR struct passwd **result);
FAR const char *gecos, FAR const char *dir,
FAR const char *shell, FAR struct passwd *pwd,
FAR char *buf, size_t buflen, FAR struct passwd **result);
#ifdef CONFIG_LIBC_PASSWD_FILE
int pwd_findby_name(FAR const char *uname, FAR struct passwd *entry,