From: Nuno Lopes Date: Fri, 25 Feb 2011 09:32:17 +0000 (+0000) Subject: fix lcov build X-Git-Tag: php-5.3.6RC2~11 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e79bf567e8a4f323d2526f0f96a37f2e52d3b5ce;p=php fix lcov build --- diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag old mode 100755 new mode 100644 index fc93d1d6b4..b1c820f276 --- a/ext/phar/Makefile.frag +++ b/ext/phar/Makefile.frag @@ -1,6 +1,5 @@ - $(srcdir)/phar_path_check.c: $(srcdir)/phar_path_check.re - $(RE2C) -b -o $(srcdir)/phar_path_check.c $(srcdir)/phar_path_check.re + @(cd $(top_srcdir); $(RE2C) -b -o ext/phar/phar_path_check.c ext/phar/phar_path_check.re) pharcmd: $(builddir)/phar.php $(builddir)/phar.phar diff --git a/ext/phar/phar_internal.h b/ext/phar/phar_internal.h old mode 100755 new mode 100644 diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c old mode 100755 new mode 100644 diff --git a/ext/phar/phar_path_check.c b/ext/phar/phar_path_check.c old mode 100755 new mode 100644 index 2c4577fe08..20969163f8 --- a/ext/phar/phar_path_check.c +++ b/ext/phar/phar_path_check.c @@ -1,5 +1,5 @@ -/* Generated by re2c 0.13.5 on Fri Dec 31 23:52:05 2010 */ -#line 1 "/home/felipe/dev/php5/ext/phar/phar_path_check.re" +/* Generated by re2c 0.13.5 on Fri Feb 25 04:29:05 2011 */ +#line 1 "ext/phar/phar_path_check.re" /* +----------------------------------------------------------------------+ | phar php single-file executable PHP extension | @@ -43,7 +43,7 @@ phar_path_check_result phar_path_check(char **s, int *len, const char **error) loop: -#line 47 "/home/felipe/dev/php5/ext/phar/phar_path_check.c" +#line 47 "ext/phar/phar_path_check.c" { YYCTYPE yych; @@ -76,30 +76,30 @@ yy2: if (yych <= '.') goto yy16; if (yych <= '/') goto yy18; yy3: -#line 93 "/home/felipe/dev/php5/ext/phar/phar_path_check.re" +#line 93 "ext/phar/phar_path_check.re" { goto loop; } -#line 84 "/home/felipe/dev/php5/ext/phar/phar_path_check.c" +#line 84 "ext/phar/phar_path_check.c" yy4: ++YYCURSOR; -#line 60 "/home/felipe/dev/php5/ext/phar/phar_path_check.re" +#line 60 "ext/phar/phar_path_check.re" { *error = "back-slash"; return pcr_err_back_slash; } -#line 92 "/home/felipe/dev/php5/ext/phar/phar_path_check.c" +#line 92 "ext/phar/phar_path_check.c" yy6: ++YYCURSOR; -#line 64 "/home/felipe/dev/php5/ext/phar/phar_path_check.re" +#line 64 "ext/phar/phar_path_check.re" { *error = "star"; return pcr_err_star; } -#line 100 "/home/felipe/dev/php5/ext/phar/phar_path_check.c" +#line 100 "ext/phar/phar_path_check.c" yy8: ++YYCURSOR; -#line 68 "/home/felipe/dev/php5/ext/phar/phar_path_check.re" +#line 68 "ext/phar/phar_path_check.re" { if (**s == '/') { (*s)++; @@ -108,22 +108,22 @@ yy8: *error = NULL; return pcr_use_query; } -#line 112 "/home/felipe/dev/php5/ext/phar/phar_path_check.c" +#line 112 "ext/phar/phar_path_check.c" yy10: ++YYCURSOR; yy11: -#line 76 "/home/felipe/dev/php5/ext/phar/phar_path_check.re" +#line 76 "ext/phar/phar_path_check.re" { *error ="illegal character"; return pcr_err_illegal_char; } -#line 121 "/home/felipe/dev/php5/ext/phar/phar_path_check.c" +#line 121 "ext/phar/phar_path_check.c" yy12: yych = *++YYCURSOR; goto yy11; yy13: ++YYCURSOR; -#line 80 "/home/felipe/dev/php5/ext/phar/phar_path_check.re" +#line 80 "ext/phar/phar_path_check.re" { if (**s == '/') { (*s)++; @@ -137,7 +137,7 @@ yy13: *error = NULL; return pcr_is_ok; } -#line 141 "/home/felipe/dev/php5/ext/phar/phar_path_check.c" +#line 141 "ext/phar/phar_path_check.c" yy15: yych = *++YYCURSOR; goto yy3; @@ -152,12 +152,12 @@ yy17: goto yy3; yy18: ++YYCURSOR; -#line 48 "/home/felipe/dev/php5/ext/phar/phar_path_check.re" +#line 48 "ext/phar/phar_path_check.re" { *error = "double slash"; return pcr_err_double_slash; } -#line 161 "/home/felipe/dev/php5/ext/phar/phar_path_check.c" +#line 161 "ext/phar/phar_path_check.c" yy20: yych = *++YYCURSOR; if (yych <= 0x00) goto yy23; @@ -165,21 +165,21 @@ yy20: goto yy17; yy21: ++YYCURSOR; -#line 56 "/home/felipe/dev/php5/ext/phar/phar_path_check.re" +#line 56 "ext/phar/phar_path_check.re" { *error = "current directory reference"; return pcr_err_curr_dir; } -#line 174 "/home/felipe/dev/php5/ext/phar/phar_path_check.c" +#line 174 "ext/phar/phar_path_check.c" yy23: ++YYCURSOR; -#line 52 "/home/felipe/dev/php5/ext/phar/phar_path_check.re" +#line 52 "ext/phar/phar_path_check.re" { *error = "upper directory reference"; return pcr_err_up_dir; } -#line 182 "/home/felipe/dev/php5/ext/phar/phar_path_check.c" +#line 182 "ext/phar/phar_path_check.c" } -#line 96 "/home/felipe/dev/php5/ext/phar/phar_path_check.re" +#line 96 "ext/phar/phar_path_check.re" } diff --git a/ext/phar/phar_path_check.re b/ext/phar/phar_path_check.re old mode 100755 new mode 100644 index 50f88666d5..8f58902809 --- a/ext/phar/phar_path_check.re +++ b/ext/phar/phar_path_check.re @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | phar php single-file executable PHP extension | +----------------------------------------------------------------------+ - | Copyright (c) 2007-2009 The PHP Group | + | Copyright (c) 2007-2011 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is |