storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bug/win64gc'

Browse Source 
Conflicts:
	istream.c
	main.c
This commit is contained in:
Tatsuya Kinoshita
2013-10-14 23:02:26 +09:00
parent 1941677307 ec81194f38
commit f7ff70f6da
13 changed files with 441 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
istream.h
View File

@@ -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