From 66a0459ab713f84953e5dd45351b65fe9714218d Mon Sep 17 00:00:00 2001 From: christos Date: Sat, 25 Jul 2020 21:53:34 +0000 Subject: [PATCH] remove duplicate, noted by chuq (this was never used). perhaps either move extattr.c from generic here, or move the man page extattr.3 in gen? --- lib/libc/posix1e/Makefile.inc | 1 - lib/libc/posix1e/extattr.c | 83 ----------------------------------- 2 files changed, 84 deletions(-) delete mode 100644 lib/libc/posix1e/extattr.c diff --git a/lib/libc/posix1e/Makefile.inc b/lib/libc/posix1e/Makefile.inc index ebfd0fedd74d..53f9aedb50fa 100644 --- a/lib/libc/posix1e/Makefile.inc +++ b/lib/libc/posix1e/Makefile.inc @@ -25,7 +25,6 @@ SRCS+= acl_branding.c \ acl_to_text.c \ acl_to_text_nfs4.c \ acl_valid.c \ - extattr.c \ subr_acl_nfs4.c MAN+= acl.3 \ diff --git a/lib/libc/posix1e/extattr.c b/lib/libc/posix1e/extattr.c deleted file mode 100644 index d76d1d369b58..000000000000 --- a/lib/libc/posix1e/extattr.c +++ /dev/null @@ -1,83 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD - * - * Copyright (c) 2001 Robert N. M. Watson - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -/* - * TrustedBSD: Utility functions for extended attributes. - */ - -#include -#if 0 -__FBSDID("$FreeBSD: head/lib/libc/posix1e/extattr.c 326193 2017-11-25 17:12:48Z pfg $"); -#else -__RCSID("$NetBSD: extattr.c,v 1.1 2020/05/16 18:31:47 christos Exp $"); -#endif - -#include -#include - -#include -#include -#include - -int -extattr_namespace_to_string(int attrnamespace, char **string) -{ - - switch(attrnamespace) { - case EXTATTR_NAMESPACE_USER: - if (string != NULL) - *string = strdup(EXTATTR_NAMESPACE_USER_STRING); - return (0); - - case EXTATTR_NAMESPACE_SYSTEM: - if (string != NULL) - *string = strdup(EXTATTR_NAMESPACE_SYSTEM_STRING); - return (0); - - default: - errno = EINVAL; - return (-1); - } -} - -int -extattr_string_to_namespace(const char *string, int *attrnamespace) -{ - - if (!strcmp(string, EXTATTR_NAMESPACE_USER_STRING)) { - if (attrnamespace != NULL) - *attrnamespace = EXTATTR_NAMESPACE_USER; - return (0); - } else if (!strcmp(string, EXTATTR_NAMESPACE_SYSTEM_STRING)) { - if (attrnamespace != NULL) - *attrnamespace = EXTATTR_NAMESPACE_SYSTEM; - return (0); - } else { - errno = EINVAL; - return (-1); - } -}