* If you paid for this software, someone is ripping you off.

* Fixed the urlesc() function to use a caller-supplied target buffer.

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 3a3d695310a1d3723ea65c1757dfe6eb459d1d75..63e202840742cbcab03f0618d4b03f191f08820a 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,8 @@
 $Log$
+Revision 301.21  2001/12/20 05:02:42  ajc
+* If you paid for this software, someone is ripping you off.
+* Fixed the urlesc() function to use a caller-supplied target buffer.
+
 Revision 301.20  2001/12/18 20:35:29  ajc
 * More fun JavaScript-enabled buttons
 
@@ -671,4 +675,3 @@ 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/auth.c b/webcit/auth.c
index a5177ced17e810528d8593876ac85550c0e2fb1c..495730679d61d68a410111e99636bdb269df49dd 100644 (file)
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -249,9 +249,10 @@ void validate(void)
        wprintf("<CENTER><TABLE border><CAPTION>Select access level:");
        wprintf("</CAPTION><TR>");
        for (a = 0; a <= 6; ++a) {
-               wprintf(
-                              "<TD><A HREF=\"/validate&user=%s&WC->axlevel=%d\">%s</A></TD>\n",
-                              urlesc(user), a, axdefs[a]);
+               wprintf("<TD><A HREF=\"/validate&user=");
+               urlescputs(user);
+               wprintf("&WC->axlevel=%d\">%s</A></TD>\n",
+                       a, axdefs[a]);
        }
        wprintf("</TR></TABLE><CENTER><BR>\n");
        wDumpContent(1);

diff --git a/webcit/roomops.c b/webcit/roomops.c
index 754bc28b069eac74573dac20baaf5bc0868567b1..5d47a99c2b4b1b72b102ba4f684489ffb56b661c 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -1410,12 +1410,12 @@ void zap(void)
                serv_printf("GOTO %s", WC->wc_roomname);
                serv_gets(buf);
                if (buf[0] != '2') {
-                       /* ExpressMessageCat(&buf[4]);   FIXME    */
+                       /* ExpressMessageCat(&buf[4]); */
                } else {
                        serv_puts("FORG");
                        serv_gets(buf);
                        if (buf[0] != '2') {
-                               /* ExpressMessageCat(&buf[4]);  FIXME   */
+                               /* ExpressMessageCat(&buf[4]); */
                        } else {
                                strcpy(final_destination, "_BASEROOM_");
                        }

diff --git a/webcit/webcit.c b/webcit/webcit.c
index d2be7d4146f74975ad697aaa4cc9832f8af0ed28..57f5b422c2b21a11f1d50f773e55f30eef4e8bb8 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -237,13 +237,12 @@ void escputs(char *strbuf)
 
 /*
  * Escape a string for feeding out as a URL.
- * FIXME ... not threadsafe!
+ * Returns a pointer to a buffer that must be freed by the caller!
  */
-char *urlesc(char *strbuf)
+void urlesc(char *outbuf, char *strbuf)
 {
        int a, b, c;
        char *ec = " #&;`'|*?-~<>^()[]{}$\\";
-       static char outbuf[SIZ];
 
        strcpy(outbuf, "");
 
@@ -259,12 +258,14 @@ char *urlesc(char *strbuf)
                else
                        sprintf(&outbuf[b], "%c", strbuf[a]);
        }
-       return (outbuf);
 }
 
 void urlescputs(char *strbuf)
 {
-       wprintf("%s", urlesc(strbuf));
+       char outbuf[SIZ];
+       
+       urlesc(outbuf, strbuf);
+       wprintf("%s", outbuf);
 }
 
 

diff --git a/webcit/webcit.h b/webcit/webcit.h
index ae26ff62497c32365680ce9074814545c57395f6..e3bcadf0c3268779b3b5b329fe1b779ae4dfe55c 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -190,7 +190,7 @@ void fmout(FILE * fp);
 void wDumpContent(int);
 void serv_printf(const char *format,...);
 char *bstr(char *key);
-char *urlesc(char *);
+void urlesc(char *, char *);
 void urlescputs(char *);
 void output_headers(int);
 void wprintf(const char *format,...);

diff --git a/webcit/webserver.c b/webcit/webserver.c
index 266cd692998c77e3b88cf1700b943888fd38c329..334187d7fb451ee06beecd3dc9ff5a43e4706c29 100644 (file)
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -266,9 +266,9 @@ int main(int argc, char **argv)
        }
        /* Tell 'em who's in da house */
        fprintf(stderr, SERVER "\n"
-               "Copyright (C) 1996-2001\n"
-               "This software is distributed under the terms of the GNU\n"
-               "General Public License.  All other rights reserved.\n\n");
+"Copyright (C) 1996-2001 by the Citadel/UX development team.\n"
+"This software is distributed under the terms of the GNU General Public\n"
+"License.  If you paid for this software, someone is ripping you off.\n\n");
 
        if (chdir(WEBCITDIR) != 0)
                perror("chdir");