DeforaOS/utils
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleaned error code

Browse Source
This commit is contained in:
Pierre Pronchery 2007-06-26 18:00:29 +00:00
parent e07dfc0403
commit 9d1a58881b
1 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/id.c
View File

@ -95,10 +95,7 @@ static int _id_G(char * user, int flagn)
puts(gr->gr_name); puts(gr->gr_name);
} }
if((user = strdup(gr->gr_name)) == NULL) if((user = strdup(gr->gr_name)) == NULL)
{ return _id_error("strdup", 1);
perror("strdup");
return 2;
}
setgrent(); setgrent();
for(gr = getgrent(); gr != NULL; gr = getgrent()) for(gr = getgrent(); gr != NULL; gr = getgrent())
{ {
@ -133,18 +130,12 @@ static int _id_g(char const * user, int flagn, int flagr)
return 0; return 0;
} }
if((gr = getgrgid(flagr ? getegid() : getgid())) == NULL) if((gr = getgrgid(flagr ? getegid() : getgid())) == NULL)
{ return _id_error("getgrgid", 1);
perror("getgrgid");
return 2;
}
printf("%s\n", gr->gr_name); printf("%s\n", gr->gr_name);
return 0; return 0;
} }
if((gr = getgrnam(user)) == NULL) if((gr = getgrnam(user)) == NULL)
{ return _id_error("getgrnam", 1);
perror("getgrnam");
return 2;
}
if(flagn == 0) if(flagn == 0)
printf("%u\n", (unsigned)gr->gr_gid); printf("%u\n", (unsigned)gr->gr_gid);
else else
@ -165,18 +156,12 @@ static int _id_u(char const * user, int flagn, int flagr)
return 0; return 0;
} }
if((passwd = getpwuid(flagr ? geteuid() : getuid())) == NULL) if((passwd = getpwuid(flagr ? geteuid() : getuid())) == NULL)
{ return _id_error("getpwuid", 1);
perror("getpwuid");
return 2;
}
printf("%s\n", passwd->pw_name); printf("%s\n", passwd->pw_name);
return 0; return 0;
} }
if((passwd = getpwnam(user)) == NULL) if((passwd = getpwnam(user)) == NULL)
{ return _id_error("getpwnam", 1);
perror("getpwnam");
return 2;
}
if(flagn == 0) if(flagn == 0)
printf("%u\n", passwd->pw_uid); printf("%u\n", passwd->pw_uid);
else else
@ -218,19 +203,16 @@ static int _id_all(char * user)
printf(" euid=%u(%s) e", (unsigned)pw->pw_uid, printf(" euid=%u(%s) e", (unsigned)pw->pw_uid,
pw->pw_name); pw->pw_name);
if(_print_gid(pw->pw_gid) == NULL) if(_print_gid(pw->pw_gid) == NULL)
return 2; return 1;
} }
} }
else else
{ {
if((pw = getpwnam(user)) == NULL) if((pw = getpwnam(user)) == NULL)
{ return _id_error("getpwnam", 1);
perror("getpwnam");
return 2;
}
printf("uid=%u(%s) ", (unsigned)pw->pw_uid, pw->pw_name); printf("uid=%u(%s) ", (unsigned)pw->pw_uid, pw->pw_name);
if((gr = _print_gid(pw->pw_gid)) == NULL) if((gr = _print_gid(pw->pw_gid)) == NULL)
return 2; return 1;
if((user = strdup(gr->gr_name)) == NULL) if((user = strdup(gr->gr_name)) == NULL)
{ {
putc('\n', stdout); putc('\n', stdout);