diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

handle cases where mem streams do not have FILE*

Browse Source
This commit is contained in:
vscosta 2016-04-08 01:22:27 -07:00
parent 6ee452f0c5
commit 2f5386bd6f
3 changed files with 66 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
os/iopreds.c
View File

@ -191,23 +191,6 @@ static bool is_file_errors(Term t) {
return false; return false;
} }
void Yap_DefaultStreamOps(StreamDesc *st) {
CACHE_REGS
st->stream_wputc = put_wchar;
st->stream_wgetc = get_wchar;
if (st->status & (Promptable_Stream_f)) {
st->stream_wgetc = get_wchar;
Yap_ConsoleOps(st, true);
} else if (st->encoding == LOCAL_encoding) {
st->stream_wgetc = get_wchar_from_file;
} else
st->stream_wgetc = get_wchar_from_FILE;
if (GLOBAL_CharConversionTable != NULL)
st->stream_wgetc_for_read = ISOWGetc;
else
st->stream_wgetc_for_read = st->stream_wgetc;
}
static void unix_upd_stream_info(StreamDesc *s) { static void unix_upd_stream_info(StreamDesc *s) {
if (s->status & InMemory_Stream_f) { if (s->status & InMemory_Stream_f) {
s->status |= Seekable_Stream_f; s->status |= Seekable_Stream_f;
@ -268,36 +251,39 @@ static void unix_upd_stream_info(StreamDesc *s) {
s->status |= Seekable_Stream_f; s->status |= Seekable_Stream_f;
} }
void Yap_DefaultStreamOps(StreamDesc *st) {
CACHE_REGS
st->stream_wputc = put_wchar;
st->stream_wgetc = get_wchar;
st->stream_putc = FilePutc;
st->stream_getc = PlGetc;
if (st->status & (Promptable_Stream_f)) {
st->stream_wgetc = get_wchar;
Yap_ConsoleOps(st, false);
} else if (st->encoding == LOCAL_encoding) {
st->stream_wgetc = get_wchar_from_file;
} else
st->stream_wgetc = get_wchar_from_FILE;
if (GLOBAL_CharConversionTable != NULL)
st->stream_wgetc_for_read = ISOWGetc;
else
st->stream_wgetc_for_read = st->stream_wgetc;
if (st->status & Pipe_Stream_f) {
Yap_PipeOps(st);
} else if (st->status & InMemory_Stream_f) {
Yap_MemOps(st);
} else if (st->status & Tty_Stream_f) {
Yap_ConsoleOps(st, false);
} else {
unix_upd_stream_info(st);
}
}
static void InitFileIO(StreamDesc *s) { static void InitFileIO(StreamDesc *s) {
CACHE_REGS CACHE_REGS
if (s->status & Socket_Stream_f) { Yap_DefaultStreamOps(s);
/* Console is a socket and socket will prompt */
Yap_ConsoleSocketOps(s);
s->stream_wputc = put_wchar;
} else if (s->status & Pipe_Stream_f) {
/* Console is a socket and socket will prompt */
Yap_ConsolePipeOps(s);
s->stream_wputc = put_wchar;
} else if (s->status & InMemory_Stream_f) {
Yap_MemOps(s);
s->stream_wputc = put_wchar;
} else {
/* check if our console is promptable: may be tty or pipe */
if (s->status & (Promptable_Stream_f)) {
Yap_ConsoleOps(s, false);
} else {
/* we are reading from a file, no need to check for prompts */
s->stream_putc = FilePutc;
s->stream_wputc = put_wchar;
s->stream_getc = PlGetc;
if (s->encoding == LOCAL_encoding)
s->stream_wgetc = get_wchar_from_file;
else
s->stream_wgetc = get_wchar_from_FILE;
}
}
s->stream_wputc = put_wchar;
s->stream_wgetc = get_wchar;
} }
static void InitStdStream(int sno, SMALLUNSGN flags, FILE *file) { static void InitStdStream(int sno, SMALLUNSGN flags, FILE *file) {
@ -326,10 +312,10 @@ static void InitStdStream(int sno, SMALLUNSGN flags, FILE *file) {
break; break;
} }
s->user_name = MkAtomTerm(s->name); s->user_name = MkAtomTerm(s->name);
Yap_DefaultStreamOps(s);
#if LIGHT #if LIGHT
s->status |= Tty_Stream_f | Promptable_Stream_f; s->status |= Tty_Stream_f | Promptable_Stream_f;
#endif #endif
Yap_DefaultStreamOps(s);
#if HAVE_SETBUF #if HAVE_SETBUF
if (s->status & Tty_Stream_f && sno == 0) { if (s->status & Tty_Stream_f && sno == 0) {
/* make sure input is unbuffered if it comes from stdin, this /* make sure input is unbuffered if it comes from stdin, this
@ -567,28 +553,7 @@ int ResetEOF(StreamDesc *s) {
if (feof(s->file)) if (feof(s->file))
clearerr(s->file); clearerr(s->file);
/* reset our function for reading input */ /* reset our function for reading input */
#if HAVE_SOCKET Yap_DefaultStreamOps(s);
if (s->status & Socket_Stream_f) {
if (s->status & Promptable_Stream_f)
Yap_ConsoleSocketOps(s);
else
Yap_SocketOps(s);
s->stream_wputc = put_wchar;
} else
#endif
if (s->status & Pipe_Stream_f) {
if (s->status & Promptable_Stream_f)
Yap_ConsolePipeOps(s);
else
Yap_PipeOps(s);
} else if (s->status & InMemory_Stream_f) {
Yap_MemOps(s);
} else if (s->status & Promptable_Stream_f) {
Yap_ConsoleOps(s, false);
} else {
s->stream_getc = PlGetc;
Yap_DefaultStreamOps(s);
}
/* next, reset our own error indicator */ /* next, reset our own error indicator */
s->status &= ~Eof_Stream_f; s->status &= ~Eof_Stream_f;
/* try reading again */ /* try reading again */
@ -609,7 +574,7 @@ static int EOFWGetc(int sno) {
return EOF; return EOF;
} }
if (ResetEOF(s)) { if (ResetEOF(s)) {
Yap_ConsoleOps(s, false); Yap_DefaultStreamOps(s);
return (s->stream_wgetc(sno)); return (s->stream_wgetc(sno));
} }
return EOF; return EOF;
@ -625,7 +590,7 @@ static int EOFGetc(int sno) {
return EOF; return EOF;
} }
if (ResetEOF(s)) { if (ResetEOF(s)) {
Yap_ConsoleOps(s, false); Yap_DefaultStreamOps(s);
return s->stream_getc(sno); return s->stream_getc(sno);
} }
return EOF; return EOF;
@ -1087,25 +1052,14 @@ bool Yap_initStream(int sno, FILE *fd, const char *name, Term file_name,
if (name == NULL) { if (name == NULL) {
char buf[YAP_FILENAME_MAX + 1]; char buf[YAP_FILENAME_MAX + 1];
name = Yap_guessFileName(fileno(fd), sno, buf, YAP_FILENAME_MAX); name = Yap_guessFileName(fd, sno, buf, YAP_FILENAME_MAX);
if (name) if (name)
st->name = Yap_LookupAtom(name); st->name = Yap_LookupAtom(name);
} }
st->user_name = file_name; st->user_name = file_name;
st->file = fd; st->file = fd;
st->linepos = 0; st->linepos = 0;
if (flags & Pipe_Stream_f) { Yap_DefaultStreamOps(st);
Yap_PipeOps(st);
Yap_DefaultStreamOps(st);
} else if (flags & Tty_Stream_f) {
Yap_ConsoleOps(st, false);
Yap_DefaultStreamOps(st);
} else {
st->stream_putc = FilePutc;
st->stream_getc = PlGetc;
unix_upd_stream_info(st);
Yap_DefaultStreamOps(st);
}
return true; return true;
} }
@ -1646,15 +1600,7 @@ static Int always_prompt_user(USES_REGS1) {
StreamDesc *s = GLOBAL_Stream + StdInStream; StreamDesc *s = GLOBAL_Stream + StdInStream;
s->status |= Promptable_Stream_f; s->status |= Promptable_Stream_f;
#if USE_SOCKET Yap_DefaultStreamOps(s);
if (s->status & Socket_Stream_f) {
Yap_ConsoleSocketOps(s);
} else
#endif
if (s->status & Pipe_Stream_f) {
Yap_ConsolePipeOps(s);
} else
Yap_ConsoleOps(s, false);
return (TRUE); return (TRUE);
} }

26
os/iopreds.h
View File

@ -165,6 +165,32 @@ typedef int (*GetsFunc)(int, UInt, char *);
#include <sys/socket.h> #include <sys/socket.h>
#endif #endif
#if __APPLE__
#include "fmemopen.h"
#define HAVE_FMEMOPEN 1
#define HAVE_OPEN_MEMSTREAM 1
FILE *open_memstream(char **buf, size_t *len);
#endif
#if __ANDROID__
#undef HAVE_FMEMOPEN
#undef HAVE_OPEN_MEMSTREAM
#endif
#if HAVE_FMEMOPEN
#define MAY_READ 1
#endif
#if HAVE_OPEN_MEMSTREAM
#define MAY_READ 1
#define MAY_WRITE 1
#endif
#if _WIN32
#undef MAY_WRITE
#undef MAY_READ
#endif
typedef struct mem_desc { typedef struct mem_desc {
char *buf; /* where the file is being read from/written to */ char *buf; /* where the file is being read from/written to */
int src; /* where the space comes from, 0 code space, 1 malloc */ int src; /* where the space comes from, 0 code space, 1 malloc */

54
os/mem.c
View File

@ -23,56 +23,7 @@ static char SccsId[] = "%W% %G%";
* *
*/ */
#include "Yap.h" #include "sysbits.h"
#include "YapHeap.h"
#include "Yatom.h"
#include "yapio.h"
#include <stdlib.h>
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
#if HAVE_STDARG_H
#include <stdarg.h>
#endif
#ifdef _WIN32
#if HAVE_IO_H
/* Windows */
#include <io.h>
#endif
#if HAVE_SOCKET
#include <winsock2.h>
#endif
#include <windows.h>
#ifndef S_ISDIR
#define S_ISDIR(x) (((x)&_S_IFDIR) == _S_IFDIR)
#endif
#endif
#include "iopreds.h"
#if __APPLE__
#include "fmemopen.h"
#define HAVE_FMEMOPEN 1
#define HAVE_OPEN_MEMSTREAM 1
FILE *open_memstream(char **buf, size_t *len);
#endif
#if __ANDROID__
#undef HAVE_FMEMOPEN
#undef HAVE_OPEN_MEMSTREAM
#endif
#if HAVE_FMEMOPEN
#define MAY_READ 1
#endif
#if HAVE_OPEN_MEMSTREAM
#define MAY_READ 1
#define MAY_WRITE 1
#endif
#if _WIN32
#undef MAY_WRITE
#undef MAY_READ
#endif
#if !MAY_READ #if !MAY_READ
static int MemGetc(int); static int MemGetc(int);
@ -196,7 +147,7 @@ int Yap_open_buf_read_stream(const char *nbuf, size_t nchars, encoding_t *encp,
st->u.mem_string.error_handler = NULL; st->u.mem_string.error_handler = NULL;
st->u.mem_string.src = src; st->u.mem_string.src = src;
#endif #endif
Yap_MemOps(st); Yap_DefaultStreamOps(st);
UNLOCK(st->streamlock); UNLOCK(st->streamlock);
return sno; return sno;
} }
@ -287,7 +238,6 @@ int Yap_open_buf_write_stream(char *buf, size_t nchars, encoding_t *encp,
st->u.mem_string.buf = st->nbuf; st->u.mem_string.buf = st->nbuf;
st->u.mem_string.max_size = nchars; st->u.mem_string.max_size = nchars;
#endif #endif
Yap_MemOps(st);
UNLOCK(st->streamlock); UNLOCK(st->streamlock);
return sno; return sno;
} }