Merging upstream version 1:4.15.2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 43 deletions

diff --git a/libmisc/getgr_nam_gid.c b/libmisc/getgr_nam_gid.c
deleted file mode 100644
index 5294f50..0000000
--- a/libmisc/getgr_nam_gid.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 1991 - 1994, Julianne Frances Haugh
- * SPDX-FileCopyrightText: 1996 - 2000, Marek Michałkiewicz
- * SPDX-FileCopyrightText: 2000 - 2006, Tomasz Kłoczko
- * SPDX-FileCopyrightText: 2007 - 2009, Nicolas François
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include <config.h>
-
-#ident "$Id$"
-
-#include <stdlib.h>
-#include <errno.h>
-#include <grp.h>
-#include "prototypes.h"
-
-/*
- * getgr_nam_gid - Return a pointer to the group specified by a string.
- * The string may be a valid GID or a valid groupname.
- * If the group does not exist on the system, NULL is returned.
- */
-extern /*@only@*//*@null@*/struct group *getgr_nam_gid (/*@null@*/const char *grname)
-{
-	long long int gid;
-	char *endptr;
-
-	if (NULL == grname) {
-		return NULL;
-	}
-
-	errno = 0;
-	gid = strtoll (grname, &endptr, 10);
-	if (   ('\0' != *grname)
-	    && ('\0' == *endptr)
-	    && (ERANGE != errno)
-	    && (/*@+longintegral@*/gid == (gid_t)gid)/*@=longintegral@*/) {
-		return xgetgrgid ((gid_t) gid);
-	}
-	return xgetgrnam (grname);
-}
-