more functions to add + implement readn, writen, preadn, and pwriten

Signed-off-by: Mattias Andrée <maandree@member.fsf.org>

6 files changed, 404 insertions, 5 deletions

diff --git a/include/fcntl.h b/include/fcntl.h
index 6bc42f0..1c13b8d 100644
--- a/include/fcntl.h
+++ b/include/fcntl.h
@@ -55,3 +55,7 @@ int creat(const char*, mode_t)
 
 #endif
 
+/*
+  TODO int reopen(int fd, int oflag); 0, on success, -1 on error
+*/
+
diff --git a/include/unistd.h b/include/unistd.h
index c6c1711..dc8e5d5 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -1259,13 +1259,112 @@ char* getpass(const char*)
 
 
 
+#if defined(__PLAN9_SOURCE) || defined(__SLIBC_SOURCE)
+/**
+ * Variant of `read` that will read until the request
+ * amount of that has been read, or there is no more
+ * data to read. This function will block signals so
+ * that it cannot throw `EINTR`, which could mean that
+ * read data is lost. Note however, it may fail for
+ * any other reason resulting in lost data.
+ * 
+ * This is a Plan 9 from Bell Labs compliant slibc extension.
+ * 
+ * @etymology  (Read) all `(n)byte` bytes!
+ * 
+ * @param  fd     The file descriptor whence the data shall be read.
+ * @param  buf    The buffer whither the read data shall be stored.
+ * @param  nbyte  The number of bytes to read.
+ * 
+ * @throws  Any error specified for read(3), except `EINTR`.
+ * 
+ * @since  Always.
+ */
+ssize_t readn(int, void*, size_t);
+#endif
+
+#if defined(__SLIBC_SOURCE)
+/**
+ * Variant of `write` that will write until all given
+ * data has been written. This function will block signals
+ * so that it cannot throw `EINTR`, which could mean that
+ * you do not know how much data has been successfully
+ * written. Note however, it may fail for any other reason
+ * resulting in the same problem.
+ * 
+ * This is a slibc extension.
+ * 
+ * @etymology  (Write) all `(n)byte` bytes!
+ * 
+ * @param  fd     The file descriptor whither the data shall be write.
+ * @param  buf    The data to write.
+ * @param  nbyte  The number of bytes to write.
+ * 
+ * @throws  Any error specified for write(3), except `EINTR`.
+ * 
+ * @since  Always.
+ */
+ssize_t writen(int, const void*, size_t);
+
+/**
+ * Variant of `pread` that will read until the request
+ * amount of that has been read, or there is no more
+ * data to read. This function will block signals so
+ * that it cannot throw `EINTR`, which could mean that
+ * read data is lost. Note however, it may fail for
+ * any other reason resulting in lost data.
+ * 
+ * This is a slibc extension.
+ * 
+ * @etymology  Variant of `(pread)` that reads all `(n)byte` bytes!
+ * 
+ * @param  fd      The file descriptor whence the data shall be read.
+ * @param  buf     The buffer whither the read data shall be stored.
+ * @param  nbyte   The number of bytes to read.
+ * @param  offset  Whence in the file the read begins.
+ * 
+ * @throws  Any error specified for pread(3), except `EINTR`.
+ * 
+ * @since  Always.
+ */
+ssize_t preadn(int, void*, size_t, off_t);
+
+/**
+ * Variant of `pwrite` that will write until all given
+ * data has been written. This function will block signals
+ * so that it cannot throw `EINTR`, which could mean that
+ * you do not know how much data has been successfully
+ * written. Note however, it may fail for any other reason
+ * resulting in the same problem.
+ * 
+ * This is a slibc extension.
+ * 
+ * @etymology  Variant of `(pwrite)` that writes all `(n)byte` bytes!
+ * 
+ * @param  fd      The file descriptor whither the data shall be write.
+ * @param  buf     The data to write.
+ * @param  nbyte   The number of bytes to write.
+ * @param  offset  Whence in the file the write begins.
+ * 
+ * @throws  Any error specified for pwrite(3), except `EINTR`.
+ * 
+ * @since  Always.
+ */
+ssize_t pwriten(int, const void*, size_t);
+#endif
+
+
+
 #endif
 
 /*
-  TODO readn(plan9), writen, preadn, pwriten
-  readn: read that can only return with a short read on error
-  writen: write that can only return with a short write on error
-  preadn: pread that can only return with a short read on error
-  pwriten: pwrite that can only return with a short write on error
+  TODO ssize_t writeatleast(int, const void*, size_t min, size_t max, size_t*);
+  TODO ssize_t pwriteatleast(int, const void*, size_t min, size_t max, off_t, size_t*);
+  TODO ssize_t readatleast(int, void**, size_t min, size_t max, size_t*);
+  TODO ssize_t preadatleast(int, void**, size_t min, size_t max, off_t, size_t*);
+  TODO int dup2atleast(int, int);
+  TODO int dup3atleast(int, int, int);
+  TODO for dup3 and dup3atleast, a flag to specify the the oldfd shall close
+  TODO for dup3 and dup3atleast, a flag to specify the the oldfd shall be /dev/null
 */
 
