From 12e09f9f85ac48ff891adf92f3b2c9a5fea27273 Mon Sep 17 00:00:00 2001
From: Nicholas Noll <nbnoll@eml.cc>
Date: Sat, 4 Dec 2021 14:10:21 -0800
Subject: Chore(REMOVE): finished deprecation of old io functions.

The old methods were simple wrappers of C standard library functions.
We've moved (painfully) over to a new interface that allows for files to
live on the stack. All users of the functionality are ported over.
---
 src/base/mmap/internal.h |  1 -
 src/base/mmap/mmap.c     | 35 +++++++++++++++++------------------
 2 files changed, 17 insertions(+), 19 deletions(-)

(limited to 'src/base/mmap')

diff --git a/src/base/mmap/internal.h b/src/base/mmap/internal.h
index 7606c7e..302c035 100644
--- a/src/base/mmap/internal.h
+++ b/src/base/mmap/internal.h
@@ -2,4 +2,3 @@
 
 #include <u.h>
 #include <base.h>
-#include <sys/mman.h>
diff --git a/src/base/mmap/mmap.c b/src/base/mmap/mmap.c
index e5cedbb..c3709d7 100644
--- a/src/base/mmap/mmap.c
+++ b/src/base/mmap/mmap.c
@@ -3,37 +3,36 @@
 mmap·Reader
 mmap·open(byte *filename)
 {
-    int     fd;
     int    err;
     void  *buf;
-    io·Stream  *s;
-    io·Stat     st;
+    io·Buffer io;
+    sys·Info info;
+    mmap·Reader rdr = {0};
 
-    s   = io·open(filename, "r");
-    fd  = io·fd(s);
-    err = io·stat(s, &st);
-    if(err){
+    if(io·open(filename, sys·ORead, &io)){
+        errorf("failed to open %s", filename);
+        goto done;
+    }
+
+    if(sys·infofd(io.fd, &info)){
         errorf("file stat: error code %d", err);
-        goto ERROR;
+        goto done;
     }
 
-    buf = mmap(nil, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
-    if(!buf){
+    if(sys·mmap(nil, info.size, sys·ProtRead, sys·MapShared, io.fd, 0, &buf)){
         errorf("mmap: failed");
-        goto ERROR;
+        goto done;
     }
     // NOTE: posix systems require that reference kept to mmap file after fd is closed
-    io·close(s);
-    return (mmap·Reader){.len=st.st_size, .b=buf};
-
-ERROR:
-    io·close(s);
-    return (mmap·Reader){ 0 };
+    rdr = (mmap·Reader){.len=info.size, .b=buf};
+done:
+    io·close((io·Header*)&io);
+    return rdr;
 }
 
 int
 mmap·close(mmap·Reader rdr)
 {
-    munmap(rdr.b, rdr.len);
+    sys·munmap(rdr.b, rdr.len);
     return 0;
 }
-- 
cgit v1.2.1