Fix conflicts

Signed-off-by: Ian Moffett <ian@osmora.org>

1 files changed, 65 insertions, 1 deletions

diff --git a/src/sys/os/os_filedes.c b/src/sys/os/os_filedes.c
index e7cc83a..3353a5f 100644
--- a/src/sys/os/os_filedes.c
+++ b/src/sys/os/os_filedes.c
@@ -31,10 +31,13 @@
 #include <sys/syslog.h>
 #include <sys/errno.h>
 #include <sys/limits.h>
+#include <sys/proc.h>
+#include <sys/namei.h>
 #include <os/filedesc.h>
 #include <os/kalloc.h>
+#include <os/systm.h>
 #include <io/cons/cons.h>
-#include <sys/proc.h>
+#include <compat/unix/syscall.h>
 #include <string.h>
 
 #define STDOUT_FILENO 1
@@ -86,6 +89,47 @@ fd_alloc(struct proc *procp, struct filedesc **fd_res)
     return -EMFILE;
 }
 
+int
+fd_open(const char *path, mode_t mode)
+{
+    struct filedesc *fd;
+    struct nameidata nd;
+    struct proc *self = proc_self();
+    struct vnode *vp;
+    int error;
+
+    /* We need the current proc */
+    if (self == NULL) {
+        return -ESRCH;
+    }
+
+    if (path == NULL) {
+        return -ESRCH;
+    }
+
+    /* Allocate a new file descriptor */
+    error = fd_alloc(self, &fd);
+    if (error < 0) {
+        return error;
+    }
+
+    /*
+     * Now we try to do the lookup, we'll need
+     * the vnode for file references to be
+     * useful
+     */
+    nd.path = path;
+    nd.flags = 0;
+    nd.vp_res = &vp;
+    error = namei(&nd);
+    if (error < 0) {
+        return error;
+    }
+
+    fd->vp = vp;
+    return fd->fdno;
+}
+
 /*
  * Initialize file descriptor table
  */
@@ -138,3 +182,23 @@ write(int fd, const void *buf, size_t count)
 
     return count;
 }
+
+/*
+ * ARG0: Path
+ * ARG1: Mode
+ */
+scret_t
+sys_open(struct syscall_args *scargs)
+{
+    const char *u_path = SCARG(scargs, const char *, 0);
+    mode_t mode = SCARG(scargs, mode_t, 1);
+    char pathbuf[PATH_MAX];
+    int error;
+
+    error = copyinstr(u_path, pathbuf, sizeof(PATH_MAX));
+    if (error < 0) {
+        return error;
+    }
+
+    return fd_open(pathbuf, mode);
+}