Commit edbd0b9
committed
ext/fileinfo: patch out strcasestr() entirely
Instead of disabling the strcasestr() prototype in libmagic/file.h
with -DHAVE_STRCASESTR=1, patch that hunk out to achieve parity on
Windows:
* Remove the HAVE_STRCASESTR conditional in libmagic/file.h
* Don't define HAVE_STRCASESTR=1 in the Unix build
* Remove strcasestr.c from the list of sources in config.w32
* Regenerate libmagic.patch
This retains the bundled copy of strcasestr.c, but so long as no one
adds it to the list of sources, it will not be used. If we were to
delete it and regenerate the patch, all of the deleted lines would
end up in the repository anyway.1 parent b283a53 commit edbd0b9
File tree
4 files changed
+19
-13
lines changed- ext/fileinfo
- libmagic
4 files changed
+19
-13
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
37 | | - | |
| 37 | + | |
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
11 | | - | |
| 11 | + | |
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| |||
1440 | 1440 | | |
1441 | 1441 | | |
1442 | 1442 | | |
1443 | | - | |
| 1443 | + | |
1444 | 1444 | | |
1445 | 1445 | | |
1446 | 1446 | | |
| |||
1727 | 1727 | | |
1728 | 1728 | | |
1729 | 1729 | | |
1730 | | - | |
| 1730 | + | |
1731 | 1731 | | |
1732 | 1732 | | |
1733 | 1733 | | |
| |||
1898 | 1898 | | |
1899 | 1899 | | |
1900 | 1900 | | |
1901 | | - | |
| 1901 | + | |
1902 | 1902 | | |
1903 | 1903 | | |
1904 | 1904 | | |
| |||
1918 | 1918 | | |
1919 | 1919 | | |
1920 | 1920 | | |
1921 | | - | |
| 1921 | + | |
| 1922 | + | |
| 1923 | + | |
| 1924 | + | |
| 1925 | + | |
| 1926 | + | |
| 1927 | + | |
| 1928 | + | |
| 1929 | + | |
| 1930 | + | |
1922 | 1931 | | |
1923 | 1932 | | |
1924 | 1933 | | |
| |||
2608 | 2617 | | |
2609 | 2618 | | |
2610 | 2619 | | |
2611 | | - | |
| 2620 | + | |
2612 | 2621 | | |
2613 | 2622 | | |
2614 | 2623 | | |
| |||
3081 | 3090 | | |
3082 | 3091 | | |
3083 | 3092 | | |
3084 | | - | |
3085 | | - | |
| 3093 | + | |
| 3094 | + | |
3086 | 3095 | | |
3087 | 3096 | | |
3088 | 3097 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
635 | 635 | | |
636 | 636 | | |
637 | 637 | | |
638 | | - | |
639 | | - | |
640 | | - | |
641 | 638 | | |
642 | 639 | | |
643 | 640 | | |
| |||
0 commit comments