hyung-hwan/qse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed code a bit for watt-32

Browse Source
This commit is contained in:
hyung-hwan
2014-10-19 13:59:44 +00:00
parent d9d75a5db5
commit 552bb7cc20
4 changed files with 45 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qse/bld/msdos-watcom/makefile
View File

@ -459,7 +459,7 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\qseawk.exe : $(
@%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\exeqseawk.lbc option caseexact @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\exeqseawk.lbc option caseexact
@%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\exeqseawk.lbc $(__DEBUG_INFO_3) system $(__DOS_LDFLAG) $(LDFLAGS) @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\exeqseawk.lbc $(__DEBUG_INFO_3) system $(__DOS_LDFLAG) $(LDFLAGS)
@for %i in ($(EXEQSEAWK_OBJECTS)) do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\exeqseawk.lbc file %i @for %i in ($(EXEQSEAWK_OBJECTS)) do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\exeqseawk.lbc file %i
@for %i in ( $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\qsecmn.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\qseawk.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\qsesed.lib ) do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\exeqseawk.lbc library %i @for %i in ( $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\qsecmn.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\qseawk.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\qsesed.lib wattcpwf.lib ) do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\exeqseawk.lbc library %i
@%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\exeqseawk.lbc @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\exeqseawk.lbc
@for %i in (256k) do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\exeqseawk.lbc option stack=%i @for %i in (256k) do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\exeqseawk.lbc option stack=%i
wlink @$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\exeqseawk.lbc wlink @$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\exeqseawk.lbc
@ -483,7 +483,7 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\qsehttpd.exe :
@%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\exeqsehttpd.lbc option caseexact @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\exeqsehttpd.lbc option caseexact
@%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\exeqsehttpd.lbc $(__DEBUG_INFO_3) system $(__DOS_LDFLAG) $(LDFLAGS) @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\exeqsehttpd.lbc $(__DEBUG_INFO_3) system $(__DOS_LDFLAG) $(LDFLAGS)
@for %i in ($(EXEQSEHTTPD_OBJECTS)) do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\exeqsehttpd.lbc file %i @for %i in ($(EXEQSEHTTPD_OBJECTS)) do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\exeqsehttpd.lbc file %i
@for %i in ( $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\qsecmn.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\qsehttp.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\qsexli.lib ) do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\exeqsehttpd.lbc library %i @for %i in ( $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\qsecmn.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\qsehttp.lib $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\qsexli.lib wattcpwf.lib ) do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\exeqsehttpd.lbc library %i
@%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\exeqsehttpd.lbc @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\exeqsehttpd.lbc
@for %i in (256k) do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\exeqsehttpd.lbc option stack=%i @for %i in (256k) do @%append $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\exeqsehttpd.lbc option stack=%i
wlink @$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\exeqsehttpd.lbc wlink @$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\exeqsehttpd.lbc

1
qse/bld/qse.bkl
View File

@ -322,6 +322,7 @@
<if cond="PLATFORM_WIN32=='1'">user32</if> <if cond="PLATFORM_WIN32=='1'">user32</if>
</set> </set>
<set var="SYSLIB_SOCKET"> <set var="SYSLIB_SOCKET">
<if cond="PLATFORM_MSDOS=='1'">wattcpwf</if> <!-- watt-32 flat model -->
<if cond="PLATFORM_WIN32=='1'">ws2_32</if> <if cond="PLATFORM_WIN32=='1'">ws2_32</if>
<if cond="PLATFORM_OS2=='1' and TCPV40HDRS=='on'">tcp32dll</if> <if cond="PLATFORM_OS2=='1' and TCPV40HDRS=='on'">tcp32dll</if>
<if cond="PLATFORM_OS2=='1' and TCPV40HDRS=='off'">tcpip32</if> <if cond="PLATFORM_OS2=='1' and TCPV40HDRS=='off'">tcpip32</if>

3
qse/lib/cmn/mux.c
View File

@ -46,6 +46,9 @@
#elif defined(__DOS__) #elif defined(__DOS__)
# include <errno.h> # include <errno.h>
# include <tcp.h> /* watt-32 */
# define select select_s
# define USE_SELECT
#else #else
# include <unistd.h> # include <unistd.h>

74
qse/lib/http/httpd-std.c
View File

@ -72,8 +72,12 @@
# undef AF_UNIX # undef AF_UNIX
#elif defined(__DOS__) #elif defined(__DOS__)
/* TODO */
# include <errno.h> # include <errno.h>
# include <tcp.h> /* watt-32 */
# define select select_s /* TODO: is this correct? */
# undef AF_UNIX
#else #else
# include "../cmn/syscall.h" # include "../cmn/syscall.h"
@ -237,15 +241,16 @@ static qse_httpd_errnum_t skerr_to_errnum (int e)
#define SKERR_TO_ERRNUM() skerr_to_errnum(sock_errno()) #define SKERR_TO_ERRNUM() skerr_to_errnum(sock_errno())
/*
#elif defined(__DOS__) #elif defined(__DOS__)
static qse_httpd_errnum_t skerr_to_errnum (int e) static qse_httpd_errnum_t skerr_to_errnum (int e)
{ {
/* TODO: */ / * TODO: * /
return QSE_HTTPD_ESYSERR; return QSE_HTTPD_ESYSERR;
} }
#define SKERR_TO_ERRNUM() skerr_to_errnum(errno) #define SKERR_TO_ERRNUM() skerr_to_errnum(errno)
*/
#else #else
static qse_httpd_errnum_t skerr_to_errnum (int e) static qse_httpd_errnum_t skerr_to_errnum (int e)
{ {
@ -411,11 +416,13 @@ static QSE_INLINE qse_ssize_t __send_file (
{ {
/* TODO: os2 warp 4.5 has send_file. support it??? load it dynamically??? */ /* TODO: os2 warp 4.5 has send_file. support it??? load it dynamically??? */
/*
#if defined(__DOS__) #if defined(__DOS__)
qse_httpd_seterrnum (httpd, QSE_HTTPD_ENOIMPL); qse_httpd_seterrnum (httpd, QSE_HTTPD_ENOIMPL);
return -1; return -1;
#elif defined(HAVE_SENDFILE) && defined(HAVE_SENDFILE64) #el*/
#if defined(HAVE_SENDFILE) && defined(HAVE_SENDFILE64)
qse_ssize_t ret; qse_ssize_t ret;
qse_fio_hnd_t fh; qse_fio_hnd_t fh;
@ -886,10 +893,10 @@ oops:
static int server_open (qse_httpd_t* httpd, qse_httpd_server_t* server) static int server_open (qse_httpd_t* httpd, qse_httpd_server_t* server)
{ {
#if defined(__DOS__) /*#if defined(__DOS__)
qse_httpd_seterrnum (httpd, QSE_HTTPD_ENOIMPL); qse_httpd_seterrnum (httpd, QSE_HTTPD_ENOIMPL);
return -1; return -1;
#else #else*/
qse_sck_hnd_t fd = QSE_INVALID_SCKHND, flag; qse_sck_hnd_t fd = QSE_INVALID_SCKHND, flag;
qse_skad_t addr; qse_skad_t addr;
int addrsize; int addrsize;
@ -1014,7 +1021,7 @@ bind_ok:
oops: oops:
if (qse_isvalidsckhnd(fd)) qse_closesckhnd (fd); if (qse_isvalidsckhnd(fd)) qse_closesckhnd (fd);
return -1; return -1;
#endif /*#endif*/
} }
static void server_close (qse_httpd_t* httpd, qse_httpd_server_t* server) static void server_close (qse_httpd_t* httpd, qse_httpd_server_t* server)
@ -1025,11 +1032,11 @@ static void server_close (qse_httpd_t* httpd, qse_httpd_server_t* server)
static int server_accept ( static int server_accept (
qse_httpd_t* httpd, qse_httpd_server_t* server, qse_httpd_client_t* client) qse_httpd_t* httpd, qse_httpd_server_t* server, qse_httpd_client_t* client)
{ {
#if defined(__DOS__) /*#if defined(__DOS__)
qse_httpd_seterrnum (httpd, QSE_HTTPD_ENOIMPL); qse_httpd_seterrnum (httpd, QSE_HTTPD_ENOIMPL);
return -1; return -1;
#else #else*/
qse_skad_t addr; qse_skad_t addr;
qse_sck_len_t addrlen; qse_sck_len_t addrlen;
qse_sck_hnd_t fd = QSE_INVALID_SCKHND; qse_sck_hnd_t fd = QSE_INVALID_SCKHND;
@ -1047,7 +1054,7 @@ static int server_accept (
/* TODO: implement maximum number of client per server??? */ /* TODO: implement maximum number of client per server??? */
if (fd >= FD_SETSIZE) if (fd >= FD_SETSIZE)
{ {
qse_fprintf (QSE_STDERR, QSE_T("Error: too many client?\n")); printf ("ERROR: too many client?\n");
/*TODO: qse_httpd_seterrnum (httpd, QSE_HTTPD_EXXXXX);*/ /*TODO: qse_httpd_seterrnum (httpd, QSE_HTTPD_EXXXXX);*/
goto oops; goto oops;
} }
@ -1108,18 +1115,18 @@ qse_fprintf (QSE_STDERR, QSE_T("Error: too many client?\n"));
oops: oops:
if (qse_isvalidsckhnd(fd)) qse_closesckhnd (fd); if (qse_isvalidsckhnd(fd)) qse_closesckhnd (fd);
return -1; return -1;
#endif /*#endif*/
} }
/* ------------------------------------------------------------------- */ /* ------------------------------------------------------------------- */
static int peer_open (qse_httpd_t* httpd, qse_httpd_peer_t* peer) static int peer_open (qse_httpd_t* httpd, qse_httpd_peer_t* peer)
{ {
#if defined(__DOS__) /*#if defined(__DOS__)
qse_httpd_seterrnum (httpd, QSE_HTTPD_ENOIMPL); qse_httpd_seterrnum (httpd, QSE_HTTPD_ENOIMPL);
return -1; return -1;
#else #else*/
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
@ -1229,9 +1236,6 @@ static int peer_open (qse_httpd_t* httpd, qse_httpd_peer_t* peer)
} }
connected = 0; connected = 0;
} }
#elif defined(__DOS__)
/* TODO: */
#else #else
if (connect (fd, (struct sockaddr*)&connaddr, connaddrsize) <= -1) if (connect (fd, (struct sockaddr*)&connaddr, connaddrsize) <= -1)
@ -1291,7 +1295,7 @@ oops:
return -1; return -1;
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
#endif /*#endif*/
} }
static void peer_close (qse_httpd_t* httpd, qse_httpd_peer_t* peer) static void peer_close (qse_httpd_t* httpd, qse_httpd_peer_t* peer)
@ -1348,11 +1352,10 @@ static int is_peer_socket_connected (qse_httpd_t* httpd, qse_httpd_peer_t* peer)
return 1; /* connection completed */ return 1; /* connection completed */
#elif defined(__DOS__) /*#elif defined(__DOS__)
/* TODO */
qse_httpd_seterrnum (httpd, QSE_HTTPD_ENOIMPL); qse_httpd_seterrnum (httpd, QSE_HTTPD_ENOIMPL);
return -1; return -1;*/
#else #else
@ -1454,14 +1457,14 @@ static qse_ssize_t peer_recv (
} }
else else
{ {
#if defined(__DOS__) /*#if defined(__DOS__)
qse_httpd_seterrnum (httpd, QSE_HTTPD_ENOIMPL); qse_httpd_seterrnum (httpd, QSE_HTTPD_ENOIMPL);
return -1; return -1;
#else #else*/
qse_ssize_t ret = recv (peer->handle, buf, bufsize, 0); qse_ssize_t ret = recv (peer->handle, buf, bufsize, 0);
if (ret <= -1) qse_httpd_seterrnum (httpd, SKERR_TO_ERRNUM()); if (ret <= -1) qse_httpd_seterrnum (httpd, SKERR_TO_ERRNUM());
return ret; return ret;
#endif /*#endif*/
} }
} }
@ -1489,14 +1492,14 @@ static qse_ssize_t peer_send (
} }
else else
{ {
#if defined(__DOS__) /*#if defined(__DOS__)
qse_httpd_seterrnum (httpd, QSE_HTTPD_ENOIMPL); qse_httpd_seterrnum (httpd, QSE_HTTPD_ENOIMPL);
return -1; return -1;
#else #else*/
qse_ssize_t ret = send (peer->handle, buf, bufsize, 0); qse_ssize_t ret = send (peer->handle, buf, bufsize, 0);
if (ret <= -1) qse_httpd_seterrnum (httpd, SKERR_TO_ERRNUM()); if (ret <= -1) qse_httpd_seterrnum (httpd, SKERR_TO_ERRNUM());
return ret; return ret;
#endif /*#endif*/
} }
} }
@ -1598,10 +1601,10 @@ static int mux_readable (qse_httpd_t* httpd, qse_httpd_hnd_t handle, const qse_n
tv = tmout? QSE_SECNSEC_TO_MSEC (tmout->sec, tmout->nsec): -1; tv = tmout? QSE_SECNSEC_TO_MSEC (tmout->sec, tmout->nsec): -1;
return os2_select (&handle, 1, 0, 0, tv); return os2_select (&handle, 1, 0, 0, tv);
#elif defined(__DOS__) /*#elif defined(__DOS__)
qse_httpd_seterrnum (httpd, QSE_HTTPD_ENOIMPL); qse_httpd_seterrnum (httpd, QSE_HTTPD_ENOIMPL);
return -1; return -1;*/
#else #else
fd_set r; fd_set r;
@ -1629,10 +1632,11 @@ static int mux_writable (qse_httpd_t* httpd, qse_httpd_hnd_t handle, const qse_n
tv = tmout? QSE_SECNSEC_TO_MSEC (tmout->sec, tmout->nsec): -1; tv = tmout? QSE_SECNSEC_TO_MSEC (tmout->sec, tmout->nsec): -1;
return os2_select (&handle, 0, 1, 0, tv); return os2_select (&handle, 0, 1, 0, tv);
#elif defined(__DOS__) /*#elif defined(__DOS__)
qse_httpd_seterrnum (httpd, QSE_HTTPD_ENOIMPL); qse_httpd_seterrnum (httpd, QSE_HTTPD_ENOIMPL);
return -1; return -1;
*/
#else #else
fd_set w; fd_set w;
@ -2164,15 +2168,15 @@ static qse_ssize_t client_recv (
} }
else else
{ {
#if defined(__DOS__) /*#if defined(__DOS__)
qse_httpd_seterrnum (httpd, QSE_HTTPD_ENOIMPL); qse_httpd_seterrnum (httpd, QSE_HTTPD_ENOIMPL);
return -1; return -1;
#else #else*/
qse_ssize_t ret; qse_ssize_t ret;
ret = recv (client->handle, buf, bufsize, 0); ret = recv (client->handle, buf, bufsize, 0);
if (ret <= -1) qse_httpd_seterrnum (httpd, SKERR_TO_ERRNUM()); if (ret <= -1) qse_httpd_seterrnum (httpd, SKERR_TO_ERRNUM());
return ret; return ret;
#endif /*#endif*/
} }
} }
@ -2200,14 +2204,14 @@ static qse_ssize_t client_send (
} }
else else
{ {
#if defined(__DOS__) /*#if defined(__DOS__)
qse_httpd_seterrnum (httpd, QSE_HTTPD_ENOIMPL); qse_httpd_seterrnum (httpd, QSE_HTTPD_ENOIMPL);
return -1; return -1;
#else #else*/
qse_ssize_t ret = send (client->handle, buf, bufsize, 0); qse_ssize_t ret = send (client->handle, buf, bufsize, 0);
if (ret <= -1) qse_httpd_seterrnum (httpd, SKERR_TO_ERRNUM()); if (ret <= -1) qse_httpd_seterrnum (httpd, SKERR_TO_ERRNUM());
return ret; return ret;
#endif /*#endif*/
} }
} }