mirror of
https://github.com/opnsense/src.git
synced 2026-05-28 04:12:45 -04:00
Correct some egregious style bugs.
This commit is contained in:
parent
a8adfe18ce
commit
6478822fba
1 changed files with 21 additions and 13 deletions
|
|
@ -82,12 +82,13 @@ __pw_scan(char *bp, struct passwd *pw, int flags)
|
|||
if (!(pw->pw_name = strsep(&bp, ":"))) /* login */
|
||||
goto fmt;
|
||||
root = !strcmp(pw->pw_name, "root");
|
||||
if(pw->pw_name[0] && (pw->pw_name[0] != '+' || pw->pw_name[1] == '\0'))
|
||||
if (pw->pw_name[0] && (pw->pw_name[0] != '+' || pw->pw_name[1] == '\0'))
|
||||
pw->pw_fields |= _PWF_NAME;
|
||||
|
||||
if (!(pw->pw_passwd = strsep(&bp, ":"))) /* passwd */
|
||||
goto fmt;
|
||||
if(pw->pw_passwd[0]) pw->pw_fields |= _PWF_PASSWD;
|
||||
if (pw->pw_passwd[0])
|
||||
pw->pw_fields |= _PWF_PASSWD;
|
||||
|
||||
if (!(p = strsep(&bp, ":"))) /* uid */
|
||||
goto fmt;
|
||||
|
|
@ -119,7 +120,8 @@ __pw_scan(char *bp, struct passwd *pw, int flags)
|
|||
|
||||
if (!(p = strsep(&bp, ":"))) /* gid */
|
||||
goto fmt;
|
||||
if(p[0]) pw->pw_fields |= _PWF_GID;
|
||||
if (p[0])
|
||||
pw->pw_fields |= _PWF_GID;
|
||||
id = strtoul(p, (char **)NULL, 10);
|
||||
if (errno == ERANGE) {
|
||||
if (flags & _PWSCAN_WARN)
|
||||
|
|
@ -133,27 +135,32 @@ __pw_scan(char *bp, struct passwd *pw, int flags)
|
|||
pw->pw_gid = id;
|
||||
|
||||
if (flags & _PWSCAN_MASTER ) {
|
||||
if (!(pw->pw_class = strsep(&bp, ":"))) /* class */
|
||||
if (!(pw->pw_class = strsep(&bp, ":"))) /* class */
|
||||
goto fmt;
|
||||
if(pw->pw_class[0]) pw->pw_fields |= _PWF_CLASS;
|
||||
if (pw->pw_class[0])
|
||||
pw->pw_fields |= _PWF_CLASS;
|
||||
|
||||
if (!(p = strsep(&bp, ":"))) /* change */
|
||||
if (!(p = strsep(&bp, ":"))) /* change */
|
||||
goto fmt;
|
||||
if(p[0]) pw->pw_fields |= _PWF_CHANGE;
|
||||
if (p[0])
|
||||
pw->pw_fields |= _PWF_CHANGE;
|
||||
pw->pw_change = atol(p);
|
||||
|
||||
if (!(p = strsep(&bp, ":"))) /* expire */
|
||||
if (!(p = strsep(&bp, ":"))) /* expire */
|
||||
goto fmt;
|
||||
if(p[0]) pw->pw_fields |= _PWF_EXPIRE;
|
||||
if (p[0])
|
||||
pw->pw_fields |= _PWF_EXPIRE;
|
||||
pw->pw_expire = atol(p);
|
||||
}
|
||||
if (!(pw->pw_gecos = strsep(&bp, ":"))) /* gecos */
|
||||
goto fmt;
|
||||
if(pw->pw_gecos[0]) pw->pw_fields |= _PWF_GECOS;
|
||||
if (pw->pw_gecos[0])
|
||||
pw->pw_fields |= _PWF_GECOS;
|
||||
|
||||
if (!(pw->pw_dir = strsep(&bp, ":"))) /* directory */
|
||||
if (!(pw->pw_dir = strsep(&bp, ":"))) /* directory */
|
||||
goto fmt;
|
||||
if(pw->pw_dir[0]) pw->pw_fields |= _PWF_DIR;
|
||||
if (pw->pw_dir[0])
|
||||
pw->pw_fields |= _PWF_DIR;
|
||||
|
||||
if (!(pw->pw_shell = strsep(&bp, ":"))) /* shell */
|
||||
goto fmt;
|
||||
|
|
@ -169,7 +176,8 @@ __pw_scan(char *bp, struct passwd *pw, int flags)
|
|||
if (!strcmp(p, sh))
|
||||
break;
|
||||
}
|
||||
if(p[0]) pw->pw_fields |= _PWF_SHELL;
|
||||
if (p[0])
|
||||
pw->pw_fields |= _PWF_SHELL;
|
||||
|
||||
if ((p = strsep(&bp, ":"))) { /* too many */
|
||||
fmt:
|
||||
|
|
|
|||
Loading…
Reference in a new issue