emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

do not complain when negating selection if we can't find a user/group

Browse Source
This commit is contained in:
Lyonel Vincent 2012-11-25 17:23:39 +01:00
parent c5ee091e4c
commit c29ce7be61
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ps/parser.c
View File

@ -95,10 +95,14 @@ static const char *parse_uid(char *str, sel_union *ret){
num = strtoul(str, &endp, 0); num = strtoul(str, &endp, 0);
if(*endp != '\0'){ /* hmmm, try as login name */ if(*endp != '\0'){ /* hmmm, try as login name */
passwd_data = getpwnam(str); passwd_data = getpwnam(str);
if(!passwd_data) return _("user name does not exist"); if(!passwd_data){
if(!negate_selection) return _("user name does not exist");
num = -1;
}
else
num = passwd_data->pw_uid; num = passwd_data->pw_uid;
} }
if(num > 0xfffffffeUL) return _("user ID out of range"); if(!negate_selection && (num > 0xfffffffeUL)) return _("user ID out of range");
ret->uid = num; ret->uid = num;
return 0; return 0;
} }
@ -110,10 +114,14 @@ static const char *parse_gid(char *str, sel_union *ret){
num = strtoul(str, &endp, 0); num = strtoul(str, &endp, 0);
if(*endp != '\0'){ /* hmmm, try as login name */ if(*endp != '\0'){ /* hmmm, try as login name */
group_data = getgrnam(str); group_data = getgrnam(str);
if(!group_data) return _("group name does not exist"); if(!group_data){
if(!negate_selection) return _("group name does not exist");
num = -1;
}
else
num = group_data->gr_gid; num = group_data->gr_gid;
} }
if(num > 0xfffffffeUL) return _("group ID out of range"); if(!negate_selection && (num > 0xfffffffeUL)) return _("group ID out of range");
ret->gid = num; ret->gid = num;
return 0; return 0;
} }