* Moved to the new string tokenizer API

[citadel.git] / webcit / groupdav_main.c

diff --git a/webcit/groupdav_main.c b/webcit/groupdav_main.c
index 5d409440d5142dec0a296a599621567d13bc7860..21ef55bd87762f9e8ac5eb8fe60ece6d1014d4ea 100644 (file)
--- a/webcit/groupdav_main.c
+++ b/webcit/groupdav_main.c
@@ -28,11 +28,16 @@
 
 /*
  * Output HTTP headers which are common to all requests.
+ *
+ * Please observe that we don't use the usual output_headers()
+ * and wDumpContent() functions in the GroupDAV subsystem, so we
+ * do our own header stuff here.
+ *
  */
 void groupdav_common_headers(void) {
        wprintf(
-               "Server: %s / %s\n"
-               "Connection: close\n",
+               "Server: %s / %s\r\n"
+               "Connection: close\r\n",
                SERVER, serv_info.serv_software
        );
 }
@@ -118,6 +123,7 @@ void groupdav_main(struct httprequest *req,
        char dav_method[SIZ];
        char dav_pathname[SIZ];
        char dav_ifmatch[SIZ];
+       int i;
 
        strcpy(dav_method, "");
        strcpy(dav_pathname, "");
@@ -136,16 +142,16 @@ void groupdav_main(struct httprequest *req,
        }
 
        if (!WC->logged_in) {
-               wprintf("HTTP/1.1 401 Unauthorized\n");
+               wprintf("HTTP/1.1 401 Unauthorized\r\n");
                groupdav_common_headers();
-               wprintf("WWW-Authenticate: Basic realm=\"%s\"\n",
+               wprintf("WWW-Authenticate: Basic realm=\"%s\"\r\n",
                        serv_info.serv_humannode);
-               wprintf("Content-Length: 0\n\n");
+               wprintf("Content-Length: 0\r\n\r\n");
                return;
        }
 
-       extract_token(dav_method, req->line, 0, ' ');
-       extract_token(dav_pathname, req->line, 1, ' ');
+       extract_token(dav_method, req->line, 0, ' ', sizeof dav_method);
+       extract_token(dav_pathname, req->line, 1, ' ', sizeof dav_pathname);
        unescape_input(dav_pathname);
 
        /*
@@ -153,10 +159,13 @@ void groupdav_main(struct httprequest *req,
         * then if all that's left is an asterisk, make it go away entirely.
         */
        if (strlen(dav_ifmatch) > 0) {
+               striplt(dav_ifmatch);
                if (dav_ifmatch[0] == '\"') {
                        strcpy(dav_ifmatch, &dav_ifmatch[1]);
-                       if (strtok(dav_ifmatch, "\"") != NULL) {
-                               strcpy(strtok(dav_ifmatch, "\""), "");
+                       for (i=0; i<strlen(dav_ifmatch); ++i) {
+                               if (dav_ifmatch[i] == '\"') {
+                                       dav_ifmatch[i] = 0;
+                               }
                        }
                }
                if (!strcmp(dav_ifmatch, "*")) {
@@ -201,11 +210,11 @@ void groupdav_main(struct httprequest *req,
        /*
         * Couldn't find what we were looking for.  Die in a car fire.
         */
-       wprintf("HTTP/1.1 501 Method not implemented\n");
+       wprintf("HTTP/1.1 501 Method not implemented\r\n");
        groupdav_common_headers();
-       wprintf("Content-Type: text/plain\n"
-               "\n"
-               "GroupDAV method \"%s\" is not implemented.\n",
+       wprintf("Content-Type: text/plain\r\n"
+               "\r\n"
+               "GroupDAV method \"%s\" is not implemented.\r\n",
                dav_method
        );
 }