Re: [Minios-devel] [UNIKRAFT/NEWLIB PATCH 1/2] Remove functions provided by internal Unikraft libs

[Felipe Huici <Felipe.Huici@xxxxxxxxx>]

Hi Costin, this patch looks good, thanks.

-- Felipe

Reviewed-by: Felipe Huici <felipe.huici@xxxxxxxxx>

On 29.05.19, 18:37, "Costin Lupu" <costin.lupu@xxxxxxxxx> wrote:

    * User functions, such as getpwnam(), are provided by ukunistd
    * pathconf() and sysconf() are provided by uksysinfo
    
    Signed-off-by: Costin Lupu <costin.lupu@xxxxxxxxx>
    ---
     Makefile.uk |  1 -
     file.c      |  5 -----
     resource.c  |  5 -----
     user.c      | 45 ---------------------------------------------
     4 files changed, 56 deletions(-)
     delete mode 100644 user.c
    
    diff --git a/Makefile.uk b/Makefile.uk
    index 0ae2fcf..f49264e 100644
    --- 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 d9c1194..ab1cdbe 100644
    --- 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 321854f..ae112f2 100644
    --- 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
    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@xxxxxxxxx>
    - *
    - * 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;
    -}
    -- 
    2.11.0
    
    

_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel