feat: flock() syscall (87) — advisory file locking no-op stub + ulibc wrapper

diff --git a/include/syscall.h b/include/syscall.h
index 9f16ebcd12e44a976c9bfbec7944b0694ab58378..33d63ba4d0a23f40c4b80e3c05099f147aff8c22 100644 (file)
--- a/include/syscall.h
+++ b/include/syscall.h
@@ -110,6 +110,7 @@ enum {
     SYSCALL_TIMES     = 84,
     SYSCALL_FUTEX     = 85,
     SYSCALL_SIGALTSTACK = 86,
+    SYSCALL_FLOCK     = 87,
 };
 
 #endif

diff --git a/src/kernel/syscall.c b/src/kernel/syscall.c
index c2940b70086a76d734cbd792729078f8d07e6de5..b876c4efec192a8105c51c54aab75c87ba56a438 100644 (file)
--- a/src/kernel/syscall.c
+++ b/src/kernel/syscall.c
@@ -2272,6 +2272,16 @@ void syscall_handler(struct registers* regs) {
         return;
     }
 
+    if (syscall_no == SYSCALL_FLOCK) {
+        int fd = (int)regs->ebx;
+        if (!current_process || fd < 0 || fd >= PROCESS_MAX_FILES || !current_process->files[fd]) {
+            regs->eax = (uint32_t)-EBADF;
+        } else {
+            regs->eax = 0; /* advisory lock — no-op stub */
+        }
+        return;
+    }
+
     if (syscall_no == SYSCALL_SIGALTSTACK ||
         syscall_no == SYSCALL_TIMES || syscall_no == SYSCALL_FUTEX) {
         posix_ext_syscall_dispatch(regs, syscall_no);

diff --git a/user/ulibc/include/syscall.h b/user/ulibc/include/syscall.h
index 568e79fabfb9e7817492f1353df9721e6ef007b4..f322fddbe526d561e28be633933291f16a46442d 100644 (file)
--- a/user/ulibc/include/syscall.h
+++ b/user/ulibc/include/syscall.h
@@ -69,6 +69,7 @@ enum {
     SYS_TIMES = 84,
     SYS_FUTEX = 85,
     SYS_SIGALTSTACK = 86,
+    SYS_FLOCK = 87,
 };
 
 /* Raw syscall wrappers — up to 5 args via INT 0x80 */

diff --git a/user/ulibc/include/unistd.h b/user/ulibc/include/unistd.h
index e2bb132d8dc5816a6b3b4568e8c780334b9d9117..e9934174a6ed3bb6cf15c13732784ca466e70b77 100644 (file)
--- a/user/ulibc/include/unistd.h
+++ b/user/ulibc/include/unistd.h
@@ -43,6 +43,11 @@ int     setgid(int gid);
 int     truncate(const char* path, int length);
 int     ftruncate(int fd, int length);
 unsigned int alarm(unsigned int seconds);
+#define LOCK_SH 1
+#define LOCK_EX 2
+#define LOCK_UN 8
+#define LOCK_NB 4
+int     flock(int fd, int operation);
 void*   brk(void* addr);
 
 void    _exit(int status) __attribute__((noreturn));

diff --git a/user/ulibc/src/unistd.c b/user/ulibc/src/unistd.c
index 609de9f9736dd4c7306869a1052e99bd1edaede6..8d6294c20637a14befe7b79ac1598e53b639fc50 100644 (file)
--- a/user/ulibc/src/unistd.c
+++ b/user/ulibc/src/unistd.c
@@ -126,6 +126,10 @@ unsigned int alarm(unsigned int seconds) {
     return (unsigned int)_syscall1(SYS_ALARM, (int)seconds);
 }
 
+int flock(int fd, int operation) {
+    return __syscall_ret(_syscall2(SYS_FLOCK, fd, operation));
+}
+
 void* brk(void* addr) {
     return (void*)_syscall1(SYS_BRK, (int)addr);
 }