mirror of
https://github.com/git/git.git
synced 2026-01-09 01:34:00 +00:00
path: move related function to path
Move path-related function from strbuf.[ch] to path.[ch] so that strbuf is focused on string manipulation routines with minimal dependencies. repository.h is no longer a necessary dependency after moving this function out. Signed-off-by: Calvin Wan <calvinwan@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
f94018506c
commit
aba0706832
21
strbuf.c
21
strbuf.c
@@ -3,7 +3,6 @@
|
||||
#include "environment.h"
|
||||
#include "gettext.h"
|
||||
#include "hex.h"
|
||||
#include "repository.h"
|
||||
#include "strbuf.h"
|
||||
#include "string-list.h"
|
||||
#include "utf8.h"
|
||||
@@ -1089,26 +1088,6 @@ void strbuf_stripspace(struct strbuf *sb, int skip_comments)
|
||||
strbuf_setlen(sb, j);
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
void strbuf_strip_file_from_path(struct strbuf *sb)
|
||||
{
|
||||
char *path_sep = find_last_dir_sep(sb->buf);
|
||||
|
||||
Reference in New Issue
Block a user