X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=cache.h;h=35a91320a50d3f0f720e4fc3672f7667934e04f9;hb=44701c67fd1d5d771b440c8646b7b268d4f1402d;hp=64ef86e129337fde851d701a30e70cb84b54ecb3;hpb=f7c3cf8106c09c714d46d39e8eef69838db8b339;p=git.git diff --git a/cache.h b/cache.h index 64ef86e12..35a91320a 100644 --- a/cache.h +++ b/cache.h @@ -522,7 +522,7 @@ int safe_create_leading_directories_const(const char *path); char *enter_repo(char *path, int strict); static inline int is_absolute_path(const char *path) { - return path[0] == '/'; + return path[0] == '/' || has_dos_drive_prefix(path); } const char *make_absolute_path(const char *path); const char *make_nonrelative_path(const char *path); @@ -819,11 +819,11 @@ void shift_tree(const unsigned char *, const unsigned char *, unsigned char *, i extern unsigned whitespace_rule_cfg; extern unsigned whitespace_rule(const char *); extern unsigned parse_whitespace_rule(const char *); -extern unsigned check_and_emit_line(const char *line, int len, unsigned ws_rule, - FILE *stream, const char *set, - const char *reset, const char *ws); +extern unsigned ws_check(const char *line, int len, unsigned ws_rule); +extern void ws_check_emit(const char *line, int len, unsigned ws_rule, FILE *stream, const char *set, const char *reset, const char *ws); extern char *whitespace_error_string(unsigned ws); extern int ws_fix_copy(char *, const char *, int, unsigned, int *); +extern int ws_blank_line(const char *line, int len, unsigned ws_rule); /* ls-files */ int pathspec_match(const char **spec, char *matched, const char *filename, int skiplen);