7182d6402f
Except for the added (and sorted) includes, the removal of redundant parentheses, a few cases that have been refactored for readability, and a couple of non-string cases that I've left out of the change, this patch can be approximated with the following semantic patch: $ cat ~/tmp/spatch/streq.sp @@ expression s; @@ - '\0' == *s + streq(s, "") @@ expression s; @@ - '\0' == s[0] + streq(s, "") @@ expression s; @@ - *s == '\0' + streq(s, "") @@ expression s; @@ - s[0] == '\0' + streq(s, "") $ find contrib/ lib* src/ -type f \ | xargs spatch --in-place --sp-file ~/tmp/spatch/streq.sp; Signed-off-by: Alejandro Colomar <alx@kernel.org>
109 lines
2.3 KiB
C
109 lines
2.3 KiB
C
/*
|
|
* SPDX-FileCopyrightText: 1990 - 1994, Julianne Frances Haugh
|
|
* SPDX-FileCopyrightText: 1996 - 1998, Marek Michałkiewicz
|
|
* SPDX-FileCopyrightText: 2005 , Tomasz Kłoczko
|
|
* SPDX-FileCopyrightText: 2008 , Nicolas François
|
|
*
|
|
* SPDX-License-Identifier: BSD-3-Clause
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#ident "$Id$"
|
|
|
|
#include <stdio.h>
|
|
#include <sys/types.h>
|
|
#include <grp.h>
|
|
#include <string.h>
|
|
|
|
#include "alloc/malloc.h"
|
|
#include "alloc/reallocf.h"
|
|
#include "atoi/getnum.h"
|
|
#include "defines.h"
|
|
#include "prototypes.h"
|
|
#include "string/strcmp/streq.h"
|
|
#include "string/strtok/stpsep.h"
|
|
|
|
|
|
#define NFIELDS 4
|
|
|
|
/*
|
|
* list - turn a comma-separated string into an array of (char *)'s
|
|
*
|
|
* list() converts the comma-separated list of member names into
|
|
* an array of character pointers.
|
|
*
|
|
* FINALLY added dynamic allocation. Still need to fix sgetsgent().
|
|
* --marekm
|
|
*/
|
|
static char **
|
|
list(char *s)
|
|
{
|
|
static char **members = NULL;
|
|
static size_t size = 0; /* max members + 1 */
|
|
size_t i;
|
|
|
|
i = 0;
|
|
for (;;) {
|
|
/* check if there is room for another pointer (to a group
|
|
member name, or terminating NULL). */
|
|
if (i >= size) {
|
|
size = i + 100; /* at least: i + 1 */
|
|
members = REALLOCF(members, size, char *);
|
|
if (!members) {
|
|
size = 0;
|
|
return NULL;
|
|
}
|
|
}
|
|
if (!s || streq(s, ""))
|
|
break;
|
|
members[i++] = strsep(&s, ",");
|
|
}
|
|
members[i] = NULL;
|
|
return members;
|
|
}
|
|
|
|
|
|
struct group *sgetgrent (const char *buf)
|
|
{
|
|
static char *grpbuf = NULL;
|
|
static size_t size = 0;
|
|
static char *grpfields[NFIELDS];
|
|
static struct group grent;
|
|
int i;
|
|
char *cp;
|
|
|
|
if (strlen (buf) + 1 > size) {
|
|
/* no need to use realloc() here - just free it and
|
|
allocate a larger block */
|
|
free (grpbuf);
|
|
size = strlen (buf) + 1000; /* at least: strlen(buf) + 1 */
|
|
grpbuf = MALLOC(size, char);
|
|
if (grpbuf == NULL) {
|
|
size = 0;
|
|
return NULL;
|
|
}
|
|
}
|
|
strcpy (grpbuf, buf);
|
|
stpsep(grpbuf, "\n");
|
|
|
|
for (cp = grpbuf, i = 0; (i < NFIELDS) && (NULL != cp); i++)
|
|
grpfields[i] = strsep(&cp, ":");
|
|
|
|
if (i < NFIELDS || streq(grpfields[2], "") || cp != NULL) {
|
|
return NULL;
|
|
}
|
|
grent.gr_name = grpfields[0];
|
|
grent.gr_passwd = grpfields[1];
|
|
if (get_gid(grpfields[2], &grent.gr_gid) == -1) {
|
|
return NULL;
|
|
}
|
|
grent.gr_mem = list (grpfields[3]);
|
|
if (NULL == grent.gr_mem) {
|
|
return NULL; /* out of memory */
|
|
}
|
|
|
|
return &grent;
|
|
}
|
|
|