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
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);
|
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
|
* path = Canonical absolute path
|
||||||
* prefixes = string_list containing normalized, absolute paths without
|
* prefixes = string_list containing normalized, absolute paths without
|
||||||
|
5
path.h
5
path.h
@ -191,6 +191,11 @@ const char *remove_leading_path(const char *in, const char *prefix);
|
|||||||
const char *relative_path(const char *in, const char *prefix, struct strbuf *sb);
|
const char *relative_path(const char *in, const char *prefix, struct strbuf *sb);
|
||||||
int normalize_path_copy_len(char *dst, const char *src, int *prefix_len);
|
int normalize_path_copy_len(char *dst, const char *src, int *prefix_len);
|
||||||
int normalize_path_copy(char *dst, const char *src);
|
int normalize_path_copy(char *dst, const char *src);
|
||||||
|
/**
|
||||||
|
* Normalize in-place the path contained in the strbuf. If an error occurs,
|
||||||
|
* the contents of "sb" are left untouched, and -1 is returned.
|
||||||
|
*/
|
||||||
|
int strbuf_normalize_path(struct strbuf *src);
|
||||||
int longest_ancestor_length(const char *path, struct string_list *prefixes);
|
int longest_ancestor_length(const char *path, struct string_list *prefixes);
|
||||||
char *strip_path_suffix(const char *path, const char *suffix);
|
char *strip_path_suffix(const char *path, const char *suffix);
|
||||||
int daemon_avoid_alias(const char *path);
|
int daemon_avoid_alias(const char *path);
|
||||||
|
21
strbuf.c
21
strbuf.c
@ -3,7 +3,6 @@
|
|||||||
#include "environment.h"
|
#include "environment.h"
|
||||||
#include "gettext.h"
|
#include "gettext.h"
|
||||||
#include "hex.h"
|
#include "hex.h"
|
||||||
#include "repository.h"
|
|
||||||
#include "strbuf.h"
|
#include "strbuf.h"
|
||||||
#include "string-list.h"
|
#include "string-list.h"
|
||||||
#include "utf8.h"
|
#include "utf8.h"
|
||||||
@ -1089,26 +1088,6 @@ void strbuf_stripspace(struct strbuf *sb, int skip_comments)
|
|||||||
strbuf_setlen(sb, j);
|
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)
|
void strbuf_strip_file_from_path(struct strbuf *sb)
|
||||||
{
|
{
|
||||||
char *path_sep = find_last_dir_sep(sb->buf);
|
char *path_sep = find_last_dir_sep(sb->buf);
|
||||||
|
Reference in New Issue
Block a user