Projects/mysql-admutils
13
0
Fork 0
Code Issues Pull Requests Activity

beautifisering (2-space-indent), og tetting av minnehull

Browse Source
This commit is contained in:
Geir Hauge
2006-08-15 11:51:59 +00:00
parent 2e1453ceba
commit 5a1f013a31
2 changed files with 218 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
common.c
View File

@@ -1,5 +1,5 @@
/*
* @(#) $Header: /tmp/cvs/mysql-admutils/common.c,v 1.7 2006-08-15 10:32:42 geirha Exp $
* @(#) $Header: /tmp/cvs/mysql-admutils/common.c,v 1.8 2006-08-15 11:51:58 geirha Exp $
*
* functions used by mysql-dbadm.c and mysql-useradm.c
*
@@ -22,7 +22,7 @@
char *program_name;
static char *rcsheader = "@(#) " PACKAGE " " VERSION " orakel@ntnu.no $Header: /tmp/cvs/mysql-admutils/common.c,v 1.7 2006-08-15 10:32:42 geirha Exp $";
static char *rcsheader = "@(#) " PACKAGE " " VERSION " orakel@ntnu.no $Header: /tmp/cvs/mysql-admutils/common.c,v 1.8 2006-08-15 11:51:58 geirha Exp $";
int
@@ -38,14 +38,13 @@ wrong_use(char *format, ...)
{
va_list ap;
if (format)
{
fprintf(stderr, "%s: ", program_name);
va_start(ap, format);
vfprintf(stderr, format, ap);
va_end(ap);
putchar('\n');
}
if (format) {
fprintf(stderr, "%s: ", program_name);
va_start(ap, format);
vfprintf(stderr, format, ap);
va_end(ap);
putchar('\n');
}
fprintf(stderr, "Try `%s --help' for more information.\n", program_name);
@@ -66,14 +65,13 @@ dberror(MYSQL *pmysql, char *format, ...)
va_end(ap);
fprintf(stderr, "\n");
if (pmysql)
{
errmsg = mysql_error(pmysql);
if ((errmsg) && (strcmp(errmsg, "") != 0))
fprintf(stderr, "mysql: %s\n", errmsg);
if (pmysql) {
errmsg = mysql_error(pmysql);
if ((errmsg) && (strcmp(errmsg, "") != 0))
fprintf(stderr, "mysql: %s\n", errmsg);
mysql_close(pmysql);
}
mysql_close(pmysql);
}
return 1;
}
@@ -102,11 +100,10 @@ owner(char *name)
struct passwd *p;
p = getpwuid(getuid());
if (!p)
{
dberror(NULL, "Failed to look up your UNIX username.");
exit(1);
}
if (!p) {
dberror(NULL, "Failed to look up your UNIX username.");
exit(1);
}
if (strcmp(name, p->pw_name) == 0)
return 1; /* OK */
@@ -182,8 +179,9 @@ member(char *gr) {
printf("You have access to '%s'\n", gr);
#endif
return 1; /* OK */
} else
} else {
*g->gr_mem++;
}
}
#if DEBUG
printf("You have no access to '%s'\n", gr);
@@ -192,15 +190,15 @@ member(char *gr) {
// brukeren var ikke med i gruppen, s<> vi m<> pr<70>ve neste.
// finner den siste _-en i navnet.
foo = strrchr(group, '_');
if (foo == NULL) {
foo = strrchr(group, '_');
if (foo == NULL) {
// hvis vi har kommet helt til bunn, og fremdeles
// ikke har blitt avbrutt, fantes det ingen slik gruppe.
return 0;
}
// det som n<> er bak siste underscore er passe uinteressant, s<>
// vi flytter slutten av strengen litt framover.
*foo = '\0';
return 0;
}
// det som n<> er bak siste underscore er passe uinteressant, s<>
// vi flytter slutten av strengen litt framover.
*foo = '\0';
} // while
}
@@ -209,40 +207,40 @@ member(char *gr) {
/* numgroups is the total number of groups found */
char **get_group_names(int *numgroups)
{
char **grouplist;
gid_t gids[33];
int real_nr_groups, nr_groups, i;
struct group *g;
char **grouplist;
gid_t gids[33];
int real_nr_groups, nr_groups, i;
struct group *g;
nr_groups = 0;
nr_groups = 0;
nr_groups = getgroups(32, &gids[0]); /* Allow a max of 32 groups */
nr_groups = getgroups(32, &gids[0]); /* Allow a max of 32 groups */
if (nr_groups == -1) {
dberror(NULL, "Error while trying to fetch group info");
return NULL;
}
if (nr_groups == -1) {
dberror(NULL, "Error while trying to fetch group info");
return NULL;
}
grouplist = malloc(sizeof(char *));
real_nr_groups = 0;
grouplist = malloc(sizeof(char *));
real_nr_groups = 0;
for (i = 0; i < nr_groups; i++) {
g = getgrgid(gids[i]);
for (i = 0; i < nr_groups; i++) {
g = getgrgid(gids[i]);
/* Go to next grp if it doesn't have a name */
if (g != NULL) {
grouplist = (char **) realloc(grouplist, (real_nr_groups+2) * sizeof(char *));
grouplist[real_nr_groups] = strdup(g->gr_name);
real_nr_groups++;
} else {
fprintf(stderr, "Omitting gid %d, no entry in group-file.\n", gids[i]);
}
}
grouplist[real_nr_groups] = NULL;
/* Go to next grp if it doesn't have a name */
if (g != NULL) {
grouplist = (char **) realloc(grouplist, (real_nr_groups+2) * sizeof(char *));
grouplist[real_nr_groups] = strdup(g->gr_name);
real_nr_groups++;
} else {
fprintf(stderr, "Omitting gid %d, no entry in group-file.\n", gids[i]);
}
}
grouplist[real_nr_groups] = NULL;
*numgroups = real_nr_groups;
*numgroups = real_nr_groups;
return grouplist;
return grouplist;
}