comparison: src/server/daemon/acl.c
src/server/daemon/acl.c
- changeset 100
- e9bb8449df02
- parent 93
- 95b77e842db3
- child 109
- 8a0a7754f123
equal
deleted
inserted
replaced
| 99:b9a6af0ae41a | 100:e9bb8449df02 |
|---|---|
| 317 return 0; | 317 return 0; |
| 318 } | 318 } |
| 319 } | 319 } |
| 320 sstr_t wd = sstr(cwd); | 320 sstr_t wd = sstr(cwd); |
| 321 sstr_t pp = sstr(path); | 321 sstr_t pp = sstr(path); |
| 322 p.length = wd.length + pp.length + 1; | 322 |
| 323 p.ptr = malloc(p.length + 1); | 323 p = sstrcat(3, wd, sstrn("/", 1), pp); |
| 324 p = sstrncat(p, 3, wd, sstrn("/", 1), pp); | |
| 325 p.ptr[p.length] = '\0'; | |
| 326 } else { | 324 } else { |
| 327 p = sstrdup(sstr(path)); | 325 p = sstrdup(sstr(path)); |
| 328 } | 326 } |
| 329 if(p.ptr[p.length-1] == '/') { | 327 if(p.ptr[p.length-1] == '/') { |
| 330 p.ptr[p.length-1] = 0; | 328 p.ptr[p.length-1] = 0; |
