| commit | author | age | ||
| 8cbcc0 | 1 | We need to rename the regular file constant in order to prevent a gcc compiler error: |
| AW | 2 | |
| 3 | In file included from /export2/home/andreas/oi-userland/components/shell/fish/fish-3.6.0/src/env_dispatch.cpp:15: | |
| 4 | oi-userland/components/shell/fish/fish-3.6.0/src/wutil.h:162:5: error: expected identifier before 'register' | |
| 5 | 162 | reg, // regular file | |
| 6 | | ^~~ | |
| 7 | ||
| 8 | --- fish-3.6.0/src/wutil.h.orig 2023-01-07 15:12:25.000000000 +0000 | |
| 9 | +++ fish-3.6.0/src/wutil.h 2023-01-08 10:47:45.570118762 +0000 | |
| 10 | @@ -159,7 +159,7 @@ | |
| 11 | chr, // character device | |
| 12 | dir, // directory | |
| 13 | blk, // block device | |
| 14 | - reg, // regular file | |
| 15 | + regr, // regular file | |
| 16 | lnk, // symlink | |
| 17 | sock, // socket | |
| 18 | whiteout, // whiteout (from BSD) | |
| 19 | --- fish-3.6.0/src/wutil.cpp.orig 2023-01-08 10:47:17.199812493 +0000 | |
| 20 | +++ fish-3.6.0/src/wutil.cpp 2023-01-08 10:48:38.986129968 +0000 | |
| 21 | @@ -78,7 +78,7 @@ | |
| 22 | case DT_BLK: | |
| 23 | return dir_entry_type_t::blk; | |
| 24 | case DT_REG: | |
| 25 | - return dir_entry_type_t::reg; | |
| 26 | + return dir_entry_type_t::regr; | |
| 27 | case DT_LNK: | |
| 28 | return dir_entry_type_t::lnk; | |
| 29 | case DT_SOCK: | |
| 30 | @@ -106,7 +106,7 @@ | |
| 31 | case S_IFBLK: | |
| 32 | return dir_entry_type_t::blk; | |
| 33 | case S_IFREG: | |
| 34 | - return dir_entry_type_t::reg; | |
| 35 | + return dir_entry_type_t::regr; | |
| 36 | case S_IFLNK: | |
| 37 | return dir_entry_type_t::lnk; | |
| 38 | case S_IFSOCK: | |
| 39 | --- fish-3.6.0/src/fish_tests.cpp.orig 2023-01-07 15:12:25.000000000 +0000 | |
| 40 | +++ fish-3.6.0/src/fish_tests.cpp 2023-01-08 10:49:07.581582097 +0000 | |
| 41 | @@ -1755,9 +1755,9 @@ | |
| 42 | if (entry->name == dirname) { | |
| 43 | expected = dir_entry_type_t::dir; | |
| 44 | } else if (entry->name == regname) { | |
| 45 | - expected = dir_entry_type_t::reg; | |
| 46 | + expected = dir_entry_type_t::regr; | |
| 47 | } else if (entry->name == reglinkname) { | |
| 48 | - expected = dir_entry_type_t::reg; | |
| 49 | + expected = dir_entry_type_t::regr; | |
| 50 | } else if (entry->name == dirlinkname) { | |
| 51 | expected = dir_entry_type_t::dir; | |
| 52 | } else if (entry->name == badlinkname) { | |
| c50e0f | 53 | --- fish-3.7.0/src/wildcard.cpp.orig 2024-01-01 16:15:17.000000000 +0100 |
| AW | 54 | +++ fish-3.7.0/src/wildcard.cpp 2024-01-01 20:23:37.471572632 +0100 |
| 55 | @@ -386,7 +386,7 @@ | |
| 56 | } | |
| 57 | ||
| 58 | // regular file *excludes* broken links - we have no use for them as commands. | |
| 59 | - const bool is_regular_file = entry.check_type() == dir_entry_type_t::reg; | |
| 60 | + const bool is_regular_file = entry.check_type() == dir_entry_type_t::regr; | |
| 61 | if (executables_only && (!is_regular_file || waccess(filepath, X_OK) != 0)) { | |
| 62 | return false; | |
| 63 | } | |
