Linus Torvalds | 6c510be | 2007-02-13 11:07:23 -0800 | [diff] [blame] | 1 | #include "cache.h" |
Junio C Hamano | 35ebfd6 | 2007-04-12 22:30:05 -0700 | [diff] [blame] | 2 | #include "attr.h" |
Junio C Hamano | 3fed15f | 2007-04-21 19:09:02 -0700 | [diff] [blame] | 3 | #include "run-command.h" |
Pete Wyckoff | a2b665d | 2010-12-22 06:40:13 -0800 | [diff] [blame] | 4 | #include "quote.h" |
Jehan Bing | 6424c2a | 2012-02-20 12:53:37 -0800 | [diff] [blame] | 5 | #include "sigchain.h" |
Junio C Hamano | 35ebfd6 | 2007-04-12 22:30:05 -0700 | [diff] [blame] | 6 | |
Linus Torvalds | 6c510be | 2007-02-13 11:07:23 -0800 | [diff] [blame] | 7 | /* |
| 8 | * convert.c - convert a file when checking it out and checking it in. |
| 9 | * |
| 10 | * This should use the pathname to decide on whether it wants to do some |
| 11 | * more interesting conversions (automatic gzip/unzip, general format |
| 12 | * conversions etc etc), but by default it just does automatic CRLF<->LF |
Eyvind Bernhardsen | 942e774 | 2010-06-04 21:29:08 +0200 | [diff] [blame] | 13 | * translation when the "text" attribute or "auto_crlf" option is set. |
Linus Torvalds | 6c510be | 2007-02-13 11:07:23 -0800 | [diff] [blame] | 14 | */ |
| 15 | |
Junio C Hamano | c61dcff | 2011-05-09 13:12:57 -0700 | [diff] [blame] | 16 | enum crlf_action { |
Eyvind Bernhardsen | fd6cce9 | 2010-05-19 22:43:10 +0200 | [diff] [blame] | 17 | CRLF_GUESS = -1, |
| 18 | CRLF_BINARY = 0, |
| 19 | CRLF_TEXT, |
| 20 | CRLF_INPUT, |
| 21 | CRLF_CRLF, |
Jonathan Nieder | c9b6782 | 2011-03-16 01:59:10 -0500 | [diff] [blame] | 22 | CRLF_AUTO |
Eyvind Bernhardsen | fd6cce9 | 2010-05-19 22:43:10 +0200 | [diff] [blame] | 23 | }; |
Junio C Hamano | 163b959 | 2007-04-19 22:37:19 -0700 | [diff] [blame] | 24 | |
Linus Torvalds | 6c510be | 2007-02-13 11:07:23 -0800 | [diff] [blame] | 25 | struct text_stat { |
Dmitry Potapov | 2862419 | 2008-01-16 04:59:12 +0300 | [diff] [blame] | 26 | /* NUL, CR, LF and CRLF counts */ |
| 27 | unsigned nul, cr, lf, crlf; |
Linus Torvalds | 6c510be | 2007-02-13 11:07:23 -0800 | [diff] [blame] | 28 | |
| 29 | /* These are just approximations! */ |
| 30 | unsigned printable, nonprintable; |
| 31 | }; |
| 32 | |
| 33 | static void gather_stats(const char *buf, unsigned long size, struct text_stat *stats) |
| 34 | { |
| 35 | unsigned long i; |
| 36 | |
| 37 | memset(stats, 0, sizeof(*stats)); |
| 38 | |
| 39 | for (i = 0; i < size; i++) { |
| 40 | unsigned char c = buf[i]; |
| 41 | if (c == '\r') { |
| 42 | stats->cr++; |
| 43 | if (i+1 < size && buf[i+1] == '\n') |
| 44 | stats->crlf++; |
| 45 | continue; |
| 46 | } |
| 47 | if (c == '\n') { |
| 48 | stats->lf++; |
| 49 | continue; |
| 50 | } |
| 51 | if (c == 127) |
| 52 | /* DEL */ |
| 53 | stats->nonprintable++; |
| 54 | else if (c < 32) { |
| 55 | switch (c) { |
| 56 | /* BS, HT, ESC and FF */ |
| 57 | case '\b': case '\t': case '\033': case '\014': |
| 58 | stats->printable++; |
| 59 | break; |
Dmitry Potapov | 2862419 | 2008-01-16 04:59:12 +0300 | [diff] [blame] | 60 | case 0: |
| 61 | stats->nul++; |
| 62 | /* fall through */ |
Linus Torvalds | 6c510be | 2007-02-13 11:07:23 -0800 | [diff] [blame] | 63 | default: |
| 64 | stats->nonprintable++; |
| 65 | } |
| 66 | } |
| 67 | else |
| 68 | stats->printable++; |
| 69 | } |
Dmitry Kakurin | f9dd4bf | 2008-07-11 18:48:16 +0200 | [diff] [blame] | 70 | |
| 71 | /* If file ends with EOF then don't count this EOF as non-printable. */ |
| 72 | if (size >= 1 && buf[size-1] == '\032') |
| 73 | stats->nonprintable--; |
Linus Torvalds | 6c510be | 2007-02-13 11:07:23 -0800 | [diff] [blame] | 74 | } |
| 75 | |
| 76 | /* |
| 77 | * The same heuristics as diff.c::mmfile_is_binary() |
| 78 | */ |
| 79 | static int is_binary(unsigned long size, struct text_stat *stats) |
| 80 | { |
| 81 | |
Dmitry Potapov | 2862419 | 2008-01-16 04:59:12 +0300 | [diff] [blame] | 82 | if (stats->nul) |
| 83 | return 1; |
Linus Torvalds | 6c510be | 2007-02-13 11:07:23 -0800 | [diff] [blame] | 84 | if ((stats->printable >> 7) < stats->nonprintable) |
| 85 | return 1; |
| 86 | /* |
| 87 | * Other heuristics? Average line length might be relevant, |
| 88 | * as might LF vs CR vs CRLF counts.. |
| 89 | * |
| 90 | * NOTE! It might be normal to have a low ratio of CRLF to LF |
| 91 | * (somebody starts with a LF-only file and edits it with an editor |
| 92 | * that adds CRLF only to lines that are added..). But do we |
| 93 | * want to support CR-only? Probably not. |
| 94 | */ |
| 95 | return 0; |
| 96 | } |
| 97 | |
Junio C Hamano | c61dcff | 2011-05-09 13:12:57 -0700 | [diff] [blame] | 98 | static enum eol output_eol(enum crlf_action crlf_action) |
Eyvind Bernhardsen | f217f0e | 2010-07-02 21:20:47 +0200 | [diff] [blame] | 99 | { |
Junio C Hamano | c61dcff | 2011-05-09 13:12:57 -0700 | [diff] [blame] | 100 | switch (crlf_action) { |
Eyvind Bernhardsen | 942e774 | 2010-06-04 21:29:08 +0200 | [diff] [blame] | 101 | case CRLF_BINARY: |
| 102 | return EOL_UNSET; |
| 103 | case CRLF_CRLF: |
| 104 | return EOL_CRLF; |
| 105 | case CRLF_INPUT: |
| 106 | return EOL_LF; |
| 107 | case CRLF_GUESS: |
| 108 | if (!auto_crlf) |
| 109 | return EOL_UNSET; |
| 110 | /* fall through */ |
| 111 | case CRLF_TEXT: |
| 112 | case CRLF_AUTO: |
| 113 | if (auto_crlf == AUTO_CRLF_TRUE) |
| 114 | return EOL_CRLF; |
| 115 | else if (auto_crlf == AUTO_CRLF_INPUT) |
| 116 | return EOL_LF; |
Junio C Hamano | ec70f52 | 2011-05-09 12:52:12 -0700 | [diff] [blame] | 117 | else if (core_eol == EOL_UNSET) |
Eyvind Bernhardsen | 942e774 | 2010-06-04 21:29:08 +0200 | [diff] [blame] | 118 | return EOL_NATIVE; |
| 119 | } |
Junio C Hamano | ec70f52 | 2011-05-09 12:52:12 -0700 | [diff] [blame] | 120 | return core_eol; |
Eyvind Bernhardsen | 942e774 | 2010-06-04 21:29:08 +0200 | [diff] [blame] | 121 | } |
| 122 | |
Junio C Hamano | c61dcff | 2011-05-09 13:12:57 -0700 | [diff] [blame] | 123 | static void check_safe_crlf(const char *path, enum crlf_action crlf_action, |
Steffen Prohaska | 21e5ad5 | 2008-02-06 12:25:58 +0100 | [diff] [blame] | 124 | struct text_stat *stats, enum safe_crlf checksafe) |
| 125 | { |
| 126 | if (!checksafe) |
| 127 | return; |
| 128 | |
Junio C Hamano | c61dcff | 2011-05-09 13:12:57 -0700 | [diff] [blame] | 129 | if (output_eol(crlf_action) == EOL_LF) { |
Steffen Prohaska | 21e5ad5 | 2008-02-06 12:25:58 +0100 | [diff] [blame] | 130 | /* |
| 131 | * CRLFs would not be restored by checkout: |
| 132 | * check if we'd remove CRLFs |
| 133 | */ |
| 134 | if (stats->crlf) { |
| 135 | if (checksafe == SAFE_CRLF_WARN) |
Eyvind Bernhardsen | 942e774 | 2010-06-04 21:29:08 +0200 | [diff] [blame] | 136 | warning("CRLF will be replaced by LF in %s.\nThe file will have its original line endings in your working directory.", path); |
Steffen Prohaska | 21e5ad5 | 2008-02-06 12:25:58 +0100 | [diff] [blame] | 137 | else /* i.e. SAFE_CRLF_FAIL */ |
| 138 | die("CRLF would be replaced by LF in %s.", path); |
| 139 | } |
Junio C Hamano | c61dcff | 2011-05-09 13:12:57 -0700 | [diff] [blame] | 140 | } else if (output_eol(crlf_action) == EOL_CRLF) { |
Steffen Prohaska | 21e5ad5 | 2008-02-06 12:25:58 +0100 | [diff] [blame] | 141 | /* |
| 142 | * CRLFs would be added by checkout: |
| 143 | * check if we have "naked" LFs |
| 144 | */ |
| 145 | if (stats->lf != stats->crlf) { |
| 146 | if (checksafe == SAFE_CRLF_WARN) |
Eyvind Bernhardsen | 942e774 | 2010-06-04 21:29:08 +0200 | [diff] [blame] | 147 | warning("LF will be replaced by CRLF in %s.\nThe file will have its original line endings in your working directory.", path); |
Steffen Prohaska | 21e5ad5 | 2008-02-06 12:25:58 +0100 | [diff] [blame] | 148 | else /* i.e. SAFE_CRLF_FAIL */ |
| 149 | die("LF would be replaced by CRLF in %s", path); |
| 150 | } |
| 151 | } |
| 152 | } |
| 153 | |
Finn Arne Gangstad | c480539 | 2010-05-12 00:37:57 +0200 | [diff] [blame] | 154 | static int has_cr_in_index(const char *path) |
| 155 | { |
Finn Arne Gangstad | c480539 | 2010-05-12 00:37:57 +0200 | [diff] [blame] | 156 | unsigned long sz; |
Finn Arne Gangstad | c480539 | 2010-05-12 00:37:57 +0200 | [diff] [blame] | 157 | void *data; |
| 158 | int has_cr; |
Finn Arne Gangstad | c480539 | 2010-05-12 00:37:57 +0200 | [diff] [blame] | 159 | |
Lukas Fleischer | 4982fd7 | 2013-04-13 15:28:32 +0200 | [diff] [blame] | 160 | data = read_blob_data_from_cache(path, &sz); |
| 161 | if (!data) |
Finn Arne Gangstad | c480539 | 2010-05-12 00:37:57 +0200 | [diff] [blame] | 162 | return 0; |
Finn Arne Gangstad | c480539 | 2010-05-12 00:37:57 +0200 | [diff] [blame] | 163 | has_cr = memchr(data, '\r', sz) != NULL; |
| 164 | free(data); |
| 165 | return has_cr; |
| 166 | } |
| 167 | |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 168 | static int crlf_to_git(const char *path, const char *src, size_t len, |
Junio C Hamano | c61dcff | 2011-05-09 13:12:57 -0700 | [diff] [blame] | 169 | struct strbuf *buf, |
| 170 | enum crlf_action crlf_action, enum safe_crlf checksafe) |
Linus Torvalds | 6c510be | 2007-02-13 11:07:23 -0800 | [diff] [blame] | 171 | { |
Linus Torvalds | 6c510be | 2007-02-13 11:07:23 -0800 | [diff] [blame] | 172 | struct text_stat stats; |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 173 | char *dst; |
Linus Torvalds | 6c510be | 2007-02-13 11:07:23 -0800 | [diff] [blame] | 174 | |
Junio C Hamano | c61dcff | 2011-05-09 13:12:57 -0700 | [diff] [blame] | 175 | if (crlf_action == CRLF_BINARY || |
Jeff King | 4c3b57b | 2012-02-24 17:05:03 -0500 | [diff] [blame] | 176 | (crlf_action == CRLF_GUESS && auto_crlf == AUTO_CRLF_FALSE) || |
| 177 | (src && !len)) |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 178 | return 0; |
Linus Torvalds | 6c510be | 2007-02-13 11:07:23 -0800 | [diff] [blame] | 179 | |
Jeff King | 4c3b57b | 2012-02-24 17:05:03 -0500 | [diff] [blame] | 180 | /* |
| 181 | * If we are doing a dry-run and have no source buffer, there is |
| 182 | * nothing to analyze; we must assume we would convert. |
| 183 | */ |
| 184 | if (!buf && !src) |
| 185 | return 1; |
| 186 | |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 187 | gather_stats(src, len, &stats); |
Linus Torvalds | 6c510be | 2007-02-13 11:07:23 -0800 | [diff] [blame] | 188 | |
Junio C Hamano | c61dcff | 2011-05-09 13:12:57 -0700 | [diff] [blame] | 189 | if (crlf_action == CRLF_AUTO || crlf_action == CRLF_GUESS) { |
Junio C Hamano | 201ac8e | 2007-04-15 13:35:45 -0700 | [diff] [blame] | 190 | /* |
| 191 | * We're currently not going to even try to convert stuff |
| 192 | * that has bare CR characters. Does anybody do that crazy |
| 193 | * stuff? |
| 194 | */ |
| 195 | if (stats.cr != stats.crlf) |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 196 | return 0; |
Linus Torvalds | 6c510be | 2007-02-13 11:07:23 -0800 | [diff] [blame] | 197 | |
Junio C Hamano | 201ac8e | 2007-04-15 13:35:45 -0700 | [diff] [blame] | 198 | /* |
| 199 | * And add some heuristics for binary vs text, of course... |
| 200 | */ |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 201 | if (is_binary(len, &stats)) |
| 202 | return 0; |
Finn Arne Gangstad | c480539 | 2010-05-12 00:37:57 +0200 | [diff] [blame] | 203 | |
Junio C Hamano | c61dcff | 2011-05-09 13:12:57 -0700 | [diff] [blame] | 204 | if (crlf_action == CRLF_GUESS) { |
Eyvind Bernhardsen | fd6cce9 | 2010-05-19 22:43:10 +0200 | [diff] [blame] | 205 | /* |
| 206 | * If the file in the index has any CR in it, do not convert. |
| 207 | * This is the new safer autocrlf handling. |
| 208 | */ |
| 209 | if (has_cr_in_index(path)) |
| 210 | return 0; |
| 211 | } |
Junio C Hamano | 201ac8e | 2007-04-15 13:35:45 -0700 | [diff] [blame] | 212 | } |
Linus Torvalds | 6c510be | 2007-02-13 11:07:23 -0800 | [diff] [blame] | 213 | |
Junio C Hamano | c61dcff | 2011-05-09 13:12:57 -0700 | [diff] [blame] | 214 | check_safe_crlf(path, crlf_action, &stats, checksafe); |
Steffen Prohaska | 21e5ad5 | 2008-02-06 12:25:58 +0100 | [diff] [blame] | 215 | |
| 216 | /* Optimization: No CR? Nothing to convert, regardless. */ |
| 217 | if (!stats.cr) |
| 218 | return 0; |
| 219 | |
Jeff King | 92ac319 | 2012-02-24 17:02:37 -0500 | [diff] [blame] | 220 | /* |
| 221 | * At this point all of our source analysis is done, and we are sure we |
| 222 | * would convert. If we are in dry-run mode, we can give an answer. |
| 223 | */ |
| 224 | if (!buf) |
| 225 | return 1; |
| 226 | |
Pierre Habouzit | 90d16ec | 2007-10-05 10:11:59 +0200 | [diff] [blame] | 227 | /* only grow if not in place */ |
| 228 | if (strbuf_avail(buf) + buf->len < len) |
| 229 | strbuf_grow(buf, len - buf->len); |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 230 | dst = buf->buf; |
Junio C Hamano | c61dcff | 2011-05-09 13:12:57 -0700 | [diff] [blame] | 231 | if (crlf_action == CRLF_AUTO || crlf_action == CRLF_GUESS) { |
Junio C Hamano | 163b959 | 2007-04-19 22:37:19 -0700 | [diff] [blame] | 232 | /* |
| 233 | * If we guessed, we already know we rejected a file with |
| 234 | * lone CR, and we can strip a CR without looking at what |
| 235 | * follow it. |
| 236 | */ |
Junio C Hamano | 201ac8e | 2007-04-15 13:35:45 -0700 | [diff] [blame] | 237 | do { |
Alex Riesen | ac78e54 | 2007-04-19 02:05:03 +0200 | [diff] [blame] | 238 | unsigned char c = *src++; |
Junio C Hamano | 201ac8e | 2007-04-15 13:35:45 -0700 | [diff] [blame] | 239 | if (c != '\r') |
Alex Riesen | ac78e54 | 2007-04-19 02:05:03 +0200 | [diff] [blame] | 240 | *dst++ = c; |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 241 | } while (--len); |
Junio C Hamano | 201ac8e | 2007-04-15 13:35:45 -0700 | [diff] [blame] | 242 | } else { |
| 243 | do { |
Alex Riesen | ac78e54 | 2007-04-19 02:05:03 +0200 | [diff] [blame] | 244 | unsigned char c = *src++; |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 245 | if (! (c == '\r' && (1 < len && *src == '\n'))) |
Alex Riesen | ac78e54 | 2007-04-19 02:05:03 +0200 | [diff] [blame] | 246 | *dst++ = c; |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 247 | } while (--len); |
Junio C Hamano | 201ac8e | 2007-04-15 13:35:45 -0700 | [diff] [blame] | 248 | } |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 249 | strbuf_setlen(buf, dst - buf->buf); |
| 250 | return 1; |
Linus Torvalds | 6c510be | 2007-02-13 11:07:23 -0800 | [diff] [blame] | 251 | } |
| 252 | |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 253 | static int crlf_to_worktree(const char *path, const char *src, size_t len, |
Junio C Hamano | c61dcff | 2011-05-09 13:12:57 -0700 | [diff] [blame] | 254 | struct strbuf *buf, enum crlf_action crlf_action) |
Linus Torvalds | 6c510be | 2007-02-13 11:07:23 -0800 | [diff] [blame] | 255 | { |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 256 | char *to_free = NULL; |
Linus Torvalds | 6c510be | 2007-02-13 11:07:23 -0800 | [diff] [blame] | 257 | struct text_stat stats; |
Linus Torvalds | 6c510be | 2007-02-13 11:07:23 -0800 | [diff] [blame] | 258 | |
Junio C Hamano | c61dcff | 2011-05-09 13:12:57 -0700 | [diff] [blame] | 259 | if (!len || output_eol(crlf_action) != EOL_CRLF) |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 260 | return 0; |
Linus Torvalds | 6c510be | 2007-02-13 11:07:23 -0800 | [diff] [blame] | 261 | |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 262 | gather_stats(src, len, &stats); |
Linus Torvalds | 6c510be | 2007-02-13 11:07:23 -0800 | [diff] [blame] | 263 | |
| 264 | /* No LF? Nothing to convert, regardless. */ |
| 265 | if (!stats.lf) |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 266 | return 0; |
Linus Torvalds | 6c510be | 2007-02-13 11:07:23 -0800 | [diff] [blame] | 267 | |
| 268 | /* Was it already in CRLF format? */ |
| 269 | if (stats.lf == stats.crlf) |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 270 | return 0; |
Linus Torvalds | 6c510be | 2007-02-13 11:07:23 -0800 | [diff] [blame] | 271 | |
Junio C Hamano | c61dcff | 2011-05-09 13:12:57 -0700 | [diff] [blame] | 272 | if (crlf_action == CRLF_AUTO || crlf_action == CRLF_GUESS) { |
| 273 | if (crlf_action == CRLF_GUESS) { |
Eyvind Bernhardsen | fd6cce9 | 2010-05-19 22:43:10 +0200 | [diff] [blame] | 274 | /* If we have any CR or CRLF line endings, we do not touch it */ |
| 275 | /* This is the new safer autocrlf-handling */ |
| 276 | if (stats.cr > 0 || stats.crlf > 0) |
| 277 | return 0; |
| 278 | } |
Finn Arne Gangstad | c480539 | 2010-05-12 00:37:57 +0200 | [diff] [blame] | 279 | |
Junio C Hamano | 201ac8e | 2007-04-15 13:35:45 -0700 | [diff] [blame] | 280 | /* If we have any bare CR characters, we're not going to touch it */ |
| 281 | if (stats.cr != stats.crlf) |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 282 | return 0; |
Linus Torvalds | 6c510be | 2007-02-13 11:07:23 -0800 | [diff] [blame] | 283 | |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 284 | if (is_binary(len, &stats)) |
| 285 | return 0; |
Junio C Hamano | 201ac8e | 2007-04-15 13:35:45 -0700 | [diff] [blame] | 286 | } |
Linus Torvalds | 6c510be | 2007-02-13 11:07:23 -0800 | [diff] [blame] | 287 | |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 288 | /* are we "faking" in place editing ? */ |
| 289 | if (src == buf->buf) |
Pierre Habouzit | b315c5c | 2007-09-27 12:58:23 +0200 | [diff] [blame] | 290 | to_free = strbuf_detach(buf, NULL); |
Alex Riesen | ac78e54 | 2007-04-19 02:05:03 +0200 | [diff] [blame] | 291 | |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 292 | strbuf_grow(buf, len + stats.lf - stats.crlf); |
| 293 | for (;;) { |
| 294 | const char *nl = memchr(src, '\n', len); |
| 295 | if (!nl) |
| 296 | break; |
| 297 | if (nl > src && nl[-1] == '\r') { |
| 298 | strbuf_add(buf, src, nl + 1 - src); |
| 299 | } else { |
| 300 | strbuf_add(buf, src, nl - src); |
| 301 | strbuf_addstr(buf, "\r\n"); |
| 302 | } |
| 303 | len -= nl + 1 - src; |
| 304 | src = nl + 1; |
| 305 | } |
| 306 | strbuf_add(buf, src, len); |
Linus Torvalds | 6c510be | 2007-02-13 11:07:23 -0800 | [diff] [blame] | 307 | |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 308 | free(to_free); |
| 309 | return 1; |
Linus Torvalds | 6c510be | 2007-02-13 11:07:23 -0800 | [diff] [blame] | 310 | } |
Junio C Hamano | 35ebfd6 | 2007-04-12 22:30:05 -0700 | [diff] [blame] | 311 | |
Johannes Sixt | 546bb58 | 2007-10-19 21:48:06 +0200 | [diff] [blame] | 312 | struct filter_params { |
| 313 | const char *src; |
| 314 | unsigned long size; |
| 315 | const char *cmd; |
Pete Wyckoff | a2b665d | 2010-12-22 06:40:13 -0800 | [diff] [blame] | 316 | const char *path; |
Johannes Sixt | 546bb58 | 2007-10-19 21:48:06 +0200 | [diff] [blame] | 317 | }; |
| 318 | |
Erik Faye-Lund | ae6a560 | 2010-02-05 12:57:38 -0800 | [diff] [blame] | 319 | static int filter_buffer(int in, int out, void *data) |
Junio C Hamano | aa4ed40 | 2007-04-21 03:14:13 -0700 | [diff] [blame] | 320 | { |
| 321 | /* |
| 322 | * Spawn cmd and feed the buffer contents through its stdin. |
| 323 | */ |
| 324 | struct child_process child_process; |
Johannes Sixt | 546bb58 | 2007-10-19 21:48:06 +0200 | [diff] [blame] | 325 | struct filter_params *params = (struct filter_params *)data; |
Junio C Hamano | aa4ed40 | 2007-04-21 03:14:13 -0700 | [diff] [blame] | 326 | int write_err, status; |
Gary V. Vaughan | 66dbfd5 | 2010-05-14 09:31:33 +0000 | [diff] [blame] | 327 | const char *argv[] = { NULL, NULL }; |
| 328 | |
Pete Wyckoff | a2b665d | 2010-12-22 06:40:13 -0800 | [diff] [blame] | 329 | /* apply % substitution to cmd */ |
| 330 | struct strbuf cmd = STRBUF_INIT; |
| 331 | struct strbuf path = STRBUF_INIT; |
| 332 | struct strbuf_expand_dict_entry dict[] = { |
| 333 | { "f", NULL, }, |
| 334 | { NULL, NULL, }, |
| 335 | }; |
| 336 | |
| 337 | /* quote the path to preserve spaces, etc. */ |
| 338 | sq_quote_buf(&path, params->path); |
| 339 | dict[0].value = path.buf; |
| 340 | |
| 341 | /* expand all %f with the quoted path */ |
| 342 | strbuf_expand(&cmd, params->cmd, strbuf_expand_dict_cb, &dict); |
| 343 | strbuf_release(&path); |
| 344 | |
| 345 | argv[0] = cmd.buf; |
Junio C Hamano | aa4ed40 | 2007-04-21 03:14:13 -0700 | [diff] [blame] | 346 | |
| 347 | memset(&child_process, 0, sizeof(child_process)); |
Johannes Sixt | dc1bfdc | 2007-10-19 21:47:55 +0200 | [diff] [blame] | 348 | child_process.argv = argv; |
Jeff King | ac0ba18 | 2009-12-30 05:53:57 -0500 | [diff] [blame] | 349 | child_process.use_shell = 1; |
Johannes Sixt | dc1bfdc | 2007-10-19 21:47:55 +0200 | [diff] [blame] | 350 | child_process.in = -1; |
Erik Faye-Lund | ae6a560 | 2010-02-05 12:57:38 -0800 | [diff] [blame] | 351 | child_process.out = out; |
Junio C Hamano | aa4ed40 | 2007-04-21 03:14:13 -0700 | [diff] [blame] | 352 | |
Johannes Sixt | dc1bfdc | 2007-10-19 21:47:55 +0200 | [diff] [blame] | 353 | if (start_command(&child_process)) |
Johannes Sixt | 546bb58 | 2007-10-19 21:48:06 +0200 | [diff] [blame] | 354 | return error("cannot fork to run external filter %s", params->cmd); |
Junio C Hamano | aa4ed40 | 2007-04-21 03:14:13 -0700 | [diff] [blame] | 355 | |
Jehan Bing | 6424c2a | 2012-02-20 12:53:37 -0800 | [diff] [blame] | 356 | sigchain_push(SIGPIPE, SIG_IGN); |
| 357 | |
Johannes Sixt | 546bb58 | 2007-10-19 21:48:06 +0200 | [diff] [blame] | 358 | write_err = (write_in_full(child_process.in, params->src, params->size) < 0); |
Johannes Sixt | dc1bfdc | 2007-10-19 21:47:55 +0200 | [diff] [blame] | 359 | if (close(child_process.in)) |
Junio C Hamano | aa4ed40 | 2007-04-21 03:14:13 -0700 | [diff] [blame] | 360 | write_err = 1; |
| 361 | if (write_err) |
Johannes Sixt | 546bb58 | 2007-10-19 21:48:06 +0200 | [diff] [blame] | 362 | error("cannot feed the input to external filter %s", params->cmd); |
Junio C Hamano | aa4ed40 | 2007-04-21 03:14:13 -0700 | [diff] [blame] | 363 | |
Jehan Bing | 6424c2a | 2012-02-20 12:53:37 -0800 | [diff] [blame] | 364 | sigchain_pop(SIGPIPE); |
| 365 | |
Junio C Hamano | aa4ed40 | 2007-04-21 03:14:13 -0700 | [diff] [blame] | 366 | status = finish_command(&child_process); |
| 367 | if (status) |
Johannes Sixt | 5709e03 | 2009-07-04 21:26:39 +0200 | [diff] [blame] | 368 | error("external filter %s failed %d", params->cmd, status); |
Pete Wyckoff | a2b665d | 2010-12-22 06:40:13 -0800 | [diff] [blame] | 369 | |
| 370 | strbuf_release(&cmd); |
Junio C Hamano | aa4ed40 | 2007-04-21 03:14:13 -0700 | [diff] [blame] | 371 | return (write_err || status); |
| 372 | } |
| 373 | |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 374 | static int apply_filter(const char *path, const char *src, size_t len, |
| 375 | struct strbuf *dst, const char *cmd) |
Junio C Hamano | aa4ed40 | 2007-04-21 03:14:13 -0700 | [diff] [blame] | 376 | { |
| 377 | /* |
| 378 | * Create a pipeline to have the command filter the buffer's |
| 379 | * contents. |
| 380 | * |
| 381 | * (child --> cmd) --> us |
| 382 | */ |
Johannes Sixt | 546bb58 | 2007-10-19 21:48:06 +0200 | [diff] [blame] | 383 | int ret = 1; |
Brandon Casey | f285a2d | 2008-10-09 14:12:12 -0500 | [diff] [blame] | 384 | struct strbuf nbuf = STRBUF_INIT; |
Johannes Sixt | 546bb58 | 2007-10-19 21:48:06 +0200 | [diff] [blame] | 385 | struct async async; |
| 386 | struct filter_params params; |
Junio C Hamano | aa4ed40 | 2007-04-21 03:14:13 -0700 | [diff] [blame] | 387 | |
| 388 | if (!cmd) |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 389 | return 0; |
Junio C Hamano | aa4ed40 | 2007-04-21 03:14:13 -0700 | [diff] [blame] | 390 | |
Jeff King | 92ac319 | 2012-02-24 17:02:37 -0500 | [diff] [blame] | 391 | if (!dst) |
| 392 | return 1; |
| 393 | |
Johannes Sixt | 546bb58 | 2007-10-19 21:48:06 +0200 | [diff] [blame] | 394 | memset(&async, 0, sizeof(async)); |
| 395 | async.proc = filter_buffer; |
| 396 | async.data = ¶ms; |
Erik Faye-Lund | ae6a560 | 2010-02-05 12:57:38 -0800 | [diff] [blame] | 397 | async.out = -1; |
Johannes Sixt | 546bb58 | 2007-10-19 21:48:06 +0200 | [diff] [blame] | 398 | params.src = src; |
| 399 | params.size = len; |
| 400 | params.cmd = cmd; |
Pete Wyckoff | a2b665d | 2010-12-22 06:40:13 -0800 | [diff] [blame] | 401 | params.path = path; |
Junio C Hamano | aa4ed40 | 2007-04-21 03:14:13 -0700 | [diff] [blame] | 402 | |
| 403 | fflush(NULL); |
Johannes Sixt | 546bb58 | 2007-10-19 21:48:06 +0200 | [diff] [blame] | 404 | if (start_async(&async)) |
| 405 | return 0; /* error was already reported */ |
Junio C Hamano | aa4ed40 | 2007-04-21 03:14:13 -0700 | [diff] [blame] | 406 | |
Johannes Sixt | 546bb58 | 2007-10-19 21:48:06 +0200 | [diff] [blame] | 407 | if (strbuf_read(&nbuf, async.out, len) < 0) { |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 408 | error("read from external filter %s failed", cmd); |
| 409 | ret = 0; |
Junio C Hamano | aa4ed40 | 2007-04-21 03:14:13 -0700 | [diff] [blame] | 410 | } |
Johannes Sixt | 546bb58 | 2007-10-19 21:48:06 +0200 | [diff] [blame] | 411 | if (close(async.out)) { |
Pierre Habouzit | 90d16ec | 2007-10-05 10:11:59 +0200 | [diff] [blame] | 412 | error("read from external filter %s failed", cmd); |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 413 | ret = 0; |
Junio C Hamano | aa4ed40 | 2007-04-21 03:14:13 -0700 | [diff] [blame] | 414 | } |
Johannes Sixt | 546bb58 | 2007-10-19 21:48:06 +0200 | [diff] [blame] | 415 | if (finish_async(&async)) { |
| 416 | error("external filter %s failed", cmd); |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 417 | ret = 0; |
Junio C Hamano | aa4ed40 | 2007-04-21 03:14:13 -0700 | [diff] [blame] | 418 | } |
| 419 | |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 420 | if (ret) { |
Pierre Habouzit | 90d16ec | 2007-10-05 10:11:59 +0200 | [diff] [blame] | 421 | strbuf_swap(dst, &nbuf); |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 422 | } |
Pierre Habouzit | 90d16ec | 2007-10-05 10:11:59 +0200 | [diff] [blame] | 423 | strbuf_release(&nbuf); |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 424 | return ret; |
Junio C Hamano | aa4ed40 | 2007-04-21 03:14:13 -0700 | [diff] [blame] | 425 | } |
| 426 | |
| 427 | static struct convert_driver { |
| 428 | const char *name; |
| 429 | struct convert_driver *next; |
Brian Hetro | cd8be6c | 2008-07-05 01:24:42 -0400 | [diff] [blame] | 430 | const char *smudge; |
| 431 | const char *clean; |
Jehan Bing | 36daaac | 2012-02-16 17:19:03 -0800 | [diff] [blame] | 432 | int required; |
Junio C Hamano | aa4ed40 | 2007-04-21 03:14:13 -0700 | [diff] [blame] | 433 | } *user_convert, **user_convert_tail; |
| 434 | |
Johannes Schindelin | ef90d6d | 2008-05-14 18:46:53 +0100 | [diff] [blame] | 435 | static int read_convert_config(const char *var, const char *value, void *cb) |
Junio C Hamano | aa4ed40 | 2007-04-21 03:14:13 -0700 | [diff] [blame] | 436 | { |
Jeff King | d731f0a | 2013-01-23 01:24:23 -0500 | [diff] [blame] | 437 | const char *key, *name; |
Junio C Hamano | aa4ed40 | 2007-04-21 03:14:13 -0700 | [diff] [blame] | 438 | int namelen; |
| 439 | struct convert_driver *drv; |
| 440 | |
| 441 | /* |
| 442 | * External conversion drivers are configured using |
| 443 | * "filter.<name>.variable". |
| 444 | */ |
Jeff King | d731f0a | 2013-01-23 01:24:23 -0500 | [diff] [blame] | 445 | if (parse_config_key(var, "filter", &name, &namelen, &key) < 0 || !name) |
Junio C Hamano | aa4ed40 | 2007-04-21 03:14:13 -0700 | [diff] [blame] | 446 | return 0; |
Junio C Hamano | aa4ed40 | 2007-04-21 03:14:13 -0700 | [diff] [blame] | 447 | for (drv = user_convert; drv; drv = drv->next) |
| 448 | if (!strncmp(drv->name, name, namelen) && !drv->name[namelen]) |
| 449 | break; |
| 450 | if (!drv) { |
Junio C Hamano | aa4ed40 | 2007-04-21 03:14:13 -0700 | [diff] [blame] | 451 | drv = xcalloc(1, sizeof(struct convert_driver)); |
Pierre Habouzit | 182af83 | 2007-09-16 00:32:36 +0200 | [diff] [blame] | 452 | drv->name = xmemdupz(name, namelen); |
Junio C Hamano | aa4ed40 | 2007-04-21 03:14:13 -0700 | [diff] [blame] | 453 | *user_convert_tail = drv; |
| 454 | user_convert_tail = &(drv->next); |
| 455 | } |
| 456 | |
Junio C Hamano | aa4ed40 | 2007-04-21 03:14:13 -0700 | [diff] [blame] | 457 | /* |
| 458 | * filter.<name>.smudge and filter.<name>.clean specifies |
| 459 | * the command line: |
| 460 | * |
| 461 | * command-line |
| 462 | * |
| 463 | * The command-line will not be interpolated in any way. |
| 464 | */ |
| 465 | |
Jeff King | d731f0a | 2013-01-23 01:24:23 -0500 | [diff] [blame] | 466 | if (!strcmp("smudge", key)) |
Brian Hetro | cd8be6c | 2008-07-05 01:24:42 -0400 | [diff] [blame] | 467 | return git_config_string(&drv->smudge, var, value); |
Junio C Hamano | aa4ed40 | 2007-04-21 03:14:13 -0700 | [diff] [blame] | 468 | |
Jeff King | d731f0a | 2013-01-23 01:24:23 -0500 | [diff] [blame] | 469 | if (!strcmp("clean", key)) |
Brian Hetro | cd8be6c | 2008-07-05 01:24:42 -0400 | [diff] [blame] | 470 | return git_config_string(&drv->clean, var, value); |
| 471 | |
Jeff King | d731f0a | 2013-01-23 01:24:23 -0500 | [diff] [blame] | 472 | if (!strcmp("required", key)) { |
Jehan Bing | 36daaac | 2012-02-16 17:19:03 -0800 | [diff] [blame] | 473 | drv->required = git_config_bool(var, value); |
| 474 | return 0; |
| 475 | } |
| 476 | |
Junio C Hamano | aa4ed40 | 2007-04-21 03:14:13 -0700 | [diff] [blame] | 477 | return 0; |
| 478 | } |
| 479 | |
Junio C Hamano | 3fed15f | 2007-04-21 19:09:02 -0700 | [diff] [blame] | 480 | static int count_ident(const char *cp, unsigned long size) |
| 481 | { |
| 482 | /* |
Andy Parkins | af9b54b | 2007-05-14 14:37:25 +0100 | [diff] [blame] | 483 | * "$Id: 0000000000000000000000000000000000000000 $" <=> "$Id$" |
Junio C Hamano | 3fed15f | 2007-04-21 19:09:02 -0700 | [diff] [blame] | 484 | */ |
| 485 | int cnt = 0; |
| 486 | char ch; |
| 487 | |
| 488 | while (size) { |
| 489 | ch = *cp++; |
| 490 | size--; |
| 491 | if (ch != '$') |
| 492 | continue; |
Andy Parkins | af9b54b | 2007-05-14 14:37:25 +0100 | [diff] [blame] | 493 | if (size < 3) |
Junio C Hamano | 3fed15f | 2007-04-21 19:09:02 -0700 | [diff] [blame] | 494 | break; |
Andy Parkins | af9b54b | 2007-05-14 14:37:25 +0100 | [diff] [blame] | 495 | if (memcmp("Id", cp, 2)) |
Junio C Hamano | 3fed15f | 2007-04-21 19:09:02 -0700 | [diff] [blame] | 496 | continue; |
Andy Parkins | af9b54b | 2007-05-14 14:37:25 +0100 | [diff] [blame] | 497 | ch = cp[2]; |
| 498 | cp += 3; |
| 499 | size -= 3; |
Junio C Hamano | 3fed15f | 2007-04-21 19:09:02 -0700 | [diff] [blame] | 500 | if (ch == '$') |
Andy Parkins | af9b54b | 2007-05-14 14:37:25 +0100 | [diff] [blame] | 501 | cnt++; /* $Id$ */ |
Junio C Hamano | 3fed15f | 2007-04-21 19:09:02 -0700 | [diff] [blame] | 502 | if (ch != ':') |
| 503 | continue; |
| 504 | |
| 505 | /* |
Andy Parkins | af9b54b | 2007-05-14 14:37:25 +0100 | [diff] [blame] | 506 | * "$Id: ... "; scan up to the closing dollar sign and discard. |
Junio C Hamano | 3fed15f | 2007-04-21 19:09:02 -0700 | [diff] [blame] | 507 | */ |
| 508 | while (size) { |
| 509 | ch = *cp++; |
| 510 | size--; |
| 511 | if (ch == '$') { |
| 512 | cnt++; |
| 513 | break; |
| 514 | } |
Henrik Grubbström | a9f3049 | 2010-04-06 14:46:37 +0200 | [diff] [blame] | 515 | if (ch == '\n') |
| 516 | break; |
Junio C Hamano | 3fed15f | 2007-04-21 19:09:02 -0700 | [diff] [blame] | 517 | } |
| 518 | } |
| 519 | return cnt; |
| 520 | } |
| 521 | |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 522 | static int ident_to_git(const char *path, const char *src, size_t len, |
| 523 | struct strbuf *buf, int ident) |
Junio C Hamano | 3fed15f | 2007-04-21 19:09:02 -0700 | [diff] [blame] | 524 | { |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 525 | char *dst, *dollar; |
Junio C Hamano | 3fed15f | 2007-04-21 19:09:02 -0700 | [diff] [blame] | 526 | |
Jeff King | 4c3b57b | 2012-02-24 17:05:03 -0500 | [diff] [blame] | 527 | if (!ident || (src && !count_ident(src, len))) |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 528 | return 0; |
Junio C Hamano | 3fed15f | 2007-04-21 19:09:02 -0700 | [diff] [blame] | 529 | |
Jeff King | 92ac319 | 2012-02-24 17:02:37 -0500 | [diff] [blame] | 530 | if (!buf) |
| 531 | return 1; |
| 532 | |
Pierre Habouzit | 90d16ec | 2007-10-05 10:11:59 +0200 | [diff] [blame] | 533 | /* only grow if not in place */ |
| 534 | if (strbuf_avail(buf) + buf->len < len) |
| 535 | strbuf_grow(buf, len - buf->len); |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 536 | dst = buf->buf; |
| 537 | for (;;) { |
| 538 | dollar = memchr(src, '$', len); |
| 539 | if (!dollar) |
| 540 | break; |
Thomas Rast | 7732118 | 2011-08-29 22:06:04 +0200 | [diff] [blame] | 541 | memmove(dst, src, dollar + 1 - src); |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 542 | dst += dollar + 1 - src; |
| 543 | len -= dollar + 1 - src; |
| 544 | src = dollar + 1; |
| 545 | |
| 546 | if (len > 3 && !memcmp(src, "Id:", 3)) { |
| 547 | dollar = memchr(src + 3, '$', len - 3); |
| 548 | if (!dollar) |
| 549 | break; |
Henrik Grubbström | a9f3049 | 2010-04-06 14:46:37 +0200 | [diff] [blame] | 550 | if (memchr(src + 3, '\n', dollar - src - 3)) { |
| 551 | /* Line break before the next dollar. */ |
| 552 | continue; |
| 553 | } |
| 554 | |
Andy Parkins | af9b54b | 2007-05-14 14:37:25 +0100 | [diff] [blame] | 555 | memcpy(dst, "Id$", 3); |
| 556 | dst += 3; |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 557 | len -= dollar + 1 - src; |
| 558 | src = dollar + 1; |
Junio C Hamano | 3fed15f | 2007-04-21 19:09:02 -0700 | [diff] [blame] | 559 | } |
| 560 | } |
Thomas Rast | 7732118 | 2011-08-29 22:06:04 +0200 | [diff] [blame] | 561 | memmove(dst, src, len); |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 562 | strbuf_setlen(buf, dst + len - buf->buf); |
| 563 | return 1; |
Junio C Hamano | 3fed15f | 2007-04-21 19:09:02 -0700 | [diff] [blame] | 564 | } |
| 565 | |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 566 | static int ident_to_worktree(const char *path, const char *src, size_t len, |
| 567 | struct strbuf *buf, int ident) |
Junio C Hamano | 3fed15f | 2007-04-21 19:09:02 -0700 | [diff] [blame] | 568 | { |
Junio C Hamano | 3fed15f | 2007-04-21 19:09:02 -0700 | [diff] [blame] | 569 | unsigned char sha1[20]; |
Henrik Grubbström | 07814d9 | 2010-04-06 14:46:38 +0200 | [diff] [blame] | 570 | char *to_free = NULL, *dollar, *spc; |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 571 | int cnt; |
Junio C Hamano | 3fed15f | 2007-04-21 19:09:02 -0700 | [diff] [blame] | 572 | |
| 573 | if (!ident) |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 574 | return 0; |
Junio C Hamano | 3fed15f | 2007-04-21 19:09:02 -0700 | [diff] [blame] | 575 | |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 576 | cnt = count_ident(src, len); |
Junio C Hamano | 3fed15f | 2007-04-21 19:09:02 -0700 | [diff] [blame] | 577 | if (!cnt) |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 578 | return 0; |
Junio C Hamano | 3fed15f | 2007-04-21 19:09:02 -0700 | [diff] [blame] | 579 | |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 580 | /* are we "faking" in place editing ? */ |
| 581 | if (src == buf->buf) |
Pierre Habouzit | b315c5c | 2007-09-27 12:58:23 +0200 | [diff] [blame] | 582 | to_free = strbuf_detach(buf, NULL); |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 583 | hash_sha1_file(src, len, "blob", sha1); |
Junio C Hamano | 3fed15f | 2007-04-21 19:09:02 -0700 | [diff] [blame] | 584 | |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 585 | strbuf_grow(buf, len + cnt * 43); |
| 586 | for (;;) { |
| 587 | /* step 1: run to the next '$' */ |
| 588 | dollar = memchr(src, '$', len); |
| 589 | if (!dollar) |
| 590 | break; |
| 591 | strbuf_add(buf, src, dollar + 1 - src); |
| 592 | len -= dollar + 1 - src; |
| 593 | src = dollar + 1; |
| 594 | |
| 595 | /* step 2: does it looks like a bit like Id:xxx$ or Id$ ? */ |
| 596 | if (len < 3 || memcmp("Id", src, 2)) |
Junio C Hamano | 3fed15f | 2007-04-21 19:09:02 -0700 | [diff] [blame] | 597 | continue; |
| 598 | |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 599 | /* step 3: skip over Id$ or Id:xxxxx$ */ |
| 600 | if (src[2] == '$') { |
| 601 | src += 3; |
| 602 | len -= 3; |
| 603 | } else if (src[2] == ':') { |
Andy Parkins | c23290d | 2007-05-25 11:50:08 +0100 | [diff] [blame] | 604 | /* |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 605 | * It's possible that an expanded Id has crept its way into the |
Henrik Grubbström | 07814d9 | 2010-04-06 14:46:38 +0200 | [diff] [blame] | 606 | * repository, we cope with that by stripping the expansion out. |
| 607 | * This is probably not a good idea, since it will cause changes |
| 608 | * on checkout, which won't go away by stash, but let's keep it |
| 609 | * for git-style ids. |
Andy Parkins | c23290d | 2007-05-25 11:50:08 +0100 | [diff] [blame] | 610 | */ |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 611 | dollar = memchr(src + 3, '$', len - 3); |
| 612 | if (!dollar) { |
| 613 | /* incomplete keyword, no more '$', so just quit the loop */ |
| 614 | break; |
| 615 | } |
| 616 | |
Henrik Grubbström | a9f3049 | 2010-04-06 14:46:37 +0200 | [diff] [blame] | 617 | if (memchr(src + 3, '\n', dollar - src - 3)) { |
| 618 | /* Line break before the next dollar. */ |
| 619 | continue; |
| 620 | } |
| 621 | |
Henrik Grubbström | 07814d9 | 2010-04-06 14:46:38 +0200 | [diff] [blame] | 622 | spc = memchr(src + 4, ' ', dollar - src - 4); |
| 623 | if (spc && spc < dollar-1) { |
| 624 | /* There are spaces in unexpected places. |
| 625 | * This is probably an id from some other |
| 626 | * versioning system. Keep it for now. |
| 627 | */ |
| 628 | continue; |
| 629 | } |
| 630 | |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 631 | len -= dollar + 1 - src; |
| 632 | src = dollar + 1; |
| 633 | } else { |
| 634 | /* it wasn't a "Id$" or "Id:xxxx$" */ |
Junio C Hamano | 3fed15f | 2007-04-21 19:09:02 -0700 | [diff] [blame] | 635 | continue; |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 636 | } |
Junio C Hamano | 3fed15f | 2007-04-21 19:09:02 -0700 | [diff] [blame] | 637 | |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 638 | /* step 4: substitute */ |
| 639 | strbuf_addstr(buf, "Id: "); |
| 640 | strbuf_add(buf, sha1_to_hex(sha1), 40); |
| 641 | strbuf_addstr(buf, " $"); |
Junio C Hamano | 3fed15f | 2007-04-21 19:09:02 -0700 | [diff] [blame] | 642 | } |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 643 | strbuf_add(buf, src, len); |
Junio C Hamano | 3fed15f | 2007-04-21 19:09:02 -0700 | [diff] [blame] | 644 | |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 645 | free(to_free); |
| 646 | return 1; |
Junio C Hamano | 35ebfd6 | 2007-04-12 22:30:05 -0700 | [diff] [blame] | 647 | } |
| 648 | |
Ramkumar Ramachandra | 7356b51 | 2011-11-15 22:29:37 +0530 | [diff] [blame] | 649 | static enum crlf_action git_path_check_crlf(const char *path, struct git_attr_check *check) |
Junio C Hamano | 35ebfd6 | 2007-04-12 22:30:05 -0700 | [diff] [blame] | 650 | { |
Junio C Hamano | 6073ee8 | 2007-04-20 23:44:02 -0700 | [diff] [blame] | 651 | const char *value = check->value; |
Junio C Hamano | 35ebfd6 | 2007-04-12 22:30:05 -0700 | [diff] [blame] | 652 | |
Junio C Hamano | 6073ee8 | 2007-04-20 23:44:02 -0700 | [diff] [blame] | 653 | if (ATTR_TRUE(value)) |
| 654 | return CRLF_TEXT; |
| 655 | else if (ATTR_FALSE(value)) |
| 656 | return CRLF_BINARY; |
| 657 | else if (ATTR_UNSET(value)) |
| 658 | ; |
| 659 | else if (!strcmp(value, "input")) |
| 660 | return CRLF_INPUT; |
Eyvind Bernhardsen | fd6cce9 | 2010-05-19 22:43:10 +0200 | [diff] [blame] | 661 | else if (!strcmp(value, "auto")) |
| 662 | return CRLF_AUTO; |
Junio C Hamano | 163b959 | 2007-04-19 22:37:19 -0700 | [diff] [blame] | 663 | return CRLF_GUESS; |
Junio C Hamano | 35ebfd6 | 2007-04-12 22:30:05 -0700 | [diff] [blame] | 664 | } |
| 665 | |
Ramsay Jones | ef563de | 2011-11-21 18:42:09 +0000 | [diff] [blame] | 666 | static enum eol git_path_check_eol(const char *path, struct git_attr_check *check) |
Eyvind Bernhardsen | fd6cce9 | 2010-05-19 22:43:10 +0200 | [diff] [blame] | 667 | { |
| 668 | const char *value = check->value; |
| 669 | |
| 670 | if (ATTR_UNSET(value)) |
| 671 | ; |
| 672 | else if (!strcmp(value, "lf")) |
| 673 | return EOL_LF; |
| 674 | else if (!strcmp(value, "crlf")) |
| 675 | return EOL_CRLF; |
| 676 | return EOL_UNSET; |
| 677 | } |
| 678 | |
Junio C Hamano | aa4ed40 | 2007-04-21 03:14:13 -0700 | [diff] [blame] | 679 | static struct convert_driver *git_path_check_convert(const char *path, |
| 680 | struct git_attr_check *check) |
| 681 | { |
| 682 | const char *value = check->value; |
| 683 | struct convert_driver *drv; |
| 684 | |
| 685 | if (ATTR_TRUE(value) || ATTR_FALSE(value) || ATTR_UNSET(value)) |
| 686 | return NULL; |
| 687 | for (drv = user_convert; drv; drv = drv->next) |
| 688 | if (!strcmp(value, drv->name)) |
| 689 | return drv; |
| 690 | return NULL; |
| 691 | } |
| 692 | |
Junio C Hamano | 3fed15f | 2007-04-21 19:09:02 -0700 | [diff] [blame] | 693 | static int git_path_check_ident(const char *path, struct git_attr_check *check) |
| 694 | { |
| 695 | const char *value = check->value; |
| 696 | |
| 697 | return !!ATTR_TRUE(value); |
| 698 | } |
| 699 | |
Junio C Hamano | c61dcff | 2011-05-09 13:12:57 -0700 | [diff] [blame] | 700 | static enum crlf_action input_crlf_action(enum crlf_action text_attr, enum eol eol_attr) |
Eyvind Bernhardsen | f217f0e | 2010-07-02 21:20:47 +0200 | [diff] [blame] | 701 | { |
Eyvind Bernhardsen | 5ec3e67 | 2010-05-19 22:43:11 +0200 | [diff] [blame] | 702 | if (text_attr == CRLF_BINARY) |
Eyvind Bernhardsen | fd6cce9 | 2010-05-19 22:43:10 +0200 | [diff] [blame] | 703 | return CRLF_BINARY; |
| 704 | if (eol_attr == EOL_LF) |
| 705 | return CRLF_INPUT; |
| 706 | if (eol_attr == EOL_CRLF) |
| 707 | return CRLF_CRLF; |
Eyvind Bernhardsen | 5ec3e67 | 2010-05-19 22:43:11 +0200 | [diff] [blame] | 708 | return text_attr; |
Eyvind Bernhardsen | fd6cce9 | 2010-05-19 22:43:10 +0200 | [diff] [blame] | 709 | } |
| 710 | |
Junio C Hamano | 3bfba20 | 2011-05-09 13:58:31 -0700 | [diff] [blame] | 711 | struct conv_attrs { |
| 712 | struct convert_driver *drv; |
| 713 | enum crlf_action crlf_action; |
| 714 | enum eol eol_attr; |
| 715 | int ident; |
| 716 | }; |
| 717 | |
Junio C Hamano | 8329596 | 2011-05-09 11:23:04 -0700 | [diff] [blame] | 718 | static const char *conv_attr_name[] = { |
| 719 | "crlf", "ident", "filter", "eol", "text", |
| 720 | }; |
| 721 | #define NUM_CONV_ATTRS ARRAY_SIZE(conv_attr_name) |
| 722 | |
Junio C Hamano | 3bfba20 | 2011-05-09 13:58:31 -0700 | [diff] [blame] | 723 | static void convert_attrs(struct conv_attrs *ca, const char *path) |
Junio C Hamano | 8329596 | 2011-05-09 11:23:04 -0700 | [diff] [blame] | 724 | { |
| 725 | int i; |
| 726 | static struct git_attr_check ccheck[NUM_CONV_ATTRS]; |
| 727 | |
| 728 | if (!ccheck[0].attr) { |
| 729 | for (i = 0; i < NUM_CONV_ATTRS; i++) |
| 730 | ccheck[i].attr = git_attr(conv_attr_name[i]); |
| 731 | user_convert_tail = &user_convert; |
| 732 | git_config(read_convert_config, NULL); |
| 733 | } |
Junio C Hamano | 3bfba20 | 2011-05-09 13:58:31 -0700 | [diff] [blame] | 734 | |
Michael Haggerty | d932f4e | 2011-08-04 06:36:33 +0200 | [diff] [blame] | 735 | if (!git_check_attr(path, NUM_CONV_ATTRS, ccheck)) { |
Junio C Hamano | 3bfba20 | 2011-05-09 13:58:31 -0700 | [diff] [blame] | 736 | ca->crlf_action = git_path_check_crlf(path, ccheck + 4); |
| 737 | if (ca->crlf_action == CRLF_GUESS) |
| 738 | ca->crlf_action = git_path_check_crlf(path, ccheck + 0); |
| 739 | ca->ident = git_path_check_ident(path, ccheck + 1); |
| 740 | ca->drv = git_path_check_convert(path, ccheck + 2); |
| 741 | ca->eol_attr = git_path_check_eol(path, ccheck + 3); |
| 742 | } else { |
| 743 | ca->drv = NULL; |
| 744 | ca->crlf_action = CRLF_GUESS; |
| 745 | ca->eol_attr = EOL_UNSET; |
| 746 | ca->ident = 0; |
| 747 | } |
Junio C Hamano | 8329596 | 2011-05-09 11:23:04 -0700 | [diff] [blame] | 748 | } |
| 749 | |
Steffen Prohaska | 21e5ad5 | 2008-02-06 12:25:58 +0100 | [diff] [blame] | 750 | int convert_to_git(const char *path, const char *src, size_t len, |
| 751 | struct strbuf *dst, enum safe_crlf checksafe) |
Junio C Hamano | 35ebfd6 | 2007-04-12 22:30:05 -0700 | [diff] [blame] | 752 | { |
Junio C Hamano | 3bfba20 | 2011-05-09 13:58:31 -0700 | [diff] [blame] | 753 | int ret = 0; |
Brian Hetro | cd8be6c | 2008-07-05 01:24:42 -0400 | [diff] [blame] | 754 | const char *filter = NULL; |
Jehan Bing | 36daaac | 2012-02-16 17:19:03 -0800 | [diff] [blame] | 755 | int required = 0; |
Junio C Hamano | 3bfba20 | 2011-05-09 13:58:31 -0700 | [diff] [blame] | 756 | struct conv_attrs ca; |
Junio C Hamano | 6073ee8 | 2007-04-20 23:44:02 -0700 | [diff] [blame] | 757 | |
Junio C Hamano | 3bfba20 | 2011-05-09 13:58:31 -0700 | [diff] [blame] | 758 | convert_attrs(&ca, path); |
Jehan Bing | 36daaac | 2012-02-16 17:19:03 -0800 | [diff] [blame] | 759 | if (ca.drv) { |
Junio C Hamano | 3bfba20 | 2011-05-09 13:58:31 -0700 | [diff] [blame] | 760 | filter = ca.drv->clean; |
Jehan Bing | 36daaac | 2012-02-16 17:19:03 -0800 | [diff] [blame] | 761 | required = ca.drv->required; |
| 762 | } |
Junio C Hamano | 3fed15f | 2007-04-21 19:09:02 -0700 | [diff] [blame] | 763 | |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 764 | ret |= apply_filter(path, src, len, dst, filter); |
Jehan Bing | 36daaac | 2012-02-16 17:19:03 -0800 | [diff] [blame] | 765 | if (!ret && required) |
| 766 | die("%s: clean filter '%s' failed", path, ca.drv->name); |
| 767 | |
Jeff King | 92ac319 | 2012-02-24 17:02:37 -0500 | [diff] [blame] | 768 | if (ret && dst) { |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 769 | src = dst->buf; |
| 770 | len = dst->len; |
Junio C Hamano | aa4ed40 | 2007-04-21 03:14:13 -0700 | [diff] [blame] | 771 | } |
Junio C Hamano | 3bfba20 | 2011-05-09 13:58:31 -0700 | [diff] [blame] | 772 | ca.crlf_action = input_crlf_action(ca.crlf_action, ca.eol_attr); |
| 773 | ret |= crlf_to_git(path, src, len, dst, ca.crlf_action, checksafe); |
Jeff King | 92ac319 | 2012-02-24 17:02:37 -0500 | [diff] [blame] | 774 | if (ret && dst) { |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 775 | src = dst->buf; |
| 776 | len = dst->len; |
Junio C Hamano | 3fed15f | 2007-04-21 19:09:02 -0700 | [diff] [blame] | 777 | } |
Junio C Hamano | 3bfba20 | 2011-05-09 13:58:31 -0700 | [diff] [blame] | 778 | return ret | ident_to_git(path, src, len, dst, ca.ident); |
Junio C Hamano | 35ebfd6 | 2007-04-12 22:30:05 -0700 | [diff] [blame] | 779 | } |
| 780 | |
Eyvind Bernhardsen | 43dd233 | 2010-07-02 21:20:49 +0200 | [diff] [blame] | 781 | static int convert_to_working_tree_internal(const char *path, const char *src, |
| 782 | size_t len, struct strbuf *dst, |
| 783 | int normalizing) |
Junio C Hamano | 35ebfd6 | 2007-04-12 22:30:05 -0700 | [diff] [blame] | 784 | { |
Jehan Bing | 36daaac | 2012-02-16 17:19:03 -0800 | [diff] [blame] | 785 | int ret = 0, ret_filter = 0; |
Brian Hetro | cd8be6c | 2008-07-05 01:24:42 -0400 | [diff] [blame] | 786 | const char *filter = NULL; |
Jehan Bing | 36daaac | 2012-02-16 17:19:03 -0800 | [diff] [blame] | 787 | int required = 0; |
Junio C Hamano | 3bfba20 | 2011-05-09 13:58:31 -0700 | [diff] [blame] | 788 | struct conv_attrs ca; |
Junio C Hamano | 6073ee8 | 2007-04-20 23:44:02 -0700 | [diff] [blame] | 789 | |
Junio C Hamano | 3bfba20 | 2011-05-09 13:58:31 -0700 | [diff] [blame] | 790 | convert_attrs(&ca, path); |
Jehan Bing | 36daaac | 2012-02-16 17:19:03 -0800 | [diff] [blame] | 791 | if (ca.drv) { |
Junio C Hamano | 3bfba20 | 2011-05-09 13:58:31 -0700 | [diff] [blame] | 792 | filter = ca.drv->smudge; |
Jehan Bing | 36daaac | 2012-02-16 17:19:03 -0800 | [diff] [blame] | 793 | required = ca.drv->required; |
| 794 | } |
Junio C Hamano | 3fed15f | 2007-04-21 19:09:02 -0700 | [diff] [blame] | 795 | |
Junio C Hamano | 3bfba20 | 2011-05-09 13:58:31 -0700 | [diff] [blame] | 796 | ret |= ident_to_worktree(path, src, len, dst, ca.ident); |
Pierre Habouzit | 5ecd293 | 2007-09-16 15:51:04 +0200 | [diff] [blame] | 797 | if (ret) { |
| 798 | src = dst->buf; |
| 799 | len = dst->len; |
Junio C Hamano | 3fed15f | 2007-04-21 19:09:02 -0700 | [diff] [blame] | 800 | } |
Eyvind Bernhardsen | 43dd233 | 2010-07-02 21:20:49 +0200 | [diff] [blame] | 801 | /* |
| 802 | * CRLF conversion can be skipped if normalizing, unless there |
| 803 | * is a smudge filter. The filter might expect CRLFs. |
| 804 | */ |
| 805 | if (filter || !normalizing) { |
Junio C Hamano | 3bfba20 | 2011-05-09 13:58:31 -0700 | [diff] [blame] | 806 | ca.crlf_action = input_crlf_action(ca.crlf_action, ca.eol_attr); |
| 807 | ret |= crlf_to_worktree(path, src, len, dst, ca.crlf_action); |
Eyvind Bernhardsen | 43dd233 | 2010-07-02 21:20:49 +0200 | [diff] [blame] | 808 | if (ret) { |
| 809 | src = dst->buf; |
| 810 | len = dst->len; |
| 811 | } |
Junio C Hamano | aa4ed40 | 2007-04-21 03:14:13 -0700 | [diff] [blame] | 812 | } |
Jehan Bing | 36daaac | 2012-02-16 17:19:03 -0800 | [diff] [blame] | 813 | |
| 814 | ret_filter = apply_filter(path, src, len, dst, filter); |
| 815 | if (!ret_filter && required) |
| 816 | die("%s: smudge filter %s failed", path, ca.drv->name); |
| 817 | |
| 818 | return ret | ret_filter; |
Junio C Hamano | 35ebfd6 | 2007-04-12 22:30:05 -0700 | [diff] [blame] | 819 | } |
Eyvind Bernhardsen | f217f0e | 2010-07-02 21:20:47 +0200 | [diff] [blame] | 820 | |
Eyvind Bernhardsen | 43dd233 | 2010-07-02 21:20:49 +0200 | [diff] [blame] | 821 | int convert_to_working_tree(const char *path, const char *src, size_t len, struct strbuf *dst) |
| 822 | { |
| 823 | return convert_to_working_tree_internal(path, src, len, dst, 0); |
| 824 | } |
| 825 | |
Eyvind Bernhardsen | f217f0e | 2010-07-02 21:20:47 +0200 | [diff] [blame] | 826 | int renormalize_buffer(const char *path, const char *src, size_t len, struct strbuf *dst) |
| 827 | { |
Eyvind Bernhardsen | 43dd233 | 2010-07-02 21:20:49 +0200 | [diff] [blame] | 828 | int ret = convert_to_working_tree_internal(path, src, len, dst, 1); |
Eyvind Bernhardsen | f217f0e | 2010-07-02 21:20:47 +0200 | [diff] [blame] | 829 | if (ret) { |
| 830 | src = dst->buf; |
| 831 | len = dst->len; |
| 832 | } |
Ramkumar Ramachandra | 7356b51 | 2011-11-15 22:29:37 +0530 | [diff] [blame] | 833 | return ret | convert_to_git(path, src, len, dst, SAFE_CRLF_FALSE); |
Eyvind Bernhardsen | f217f0e | 2010-07-02 21:20:47 +0200 | [diff] [blame] | 834 | } |
Junio C Hamano | dd8e912 | 2011-05-12 14:31:08 -0700 | [diff] [blame] | 835 | |
Junio C Hamano | b669109 | 2011-05-20 14:33:31 -0700 | [diff] [blame] | 836 | /***************************************************************** |
| 837 | * |
OndÅ™ej BÃlka | 749f763 | 2013-07-22 23:02:23 +0200 | [diff] [blame] | 838 | * Streaming conversion support |
Junio C Hamano | b669109 | 2011-05-20 14:33:31 -0700 | [diff] [blame] | 839 | * |
| 840 | *****************************************************************/ |
| 841 | |
| 842 | typedef int (*filter_fn)(struct stream_filter *, |
| 843 | const char *input, size_t *isize_p, |
| 844 | char *output, size_t *osize_p); |
| 845 | typedef void (*free_fn)(struct stream_filter *); |
| 846 | |
| 847 | struct stream_filter_vtbl { |
| 848 | filter_fn filter; |
| 849 | free_fn free; |
| 850 | }; |
| 851 | |
| 852 | struct stream_filter { |
| 853 | struct stream_filter_vtbl *vtbl; |
| 854 | }; |
| 855 | |
| 856 | static int null_filter_fn(struct stream_filter *filter, |
| 857 | const char *input, size_t *isize_p, |
| 858 | char *output, size_t *osize_p) |
| 859 | { |
Junio C Hamano | 4ae6670 | 2011-05-21 14:05:51 -0700 | [diff] [blame] | 860 | size_t count; |
| 861 | |
| 862 | if (!input) |
| 863 | return 0; /* we do not keep any states */ |
| 864 | count = *isize_p; |
Junio C Hamano | b669109 | 2011-05-20 14:33:31 -0700 | [diff] [blame] | 865 | if (*osize_p < count) |
| 866 | count = *osize_p; |
| 867 | if (count) { |
| 868 | memmove(output, input, count); |
| 869 | *isize_p -= count; |
| 870 | *osize_p -= count; |
| 871 | } |
| 872 | return 0; |
| 873 | } |
| 874 | |
| 875 | static void null_free_fn(struct stream_filter *filter) |
| 876 | { |
| 877 | ; /* nothing -- null instances are shared */ |
| 878 | } |
| 879 | |
| 880 | static struct stream_filter_vtbl null_vtbl = { |
| 881 | null_filter_fn, |
| 882 | null_free_fn, |
| 883 | }; |
| 884 | |
| 885 | static struct stream_filter null_filter_singleton = { |
| 886 | &null_vtbl, |
| 887 | }; |
| 888 | |
| 889 | int is_null_stream_filter(struct stream_filter *filter) |
| 890 | { |
| 891 | return filter == &null_filter_singleton; |
| 892 | } |
| 893 | |
Junio C Hamano | b84c7839 | 2011-05-20 18:28:00 -0700 | [diff] [blame] | 894 | |
| 895 | /* |
| 896 | * LF-to-CRLF filter |
| 897 | */ |
Carlos MartÃn Nieto | 284e3d2 | 2011-11-28 11:48:12 +0100 | [diff] [blame] | 898 | |
| 899 | struct lf_to_crlf_filter { |
| 900 | struct stream_filter filter; |
Junio C Hamano | 8496f56 | 2011-12-16 15:44:18 -0800 | [diff] [blame] | 901 | unsigned has_held:1; |
| 902 | char held; |
Carlos MartÃn Nieto | 284e3d2 | 2011-11-28 11:48:12 +0100 | [diff] [blame] | 903 | }; |
| 904 | |
Junio C Hamano | e322ee3 | 2011-05-20 16:47:56 -0700 | [diff] [blame] | 905 | static int lf_to_crlf_filter_fn(struct stream_filter *filter, |
| 906 | const char *input, size_t *isize_p, |
| 907 | char *output, size_t *osize_p) |
| 908 | { |
Carlos MartÃn Nieto | 284e3d2 | 2011-11-28 11:48:12 +0100 | [diff] [blame] | 909 | size_t count, o = 0; |
| 910 | struct lf_to_crlf_filter *lf_to_crlf = (struct lf_to_crlf_filter *)filter; |
Junio C Hamano | e322ee3 | 2011-05-20 16:47:56 -0700 | [diff] [blame] | 911 | |
Junio C Hamano | 8496f56 | 2011-12-16 15:44:18 -0800 | [diff] [blame] | 912 | /* |
| 913 | * We may be holding onto the CR to see if it is followed by a |
| 914 | * LF, in which case we would need to go to the main loop. |
| 915 | * Otherwise, just emit it to the output stream. |
| 916 | */ |
| 917 | if (lf_to_crlf->has_held && (lf_to_crlf->held != '\r' || !input)) { |
| 918 | output[o++] = lf_to_crlf->held; |
| 919 | lf_to_crlf->has_held = 0; |
Carlos MartÃn Nieto | 284e3d2 | 2011-11-28 11:48:12 +0100 | [diff] [blame] | 920 | } |
Junio C Hamano | e322ee3 | 2011-05-20 16:47:56 -0700 | [diff] [blame] | 921 | |
Junio C Hamano | 87afe9a | 2011-12-16 14:39:37 -0800 | [diff] [blame] | 922 | /* We are told to drain */ |
| 923 | if (!input) { |
| 924 | *osize_p -= o; |
| 925 | return 0; |
| 926 | } |
Carlos MartÃn Nieto | 284e3d2 | 2011-11-28 11:48:12 +0100 | [diff] [blame] | 927 | |
Junio C Hamano | e322ee3 | 2011-05-20 16:47:56 -0700 | [diff] [blame] | 928 | count = *isize_p; |
Junio C Hamano | 8496f56 | 2011-12-16 15:44:18 -0800 | [diff] [blame] | 929 | if (count || lf_to_crlf->has_held) { |
Carlos MartÃn Nieto | 284e3d2 | 2011-11-28 11:48:12 +0100 | [diff] [blame] | 930 | size_t i; |
Junio C Hamano | 8496f56 | 2011-12-16 15:44:18 -0800 | [diff] [blame] | 931 | int was_cr = 0; |
| 932 | |
| 933 | if (lf_to_crlf->has_held) { |
| 934 | was_cr = 1; |
| 935 | lf_to_crlf->has_held = 0; |
| 936 | } |
| 937 | |
Carlos MartÃn Nieto | 284e3d2 | 2011-11-28 11:48:12 +0100 | [diff] [blame] | 938 | for (i = 0; o < *osize_p && i < count; i++) { |
Junio C Hamano | e322ee3 | 2011-05-20 16:47:56 -0700 | [diff] [blame] | 939 | char ch = input[i]; |
Junio C Hamano | 8496f56 | 2011-12-16 15:44:18 -0800 | [diff] [blame] | 940 | |
Junio C Hamano | e322ee3 | 2011-05-20 16:47:56 -0700 | [diff] [blame] | 941 | if (ch == '\n') { |
Carlos MartÃn Nieto | 284e3d2 | 2011-11-28 11:48:12 +0100 | [diff] [blame] | 942 | output[o++] = '\r'; |
Junio C Hamano | 8496f56 | 2011-12-16 15:44:18 -0800 | [diff] [blame] | 943 | } else if (was_cr) { |
| 944 | /* |
| 945 | * Previous round saw CR and it is not followed |
| 946 | * by a LF; emit the CR before processing the |
| 947 | * current character. |
| 948 | */ |
| 949 | output[o++] = '\r'; |
Junio C Hamano | e322ee3 | 2011-05-20 16:47:56 -0700 | [diff] [blame] | 950 | } |
Junio C Hamano | 8496f56 | 2011-12-16 15:44:18 -0800 | [diff] [blame] | 951 | |
| 952 | /* |
| 953 | * We may have consumed the last output slot, |
| 954 | * in which case we need to break out of this |
| 955 | * loop; hold the current character before |
| 956 | * returning. |
| 957 | */ |
| 958 | if (*osize_p <= o) { |
| 959 | lf_to_crlf->has_held = 1; |
| 960 | lf_to_crlf->held = ch; |
| 961 | continue; /* break but increment i */ |
| 962 | } |
| 963 | |
| 964 | if (ch == '\r') { |
| 965 | was_cr = 1; |
| 966 | continue; |
| 967 | } |
| 968 | |
| 969 | was_cr = 0; |
Junio C Hamano | e322ee3 | 2011-05-20 16:47:56 -0700 | [diff] [blame] | 970 | output[o++] = ch; |
| 971 | } |
| 972 | |
| 973 | *osize_p -= o; |
| 974 | *isize_p -= i; |
Junio C Hamano | 8496f56 | 2011-12-16 15:44:18 -0800 | [diff] [blame] | 975 | |
| 976 | if (!lf_to_crlf->has_held && was_cr) { |
| 977 | lf_to_crlf->has_held = 1; |
| 978 | lf_to_crlf->held = '\r'; |
| 979 | } |
Junio C Hamano | e322ee3 | 2011-05-20 16:47:56 -0700 | [diff] [blame] | 980 | } |
| 981 | return 0; |
| 982 | } |
| 983 | |
Carlos MartÃn Nieto | 284e3d2 | 2011-11-28 11:48:12 +0100 | [diff] [blame] | 984 | static void lf_to_crlf_free_fn(struct stream_filter *filter) |
| 985 | { |
| 986 | free(filter); |
| 987 | } |
| 988 | |
Junio C Hamano | e322ee3 | 2011-05-20 16:47:56 -0700 | [diff] [blame] | 989 | static struct stream_filter_vtbl lf_to_crlf_vtbl = { |
| 990 | lf_to_crlf_filter_fn, |
Carlos MartÃn Nieto | 284e3d2 | 2011-11-28 11:48:12 +0100 | [diff] [blame] | 991 | lf_to_crlf_free_fn, |
Junio C Hamano | e322ee3 | 2011-05-20 16:47:56 -0700 | [diff] [blame] | 992 | }; |
| 993 | |
Carlos MartÃn Nieto | 284e3d2 | 2011-11-28 11:48:12 +0100 | [diff] [blame] | 994 | static struct stream_filter *lf_to_crlf_filter(void) |
| 995 | { |
Junio C Hamano | 87afe9a | 2011-12-16 14:39:37 -0800 | [diff] [blame] | 996 | struct lf_to_crlf_filter *lf_to_crlf = xcalloc(1, sizeof(*lf_to_crlf)); |
Junio C Hamano | e322ee3 | 2011-05-20 16:47:56 -0700 | [diff] [blame] | 997 | |
Carlos MartÃn Nieto | 284e3d2 | 2011-11-28 11:48:12 +0100 | [diff] [blame] | 998 | lf_to_crlf->filter.vtbl = &lf_to_crlf_vtbl; |
Carlos MartÃn Nieto | 284e3d2 | 2011-11-28 11:48:12 +0100 | [diff] [blame] | 999 | return (struct stream_filter *)lf_to_crlf; |
| 1000 | } |
Junio C Hamano | b84c7839 | 2011-05-20 18:28:00 -0700 | [diff] [blame] | 1001 | |
| 1002 | /* |
Junio C Hamano | a265a7f | 2011-05-21 18:28:41 -0700 | [diff] [blame] | 1003 | * Cascade filter |
| 1004 | */ |
| 1005 | #define FILTER_BUFFER 1024 |
| 1006 | struct cascade_filter { |
| 1007 | struct stream_filter filter; |
| 1008 | struct stream_filter *one; |
| 1009 | struct stream_filter *two; |
| 1010 | char buf[FILTER_BUFFER]; |
| 1011 | int end, ptr; |
| 1012 | }; |
| 1013 | |
| 1014 | static int cascade_filter_fn(struct stream_filter *filter, |
| 1015 | const char *input, size_t *isize_p, |
| 1016 | char *output, size_t *osize_p) |
| 1017 | { |
| 1018 | struct cascade_filter *cas = (struct cascade_filter *) filter; |
| 1019 | size_t filled = 0; |
| 1020 | size_t sz = *osize_p; |
| 1021 | size_t to_feed, remaining; |
| 1022 | |
| 1023 | /* |
| 1024 | * input -- (one) --> buf -- (two) --> output |
| 1025 | */ |
| 1026 | while (filled < sz) { |
| 1027 | remaining = sz - filled; |
| 1028 | |
| 1029 | /* do we already have something to feed two with? */ |
| 1030 | if (cas->ptr < cas->end) { |
| 1031 | to_feed = cas->end - cas->ptr; |
| 1032 | if (stream_filter(cas->two, |
| 1033 | cas->buf + cas->ptr, &to_feed, |
| 1034 | output + filled, &remaining)) |
| 1035 | return -1; |
| 1036 | cas->ptr += (cas->end - cas->ptr) - to_feed; |
| 1037 | filled = sz - remaining; |
| 1038 | continue; |
| 1039 | } |
| 1040 | |
| 1041 | /* feed one from upstream and have it emit into our buffer */ |
| 1042 | to_feed = input ? *isize_p : 0; |
| 1043 | if (input && !to_feed) |
| 1044 | break; |
| 1045 | remaining = sizeof(cas->buf); |
| 1046 | if (stream_filter(cas->one, |
| 1047 | input, &to_feed, |
| 1048 | cas->buf, &remaining)) |
| 1049 | return -1; |
| 1050 | cas->end = sizeof(cas->buf) - remaining; |
| 1051 | cas->ptr = 0; |
| 1052 | if (input) { |
| 1053 | size_t fed = *isize_p - to_feed; |
| 1054 | *isize_p -= fed; |
| 1055 | input += fed; |
| 1056 | } |
| 1057 | |
| 1058 | /* do we know that we drained one completely? */ |
| 1059 | if (input || cas->end) |
| 1060 | continue; |
| 1061 | |
| 1062 | /* tell two to drain; we have nothing more to give it */ |
| 1063 | to_feed = 0; |
| 1064 | remaining = sz - filled; |
| 1065 | if (stream_filter(cas->two, |
| 1066 | NULL, &to_feed, |
| 1067 | output + filled, &remaining)) |
| 1068 | return -1; |
| 1069 | if (remaining == (sz - filled)) |
| 1070 | break; /* completely drained two */ |
| 1071 | filled = sz - remaining; |
| 1072 | } |
| 1073 | *osize_p -= filled; |
| 1074 | return 0; |
| 1075 | } |
| 1076 | |
| 1077 | static void cascade_free_fn(struct stream_filter *filter) |
| 1078 | { |
| 1079 | struct cascade_filter *cas = (struct cascade_filter *)filter; |
| 1080 | free_stream_filter(cas->one); |
| 1081 | free_stream_filter(cas->two); |
| 1082 | free(filter); |
| 1083 | } |
| 1084 | |
| 1085 | static struct stream_filter_vtbl cascade_vtbl = { |
| 1086 | cascade_filter_fn, |
| 1087 | cascade_free_fn, |
| 1088 | }; |
| 1089 | |
| 1090 | static struct stream_filter *cascade_filter(struct stream_filter *one, |
| 1091 | struct stream_filter *two) |
| 1092 | { |
| 1093 | struct cascade_filter *cascade; |
| 1094 | |
| 1095 | if (!one || is_null_stream_filter(one)) |
| 1096 | return two; |
| 1097 | if (!two || is_null_stream_filter(two)) |
| 1098 | return one; |
| 1099 | |
| 1100 | cascade = xmalloc(sizeof(*cascade)); |
| 1101 | cascade->one = one; |
| 1102 | cascade->two = two; |
| 1103 | cascade->end = cascade->ptr = 0; |
| 1104 | cascade->filter.vtbl = &cascade_vtbl; |
| 1105 | return (struct stream_filter *)cascade; |
| 1106 | } |
| 1107 | |
| 1108 | /* |
Junio C Hamano | b84c7839 | 2011-05-20 18:28:00 -0700 | [diff] [blame] | 1109 | * ident filter |
| 1110 | */ |
| 1111 | #define IDENT_DRAINING (-1) |
| 1112 | #define IDENT_SKIPPING (-2) |
| 1113 | struct ident_filter { |
| 1114 | struct stream_filter filter; |
| 1115 | struct strbuf left; |
| 1116 | int state; |
| 1117 | char ident[45]; /* ": x40 $" */ |
| 1118 | }; |
| 1119 | |
| 1120 | static int is_foreign_ident(const char *str) |
| 1121 | { |
| 1122 | int i; |
| 1123 | |
Jeff King | ae021d8 | 2014-06-18 15:47:50 -0400 | [diff] [blame] | 1124 | if (!skip_prefix(str, "$Id: ", &str)) |
Junio C Hamano | b84c7839 | 2011-05-20 18:28:00 -0700 | [diff] [blame] | 1125 | return 0; |
Jeff King | ae021d8 | 2014-06-18 15:47:50 -0400 | [diff] [blame] | 1126 | for (i = 0; str[i]; i++) { |
Junio C Hamano | b84c7839 | 2011-05-20 18:28:00 -0700 | [diff] [blame] | 1127 | if (isspace(str[i]) && str[i+1] != '$') |
| 1128 | return 1; |
| 1129 | } |
| 1130 | return 0; |
| 1131 | } |
| 1132 | |
| 1133 | static void ident_drain(struct ident_filter *ident, char **output_p, size_t *osize_p) |
| 1134 | { |
| 1135 | size_t to_drain = ident->left.len; |
| 1136 | |
| 1137 | if (*osize_p < to_drain) |
| 1138 | to_drain = *osize_p; |
| 1139 | if (to_drain) { |
| 1140 | memcpy(*output_p, ident->left.buf, to_drain); |
| 1141 | strbuf_remove(&ident->left, 0, to_drain); |
| 1142 | *output_p += to_drain; |
| 1143 | *osize_p -= to_drain; |
| 1144 | } |
| 1145 | if (!ident->left.len) |
| 1146 | ident->state = 0; |
| 1147 | } |
| 1148 | |
| 1149 | static int ident_filter_fn(struct stream_filter *filter, |
| 1150 | const char *input, size_t *isize_p, |
| 1151 | char *output, size_t *osize_p) |
| 1152 | { |
| 1153 | struct ident_filter *ident = (struct ident_filter *)filter; |
| 1154 | static const char head[] = "$Id"; |
| 1155 | |
| 1156 | if (!input) { |
| 1157 | /* drain upon eof */ |
| 1158 | switch (ident->state) { |
| 1159 | default: |
| 1160 | strbuf_add(&ident->left, head, ident->state); |
| 1161 | case IDENT_SKIPPING: |
| 1162 | /* fallthru */ |
| 1163 | case IDENT_DRAINING: |
| 1164 | ident_drain(ident, &output, osize_p); |
| 1165 | } |
| 1166 | return 0; |
| 1167 | } |
| 1168 | |
| 1169 | while (*isize_p || (ident->state == IDENT_DRAINING)) { |
| 1170 | int ch; |
| 1171 | |
| 1172 | if (ident->state == IDENT_DRAINING) { |
| 1173 | ident_drain(ident, &output, osize_p); |
| 1174 | if (!*osize_p) |
| 1175 | break; |
| 1176 | continue; |
| 1177 | } |
| 1178 | |
| 1179 | ch = *(input++); |
| 1180 | (*isize_p)--; |
| 1181 | |
| 1182 | if (ident->state == IDENT_SKIPPING) { |
| 1183 | /* |
| 1184 | * Skipping until '$' or LF, but keeping them |
| 1185 | * in case it is a foreign ident. |
| 1186 | */ |
| 1187 | strbuf_addch(&ident->left, ch); |
| 1188 | if (ch != '\n' && ch != '$') |
| 1189 | continue; |
| 1190 | if (ch == '$' && !is_foreign_ident(ident->left.buf)) { |
| 1191 | strbuf_setlen(&ident->left, sizeof(head) - 1); |
| 1192 | strbuf_addstr(&ident->left, ident->ident); |
| 1193 | } |
| 1194 | ident->state = IDENT_DRAINING; |
| 1195 | continue; |
| 1196 | } |
| 1197 | |
| 1198 | if (ident->state < sizeof(head) && |
| 1199 | head[ident->state] == ch) { |
| 1200 | ident->state++; |
| 1201 | continue; |
| 1202 | } |
| 1203 | |
| 1204 | if (ident->state) |
| 1205 | strbuf_add(&ident->left, head, ident->state); |
| 1206 | if (ident->state == sizeof(head) - 1) { |
| 1207 | if (ch != ':' && ch != '$') { |
| 1208 | strbuf_addch(&ident->left, ch); |
| 1209 | ident->state = 0; |
| 1210 | continue; |
| 1211 | } |
| 1212 | |
| 1213 | if (ch == ':') { |
| 1214 | strbuf_addch(&ident->left, ch); |
| 1215 | ident->state = IDENT_SKIPPING; |
| 1216 | } else { |
| 1217 | strbuf_addstr(&ident->left, ident->ident); |
| 1218 | ident->state = IDENT_DRAINING; |
| 1219 | } |
| 1220 | continue; |
| 1221 | } |
| 1222 | |
| 1223 | strbuf_addch(&ident->left, ch); |
| 1224 | ident->state = IDENT_DRAINING; |
| 1225 | } |
| 1226 | return 0; |
| 1227 | } |
| 1228 | |
| 1229 | static void ident_free_fn(struct stream_filter *filter) |
| 1230 | { |
| 1231 | struct ident_filter *ident = (struct ident_filter *)filter; |
| 1232 | strbuf_release(&ident->left); |
| 1233 | free(filter); |
| 1234 | } |
| 1235 | |
| 1236 | static struct stream_filter_vtbl ident_vtbl = { |
| 1237 | ident_filter_fn, |
| 1238 | ident_free_fn, |
| 1239 | }; |
| 1240 | |
| 1241 | static struct stream_filter *ident_filter(const unsigned char *sha1) |
| 1242 | { |
| 1243 | struct ident_filter *ident = xmalloc(sizeof(*ident)); |
| 1244 | |
| 1245 | sprintf(ident->ident, ": %s $", sha1_to_hex(sha1)); |
| 1246 | strbuf_init(&ident->left, 0); |
| 1247 | ident->filter.vtbl = &ident_vtbl; |
| 1248 | ident->state = 0; |
| 1249 | return (struct stream_filter *)ident; |
| 1250 | } |
| 1251 | |
Junio C Hamano | dd8e912 | 2011-05-12 14:31:08 -0700 | [diff] [blame] | 1252 | /* |
Junio C Hamano | b669109 | 2011-05-20 14:33:31 -0700 | [diff] [blame] | 1253 | * Return an appropriately constructed filter for the path, or NULL if |
| 1254 | * the contents cannot be filtered without reading the whole thing |
| 1255 | * in-core. |
| 1256 | * |
| 1257 | * Note that you would be crazy to set CRLF, smuge/clean or ident to a |
| 1258 | * large binary blob you would want us not to slurp into the memory! |
Junio C Hamano | dd8e912 | 2011-05-12 14:31:08 -0700 | [diff] [blame] | 1259 | */ |
Junio C Hamano | b669109 | 2011-05-20 14:33:31 -0700 | [diff] [blame] | 1260 | struct stream_filter *get_stream_filter(const char *path, const unsigned char *sha1) |
Junio C Hamano | dd8e912 | 2011-05-12 14:31:08 -0700 | [diff] [blame] | 1261 | { |
| 1262 | struct conv_attrs ca; |
| 1263 | enum crlf_action crlf_action; |
Junio C Hamano | b84c7839 | 2011-05-20 18:28:00 -0700 | [diff] [blame] | 1264 | struct stream_filter *filter = NULL; |
Junio C Hamano | dd8e912 | 2011-05-12 14:31:08 -0700 | [diff] [blame] | 1265 | |
| 1266 | convert_attrs(&ca, path); |
| 1267 | |
Junio C Hamano | b84c7839 | 2011-05-20 18:28:00 -0700 | [diff] [blame] | 1268 | if (ca.drv && (ca.drv->smudge || ca.drv->clean)) |
| 1269 | return filter; |
| 1270 | |
| 1271 | if (ca.ident) |
| 1272 | filter = ident_filter(sha1); |
Junio C Hamano | dd8e912 | 2011-05-12 14:31:08 -0700 | [diff] [blame] | 1273 | |
| 1274 | crlf_action = input_crlf_action(ca.crlf_action, ca.eol_attr); |
Junio C Hamano | b84c7839 | 2011-05-20 18:28:00 -0700 | [diff] [blame] | 1275 | |
Junio C Hamano | b0d9c69 | 2011-05-20 16:14:32 -0700 | [diff] [blame] | 1276 | if ((crlf_action == CRLF_BINARY) || (crlf_action == CRLF_INPUT) || |
Junio C Hamano | a265a7f | 2011-05-21 18:28:41 -0700 | [diff] [blame] | 1277 | (crlf_action == CRLF_GUESS && auto_crlf == AUTO_CRLF_FALSE)) |
| 1278 | filter = cascade_filter(filter, &null_filter_singleton); |
| 1279 | |
| 1280 | else if (output_eol(crlf_action) == EOL_CRLF && |
| 1281 | !(crlf_action == CRLF_AUTO || crlf_action == CRLF_GUESS)) |
Carlos MartÃn Nieto | 284e3d2 | 2011-11-28 11:48:12 +0100 | [diff] [blame] | 1282 | filter = cascade_filter(filter, lf_to_crlf_filter()); |
Junio C Hamano | e322ee3 | 2011-05-20 16:47:56 -0700 | [diff] [blame] | 1283 | |
Junio C Hamano | b84c7839 | 2011-05-20 18:28:00 -0700 | [diff] [blame] | 1284 | return filter; |
Junio C Hamano | b669109 | 2011-05-20 14:33:31 -0700 | [diff] [blame] | 1285 | } |
| 1286 | |
| 1287 | void free_stream_filter(struct stream_filter *filter) |
| 1288 | { |
| 1289 | filter->vtbl->free(filter); |
| 1290 | } |
| 1291 | |
| 1292 | int stream_filter(struct stream_filter *filter, |
| 1293 | const char *input, size_t *isize_p, |
| 1294 | char *output, size_t *osize_p) |
| 1295 | { |
| 1296 | return filter->vtbl->filter(filter, input, isize_p, output, osize_p); |
Junio C Hamano | dd8e912 | 2011-05-12 14:31:08 -0700 | [diff] [blame] | 1297 | } |