commit 43625762a9751cc6e6e4d8f54fbc8b82d98fb20d
author K.Takata <kentkt@csc.jp> Thu Oct 20 13:28:51 2022 +0100
committer Bram Moolenaar <Bram@vim.org> Thu Oct 20 13:28:51 2022 +0100
tree 0261835c4d3eb079e9013ae8277531b12c1d5db2
parent 4c36678ffd1f933a6d4a12415994dea15e4ccec6

patch 9.0.0803: readblob() cannot read from character device

Problem:    readblob() cannot read from character device.
Solution:   Use S_ISCHR() to not check the size. (Ken Takata, closes #11407)

src/blob.c

diff --git a/src/blob.c b/src/blob.c
index 92efb67..a94316c 100644
--- a/src/blob.c
+++ b/src/blob.c
@@ -212,9 +212,13 @@
     }
     // Trying to read bytes that aren't there results in an empty blob, not an
     // error.
-    if (size < 0 || size > st.st_size)
+    if (size <= 0 || (
+#ifdef S_ISCHR
+		!S_ISCHR(st.st_mode) &&
+#endif
+		size > st.st_size))
 	return OK;
-    if (vim_fseek(fd, offset, whence) != 0)
+    if (offset != 0 && vim_fseek(fd, offset, whence) != 0)
 	return OK;
 
     if (ga_grow(&blob->bv_ga, (int)size) == FAIL)

src/proto/blob.pro

diff --git a/src/proto/blob.pro b/src/proto/blob.pro
index 176f43e..7c8b5ac 100644
--- a/src/proto/blob.pro
+++ b/src/proto/blob.pro
@@ -10,7 +10,7 @@
 void blob_set(blob_T *blob, int idx, int byte);
 void blob_set_append(blob_T *blob, int idx, int byte);
 int blob_equal(blob_T *b1, blob_T *b2);
-int read_blob(FILE *fd, typval_T *rettv, off_T offset, off_T size);
+int read_blob(FILE *fd, typval_T *rettv, off_T offset, off_T size_arg);
 int write_blob(FILE *fd, blob_T *blob);
 char_u *blob2string(blob_T *blob, char_u **tofree, char_u *numbuf);
 blob_T *string2blob(char_u *str);

src/testdir/test_blob.vim

diff --git a/src/testdir/test_blob.vim b/src/testdir/test_blob.vim
index a54cede..47315ab 100644
--- a/src/testdir/test_blob.vim
+++ b/src/testdir/test_blob.vim
@@ -508,6 +508,11 @@
   END
   call v9.CheckLegacyAndVim9Success(lines)
 
+  if filereadable('/dev/random')
+    let b = readblob('/dev/random', 0, 10)
+    call assert_equal(10, len(b))
+  endif
+
   call assert_fails("call readblob('notexist')", 'E484:')
   " TODO: How do we test for the E485 error?
 

src/version.c

diff --git a/src/version.c b/src/version.c
index 34ff382..0de044e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    803,
+/**/
     802,
 /**/
     801,