webserver: comparison src/server/safs/cgi.c

-:99a34860c105
+:d938228c382e
 #include <sys/types.h>
 #include <signal.h>
 #include <sys/wait.h>
-#include <ucx/string.h>
+#include <cx/string.h>
 #include "../util/util.h"
 #include "../util/pblock.h"
 #include "../daemon/netsite.h"
 #include "../util/io.h"
 p->pid = fork();
 if(p->pid == 0) {
 // child
 // get script directory and script name
-sstr_t script = sstr(path);
+cxstring script = cx_str(path);
-sstr_t parent;
+cxmutstr parent;
 int len = strlen(path);
 for(int i=len-1;i>=0;i--) {
 if(path[i] == '/') {
-script = sstrn(path + i + 1, len - i);
+script = cx_strn(path + i + 1, len - i);
-parent = sstrdup(sstrn(path, i));
+parent = cx_strdup(cx_strn(path, i));
 if(chdir(parent.ptr)) {
 perror("cgi_start: chdir");
 free(parent.ptr);
 exit(-1);
 }
 CGIResponseParser* cgi_parser_new(Session *sn, Request *rq) {
 CGIResponseParser* parser = pool_malloc(sn->pool, sizeof(CGIResponseParser));
 parser->sn = sn;
 parser->rq = rq;
-parser->tmp = ucx_buffer_new(NULL, 64, UCX_BUFFER_AUTOEXTEND);
 parser->status = 0;
 parser->msg = NULL;
+cxBufferInit(&parser->tmp, NULL, 64, pool_allocator(sn->pool), CX_BUFFER_AUTO_EXTEND|CX_BUFFER_FREE_CONTENTS);
 return parser;
 }
 void cgi_parser_free(CGIResponseParser *parser) {
-if(parser->tmp) {
+if(parser->tmp.space) {
-ucx_buffer_free(parser->tmp);
+cxBufferDestroy(&parser->tmp);
 }
 pool_free(parser->sn->pool, parser);
 }
 /*
 *         1: successfully parsed lines
 *         2: cgi response header complete (empty line)
 *        -1: error
 */
 static int parse_lines(CGIResponseParser *parser, char *buf, size_t len, int *pos) {
-UcxAllocator a = util_pool_allocator(parser->sn->pool);
+CxAllocator *a = pool_allocator(parser->sn->pool);
-sstr_t name;
+cxmutstr name;
-sstr_t value;
+cxmutstr value;
 WSBool space = TRUE;
 int i;
 int line_begin = 0;
 int value_begin = 0;
 for(i=0;i<len;i++) {
 char c = buf[i];
 if(value_begin == line_begin && c == ':') {
-name = sstrn(buf + line_begin, i - line_begin);
+name = cx_mutstrn(buf + line_begin, i - line_begin);
 value_begin = i + 1;
 } else if(c == '\n') {
 if(value_begin == line_begin) {
 if(space) {
 *pos = i + 1;
 } else {
 // line ends with content but without ':' -> error
 return -1;
 }
 }
-value = sstrn(buf + value_begin, i - value_begin);
+value = cx_mutstrn(buf + value_begin, i - value_begin);
-name = sstrlower_a(&a, sstrtrim(name));
+cx_strlower(name);
-value = sstrtrim(value);
+name = cx_strdup_a(a, cx_strtrim((cxstring){name.ptr, name.length}));
+value = cx_strtrim_m(value);
 if(name.length == 0 || value.length == 0) {
 return -1;
 }
-if(!sstrcmp(name, S("status"))) {
+if(!cx_strcmp((cxstring){name.ptr, name.length}, (cxstring)CX_STR("status"))) {
-sstr_t codestr = value;
+cxmutstr codestr = value;
 int j;
 for(j=0;j<codestr.length;j++) {
 if(!isdigit(codestr.ptr[j])) {
 break;
 }
 int64_t s = 0;
 util_strtoint(codestr.ptr, &s);
 parser->status = (int)s;
-sstr_t msg = sstrtrim(sstrsubs(value, j + 1));
+cxmutstr msg = cx_strtrim_m(cx_strsubs_m(value, j + 1));
 if(msg.length > 0) {
-parser->msg = sstrdup_pool(parser->sn->pool, msg).ptr;
+parser->msg = cx_strdup_pool(parser->sn->pool, msg).ptr;
 }
 } else {
 pblock_nvlinsert(
 name.ptr,
 name.length,
 *          1: complete
 */
 int cgi_parse_response(CGIResponseParser *parser, char *buf, size_t len, size_t *bpos) {
 *bpos = 0;
 int pos = 0;
-if(parser->tmp->pos > 0) {
+if(parser->tmp.pos > 0) {
 // the tmp buffer contains an unfinished line
 // fill up the buffer until the line is complete
 WSBool nb = FALSE;
 for(pos=0;pos<len;pos++) {
 if(buf[pos] == '\n') {
 nb = TRUE;
 break;
 }
 }
-ucx_buffer_write(buf, 1, pos, parser->tmp);
+cxBufferWrite(buf, 1, pos, &parser->tmp);
 if(nb) {
 // line complete
 int npos;
-int r = parse_lines(parser, parser->tmp->space, parser->tmp->pos, &npos);
+int r = parse_lines(parser, parser->tmp.space, parser->tmp.pos, &npos);
 switch(r) {
 case -1: return -1;
 case 0: return -1;
 case 1: break;
 case 2: {
 *bpos = pos + 1;
 return 1;
 }
 }
 // reset tmp buffer
-parser->tmp->pos = 0;
+parser->tmp.pos = 0;
 } else {
-if(parser->tmp->pos > CGI_RESPONSE_MAX_LINE_LENGTH) {
+if(parser->tmp.pos > CGI_RESPONSE_MAX_LINE_LENGTH) {
 return -1;
 }
 }
 }
 default: return -1;
 case 0:
 case 1: {
 int newlen = len - npos;
 if(npos > 0) {
-ucx_buffer_write(buf + npos, 1, newlen, parser->tmp);
+cxBufferWrite(buf + npos, 1, newlen, &parser->tmp);
 }
 return 0;
 }
 case 2: {
 *bpos = pos + npos;

Mercurial > hg > webserver / file comparison

comparison: src/server/safs/cgi.c

src/server/safs/cgi.c