Changeset da0fef6 in mainline for uspace/app/bithenge/file.c

Timestamp:

2012-06-23T18:24:21Z (13 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

03b2b2c

Parents:

d5070ef

Message:

Bithenge: port to Linux and allow choosing a data source

File:

• uspace/app/bithenge/file.c (modified) (3 diffs)

uspace/app/bithenge/file.c

@@ -39 +39 @@
 #include <errno.h>
 #include <fcntl.h>
-#include <macros.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
 #include "blob.h"
 #include "file.h"
+#include "os.h"
 
 typedef struct {
@@ -76 +78 @@
         if (offset > blob->size)
                 return ELIMIT;
-        *size = min(*size, blob->size - offset);
-        int rc = lseek(blob->fd, offset, SEEK_SET);
-        if (rc != EOK)
-                return rc;
-        return read(blob->fd, buffer, *size);
+        if (lseek(blob->fd, offset, SEEK_SET) < 0)
+                return errno;
+
+        ssize_t amount_read;
+        aoff64_t remaining_size = *size;
+        *size = 0;
+        do {
+                amount_read = read(blob->fd, buffer, remaining_size);
+                if (amount_read < 0)
+                        return errno;
+                buffer += amount_read;
+                *size += amount_read;
+                remaining_size -= amount_read;
+        } while (remaining_size && amount_read);
+        return EOK;
 }
 
@@ -125 +137 @@
         }
         blob->fd = fd;
+#ifdef __HELENOS__
         blob->size = stat.size;
+#else
+        blob->size = stat.st_size;
+#endif
         blob->needs_close = needs_close;
         *out = bithenge_blob_as_node(blob_from_file(blob));