diff --git a/src/unistd/preadn.c b/src/unistd/preadn.c
new file mode 100644
index 0000000..d7da108
--- /dev/null
+++ b/src/unistd/preadn.c
@@ -0,0 +1,75 @@
+/**
+ * slibc — Yet another C library
+ * Copyright © 2015  Mattias Andrée (maandree@member.fsf.org)
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include <unistd.h>
+#include <signal.h>
+
+
+
+/**
+ * Variant of `pread` that will read until the request
+ * amount of that has been read, or there is no more
+ * data to read. This function will block signals so
+ * that it cannot throw `EINTR`, which could mean that
+ * read data is lost. Note however, it may fail for
+ * any other reason resulting in lost data.
+ * 
+ * This is a slibc extension.
+ * 
+ * @etymology  Variant of `(pread)` that reads all `(n)byte` bytes!
+ * 
+ * @param  fd      The file descriptor whence the data shall be read.
+ * @param  buf     The buffer whither the read data shall be stored.
+ * @param  nbyte   The number of bytes to read.
+ * @param  offset  Whence in the file the read begins.
+ * 
+ * @throws  Any error specified for pread(3), except `EINTR`.
+ * 
+ * @since  Always.
+ */
+ssize_t preadn(int fd, void* buf, size_t nbyte, off_t offset)
+{
+  char *buffer = buf;
+  ssize_t r, n = 0;
+  sigset_t mask, oldmask;
+  int saved_errno = 0;
+  
+  sigfillset(&mask);
+  sigprocmask(SIG_BLOCK, &mask, &oldmask);
+  
+  while (nbyte)
+    {
+      r = pread(fildes, buffer, nbyte, offset);
+      if (r < 0)
+	goto fail;
+      if (r == 0)
+	break;
+      n += r;
+      nbyte -= (size_t)r;
+      offset += (off_t)r;
+      buffer += r;
+    }
+
+  sigprocmask(SIG_SETMASK, &oldmask, NULL);
+  return n;
+ fail:
+  errno = saved_errno;
+  sigprocmask(SIG_SETMASK, &oldmask, NULL);
+  saved_errno = errno;
+  return -1;
+}
+
diff --git a/src/unistd/pwriten.c b/src/unistd/pwriten.c
new file mode 100644
index 0000000..fefe537
--- /dev/null
+++ b/src/unistd/pwriten.c
@@ -0,0 +1,75 @@
+/**
+ * slibc — Yet another C library
+ * Copyright © 2015  Mattias Andrée (maandree@member.fsf.org)
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include <unistd.h>
+#include <signal.h>
+
+
+
+/**
+ * Variant of `pwrite` that will write until all given
+ * data has been written. This function will block signals
+ * so that it cannot throw `EINTR`, which could mean that
+ * you do not know how much data has been successfully
+ * written. Note however, it may fail for any other reason
+ * resulting in the same problem.
+ * 
+ * This is a slibc extension.
+ * 
+ * @etymology  Variant of `(pwrite)` that writes all `(n)byte` bytes!
+ * 
+ * @param  fd      The file descriptor whither the data shall be write.
+ * @param  buf     The data to write.
+ * @param  nbyte   The number of bytes to write.
+ * @param  offset  Whence in the file the write begins.
+ * 
+ * @throws  Any error specified for pwrite(3), except `EINTR`.
+ * 
+ * @since  Always.
+ */
+ssize_t pwriten(int fd, const void* buf, size_t nbyte, off_t offset)
+{
+  const char *buffer = buf;
+  ssize_t r, n = 0;
+  sigset_t mask, oldmask;
+  int saved_errno = 0;
+  
+  sigfillset(&mask);
+  sigprocmask(SIG_BLOCK, &mask, &oldmask);
+  
+  while (nbyte)
+    {
+      r = pwrite(fildes, buffer, nbyte, offset);
+      if (r < 0)
+	goto fail;
+      if (r == 0)
+	break;
+      n += r;
+      nbyte -= (size_t)r;
+      offset += (off_t)r;
+      buffer += r;
+    }
+
+  sigprocmask(SIG_SETMASK, &oldmask, NULL);
+  return n;
+ fail:
+  errno = saved_errno;
+  sigprocmask(SIG_SETMASK, &oldmask, NULL);
+  saved_errno = errno;
+  return -1;
+}
+
diff --git a/src/unistd/readn.c b/src/unistd/readn.c
new file mode 100644
index 0000000..b50abe5
--- /dev/null
+++ b/src/unistd/readn.c
@@ -0,0 +1,73 @@
+/**
+ * slibc — Yet another C library
+ * Copyright © 2015  Mattias Andrée (maandree@member.fsf.org)
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include <unistd.h>
+#include <signal.h>
+
+
+
+/**
+ * Variant of `read` that will read until the request
+ * amount of that has been read, or there is no more
+ * data to read. This function will block signals so
+ * that it cannot throw `EINTR`, which could mean that
+ * read data is lost. Note however, it may fail for
+ * any other reason resulting in lost data.
+ * 
+ * This is a Plan 9 from Bell Labs compliant slibc extension.
+ * 
+ * @etymology  (Read) all `(n)byte` bytes!
+ * 
+ * @param  fd     The file descriptor whence the data shall be read.
+ * @param  buf    The buffer whither the read data shall be stored.
+ * @param  nbyte  The number of bytes to read.
+ * 
+ * @throws  Any error specified for read(3), except `EINTR`.
+ * 
+ * @since  Always.
+ */
+ssize_t readn(int fd, void* buf, size_t nbyte)
+{
+  char *buffer = buf;
+  ssize_t r, n = 0;
+  sigset_t mask, oldmask;
+  int saved_errno = 0;
+  
+  sigfillset(&mask);
+  sigprocmask(SIG_BLOCK, &mask, &oldmask);
+  
+  while (nbyte)
+    {
+      r = read(fildes, buffer, nbyte);
+      if (r < 0)
+	goto fail;
+      if (r == 0)
+	break;
+      n += r;
+      nbyte -= (size_t)r;
+      buffer += r;
+    }
+
+  sigprocmask(SIG_SETMASK, &oldmask, NULL);
+  return n;
+ fail:
+  errno = saved_errno;
+  sigprocmask(SIG_SETMASK, &oldmask, NULL);
+  saved_errno = errno;
+  return -1;
+}
+
diff --git a/src/unistd/writen.c b/src/unistd/writen.c
new file mode 100644
index 0000000..8082b00
--- /dev/null
+++ b/src/unistd/writen.c
@@ -0,0 +1,73 @@
+/**
+ * slibc — Yet another C library
+ * Copyright © 2015  Mattias Andrée (maandree@member.fsf.org)
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include <unistd.h>
+#include <signal.h>
+
+
+
+/**
+ * Variant of `write` that will write until all given
+ * data has been written. This function will block signals
+ * so that it cannot throw `EINTR`, which could mean that
+ * you do not know how much data has been successfully
+ * written. Note however, it may fail for any other reason
+ * resulting in the same problem.
+ * 
+ * This is a slibc extension.
+ * 
+ * @etymology  (Write) all `(n)byte` bytes!
+ * 
+ * @param  fd     The file descriptor whither the data shall be write.
+ * @param  buf    The data to write.
+ * @param  nbyte  The number of bytes to write.
+ * 
+ * @throws  Any error specified for write(3), except `EINTR`.
+ * 
+ * @since  Always.
+ */
+ssize_t writen(int fd, const void* buf, size_t nbyte);
+{
+  const char *buffer = buf;
+  ssize_t r, n = 0;
+  sigset_t mask, oldmask;
+  int saved_errno = 0;
+  
+  sigfillset(&mask);
+  sigprocmask(SIG_BLOCK, &mask, &oldmask);
+  
+  while (nbyte)
+    {
+      r = write(fildes, buffer, nbyte);
+      if (r < 0)
+	goto fail;
+      if (r == 0)
+	break;
+      n += r;
+      nbyte -= (size_t)r;
+      buffer += r;
+    }
+
+  sigprocmask(SIG_SETMASK, &oldmask, NULL);
+  return n;
+ fail:
+  errno = saved_errno;
+  sigprocmask(SIG_SETMASK, &oldmask, NULL);
+  saved_errno = errno;
+  return -1;
+}
+