emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move the error messages to the option parsing

Browse Source
This commit is contained in:
Roy Marples 2007-09-19 16:54:23 +00:00
parent b6aa1c857c
commit 40a1beabe0
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/checkown.c
View File

@ -91,27 +91,20 @@ static struct passwd *get_user (char **name)
else else
pw = getpwuid (tid); pw = getpwuid (tid);
if (! pw) if (pw)
eerrorx ("%s: user `%s' not found", applet, token); *name = p;
*name = p;
return (pw); return (pw);
} }
static struct group *get_group (const char *name) static struct group *get_group (const char *name)
{ {
struct group *gr;
int tid; int tid;
if (sscanf (name, "%d", &tid) != 1) if (sscanf (name, "%d", &tid) != 1)
gr = getgrnam (name); return (getgrnam (name));
else else
gr = getgrgid (tid); return (getgrgid (tid));
if (! gr)
eerrorx ("%s: group `%s' not found", applet, name);
return (gr);
} }
#include "_usage.h" #include "_usage.h"
@ -149,13 +142,15 @@ int checkown (int argc, char **argv)
break; break;
case 'u': case 'u':
p = optarg; p = optarg;
pw = get_user (&p); if (! (pw = get_user (&p)))
eerrorx ("%s: user `%s' not found", applet, optarg);
if (p && *p) if (p && *p)
optarg = p; optarg = p;
else else
break; break;
case 'g': case 'g':
gr = get_group (optarg); if (! (gr = get_group (optarg)))
eerrorx ("%s: group `%s' not found", applet, optarg);
break; break;
case_RC_COMMON_GETOPT case_RC_COMMON_GETOPT