Remove functions provided by internal Unikraft libs

* User functions, such as getpwnam(), are provided by ukunistd
* pathconf() and sysconf() are provided by uksysinfo

Signed-off-by: Costin Lupu <costin.lupu@cs.pub.ro>
Reviewed-by: Felipe Huici <felipe.huici@neclab.eu>

diff --git a/Makefile.uk b/Makefile.uk
index 0ae2fcf37ae526ea1599c0cb5d4f270ec2d4f4c1..f49264e52b67c39e881d829b4bd4c28814435b48 100644 (file)
--- a/Makefile.uk
+++ b/Makefile.uk
@@ -113,7 +113,6 @@ LIBNEWLIBGLUE_SRCS-y += $(LIBNEWLIBC_BASE)/resource.c
 LIBNEWLIBGLUE_SRCS-y += $(LIBNEWLIBC_BASE)/pty.c
 LIBNEWLIBGLUE_SRCS-y += $(LIBNEWLIBC_BASE)/time.c|glue
 LIBNEWLIBGLUE_SRCS-y += $(LIBNEWLIBC_BASE)/locale.c
-LIBNEWLIBGLUE_SRCS-y += $(LIBNEWLIBC_BASE)/user.c
 
 ################################################################################
 # Newlib/libc code -- argz

diff --git a/file.c b/file.c
index d9c1194d63477ac0ad7f1a77db07cd9764246812..ab1cdbe3365c316aa94636dfe340bf660b525d70 100644 (file)
--- a/file.c
+++ b/file.c
@@ -58,11 +58,6 @@ mode_t umask(mode_t cmask __unused)
        return 0;
 }
 
-long pathconf(const char *path __unused, int name __unused)
-{
-       return 0;
-}
-
 #include <sys/mman.h>
 void *mmap(void *addr __unused, size_t len __unused, int prot __unused,
                int flags __unused, int fildes __unused, off_t off __unused)

diff --git a/resource.c b/resource.c
index 321854f02bdd2c10e70e7f2920836692dbeded0e..ae112f2d05a4b5ead3c35ff5850f696803ada088 100644 (file)
--- a/resource.c
+++ b/resource.c
@@ -46,8 +46,3 @@ int setrlimit(int resource __unused, const struct rlimit *rlim __unused)
 {
        return 0;
 }
-
-long sysconf(int name __unused)
-{
-       return 0;
-}

diff --git a/user.c b/user.c
deleted file mode 100644 (file)
index ef3aef6..0000000
--- a/user.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause */
-/*
- * libnewlib glue code
- *
- * Authors: Florian Schmidt <florian.schmidt@neclab.eu>
- *
- * Copyright (c) 2019, NEC Europe Ltd., NEC Corporation. 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.
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
- */
-
-#include <errno.h>
-#include <pwd.h>
-
-/* No password file available */
-struct passwd *getpwnam(const char *name __unused)
-{
-       errno = EIO;
-       return NULL;
-}