From 16402b992e0332d2ac68106f4488b47175bf0a13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Date: Sun, 9 Feb 2014 07:26:37 +0700 Subject: dir: warn about trailing spaces in exclude patterns MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- dir.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'dir.c') diff --git a/dir.c b/dir.c index 23b6de4703..065491bb4b 100644 --- a/dir.c +++ b/dir.c @@ -463,6 +463,22 @@ void clear_exclude_list(struct exclude_list *el) el->filebuf = NULL; } +static void check_trailing_spaces(const char *fname, char *buf) +{ + int i, last_space = -1, len = strlen(buf); + for (i = 0; i < len; i++) + if (buf[i] == '\\') + i++; + else if (buf[i] == ' ') + last_space = i; + else + last_space = -1; + + if (last_space == len - 1) + warning(_("%s: trailing spaces in '%s'. Please quote or remove them."), + fname, buf); +} + int add_excludes_from_file_to_list(const char *fname, const char *base, int baselen, @@ -514,6 +530,7 @@ int add_excludes_from_file_to_list(const char *fname, if (buf[i] == '\n') { if (entry != buf + i && entry[0] != '#') { buf[i - (i && buf[i-1] == '\r')] = 0; + check_trailing_spaces(fname, entry); add_exclude(entry, base, baselen, el, lineno); } lineno++; -- cgit v1.2.1