diff options
| author | Tatsuya Kinoshita <tats@debian.org> | 2013-10-14 14:02:26 +0000 |
|---|---|---|
| committer | Tatsuya Kinoshita <tats@debian.org> | 2013-10-14 14:02:26 +0000 |
| commit | f7ff70f6da9f70e21c690f1d11a695de7536bf6f (patch) | |
| tree | 42815fcf0bf71d5944461cb83f3f779138080d80 /istream.h | |
| parent | Merge branch 'feature/debian-version' (diff) | |
| parent | Workaround of GC crash on Cygwin64 (diff) | |
| download | w3m-f7ff70f6da9f70e21c690f1d11a695de7536bf6f.tar.gz w3m-f7ff70f6da9f70e21c690f1d11a695de7536bf6f.zip | |
Merge branch 'bug/win64gc'
Conflicts:
istream.c
main.c
Diffstat (limited to 'istream.h')
| -rw-r--r-- | istream.h | 13 |
1 files changed, 9 insertions, 4 deletions
@@ -2,13 +2,13 @@ #ifndef IO_STREAM_H #define IO_STREAM_H +#include "indep.h" #include <stdio.h> #ifdef USE_SSL #include <openssl/bio.h> #include <openssl/x509.h> #include <openssl/ssl.h> #endif -#include "Str.h" #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> @@ -36,7 +36,7 @@ union input_stream; struct ens_handle { union input_stream *is; - Str s; + struct growbuf gb; int pos; char encoding; }; @@ -119,9 +119,14 @@ extern InputStream newEncodedStream(InputStream is, char encoding); extern int ISclose(InputStream stream); extern int ISgetc(InputStream stream); extern int ISundogetc(InputStream stream); -extern Str StrISgets(InputStream stream); -extern Str StrmyISgets(InputStream stream); +extern Str StrISgets2(InputStream stream, char crnl); +#define StrISgets(stream) StrISgets2(stream, FALSE) +#define StrmyISgets(stream) StrISgets2(stream, TRUE) +void ISgets_to_growbuf(InputStream stream, struct growbuf *gb, char crnl); +#ifdef unused extern int ISread(InputStream stream, Str buf, int count); +#endif +int ISread_n(InputStream stream, char *dst, int bufsize); extern int ISfileno(InputStream stream); extern int ISeos(InputStream stream); #ifdef USE_SSL |