projects / citadel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f23574a)
* When reading from the server, do not treat CR as end-of-line because
authorArt Cancro <ajc@citadel.org>
Sun, 30 Mar 2003 06:13:19 +0000 (06:13 +0000)
committerArt Cancro <ajc@citadel.org>
Sun, 30 Mar 2003 06:13:19 +0000 (06:13 +0000)
  there's probably an LF coming after it.  Instead, keep reading to the LF
  and then strip both.
* No not underline links in the icon bars

webcit/ChangeLog patch | blob | history
webcit/messages.c patch | blob | history
webcit/static/head.html patch | blob | history
webcit/static/iconbar.html patch | blob | history
webcit/static/navbar.html patch | blob | history
webcit/tcp_sockets.c patch | blob | history

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 9705c718bf75eca6b69bb163e5edc795380b5c96..465b98dccf787f52906c5fe0ea38d35a8fa0bb14 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,10 @@
 $Log$
+Revision 410.7  2003/03/30 06:13:19  ajc
+* When reading from the server, do not treat CR as end-of-line because
+  there's probably an LF coming after it.  Instead, keep reading to the LF
+  and then strip both.
+* No not underline links in the icon bars
+
 Revision 410.6  2003/03/17 04:17:41  ajc
 * Call to accept() was being made with an uninitialized variable for the
   third argument.  Changed the second and third argument to NULL and 0 because
@@ -1306,3 +1312,6 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
        * webserver.c: warning fix
+
+
+
diff --git a/webcit/messages.c b/webcit/messages.c
index 17eaeb9abbc6b3af8f2682b738c08ca5c964c41d..9832741fbd892128e36c293c74b47f80ac19a6e6 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -428,6 +428,8 @@ void read_message(long msgnum) {
        /* Boring old 80-column fixed format text gets handled this way... */
        else if (!strcasecmp(mime_content_type, "text/plain")) {
                while (serv_gets(buf), strcmp(buf, "000")) {
+                       if (buf[strlen(buf)-1] == '\n') buf[strlen(buf)-1] = 0;
+                       if (buf[strlen(buf)-1] == '\r') buf[strlen(buf)-1] = 0;
                        while ((strlen(buf) > 0) && (isspace(buf[strlen(buf) - 1])))
                                buf[strlen(buf) - 1] = 0;
                        if ((bq == 0) &&
diff --git a/webcit/static/head.html b/webcit/static/head.html
index b7442df203198120f0040b3139bb5bbc73b12899..8e59da96deafdd007c70e0917b375245c5e6ea21 100644 (file)
--- a/webcit/static/head.html
+++ b/webcit/static/head.html
@@ -4,6 +4,7 @@
 <META HTTP-EQUIV="Pragma" CONTENT="no-cache">
 <META HTTP-EQUIV="expired" CONTENT="28-May-1971 18:10:00 GMT">
 <META NAME="MSSmartTagsPreventParsing" CONTENT="TRUE">
+
 <?REFRESHTAG>
 </HEAD>
 <?PAGERSCRIPT>
diff --git a/webcit/static/iconbar.html b/webcit/static/iconbar.html
index 92e39e294ae3b8edfac6f759f8da8d1d9cca9423..73da163f9e808507c8118b5bcdb7275a56e97c19 100644 (file)
--- a/webcit/static/iconbar.html
+++ b/webcit/static/iconbar.html
@@ -1,4 +1,11 @@
 <HTML>
+<HEAD>
+<style type="text/css">
+<!--
+a {text-decoration: none; }
+-->
+</style> 
+</HEAD>
 <BODY BGCOLOR=AAAAAA>
 
 <TABLE BORDER=0 CELLSPACING=3 CELLPADDING=3>
diff --git a/webcit/static/navbar.html b/webcit/static/navbar.html
index cc2b544a5972725ea4e31d12d595cb7c6487c627..75a2a2f7f3e25c040ae62a4475ba7298f2004f95 100644 (file)
--- a/webcit/static/navbar.html
+++ b/webcit/static/navbar.html
@@ -1,4 +1,11 @@
 <HTML>
+<HEAD>
+<style type="text/css">
+<!--
+a {text-decoration: none; }
+-->
+</style> 
+</HEAD>
 <BODY BGCOLOR=AAAAAA>
 <CENTER>
 <TABLE border=0 cellspacing=0 cellpadding=0 width=100%>
diff --git a/webcit/tcp_sockets.c b/webcit/tcp_sockets.c
index 9c32b71588a744752ec4fea7101838e329ad309f..37eaa29879ffbcace514b9f7ac1db48b398d4ce8 100644 (file)
--- a/webcit/tcp_sockets.c
+++ b/webcit/tcp_sockets.c
@@ -166,8 +166,9 @@ void serv_gets(char *strbuf)
                serv_read(&buf[0], 1);
                ch = buf[0];
                strbuf[len++] = ch;
-       } while ((ch != 10) && (ch != 13) && (ch != 0) && (len < 255));
-       strbuf[len - 1] = 0;
+       } while ((ch != 10) && (ch != 0) && (len < (SIZ-1)));
+       if (strbuf[len-1] == 10) strbuf[--len] = 0;
+       if (strbuf[len-1] == 13) strbuf[--len] = 0;
        /* lprintf(9, ">%s\n", strbuf); */
 }
 
Citadel server, clients, utilities