implement linkat

diff --git a/include/unistd.h b/include/unistd.h
index b9efb52..b8dbf46 100644 (file)
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -425,8 +425,8 @@ int faccessat(int, const char *, int, int);
 int    fchownat(int, const char *, uid_t, gid_t, int);
 #if 0
 int    fexecve(int, char *const [], char *const []);
-int    linkat(int, const char *, int, const char *, int);
 #endif
+int    linkat(int, const char *, int, const char *, int);
 ssize_t        readlinkat(int, const char * __restrict, char * __restrict, size_t);
 int    symlinkat(const char *, int, const char *);
 int    unlinkat(int, const char *, int);

diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index 3c0762b..b96207f 100644 (file)
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -564,4 +564,5 @@ struct sysent sysent[] = {
        { AS(symlinkat_args), (sy_call_t *)sys_symlinkat },     /* 528 = symlinkat */
        { AS(swapoff_args), (sy_call_t *)sys_swapoff }, /* 529 = swapoff */
        { AS(vquotactl_args), (sy_call_t *)sys_vquotactl },     /* 530 = vquotactl */
+       { AS(linkat_args), (sy_call_t *)sys_linkat },   /* 531 = linkat */
 };

diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index 0c8e3f0..013a338 100644 (file)
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -538,4 +538,5 @@ const char *syscallnames[] = {
        "symlinkat",                    /* 528 = symlinkat */
        "swapoff",                      /* 529 = swapoff */
        "vquotactl",                    /* 530 = vquotactl */
+       "linkat",                       /* 531 = linkat */
 };

diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index 843f90e..8a5a793 100644 (file)
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -745,3 +745,5 @@
 529    STD     BSD     { int swapoff(char *name); }
 530    STD     BSD     { int vquotactl(const char *path, \
                            struct plistref *pref); }
+531    STD     POSIX   { int linkat(int fd1, char *path1, int fd2, \
+                               char *path2, int flags); }

diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 11c66a8..4e9fe49 100644 (file)
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -2287,6 +2287,33 @@ sys_link(struct link_args *uap)
        return (error);
 }
 
+/*
+ * linkat_args(int fd1, char *path1, int fd2, char *path2, int flags)
+ *
+ * Make a hard file link. The path1 argument is relative to the directory
+ * associated with fd1, and similarly the path2 argument is relative to
+ * the directory associated with fd2.
+ */
+int
+sys_linkat(struct linkat_args *uap)
+{
+       struct nlookupdata nd, linknd;
+       struct file *fp1, *fp2;
+       int error;
+
+       error = nlookup_init_at(&nd, &fp1, uap->fd1, uap->path1, UIO_USERSPACE,
+           (uap->flags & AT_SYMLINK_FOLLOW) ? NLC_FOLLOW : 0);
+       if (error == 0) {
+               error = nlookup_init_at(&linknd, &fp2, uap->fd2,
+                   uap->path2, UIO_USERSPACE, 0);
+               if (error == 0)
+                       error = kern_link(&nd, &linknd);
+               nlookup_done_at(&linknd, fp2);
+       }
+       nlookup_done_at(&nd, fp1);
+       return (error);
+}
+
 int
 kern_symlink(struct nlookupdata *nd, char *path, int mode)
 {

diff --git a/sys/sys/fcntl.h b/sys/sys/fcntl.h
index 489f0b6..03e657b 100644 (file)
--- a/sys/sys/fcntl.h
+++ b/sys/sys/fcntl.h
@@ -170,6 +170,7 @@
 #define AT_SYMLINK_NOFOLLOW    1
 #define AT_REMOVEDIR           2
 #define AT_EACCESS             4
+#define AT_SYMLINK_FOLLOW      8
 
 /*
  * Constants used for fcntl(2)

diff --git a/sys/sys/syscall-hide.h b/sys/sys/syscall-hide.h
index 8d1e086..e0310e1 100644 (file)
--- a/sys/sys/syscall-hide.h
+++ b/sys/sys/syscall-hide.h
@@ -361,3 +361,4 @@ HIDE_POSIX(readlinkat)
 HIDE_POSIX(symlinkat)
 HIDE_BSD(swapoff)
 HIDE_BSD(vquotactl)
+HIDE_POSIX(linkat)

diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index a97cb28..ed049b4 100644 (file)
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -370,4 +370,5 @@
 #define        SYS_symlinkat   528
 #define        SYS_swapoff     529
 #define        SYS_vquotactl   530
-#define        SYS_MAXSYSCALL  531
+#define        SYS_linkat      531
+#define        SYS_MAXSYSCALL  532

diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk
index 5a8f8d8..10a711d 100644 (file)
--- a/sys/sys/syscall.mk
+++ b/sys/sys/syscall.mk
@@ -309,4 +309,5 @@ MIASM =  \
        readlinkat.o \
        symlinkat.o \
        swapoff.o \
-       vquotactl.o
+       vquotactl.o \
+       linkat.o

diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h
index e02fa51..d334469 100644 (file)
--- a/sys/sys/sysproto.h
+++ b/sys/sys/sysproto.h
@@ -2365,6 +2365,16 @@ struct   vquotactl_args {
        const char *    path;   char path_[PAD_(const char *)];
        struct plistref *       pref;   char pref_[PAD_(struct plistref *)];
 };
+struct linkat_args {
+#ifdef _KERNEL
+       struct sysmsg sysmsg;
+#endif
+       int     fd1;    char fd1_[PAD_(int)];
+       char *  path1;  char path1_[PAD_(char *)];
+       int     fd2;    char fd2_[PAD_(int)];
+       char *  path2;  char path2_[PAD_(char *)];
+       int     flags;  char flags_[PAD_(int)];
+};
 
 #ifdef COMPAT_43
 
@@ -2982,6 +2992,7 @@ int       sys_readlinkat (struct readlinkat_args *);
 int    sys_symlinkat (struct symlinkat_args *);
 int    sys_swapoff (struct swapoff_args *);
 int    sys_vquotactl (struct vquotactl_args *);
+int    sys_linkat (struct linkat_args *);
 
 #endif /* !_SYS_SYSPROTO_H_ */
 #undef PAD_

diff --git a/sys/sys/sysunion.h b/sys/sys/sysunion.h
index 6006e90..b18ba48 100644 (file)
--- a/sys/sys/sysunion.h
+++ b/sys/sys/sysunion.h
@@ -417,4 +417,5 @@ union sysunion {
        struct  symlinkat_args symlinkat;
        struct  swapoff_args swapoff;
        struct  vquotactl_args vquotactl;
+       struct  linkat_args linkat;
 };