diff options
| author | Ron Yorston <rmy@pobox.com> | 2014-05-06 20:41:10 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2014-05-06 20:41:10 +0100 |
| commit | d3bef66324a8ca5eed9ad7c15ead3a1cc9a9151e (patch) | |
| tree | 4b364ba4b6b9e96c2629fe382fef0248d76833dd /coreutils/test.c | |
| parent | 7905d97aeece18da362a5a1e066abff2d2e5c16b (diff) | |
| parent | d257608a8429b64e1a04c7cb6d99975eeb2c3955 (diff) | |
| download | busybox-w32-d3bef66324a8ca5eed9ad7c15ead3a1cc9a9151e.tar.gz busybox-w32-d3bef66324a8ca5eed9ad7c15ead3a1cc9a9151e.tar.bz2 busybox-w32-d3bef66324a8ca5eed9ad7c15ead3a1cc9a9151e.zip | |
Merge branch 'busybox' into merge
Conflicts:
debianutils/which.c
editors/vi.c
libbb/executable.c
Diffstat (limited to 'coreutils/test.c')
| -rw-r--r-- | coreutils/test.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coreutils/test.c b/coreutils/test.c index d8af4dcf3..139f1db75 100644 --- a/coreutils/test.c +++ b/coreutils/test.c | |||
| @@ -650,7 +650,7 @@ static int filstat(char *nm, enum token mode) | |||
| 650 | if (mode == FILEX) { | 650 | if (mode == FILEX) { |
| 651 | char *p; | 651 | char *p; |
| 652 | 652 | ||
| 653 | if (execable_file(nm)) { | 653 | if (file_is_executable(nm)) { |
| 654 | return 1; | 654 | return 1; |
| 655 | } | 655 | } |
| 656 | else if ((p=win32_execable_file(nm))) { | 656 | else if ((p=win32_execable_file(nm))) { |