libblkid-tiny: allow probing files

[project/ubox.git] / libblkid-tiny / libblkid-tiny.c

diff --git a/libblkid-tiny/libblkid-tiny.c b/libblkid-tiny/libblkid-tiny.c
index bd86c41..dc18aa7 100644 (file)
--- a/libblkid-tiny/libblkid-tiny.c
+++ b/libblkid-tiny/libblkid-tiny.c
@@ -13,6 +13,7 @@
 int blkid_debug_mask = 0;
 
 static unsigned char *probe_buffer;
+static unsigned int probe_buffer_size = 0;
 
 int get_linux_version (void)
 {
@@ -80,17 +81,24 @@ unsigned char *blkid_probe_get_buffer(blkid_probe pr,
                                blkid_loff_t off, blkid_loff_t len)
 {
        int ret;
+       unsigned char *buf;
 
-       if (len > 4096) {
-               fprintf(stderr, "probe buffer too small %d\n", (int) len);
-               return NULL;
-       }
+       if (len > probe_buffer_size) {
+               buf = realloc(probe_buffer, len);
+
+               if (!buf) {
+                       fprintf(stderr, "failed to allocate %d byte buffer\n",
+                               (int)len);
+
+                       return NULL;
+               }
 
-       if (!probe_buffer) {
-               probe_buffer = malloc(4096);
-               memset(probe_buffer, 0, 4096);
+               probe_buffer = buf;
+               probe_buffer_size = len;
        }
 
+       memset(probe_buffer, 0, probe_buffer_size);
+
        lseek(pr->fd, off, SEEK_SET);
        ret = read(pr->fd, probe_buffer, len);
 
@@ -163,7 +171,7 @@ int probe_block(char *block, struct blkid_struct_probe *pr)
        struct stat s;
        int i;
 
-       if (stat(block, &s) || !S_ISBLK(s.st_mode))
+       if (stat(block, &s) || (!S_ISBLK(s.st_mode) && !S_ISREG(s.st_mode)))
                return -1;
 
        pr->err = -1;
@@ -207,4 +215,3 @@ int probe_block(char *block, struct blkid_struct_probe *pr)
 
        return 0;
 }
-