include/unistd.h: merged

Also removing lseek64, pread64, pwrite64.

Those functions have lost their "raison d'être", when off_t switched to
64bits.

Change-Id: I5aea35f01d6d10e3d6578a70323da7be5eca315a

diff --git a/commands/autopart/autopart.c b/commands/autopart/autopart.c
index 00146098d9b3750ffe4883a203b80a220ab34c10..4a47c3ad2b8175ab777d461f11553c729b548ae2 100644 (file)
--- a/commands/autopart/autopart.c
+++ b/commands/autopart/autopart.c
@@ -1397,7 +1397,7 @@ ssize_t boot_readwrite(int rw)
 {
        int r = 0;
 
-       if (lseek64(device, (u64_t) offset * SECTOR_SIZE, SEEK_SET, NULL) < 0)
+       if (lseek(device, offset * SECTOR_SIZE, SEEK_SET) < 0)
                return -1;
 
        switch (rw) {

diff --git a/commands/fsck.mfs/fsck.c b/commands/fsck.mfs/fsck.c
index 3cf242dcb65fc2282fc02729905f89ca323e3c23..48c63c58aa30c36b2c6f3fb9db250d9f9dfe94aa 100644 (file)
--- a/commands/fsck.mfs/fsck.c
+++ b/commands/fsck.mfs/fsck.c
@@ -412,9 +412,9 @@ int dir;
 #if 0
 printf("%s at block %5d\n", dir == READING ? "reading " : "writing", bno);
 #endif
-  r= lseek64(dev, btoa64(bno), SEEK_SET, NULL);
-  if (r != 0)
-       fatal("lseek64 failed");
+  r= lseek(dev, btoa64(bno), SEEK_SET);
+  if (r < 0)
+       fatal("lseek failed");
   if (dir == READING) {
        if (read(dev, rwbuf, block_size) == block_size)
                return;

diff --git a/commands/part/part.c b/commands/part/part.c
index 2bf169cf9db18e6f01d8bf6b58d4030d4c79c024..66c60b0d5fe1689bee163e43e76340654024e735 100644 (file)
--- a/commands/part/part.c
+++ b/commands/part/part.c
@@ -1578,7 +1578,7 @@ ssize_t boot_readwrite(int rw)
 {
        int r = 0;
 
-       if (lseek64(device, (u64_t) offset * SECTOR_SIZE, SEEK_SET, NULL) < 0)
+       if (lseek(device, offset * SECTOR_SIZE, SEEK_SET) < 0)
                return -1;
 
        switch (rw) {

diff --git a/commands/sprofdiff/sprofdiff.c b/commands/sprofdiff/sprofdiff.c
index 9232a089ee142141c7fe97f6003aa5ac59b81878..8009561445a8ed1e3abc8c0635337d3efc0f3acd 100755 (executable)
--- a/commands/sprofdiff/sprofdiff.c
+++ b/commands/sprofdiff/sprofdiff.c
@@ -5,6 +5,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <minix/type.h>
 
 #include "tdist.h"
 

diff --git a/drivers/vnd/vnd.c b/drivers/vnd/vnd.c
index bf55d18cfb0cdc0913de1b11585154eb49793ddc..5fabcdd3159f527044feb68a6e25258257e3bd07 100644 (file)
--- a/drivers/vnd/vnd.c
+++ b/drivers/vnd/vnd.c
@@ -256,7 +256,7 @@ vnd_transfer(devminor_t minor, int do_write, u64_t position,
 
                /* For reads, read in the data for the chunk; possibly less. */
                if (!do_write) {
-                       chunk = r = pread64(state.fd, state.buf, chunk,
+                       chunk = r = pread(state.fd, state.buf, chunk,
                            position);
 
                        if (r < 0) {
@@ -276,7 +276,7 @@ vnd_transfer(devminor_t minor, int do_write, u64_t position,
 
                /* For writes, write the data to the file; possibly less. */
                if (do_write) {
-                       chunk = r = pwrite64(state.fd, state.buf, chunk,
+                       chunk = r = pwrite(state.fd, state.buf, chunk,
                            position);
 
                        if (r <= 0) {

diff --git a/include/lib.h b/include/lib.h
index f5d15cf076573314eb7ecb814b11dcf051a6ebea..f3df2951ffb9c2351a7ca903011e2c60e4cffe29 100644 (file)
--- a/include/lib.h
+++ b/include/lib.h
@@ -36,7 +36,4 @@ void _loadname(const char *_name, message *_msgptr);
 int _len(const char *_s);
 void _begsig(int _dummy);
 
-ssize_t pread64(int fd, void *buf, size_t count, u64_t where);
-ssize_t pwrite64(int fd, const void *buf, size_t count, u64_t where);
-
 #endif /* _LIB_H */

diff --git a/include/unistd.h b/include/unistd.h
index c50e91d0d797b87bbdb5200815acffebd84bc214..128ab50da291401706b025a6b2ca2f0ddfaa38b2 100644 (file)
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -88,7 +88,7 @@ __dead         void _exit(int);
 int     access(const char *, int);
 unsigned int alarm(unsigned int);
 int     chdir(const char *);
-#if !defined(__minix) && (defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE))
+#if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE)
 int    chown(const char *, uid_t, gid_t) __RENAME(__posix_chown);
 #else
 int    chown(const char *, uid_t, gid_t);
@@ -194,7 +194,7 @@ int  ftruncate(int, off_t);
  */
 #if (_POSIX_C_SOURCE - 0) >= 199309L || (_XOPEN_SOURCE - 0) >= 500 || \
     defined(_NETBSD_SOURCE)
-#ifndef __minix 
+#ifndef __minix
 int     fdatasync(int);
 #endif /* !__minix */
 int     fsync(int);
@@ -247,7 +247,7 @@ typedef     __intptr_t      intptr_t;
 
 int     brk(void *);
 int     fchdir(int);
-#if !defined(__minix) && defined(_XOPEN_SOURCE)
+#if defined(_XOPEN_SOURCE)
 int     fchown(int, uid_t, gid_t) __RENAME(__posix_fchown);
 #else
 int     fchown(int, uid_t, gid_t);
@@ -321,14 +321,6 @@ int        unlinkat(int, const char *, int);
 /*
  * Implementation-defined extensions
  */
-#ifdef __minix
-
-int lseek64(int fd, u64_t _offset, int _whence, u64_t *_newpos);
-#if defined(_NETBSD_SOURCE)
-#include <minix/type.h>
-#endif /* defined(_NETBSD_SOURCE) */
-#endif /* __minix */
-
 #if defined(_NETBSD_SOURCE)
 #ifndef __minix
 int     acct(const char *);

diff --git a/lib/libc/include/namespace.h b/lib/libc/include/namespace.h
index 74337eecd67cd9bf423a37998c2bf05aa56b08e5..ed48bc5e1edbc2d510559369c01b47770c061692 100644 (file)
--- a/lib/libc/include/namespace.h
+++ b/lib/libc/include/namespace.h
@@ -864,7 +864,6 @@
 #define bind _bind
 #define chdir _chdir
 #define chmod _chmod
-#define chown _chown
 #define chroot _chroot
 #define close _close
 #define dup _dup
@@ -872,7 +871,6 @@
 #define execve _execve
 #define fchdir _fchdir
 #define fchmod _fchmod
-#define fchown _fchown
 #define fcntl _fcntl
 #define flock _flock
 #define fstatfs _fstatfs

diff --git a/lib/libc/sys-minix/Makefile.inc b/lib/libc/sys-minix/Makefile.inc
index c4194b635a66991b96cedb01b97872e0c8e616e7..2dea8f10d357074ab13d10624bddf21afac5db65 100644 (file)
--- a/lib/libc/sys-minix/Makefile.inc
+++ b/lib/libc/sys-minix/Makefile.inc
@@ -24,7 +24,7 @@ SRCS+=        accept.c access.c adjtime.c bind.c brk.c sbrk.c m_closefrom.c getsid.c \
        _exit.c _ucontext.c environ.c __getcwd.c vfork.c sizeup.c init.c \
        getrusage.c
 
-# Minix specific syscalls.
-SRCS+= cprofile.c lseek64.c sprofile.c stack_utils.c _mcontext.c
+# Minix specific syscalls / utils.
+SRCS+= cprofile.c sprofile.c stack_utils.c _mcontext.c
 
 .include "${ARCHDIR}/sys-minix/Makefile.inc"

diff --git a/lib/libc/sys-minix/chown.c b/lib/libc/sys-minix/chown.c
index f6d5517e5f58c7178b2ea1ed4d4ce61520ca8c57..b0505971a20b3b1997cb5edc15dac6d9360801b7 100644 (file)
--- a/lib/libc/sys-minix/chown.c
+++ b/lib/libc/sys-minix/chown.c
@@ -6,7 +6,7 @@
 #include <unistd.h>
 
 #ifdef __weak_alias
-__weak_alias(chown, _chown)
+__weak_alias(__posix_chown, chown)
 #endif
 
 int chown(const char *name, uid_t owner, gid_t grp)

diff --git a/lib/libc/sys-minix/fchown.c b/lib/libc/sys-minix/fchown.c
index d3538562fef65d81fc85076114e2c4e5e82689fb..b49601c858fd5278ec18e0c60c1e9f063da539b4 100644 (file)
--- a/lib/libc/sys-minix/fchown.c
+++ b/lib/libc/sys-minix/fchown.c
@@ -6,7 +6,7 @@
 #include <unistd.h>
 
 #ifdef __weak_alias
-__weak_alias(fchown, _fchown)
+__weak_alias(__posix_fchown, fchown)
 #endif
 
 int fchown(int fd, uid_t owner, gid_t grp)

diff --git a/lib/libc/sys-minix/lseek64.c b/lib/libc/sys-minix/lseek64.c
deleted file mode 100644 (file)
index b75b132..0000000
--- a/lib/libc/sys-minix/lseek64.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include <sys/cdefs.h>
-#include "namespace.h"
-#include <lib.h>
-
-#include <string.h>
-#include <unistd.h>
-#include <minix/u64.h>
-
-int lseek64(fd, offset, whence, newpos)
-int fd;
-u64_t offset;
-int whence;
-u64_t *newpos;
-{
-  message m;
-
-  memset(&m, 0, sizeof(m));
-  m.VFS_LSEEK_FD = fd;
-  m.VFS_LSEEK_OFF_LO = ex64lo(offset);
-  m.VFS_LSEEK_OFF_HI = ex64hi(offset);
-  m.VFS_LSEEK_WHENCE = whence;
-  if (_syscall(VFS_PROC_NR, VFS_LSEEK, &m) < 0) return -1;
-  if (newpos)
-       *newpos= make64(m.VFS_LSEEK_OFF_LO, m.VFS_LSEEK_OFF_HI);
-  return 0;
-}

diff --git a/lib/libc/sys-minix/pread.c b/lib/libc/sys-minix/pread.c
index f2b751544e78ffc9bf1f2198c05d2b5846af484c..d5dd1e57e56ff939bce261b3d51dc94f4e6ac0c6 100644 (file)
--- a/lib/libc/sys-minix/pread.c
+++ b/lib/libc/sys-minix/pread.c
@@ -1,36 +1,13 @@
 #include <sys/cdefs.h>
 #include "namespace.h"
-#include <lib.h>
 
+#include <errno.h>
 #include <unistd.h>
 
 #ifdef __weak_alias
 __weak_alias(pread, _pread)
 #endif
 
-#include <lib.h>
-#include <unistd.h>
-#include <minix/u64.h>
-
-ssize_t pread64(int fd, void *buffer, size_t nbytes, u64_t where)
-{
-       u64_t here;
-       ssize_t r;
-
-       if (lseek64(fd, make64(0,0), SEEK_CUR, &here) < 0) return(-1);
-       if (lseek64(fd, where, SEEK_SET, NULL) < 0) return(-1);
-       if ((r = read(fd, buffer, nbytes)) < 0) {
-               int e = errno;
-               lseek64(fd, here, SEEK_SET, NULL);
-               errno = e;
-               return(-1);
-       }
-
-       if (lseek64(fd, here, SEEK_SET, NULL) < 0) return(-1);
-
-       return(r);
-}
-
 ssize_t pread(int fd, void *buffer, size_t nbytes, off_t where)
 {
        off_t here;

diff --git a/lib/libc/sys-minix/pwrite.c b/lib/libc/sys-minix/pwrite.c
index f2c07b3a42bc0a32bc9e3f278bb00e674999ceb4..d36b1ec21f8f7ab7178e3b795c237bddd8e08916 100644 (file)
--- a/lib/libc/sys-minix/pwrite.c
+++ b/lib/libc/sys-minix/pwrite.c
@@ -1,34 +1,13 @@
 #include <sys/cdefs.h>
 #include "namespace.h"
-#include <lib.h>
 
+#include <errno.h>
 #include <unistd.h>
 
 #ifdef __weak_alias
 __weak_alias(pwrite, _pwrite)
 #endif
 
-#include <minix/u64.h>
-
-ssize_t pwrite64(int fd, const void *buffer, size_t nbytes, u64_t where)
-{
-       u64_t here;
-       ssize_t w;
-
-       if (lseek64(fd, make64(0,0), SEEK_CUR, &here) < 0) return(-1);
-       if (lseek64(fd, where, SEEK_SET, NULL) < 0) return(-1);
-       if ((w = write(fd, buffer, nbytes)) < 0) {
-               int e = errno;
-               lseek64(fd, here, SEEK_SET, NULL);
-               errno = e;
-               return(-1);
-       }
-
-       if (lseek64(fd, here, SEEK_SET, NULL) < 0) return(-1);
-
-       return(w);
-}
-
 ssize_t pwrite(int fd, const void *buffer, size_t nbytes, off_t where)
 {
        off_t here;

diff --git a/lib/libminc/Makefile b/lib/libminc/Makefile
index 28608249808dceb69bc62ebad03b98e9cf151191..aa3eeb8fb419aa6576f119d42365424456a236ca 100644 (file)
--- a/lib/libminc/Makefile
+++ b/lib/libminc/Makefile
@@ -145,7 +145,7 @@ CPPFLAGS.${i}+= -I${LIBCDIR}/locale
 # Import from sys-minix
 .for i in access.c brk.c close.c environ.c execve.c fork.c fsync.c \
        getgid.c getpid.c geteuid.c getuid.c gettimeofday.c getvfsstat.c \
-       init.c link.c loadname.c lseek.c lseek64.c _mcontext.c mknod.c \
+       init.c link.c loadname.c lseek.c _mcontext.c mknod.c \
        mmap.c nanosleep.c open.c pread.c pwrite.c read.c sbrk.c \
        select.c setuid.c sigprocmask.c stack_utils.c stat.c stime.c \
        syscall.c _ucontext.c umask.c unlink.c waitpid.c write.c \

diff --git a/sbin/fsck_ext2fs/utilities.c b/sbin/fsck_ext2fs/utilities.c
index 11693787672a688f75db3f1ee6bb46c46968498b..59920d2c5a035b02728b6fcebb7017aeafd21cc1 100644 (file)
--- a/sbin/fsck_ext2fs/utilities.c
+++ b/sbin/fsck_ext2fs/utilities.c
@@ -318,23 +318,13 @@ bread(int fd, char *buf, daddr_t blk, long size)
 
        offset = blk;
        offset *= dev_bsize;
-#ifndef __minix
        if (lseek(fd, offset, 0) < 0)
                rwerror("SEEK", blk);
-#else
-       if (lseek64(fd, offset, 0, NULL) < 0)
-               rwerror("SEEK", blk);
-#endif
        else if (read(fd, buf, (int)size) == size)
                return (0);
        rwerror("READ", blk);
-#ifndef __minix
        if (lseek(fd, offset, 0) < 0)
                rwerror("SEEK", blk);
-#else
-       if (lseek64(fd, offset, 0, NULL) < 0)
-               rwerror("SEEK", blk);
-#endif
        errs = 0;
        memset(buf, 0, (size_t)size);
        printf("THE FOLLOWING DISK SECTORS COULD NOT BE READ:");
@@ -370,25 +360,15 @@ bwrite(int fd, char *buf, daddr_t blk, long size)
                return;
        offset = blk;
        offset *= dev_bsize;
-#ifndef __minix
        if (lseek(fd, offset, 0) < 0)
                rwerror("SEEK", blk);
-#else
-       if (lseek64(fd, offset, 0, NULL) < 0)
-               rwerror("SEEK", blk);
-#endif
        else if (write(fd, buf, (int)size) == size) {
                fsmodified = 1;
                return;
        }
        rwerror("WRITE", blk);
-#ifndef __minix
        if (lseek(fd, offset, 0) < 0)
                rwerror("SEEK", blk);
-#else
-       if (lseek64(fd, offset, 0, NULL) < 0)
-               rwerror("SEEK", blk);
-#endif
        printf("THE FOLLOWING SECTORS COULD NOT BE WRITTEN:");
        for (cp = buf, i = 0; i < size; i += dev_bsize, cp += dev_bsize)
                if (write(fd, cp, (int)dev_bsize) != dev_bsize) {

diff --git a/sbin/newfs_ext2fs/mke2fs.c b/sbin/newfs_ext2fs/mke2fs.c
index 71ae78671bd40d70885ff2f63538d398c16506a1..ef86c8f3f0dd1a5081131e2e9318a82f1b9ec352 100644 (file)
--- a/sbin/newfs_ext2fs/mke2fs.c
+++ b/sbin/newfs_ext2fs/mke2fs.c
@@ -1385,18 +1385,10 @@ void
 rdfs(daddr_t bno, int size, void *bf)
 {
        int n;
-#ifndef __minix
        off_t offset;
-#else
-       u64_t offset;
-#endif
 
        offset = bno;
-#ifndef __minix
        n = pread(fsi, bf, size, offset * sectorsize);
-#else
-       n = pread64(fsi, bf, size, offset * sectorsize);
-#endif
        if (n != size)
                err(EXIT_FAILURE, "%s: read error for sector %" PRId64,
                    __func__, (int64_t)bno);
@@ -1409,21 +1401,13 @@ void
 wtfs(daddr_t bno, int size, void *bf)
 {
        int n;
-#ifndef __minix
        off_t offset;
-#else
-       u64_t offset;
-#endif
 
        if (Nflag)
                return;
        offset = bno;
        errno = 0;
-#ifndef __minix
        n = pwrite(fso, bf, size, offset * sectorsize);
-#else
-       n = pwrite64(fso, bf, size, offset * sectorsize);
-#endif
        if (n != size)
                err(EXIT_FAILURE, "%s: write error for sector %" PRId64,
                    __func__, (int64_t)bno);

diff --git a/usr.sbin/mkfs.mfs/mkfs.c b/usr.sbin/mkfs.mfs/mkfs.c
index 9ceb85dabe2b8217af10deb1ba89145308027bef..b1037ad7f95dc6a2f02fa652e45eac01d0f59d18 100644 (file)
--- a/usr.sbin/mkfs.mfs/mkfs.c
+++ b/usr.sbin/mkfs.mfs/mkfs.c
@@ -1633,15 +1633,8 @@ static uint64_t
 mkfs_seek(uint64_t pos, int whence)
 {
        if(whence == SEEK_SET) pos += fs_offset_bytes;
-#ifdef __minix
-       uint64_t newpos;
-       if((lseek64(fd, pos, whence, &newpos)) < 0)
-               err(1, "mkfs_seek: lseek64 failed");
-       return newpos;
-#else
        off_t newpos;
        if((newpos=lseek(fd, pos, whence)) == (off_t) -1)
                err(1, "mkfs_seek: lseek failed");
        return newpos;
-#endif
 }