* do linebuffered/non-blocking reads from http requests

[citadel.git] / webcit / groupdav_delete.c

diff --git a/webcit/groupdav_delete.c b/webcit/groupdav_delete.c
index 2d44b8fc1cce551e46ce49752b7d7cdac227e91f..2a76687b1e811fde160cf17ef9309a9d81a570f0 100644 (file)
--- a/webcit/groupdav_delete.c
+++ b/webcit/groupdav_delete.c
@@ -13,36 +13,38 @@
 /*
  * The pathname is always going to be /groupdav/room_name/euid
  */
-void groupdav_delete(char *dav_pathname, char *dav_ifmatch) {
+void groupdav_delete(StrBuf *dav_pathname, char *dav_ifmatch) {
        char dav_roomname[SIZ];
        char dav_uid[SIZ];
        long dav_msgnum = (-1);
        char buf[SIZ];
        int n = 0;
+       int len;
 
        /* First, break off the "/groupdav/" prefix */
-       remove_token(dav_pathname, 0, '/');
-       remove_token(dav_pathname, 0, '/');
+       StrBufRemove_token(dav_pathname, 0, '/');
+       StrBufRemove_token(dav_pathname, 0, '/');
 
        /* Now extract the message euid */
-       n = num_tokens(dav_pathname, '/');
-       extract_token(dav_uid, dav_pathname, n-1, '/', sizeof dav_uid);
-       remove_token(dav_pathname, n-1, '/');
+       n = StrBufNum_tokens(dav_pathname, '/');
+       extract_token(dav_uid, ChrPtr(dav_pathname), n-1, '/', sizeof dav_uid);
+       StrBufRemove_token(dav_pathname, n-1, '/');
 
        /* What's left is the room name.  Remove trailing slashes. */
-       if (dav_pathname[strlen(dav_pathname)-1] == '/') {
-               dav_pathname[strlen(dav_pathname)-1] = 0;
+       len = StrLength(dav_pathname);
+       if ((len > 0) && (ChrPtr(dav_pathname)[len-1] == '/')) {
+               StrBufCutRight(dav_pathname, 1);
        }
-       strcpy(dav_roomname, dav_pathname);
+       strcpy(dav_roomname, ChrPtr(dav_pathname));
 
        /* Go to the correct room. */
        if (strcasecmp(WC->wc_roomname, dav_roomname)) {
                gotoroom(dav_roomname);
        }
        if (strcasecmp(WC->wc_roomname, dav_roomname)) {
-               wprintf("HTTP/1.1 404 not found\r\n");
+               hprintf("HTTP/1.1 404 not found\r\n");
                groupdav_common_headers();
-               wprintf("Content-Length: 0\r\n\r\n");
+               hprintf("Content-Length: 0\r\n\r\n");
                return;
        }
 
@@ -52,9 +54,9 @@ void groupdav_delete(char *dav_pathname, char *dav_ifmatch) {
         * If no item exists with the requested uid ... simple error.
         */
        if (dav_msgnum < 0L) {
-               wprintf("HTTP/1.1 404 Not Found\r\n");
+               hprintf("HTTP/1.1 404 Not Found\r\n");
                groupdav_common_headers();
-               wprintf("Content-Length: 0\r\n\r\n");
+               hprintf("Content-Length: 0\r\n\r\n");
                return;
        }
 
@@ -62,11 +64,11 @@ void groupdav_delete(char *dav_pathname, char *dav_ifmatch) {
         * It's there ... check the ETag and make sure it matches
         * the message number.
         */
-       if (strlen(dav_ifmatch) > 0) {
+       if (!IsEmptyStr(dav_ifmatch)) {
                if (atol(dav_ifmatch) != dav_msgnum) {
-                       wprintf("HTTP/1.1 412 Precondition Failed\r\n");
+                       hprintf("HTTP/1.1 412 Precondition Failed\r\n");
                        groupdav_common_headers();
-                       wprintf("Content-Length: 0\r\n\r\n");
+                       hprintf("Content-Length: 0\r\n\r\n");
                        return;
                }
        }
@@ -77,14 +79,14 @@ void groupdav_delete(char *dav_pathname, char *dav_ifmatch) {
        serv_printf("DELE %ld", dav_msgnum);
        serv_getln(buf, sizeof buf);
        if (buf[0] == '2') {
-               wprintf("HTTP/1.1 204 No Content\r\n"); /* success */
+               hprintf("HTTP/1.1 204 No Content\r\n"); /* success */
                groupdav_common_headers();
-               wprintf("Content-Length: 0\r\n\r\n");
+               hprintf("Content-Length: 0\r\n\r\n");
        }
        else {
-               wprintf("HTTP/1.1 403 Forbidden\r\n");  /* access denied */
+               hprintf("HTTP/1.1 403 Forbidden\r\n");  /* access denied */
                groupdav_common_headers();
-               wprintf("Content-Length: 0\r\n\r\n");
+               hprintf("Content-Length: 0\r\n\r\n");
        }
        return;
 }