diff options
Diffstat (limited to 'util')
| -rw-r--r-- | util/ChangeLog | 7 | ||||
| -rw-r--r-- | util/http.c | 1 | ||||
| -rw-r--r-- | util/ttyio.c | 8 |
3 files changed, 14 insertions, 2 deletions
diff --git a/util/ChangeLog b/util/ChangeLog index ff85c9235..b1236dea0 100644 --- a/util/ChangeLog +++ b/util/ChangeLog @@ -1,3 +1,10 @@ +2001-03-26 Werner Koch <[email protected]> + + * ttyio.c: Define TERMDEVICE depending on OS. + + * http.c (http_start_data): send a CRLF and not just a LF. + Pointed out by Steven Murdoch. + 2001-03-13 Werner Koch <[email protected]> * iobuf.c (iobuf_sockopen): New. diff --git a/util/http.c b/util/http.c index 269e9238d..e61f20972 100644 --- a/util/http.c +++ b/util/http.c @@ -150,6 +150,7 @@ void http_start_data( HTTP_HD hd ) { if( !hd->in_data ) { + iobuf_put( hd->fp_write, '\r' ); iobuf_put( hd->fp_write, '\n' ); hd->in_data = 1; } diff --git a/util/ttyio.c b/util/ttyio.c index bef688221..c1e0d7951 100644 --- a/util/ttyio.c +++ b/util/ttyio.c @@ -50,7 +50,11 @@ #include "ttyio.h" #define CONTROL_D ('D' - 'A' + 1) - +#ifdef __VMS + #define TERMDEVICE "/dev/tty" +#else + #define TERMDEVICE "/dev/tty" +#endif #ifdef __MINGW32__ /* use the odd Win32 functions */ static struct { @@ -120,7 +124,7 @@ init_ttyfp(void) #elif defined(__EMX__) ttyfp = stdout; /* Fixme: replace by the real functions: see wklib */ #else - ttyfp = batchmode? stderr : fopen("/dev/tty", "r+"); + ttyfp = batchmode? stderr : fopen(TERMDEVICE, "r+"); if( !ttyfp ) { log_error("cannot open /dev/tty: %s\n", strerror(errno) ); exit(2); |