Merge branch 'cw/strbuf-cleanup'
Move functions that are not about pure string manipulation out of strbuf.[ch] * cw/strbuf-cleanup: strbuf: remove global variable path: move related function to path object-name: move related functions to object-name credential-store: move related functions to credential-store file abspath: move related functions to abspath strbuf: clarify dependency strbuf: clarify API boundary
This commit is contained in:
20
path.c
20
path.c
@@ -1213,6 +1213,26 @@ int normalize_path_copy(char *dst, const char *src)
|
||||
return normalize_path_copy_len(dst, src, NULL);
|
||||
}
|
||||
|
||||
int strbuf_normalize_path(struct strbuf *src)
|
||||
{
|
||||
struct strbuf dst = STRBUF_INIT;
|
||||
|
||||
strbuf_grow(&dst, src->len);
|
||||
if (normalize_path_copy(dst.buf, src->buf) < 0) {
|
||||
strbuf_release(&dst);
|
||||
return -1;
|
||||
}
|
||||
|
||||
/*
|
||||
* normalize_path does not tell us the new length, so we have to
|
||||
* compute it by looking for the new NUL it placed
|
||||
*/
|
||||
strbuf_setlen(&dst, strlen(dst.buf));
|
||||
strbuf_swap(src, &dst);
|
||||
strbuf_release(&dst);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* path = Canonical absolute path
|
||||
* prefixes = string_list containing normalized, absolute paths without
|
||||
|
||||
Reference in New Issue
Block a user