summaryrefslogtreecommitdiff
path: root/attr.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-04-16 17:48:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-04-16 18:35:38 (GMT)
commit27547e5fccda134560ad0441aa5bfa187387cec0 (patch)
treed35c6fd87e15a685d0fefef6625a450ba5ba34df /attr.c
parent599446dc323d15bab7f2a54f57ae8c5c4d7d6103 (diff)
downloadgit-27547e5fccda134560ad0441aa5bfa187387cec0.zip
git-27547e5fccda134560ad0441aa5bfa187387cec0.tar.gz
git-27547e5fccda134560ad0441aa5bfa187387cec0.tar.bz2
attr: skip UTF8 BOM at the beginning of the input file
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'attr.c')
-rw-r--r--attr.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/attr.c b/attr.c
index cd54697..7c530f4 100644
--- a/attr.c
+++ b/attr.c
@@ -12,6 +12,7 @@
#include "exec_cmd.h"
#include "attr.h"
#include "dir.h"
+#include "utf8.h"
const char git_attr__true[] = "(builtin)true";
const char git_attr__false[] = "\0(builtin)false";
@@ -369,8 +370,12 @@ static struct attr_stack *read_attr_from_file(const char *path, int macro_ok)
return NULL;
}
res = xcalloc(1, sizeof(*res));
- while (fgets(buf, sizeof(buf), fp))
- handle_attr_line(res, buf, path, ++lineno, macro_ok);
+ while (fgets(buf, sizeof(buf), fp)) {
+ char *bufp = buf;
+ if (!lineno)
+ skip_utf8_bom(&bufp, strlen(bufp));
+ handle_attr_line(res, bufp, path, ++lineno, macro_ok);
+ }
fclose(fp);
return res;
}