sync

diff --git a/distrib/sets/lists/base/md.amiga b/distrib/sets/lists/base/md.amiga
index b0782c0..3d3ffc2 100644 (file)
--- a/distrib/sets/lists/base/md.amiga
+++ b/distrib/sets/lists/base/md.amiga
@@ -663,10 +663,10 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/esovar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/hifn7751reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/hifn7751var.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_dcreg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/dcreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_devar.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_fxpreg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_fxpvar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/fxpreg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/fxpvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_levar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_lmc_types.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_lmcioctl.ph

diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index b2b672d..c8ec3c0 100644 (file)
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -662,10 +662,10 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/esovar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/hifn7751reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/hifn7751var.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_dcreg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/dcreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_devar.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_fxpreg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_fxpvar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/fxpreg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/fxpvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_levar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_lmc_types.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_lmcioctl.ph

diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 2adf52e..f7eb705 100644 (file)
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -665,10 +665,10 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/esovar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/hifn7751reg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/hifn7751var.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/if_dcreg.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/dcreg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/if_devar.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/if_fxpreg.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/if_fxpvar.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/fxpreg.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/fxpvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/if_levar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/if_lmc_types.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/if_lmcioctl.ph

diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 170a877..609d629 100644 (file)
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -662,10 +662,10 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/esovar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/hifn7751reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/hifn7751var.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_dcreg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/dcreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_devar.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_fxpreg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_fxpvar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/fxpreg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/fxpvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_levar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_lmc_types.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_lmcioctl.ph

diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 30b0740..75b8573 100644 (file)
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -661,10 +661,10 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/esovar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/hifn7751reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/hifn7751var.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_dcreg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/dcreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_devar.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_fxpreg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_fxpvar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/fxpreg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/fxpvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_levar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_lmc_types.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_lmcioctl.ph

diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 9e44efd..4a67550 100644 (file)
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -328,10 +328,10 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/esovar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/hifn7751reg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/hifn7751var.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/if_dcreg.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/dcreg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/if_devar.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/if_fxpreg.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/if_fxpvar.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/fxpreg.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/fxpvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/if_levar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/if_lmc_types.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/if_lmcioctl.ph

diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 215e66e..69ca081 100644 (file)
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -124,6 +124,7 @@
 ./usr/include/dev/ic/cs4231reg.h
 ./usr/include/dev/ic/cyreg.h
 ./usr/include/dev/ic/dc21040reg.h
+./usr/include/dev/ic/dcreg.h
 ./usr/include/dev/ic/dp8390reg.h
 ./usr/include/dev/ic/dp8390var.h
 ./usr/include/dev/ic/dp857xreg.h
@@ -133,6 +134,8 @@
 ./usr/include/dev/ic/elink3reg.h
 ./usr/include/dev/ic/elink3var.h
 ./usr/include/dev/ic/espreg.h
+./usr/include/dev/ic/fxpreg.h
+./usr/include/dev/ic/fxpvar.h
 ./usr/include/dev/ic/gdtreg.h
 ./usr/include/dev/ic/gdtvar.h
 ./usr/include/dev/ic/hayespreg.h
@@ -278,10 +281,7 @@
 ./usr/include/dev/pci/esovar.h
 ./usr/include/dev/pci/hifn7751reg.h
 ./usr/include/dev/pci/hifn7751var.h
-./usr/include/dev/pci/if_dcreg.h
 ./usr/include/dev/pci/if_devar.h
-./usr/include/dev/pci/if_fxpreg.h
-./usr/include/dev/pci/if_fxpvar.h
 ./usr/include/dev/pci/if_levar.h
 ./usr/include/dev/pci/if_lmc_types.h
 ./usr/include/dev/pci/if_lmcioctl.h
@@ -1547,8 +1547,12 @@
 ./usr/share/man/cat2/pathconf.0
 ./usr/share/man/cat2/pipe.0
 ./usr/share/man/cat2/poll.0
+./usr/share/man/cat2/pread.0
+./usr/share/man/cat2/preadv.0
 ./usr/share/man/cat2/profil.0
 ./usr/share/man/cat2/ptrace.0
+./usr/share/man/cat2/pwrite.0
+./usr/share/man/cat2/pwritev.0
 ./usr/share/man/cat2/quotactl.0
 ./usr/share/man/cat2/read.0
 ./usr/share/man/cat2/readlink.0

diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index 69977f0..38610e0 100644 (file)
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -1598,3 +1598,4 @@
 ./usr/share/man/man4/alpha
 ./usr/share/man/man4/pmax
 ./usr/share/man/man4/powerpc
+./usr/share/man/cat7/mirroring-ports.0

diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index 29dcde3..da32908 100644 (file)
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -1,10 +1,10 @@
-/*     $OpenBSD: init_sysent.c,v 1.43 2000/02/07 08:04:17 assar Exp $  */
+/*     $OpenBSD: init_sysent.c,v 1.44 2000/04/20 06:32:47 deraadt Exp $        */
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;       OpenBSD: syscalls.master,v 1.38 2000/02/07 04:49:27 assar Exp 
+ * created from;       OpenBSD: syscalls.master,v 1.39 2000/04/20 06:32:23 deraadt Exp 
  */
 
 #include <sys/param.h>
@@ -411,10 +411,10 @@ struct sysent sysent[] = {
 #endif
        { 0, 0,
            sys_nosys },                        /* 172 = unimplemented */
-       { 0, 0,
-           sys_nosys },                        /* 173 = unimplemented */
-       { 0, 0,
-           sys_nosys },                        /* 174 = unimplemented */
+       { 5, s(struct sys_pread_args),
+           sys_pread },                        /* 173 = pread */
+       { 5, s(struct sys_pwrite_args),
+           sys_pwrite },                       /* 174 = pwrite */
 #ifdef NTP
        { 1, s(struct sys_ntp_gettime_args),
            sys_ntp_gettime },                  /* 175 = ntp_gettime */
@@ -688,5 +688,9 @@ struct sysent sysent[] = {
            sys_fhstat },                       /* 265 = fhstat */
        { 2, s(struct sys_fhstatfs_args),
            sys_fhstatfs },                     /* 266 = fhstatfs */
+       { 5, s(struct sys_preadv_args),
+           sys_preadv },                       /* 267 = preadv */
+       { 5, s(struct sys_pwritev_args),
+           sys_pwritev },                      /* 268 = pwritev */
 };
 

diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index 4a1fd3e..cbdc7cd 100644 (file)
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -1,10 +1,10 @@
-/*     $OpenBSD: syscalls.c,v 1.43 2000/02/07 08:05:09 assar Exp $     */
+/*     $OpenBSD: syscalls.c,v 1.44 2000/04/20 06:32:47 deraadt Exp $   */
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;       OpenBSD: syscalls.master,v 1.38 2000/02/07 04:49:27 assar Exp 
+ * created from;       OpenBSD: syscalls.master,v 1.39 2000/04/20 06:32:23 deraadt Exp 
  */
 
 char *syscallnames[] = {
@@ -205,8 +205,8 @@ char *syscallnames[] = {
        "#171 (unimplemented 1.0 shmsys)",              /* 171 = unimplemented 1.0 shmsys */
 #endif
        "#172 (unimplemented)",         /* 172 = unimplemented */
-       "#173 (unimplemented)",         /* 173 = unimplemented */
-       "#174 (unimplemented)",         /* 174 = unimplemented */
+       "pread",                        /* 173 = pread */
+       "pwrite",                       /* 174 = pwrite */
 #ifdef NTP
        "ntp_gettime",                  /* 175 = ntp_gettime */
        "ntp_adjtime",                  /* 176 = ntp_adjtime */
@@ -357,4 +357,6 @@ char *syscallnames[] = {
        "fhopen",                       /* 264 = fhopen */
        "fhstat",                       /* 265 = fhstat */
        "fhstatfs",                     /* 266 = fhstatfs */
+       "preadv",                       /* 267 = preadv */
+       "pwritev",                      /* 268 = pwritev */
 };

diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index 96bb969..3810113 100644 (file)
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -1,10 +1,10 @@
-/*     $OpenBSD: syscall.h,v 1.42 2000/02/07 08:06:10 assar Exp $      */
+/*     $OpenBSD: syscall.h,v 1.43 2000/04/20 06:32:47 deraadt Exp $    */
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;       OpenBSD: syscalls.master,v 1.38 2000/02/07 04:49:27 assar Exp 
+ * created from;       OpenBSD: syscalls.master,v 1.39 2000/04/20 06:32:23 deraadt Exp 
  */
 
 /* syscall: "syscall" ret: "int" args: "int" "..." */
@@ -434,6 +434,12 @@
 
                                /* 171 is compat_10 oshmsys */
 
+/* syscall: "pread" ret: "ssize_t" args: "int" "void *" "size_t" "int" "off_t" */
+#define        SYS_pread       173
+
+/* syscall: "pwrite" ret: "ssize_t" args: "int" "const void *" "size_t" "int" "off_t" */
+#define        SYS_pwrite      174
+
 /* syscall: "ntp_gettime" ret: "int" args: "struct ntptimeval *" */
 #define        SYS_ntp_gettime 175
 
@@ -623,4 +629,10 @@
 /* syscall: "fhstatfs" ret: "int" args: "const fhandle_t *" "struct statfs *" */
 #define        SYS_fhstatfs    266
 
-#define        SYS_MAXSYSCALL  267
+/* syscall: "preadv" ret: "ssize_t" args: "int" "const struct iovec *" "int" "int" "off_t" */
+#define        SYS_preadv      267
+
+/* syscall: "pwritev" ret: "ssize_t" args: "int" "const struct iovec *" "int" "int" "off_t" */
+#define        SYS_pwritev     268
+
+#define        SYS_MAXSYSCALL  269

diff --git a/sys/sys/syscallargs.h b/sys/sys/syscallargs.h
index 36c7e98..6c29c41 100644 (file)
--- a/sys/sys/syscallargs.h
+++ b/sys/sys/syscallargs.h
@@ -1,10 +1,10 @@
-/*     $OpenBSD: syscallargs.h,v 1.43 2000/02/07 08:07:14 assar Exp $  */
+/*     $OpenBSD: syscallargs.h,v 1.44 2000/04/20 06:32:47 deraadt Exp $        */
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;       OpenBSD: syscalls.master,v 1.38 2000/02/07 04:49:27 assar Exp 
+ * created from;       OpenBSD: syscalls.master,v 1.39 2000/04/20 06:32:23 deraadt Exp 
  */
 
 #define        syscallarg(x)   union { x datum; register_t pad; }
@@ -743,6 +743,22 @@ struct compat_10_sys_shmsys_args {
        syscallarg(int) a4;
 };
 
+struct sys_pread_args {
+       syscallarg(int) fd;
+       syscallarg(void *) buf;
+       syscallarg(size_t) nbyte;
+       syscallarg(int) pad;
+       syscallarg(off_t) offset;
+};
+
+struct sys_pwrite_args {
+       syscallarg(int) fd;
+       syscallarg(const void *) buf;
+       syscallarg(size_t) nbyte;
+       syscallarg(int) pad;
+       syscallarg(off_t) offset;
+};
+
 struct sys_ntp_gettime_args {
        syscallarg(struct ntptimeval *) ntvp;
 };
@@ -1079,6 +1095,22 @@ struct sys_fhstatfs_args {
        syscallarg(struct statfs *) buf;
 };
 
+struct sys_preadv_args {
+       syscallarg(int) fd;
+       syscallarg(const struct iovec *) iovp;
+       syscallarg(int) iovcnt;
+       syscallarg(int) pad;
+       syscallarg(off_t) offset;
+};
+
+struct sys_pwritev_args {
+       syscallarg(int) fd;
+       syscallarg(const struct iovec *) iovp;
+       syscallarg(int) iovcnt;
+       syscallarg(int) pad;
+       syscallarg(off_t) offset;
+};
+
 /*
  * System call prototypes.
  */
@@ -1253,6 +1285,8 @@ int       compat_10_sys_msgsys    __P((struct proc *, void *, register_t *));
 int    compat_10_sys_shmsys    __P((struct proc *, void *, register_t *));
 #else
 #endif
+int    sys_pread       __P((struct proc *, void *, register_t *));
+int    sys_pwrite      __P((struct proc *, void *, register_t *));
 #ifdef NTP
 int    sys_ntp_gettime __P((struct proc *, void *, register_t *));
 int    sys_ntp_adjtime __P((struct proc *, void *, register_t *));
@@ -1352,3 +1386,5 @@ int       sys_pipe        __P((struct proc *, void *, register_t *));
 int    sys_fhopen      __P((struct proc *, void *, register_t *));
 int    sys_fhstat      __P((struct proc *, void *, register_t *));
 int    sys_fhstatfs    __P((struct proc *, void *, register_t *));
+int    sys_preadv      __P((struct proc *, void *, register_t *));
+int    sys_pwritev     __P((struct proc *, void *, register_t *));