1 files changed, 5 insertions, 11 deletions

diff --git a/tccpp.c b/tccpp.c
index cc54dee..c0c7aec 100644
--- a/tccpp.c
+++ b/tccpp.c
@@ -360,13 +360,13 @@ static int tcc_peekc_slow(BufferedFile *bf)
     int len;
     /* only tries to read if really end of buffer */
     if (bf->buf_ptr >= bf->buf_end) {
-        if (bf->fd.fd != -1) {
+        if (bf->fd != -1) {
 #if defined(PARSE_DEBUG)
             len = 8;
 #else
             len = IO_BUF_SIZE;
 #endif
-            len = vio_read(bf->fd, bf->buffer, len);
+            len = read(bf->fd, bf->buffer, len);
             if (len < 0)
                 len = 0;
         } else {
@@ -1438,8 +1438,6 @@ ST_FUNC void preprocess(int is_bof)
             CachedInclude *e;
             BufferedFile **f;
             const char *path;
-            int size;
-            vio_fd fd;
 
             if (i == -2) {
                 /* check absolute include path */
@@ -1452,9 +1450,8 @@ ST_FUNC void preprocess(int is_bof)
                 /* search in current dir if "header.h" */
                 if (c != '\"')
                     continue;
-                size = tcc_basename(file->filename) - file->filename;
-                memcpy(buf1, file->filename, size);
-                buf1[size] = '\0';
+                path = file->filename;
+                pstrncpy(buf1, path, tcc_basename(path) - path);
 
             } else {
                 /* search in all the include paths */
@@ -1484,13 +1481,10 @@ ST_FUNC void preprocess(int is_bof)
 #ifdef INC_DEBUG
                 printf("%s: skipping cached %s\n", file->filename, buf1);
 #endif
-				vio_initialize(&fd);
-				fd.fd = 0;
                 goto include_done;
             }
 
-			fd = tcc_open(s1, buf1);
-            if (fd.fd < 0)
+            if (tcc_open(s1, buf1) < 0)
 include_trynext:
                 continue;