comparison: src/server/safs/nametrans.c
src/server/safs/nametrans.c
- changeset 116
- d7a186cf87f6
- parent 97
- 09fbefc0e6a9
- child 117
- a94cf2e94492
equal
deleted
inserted
replaced
| 115:51d9a15eac98 | 116:d7a186cf87f6 |
|---|---|
| 27 */ | 27 */ |
| 28 | 28 |
| 29 #include "nametrans.h" | 29 #include "nametrans.h" |
| 30 | 30 |
| 31 #include "../daemon/log.h" | 31 #include "../daemon/log.h" |
| 32 #include "../daemon/request.h" | |
| 32 #include "../util/pblock.h" | 33 #include "../util/pblock.h" |
| 33 #include "../util/util.h" | 34 #include "../util/util.h" |
| 34 | 35 |
| 35 /* | 36 /* |
| 36 * assign_name | 37 * assign_name |
| 88 return REQ_ABORTED; | 89 return REQ_ABORTED; |
| 89 } | 90 } |
| 90 | 91 |
| 91 sstr_t root_str = sstr(root); | 92 sstr_t root_str = sstr(root); |
| 92 sstr_t uri_str = sstr(pblock_findkeyval(pb_key_uri, rq->reqpb)); | 93 sstr_t uri_str = sstr(pblock_findkeyval(pb_key_uri, rq->reqpb)); |
| 93 util_add_ppath(root_str, uri_str, rq->vars); | 94 |
| 95 request_set_path(root_str, uri_str, rq->vars); | |
| 94 | 96 |
| 95 return REQ_PROCEED; | 97 return REQ_PROCEED; |
| 96 } | 98 } |
| 97 | 99 |
| 98 /* | 100 /* |
| 142 | 144 |
| 143 uri = uri + i; | 145 uri = uri + i; |
| 144 if(uri[0] == '/') { | 146 if(uri[0] == '/') { |
| 145 uri++; | 147 uri++; |
| 146 } | 148 } |
| 149 | |
| 150 | |
| 147 sstr_t ppath = util_path_append(sn->pool, dir, uri); | 151 sstr_t ppath = util_path_append(sn->pool, dir, uri); |
| 152 | |
| 148 pblock_kvinsert( | 153 pblock_kvinsert( |
| 149 pb_key_ppath, | 154 pb_key_ppath, |
| 150 ppath.ptr, | 155 ppath.ptr, |
| 151 ppath.length, | 156 ppath.length, |
| 152 rq->vars); | 157 rq->vars); |
| 158 | |
| 159 request_set_path(sstr(dir), sstr(uri), rq->vars); | |
| 153 | 160 |
| 154 if(name) { | 161 if(name) { |
| 155 // add object to rq->vars | 162 // add object to rq->vars |
| 156 pblock_kvinsert(pb_key_name, name, strlen(name), rq->vars); | 163 pblock_kvinsert(pb_key_name, name, strlen(name), rq->vars); |
| 157 } | 164 } |
