merge runxos dev

ulib/ruxlibc/c/ioctl.c

@@ -3,7 +3,6 @@
  *   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.
@@ -25,18 +24,4 @@ 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 <stdio.h>
-#include <sys/statfs.h>
-
-// TODO
-int statfs(const char *path, struct statfs *buf)
-{
-    unimplemented();
-    return 0;
->>>>>>> remote/dev
 }

ulib/ruxlibc/c/pwd.c

@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
+#include <semaphore.h>
 
 static struct passwd pw__ = {
     .pw_name = RUX_DEFAULT_USER,