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

* src/groupmems.c: Really use booleans.

Browse Source 
* src/groupmems.c: Change isroot() to a macro that returns a
	boolean.
This commit is contained in:
nekral-guest 2008-07-26 16:24:27 +00:00
parent a363e1c51f
commit 6f571dbfc6
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-07-26 Nicolas François <nicolas.francois@centraliens.net>
* src/groupmems.c: Really use booleans.
* src/groupmems.c: Change isroot() to a macro that returns a
boolean.
2008-07-26 Nicolas François <nicolas.francois@centraliens.net>
* lib/defines.h: Make sure the booleans are defined before using

21
src/groupmems.c
View File

@ -57,24 +57,18 @@
#define EXIT_INVALID_USER 8 /* specified user does not exist */
#define EXIT_INVALID_GROUP 9 /* specified group does not exist */
#define TRUE 1
#define FALSE 0
/*
* Global variables
*/
static char *adduser = NULL;
static char *deluser = NULL;
static char *thisgroup = NULL;
static int purge = FALSE;
static int list = FALSE;
static bool purge = false;
static bool list = false;
static int exclusive = 0;
static char *Prog;
static int isroot (void)
{
return getuid ()? FALSE : TRUE;
}
#define isroot () (getuid () == 0)
static int isgroup (void)
{
@ -117,12 +111,12 @@ static void addtogroup (char *user, char **members)
static void rmfromgroup (char *user, char **members)
{
int i;
int found = FALSE;
bool found = false;
i = 0;
while (!found && NULL != members[i]) {
if (0 == strcmp (user, members[i])) {
found = TRUE;
found = true;
} else {
i++;
}
@ -212,14 +206,14 @@ int main (int argc, char **argv)
++exclusive;
break;
case 'p':
purge = TRUE;
purge = true;
++exclusive;
break;
case 'g':
thisgroup = strdup (optarg);
break;
case 'l':
list = TRUE;
list = true;
++exclusive;
break;
default:
@ -231,6 +225,7 @@ int main (int argc, char **argv)
usage ();
}
/* local, no need for xgetpwnam */
if (getpwnam(adduser) == NULL) {
fprintf (stderr, _("%s: user `%s' does not exist\n")
Prog, adduser);