Mercurialcrosstool-ng / changeset
summary | shortlog | changelog | graph | tags | branches | files | changeset | raw | bz2 | help
scripts/wrapper: fix wrong test when checking access to the reall tool
author"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Tue Jun 22 23:49:23 2010 +0200 (2010-06-22)
changeset 1992eebcaff6626f
parent 1991 1974075aa641
child 1993 6641889d5603
scripts/wrapper: fix wrong test when checking access to the reall tool

In C, the proper syntax for a bit-wise OR is a single '|', not two.

It worked so far because all was well:
- X_OK == 1
- R_OK||X_OK == 1
- the file we searched for had the x-bit set
-> access( file, R_OK||X_OK ) worked
- inicidentally, the file we searched for also had the r-bit set,
but we were not testing that in fact.
scripts/wrapper.c file | annotate | diff | revisions 
     1.1 --- a/scripts/wrapper.c	Thu Jun 17 21:26:23 2010 +0200
     1.2 +++ b/scripts/wrapper.c	Tue Jun 22 23:49:23 2010 +0200
     1.3 @@ -71,7 +71,7 @@
     1.4        if( stat( testname, &st ) == 0 ) {
     1.5          /* OK, exists. Is it a regular file, or a
     1.6           * symlink, which the current user may execute? */
     1.7 -        if( S_ISREG( st.st_mode ) && ! access( testname, X_OK || R_OK ) ) {
     1.8 +        if( S_ISREG( st.st_mode ) && ! access( testname, X_OK | R_OK ) ) {
     1.9            fullname = strdup( testname );
    1.10            break;
    1.11          }
crosstool-ng