Merge branch 'jk/strbuf-read-file-close-error'

Code clean-up. * jk/strbuf-read-file-close-error: strbuf_read_file(): preserve errno across close() call