d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable numeric arguments and +/- prefixes with -user (-group)

Browse Source 
options.

PR:		bin/71513
Submitted by:	Andre Albsmeier <Andre.Albsmeier@siemens.com>
MFC after:	7 days
This commit is contained in:
Kirill Ponomarev 2006-05-25 21:20:43 +00:00
parent 7e16358b54
commit 4ba3b38b64
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=158919
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
usr.bin/find/function.c
View File

@ -952,7 +952,7 @@ c_fstype(OPTION *option, char ***argvp)
int
f_group(PLAN *plan, FTSENT *entry)
{
return entry->fts_statp->st_gid == plan->g_data;
COMPARE(entry->fts_statp->st_gid, plan->g_data);
}
PLAN *
@ -966,15 +966,19 @@ c_group(OPTION *option, char ***argvp)
gname = nextarg(option, argvp);
ftsoptions &= ~FTS_NOSTAT;
new = palloc(option);
g = getgrnam(gname);
if (g == NULL) {
char* cp = gname;
if( gname[0] == '-' || gname[0] == '+' )
gname++;
gid = atoi(gname);
if (gid == 0 && gname[0] != '0')
errx(1, "%s: %s: no such group", option->name, gname);
gid = find_parsenum(new, option->name, cp, NULL);
} else
gid = g->gr_gid;
new = palloc(option);
new->g_data = gid;
return new;
}
@ -1465,7 +1469,7 @@ c_type(OPTION *option, char ***argvp)
int
f_user(PLAN *plan, FTSENT *entry)
{
return entry->fts_statp->st_uid == plan->u_data;
COMPARE(entry->fts_statp->st_uid, plan->u_data);
}
PLAN *
@ -1479,15 +1483,19 @@ c_user(OPTION *option, char ***argvp)
username = nextarg(option, argvp);
ftsoptions &= ~FTS_NOSTAT;
new = palloc(option);
p = getpwnam(username);
if (p == NULL) {
char* cp = username;
if( username[0] == '-' || username[0] == '+' )
username++;
uid = atoi(username);
if (uid == 0 && username[0] != '0')
errx(1, "%s: %s: no such user", option->name, username);
uid = find_parsenum(new, option->name, cp, NULL);
} else
uid = p->pw_uid;
new = palloc(option);
new->u_data = uid;
return new;
}