diff --git a/ulib/ruxlibc/c/ioctl.c b/ulib/ruxlibc/c/ioctl.c index 578622a46..1248dfabb 100644 --- a/ulib/ruxlibc/c/ioctl.c +++ b/ulib/ruxlibc/c/ioctl.c @@ -3,6 +3,7 @@ * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: * http://license.coscl.org.cn/MulanPSL2 +<<<<<<< HEAD * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A * PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. @@ -24,4 +25,18 @@ int ioctl(int fd, int request, ...) va_end(ap); return rux_ioctl(fd, request, arg); +======= + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + * See the Mulan PSL v2 for more details. + */ + +#include +#include + +// TODO +int statfs(const char *path, struct statfs *buf) +{ + unimplemented(); + return 0; +>>>>>>> remote/dev } diff --git a/ulib/ruxlibc/c/pwd.c b/ulib/ruxlibc/c/pwd.c index 466974594..df287bc2a 100644 --- a/ulib/ruxlibc/c/pwd.c +++ b/ulib/ruxlibc/c/pwd.c @@ -29,6 +29,12 @@ int getpwnam_r(const char *name, struct passwd *pw, char *buf, size_t size, stru unimplemented(); return 0; } +// TODO +int sem_destroy(sem_t *sem) +{ + unimplemented(); + return 0; +} int getpwuid_r(uid_t uid, struct passwd *pw, char *buf, size_t size, struct passwd **res) { @@ -36,6 +42,13 @@ int getpwuid_r(uid_t uid, struct passwd *pw, char *buf, size_t size, struct pass return 0; } +// TODO +int sem_init(sem_t *sem, int pshared, unsigned int value) +{ + unimplemented(); + return 0; +} + struct passwd *getpwnam(const char *name) { struct passwd *pwd; @@ -49,3 +62,17 @@ struct passwd *getpwnam(const char *name) return pwd; } + +// TODO +int sem_post(sem_t *sem) +{ + unimplemented(); + return 0; +} + +// TODO +int sem_wait(sem_t *sem) +{ + unimplemented(); + return 0; +} diff --git a/ulib/ruxlibc/c/resource.c b/ulib/ruxlibc/c/resource.c index e46041a8e..4ed6955fe 100644 --- a/ulib/ruxlibc/c/resource.c +++ b/ulib/ruxlibc/c/resource.c @@ -24,3 +24,8 @@ int setpriority(int which, id_t who, int prio) unimplemented(); return 0; } + +ssize_t sendfile(int out_fd, int in_fd, off_t *offset, size_t count){ + unimplemented(); + return 0; +}