X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=webcit%2Fdav_put.c;h=3930dae46e28db1b401b4d77d3a5c5400b24885a;hp=8b6935ef1a2cbc94bd39d02b7668f7dd74dc42b8;hb=c6aec42f213ec284e34648f3d69bcf927dccddb1;hpb=7beff529e758f6f0706e733901824c63bcac6d19 diff --git a/webcit/dav_put.c b/webcit/dav_put.c index 8b6935ef1..3930dae46 100644 --- a/webcit/dav_put.c +++ b/webcit/dav_put.c @@ -1,3 +1,4 @@ + /* * Handles GroupDAV PUT requests. * @@ -22,8 +23,7 @@ * component. This would be for webcal:// 'publish' operations, not * for GroupDAV. */ -void dav_put_bigics(void) -{ +void dav_put_bigics(void) { wcsession *WCC = WC; char buf[1024]; @@ -64,8 +64,7 @@ void dav_put_bigics(void) * [/groupdav/]room_name/euid (GroupDAV) * [/groupdav/]room_name (webcal) */ -void dav_put(void) -{ +void dav_put(void) { wcsession *WCC = WC; StrBuf *dav_roomname; StrBuf *dav_uid; @@ -88,8 +87,7 @@ void dav_put(void) dav_uid = NewStrBuf();; StrBufExtract_token(dav_roomname, WCC->Hdr->HR.ReqLine, 0, '/'); StrBufExtract_token(dav_uid, WCC->Hdr->HR.ReqLine, 1, '/'); - if ((!strcasecmp(ChrPtr(dav_uid), "ics")) || - (!strcasecmp(ChrPtr(dav_uid), "calendar.ics"))) { + if ((!strcasecmp(ChrPtr(dav_uid), "ics")) || (!strcasecmp(ChrPtr(dav_uid), "calendar.ics"))) { FlushStrBuf(dav_uid); } @@ -102,11 +100,10 @@ void dav_put(void) dav_common_headers(); hprintf("Content-Type: text/plain\r\n"); begin_burst(); - wc_printf("There is no folder called \"%s\" on this server.\r\n", - ChrPtr(dav_roomname)); + wc_printf("There is no folder called \"%s\" on this server.\r\n", ChrPtr(dav_roomname)); end_burst(); FreeStrBuf(&dav_roomname); - FreeStrBuf(&dav_uid); + FreeStrBuf(&dav_uid); return; } @@ -124,9 +121,9 @@ void dav_put(void) if (StrTol(WCC->Hdr->HR.dav_ifmatch) != old_msgnum) { hprintf("HTTP/1.1 412 Precondition Failed\r\n"); syslog(LOG_INFO, "HTTP/1.1 412 Precondition Failed (ifmatch=%ld, old_msgnum=%ld)\r\n", - StrTol(WCC->Hdr->HR.dav_ifmatch), old_msgnum); + StrTol(WCC->Hdr->HR.dav_ifmatch), old_msgnum); dav_common_headers(); - + end_burst(); FreeStrBuf(&dav_roomname); FreeStrBuf(&dav_uid); @@ -169,14 +166,14 @@ void dav_put(void) n = 0; FlushStrBuf(dav_uid); while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { - switch(n++) { - case 0: + switch (n++) { + case 0: new_msgnum = atol(buf); break; - case 1: + case 1: syslog(LOG_DEBUG, "new_msgnum=%ld (%s)\n", new_msgnum, buf); break; - case 2: + case 2: StrBufAppendBufPlain(dav_uid, buf, -1, 0); break; default: @@ -192,8 +189,7 @@ void dav_put(void) dav_common_headers(); hprintf("Content-type: text/plain\r\n"); begin_burst(); - wc_printf("new_msgnum is %ld\r\n" - "\r\n", new_msgnum); + wc_printf("new_msgnum is %ld\r\n" "\r\n", new_msgnum); end_burst(); FreeStrBuf(&dav_roomname); FreeStrBuf(&dav_uid); @@ -202,17 +198,17 @@ void dav_put(void) /* We created this item for the first time. */ if (old_msgnum < 0L) { - char escaped_uid[1024]; + char escaped_uid[1024]; hprintf("HTTP/1.1 201 Created\r\n"); syslog(LOG_DEBUG, "HTTP/1.1 201 Created\r\n"); dav_common_headers(); hprintf("etag: \"%ld\"\r\n", new_msgnum); hprintf("Location: "); dav_identify_hosthdr(); - hprintf("/groupdav/");/* TODO */ + hprintf("/groupdav/"); /* TODO */ hurlescputs(ChrPtr(dav_roomname)); - euid_escapize(escaped_uid, ChrPtr(dav_uid)); - hprintf("/%s\r\n", escaped_uid); + euid_escapize(escaped_uid, ChrPtr(dav_uid)); + hprintf("/%s\r\n", escaped_uid); end_burst(); FreeStrBuf(&dav_roomname); FreeStrBuf(&dav_uid);