summaryrefslogtreecommitdiffstats
path: root/cpukit/httpd/webpage.c
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2003-04-11 14:46:55 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2003-04-11 14:46:55 +0000
commitee3afa2e2ae017b22156164763a4099702ca472d (patch)
treed41c03f7bf2396e7e01147a9ffd75c7a0a71232c /cpukit/httpd/webpage.c
parent2003-04-10 Till Straumann <strauman@slac.stanford.edu> (diff)
downloadrtems-ee3afa2e2ae017b22156164763a4099702ca472d.tar.bz2
2002-04-10 Mike Siers <mikes@poliac.com>
* rtems_webserver/NOTES, rtems_webserver/asp.c, rtems_webserver/balloc.c, rtems_webserver/default.c, rtems_webserver/ej.h, rtems_webserver/ejIntrn.h, rtems_webserver/ejlex.c, rtems_webserver/ejparse.c, rtems_webserver/emfdb.c, rtems_webserver/emfdb.h, rtems_webserver/form.c, rtems_webserver/h.c, rtems_webserver/handler.c, rtems_webserver/license.txt, rtems_webserver/md5.h, rtems_webserver/md5c.c, rtems_webserver/mime.c, rtems_webserver/misc.c, rtems_webserver/ringq.c, rtems_webserver/rom.c, rtems_webserver/security.c, rtems_webserver/sock.c, rtems_webserver/sym.c, rtems_webserver/uemf.c, rtems_webserver/uemf.h, rtems_webserver/um.c, rtems_webserver/um.h, rtems_webserver/url.c, rtems_webserver/value.c, rtems_webserver/wbase64.c, rtems_webserver/webcomp.c, rtems_webserver/webpage.c, rtems_webserver/webrom.c, rtems_webserver/webs.c, rtems_webserver/webs.h, rtems_webserver/websuemf.c, rtems_webserver/wsIntrn.h: Update to GoAhead Webserver 2.1.4. The following URL is the release notes from GoAhead. http://data.goahead.com/Software/Webserver/2.1.4/release.htm I have only done a minimal amount of testing (i.e. the network demo program works fine). Please try this out and let me know if it works. The patch needs to be applied on the c/src/libnetworking/rtems_webserver directory.
Diffstat (limited to 'cpukit/httpd/webpage.c')
-rw-r--r--cpukit/httpd/webpage.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/cpukit/httpd/webpage.c b/cpukit/httpd/webpage.c
index efac13f508..b161740738 100644
--- a/cpukit/httpd/webpage.c
+++ b/cpukit/httpd/webpage.c
@@ -4,6 +4,8 @@
* Copyright (c) GoAhead Software Inc., 1995-2000. All Rights Reserved.
*
* See the file "license.txt" for usage and redistribution license requirements
+ *
+ * $Id$
*/
/******************************** Description *********************************/
@@ -27,7 +29,7 @@ int websPageOpen(webs_t wp, char_t *lpath, char_t *path, int mode, int perm)
{
a_assert(websValid(wp));
-#if WEBS_PAGE_ROM
+#ifdef WEBS_PAGE_ROM
return websRomPageOpen(wp, path, mode, perm);
#else
return (wp->docfd = gopen(lpath, mode, perm));
@@ -43,7 +45,7 @@ void websPageClose(webs_t wp)
{
a_assert(websValid(wp));
-#if WEBS_PAGE_ROM
+#ifdef WEBS_PAGE_ROM
websRomPageClose(wp->docfd);
#else
if (wp->docfd >= 0) {
@@ -60,7 +62,7 @@ void websPageClose(webs_t wp)
int websPageStat(webs_t wp, char_t *lpath, char_t *path, websStatType* sbuf)
{
-#if WEBS_PAGE_ROM
+#ifdef WEBS_PAGE_ROM
return websRomPageStat(path, sbuf);
#else
gstat_t s;
@@ -82,7 +84,7 @@ int websPageStat(webs_t wp, char_t *lpath, char_t *path, websStatType* sbuf)
int websPageIsDirectory(char_t *lpath)
{
-#if WEBS_PAGE_ROM
+#ifdef WEBS_PAGE_ROM
websStatType sbuf;
if (websRomPageStat(lpath, &sbuf) >= 0) {
@@ -111,7 +113,7 @@ int websPageIsDirectory(char_t *lpath)
int websPageReadData(webs_t wp, char *buf, int nBytes)
{
-#if WEBS_PAGE_ROM
+#ifdef WEBS_PAGE_ROM
a_assert(websValid(wp));
return websRomPageReadData(wp, buf, nBytes);
#else
@@ -129,7 +131,7 @@ void websPageSeek(webs_t wp, long offset)
{
a_assert(websValid(wp));
-#if WEBS_PAGE_ROM
+#ifdef WEBS_PAGE_ROM
websRomPageSeek(wp, offset, SEEK_CUR);
#else
lseek(wp->docfd, offset, SEEK_CUR);