Merge pull request #33 from jamessan/bigger-terminfo-files

Support terminfo files larger than 4K

Author: jamessan

doc/unibi_from_fd.pod

@@ -12,7 +12,7 @@ unibi_from_fd - read a terminfo entry from a file descriptor
 
 =head1 DESCRIPTION
 
-This function reads up to 4096 bytes from I<fd>, then calls C<unibi_from_mem>.
+This function reads up to 32768 bytes from I<fd>, then calls C<unibi_from_mem>.
 
 =head1 RETURN VALUE
 

doc/unibi_from_fp.pod

@@ -12,7 +12,7 @@ unibi_from_fp - read a terminfo entry from a FILE *
 
 =head1 DESCRIPTION
 
-This function reads up to 4096 bytes from I<fp>, then calls C<unibi_from_mem>.
+This function reads up to 32768 bytes from I<fp>, then calls C<unibi_from_mem>.
 
 =head1 RETURN VALUE
 

t/static_screen-256color.c

@@ -43,44 +43,56 @@ along with unibilium.  If not, see <http://www.gnu.org/licenses/>.
 #error "internal error: TERMINFO_DIRS is not defined"
 #endif
 
-enum {MAX_BUF = 4096};
+enum {MAX_BUF = 32768};
 
 const char *const unibi_terminfo_dirs = TERMINFO_DIRS;
 const char *const unibi_terminfo = TERMINFO;
 
 unibi_term *unibi_from_fp(FILE *fp) {
-    char buf[MAX_BUF];
+    char *buf = NULL;
+    unibi_term *term = NULL;
     size_t n, r;
 
-    for (n = 0; n < sizeof buf && (r = fread(buf + n, 1, sizeof buf - n, fp)) > 0; ) {
+    if (!(buf = malloc(MAX_BUF))) {
+        return term;
+    }
+
+    for (n = 0; n < MAX_BUF && (r = fread(buf + n, 1, MAX_BUF - n, fp)) > 0; ) {
         n += r;
 
         if (feof(fp)) {
             break;
         }
     }
 
-    if (ferror(fp)) {
-        return NULL;
+    if (!ferror(fp)) {
+        term = unibi_from_mem(buf, n);
     }
 
-    return unibi_from_mem(buf, n);
+    free(buf);
+    return term;
 }
 
 unibi_term *unibi_from_fd(int fd) {
-    char buf[MAX_BUF];
+    char *buf = NULL;
+    unibi_term *term = NULL;
     size_t n;
     ssize_t r;
 
-    for (n = 0; n < sizeof buf && (r = read(fd, buf + n, sizeof buf - n)) > 0; ) {
+    if (!(buf = malloc(MAX_BUF))) {
+        return term;
+    }
+
+    for (n = 0; n < MAX_BUF && (r = read(fd, buf + n, MAX_BUF - n)) > 0; ) {
         n += r;
     }
 
-    if (r < 0) {
-        return NULL;
+    if (r >= 0) {
+        term = unibi_from_mem(buf, n);
     }
 
-    return unibi_from_mem(buf, n);
+    free(buf);
+    return term;
 }
 
 unibi_term *unibi_from_file(const char *file) {