diff -r 1fdbf4170ef4 -r b8bf95b39952 src/server/nametrans.c --- a/src/server/nametrans.c Sun Jan 08 15:46:47 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,81 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 2011 Olaf Wintermann. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#include "nametrans.h" - -#include "pblock.h" - -int test_nametrans(pblock *pb, Session *sn, Request *rq) { - printf("test_nametrans...\n"); - - // set ppath - //char *ppath = "/export/home/olaf/Desktop/hello.txt"; - //pblock_kvinsert(pb_key_ppath, ppath, strlen(ppath), rq->vars); - - return REQ_NOACTION; -} - -/* - * assign_name - * - * Assigns the name specified by the name parameter if the uri has the - * specified prefix. - * - * pblock parameter: - * name object name - * from optional uri prefix - */ -int assign_name(pblock *pb, Session *sn, Request *rq) { - /* TODO: expression instead of simple prefix */ - - char *name = pblock_findkeyval(pb_key_name, pb); - char *from = pblock_findkeyval(pb_key_from, pb); - - if(!name) { - /* TODO: add log */ - protocol_status(sn, rq, 500, NULL); - return REQ_ABORTED; - } - - if(from) { - char *uri = pblock_findkeyval(pb_key_uri, rq->reqpb); - char c; - int i = 0; - while((c = from[i]) != 0) { - if(c != uri[i]) { - return REQ_NOACTION; - } - i++; - } - } - - /* add object to rq->vars */ - pblock_kvinsert(pb_key_name, name, strlen(name), rq->vars); - - return REQ_NOACTION; -}