diff options
author | Ron Yorston <rmy@pobox.com> | 2020-02-15 13:25:04 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2020-02-15 13:25:04 +0000 |
commit | 0abe89bc214c9d1f16f32c4339792066b875b7c6 (patch) | |
tree | 3748f654565bd08513093ebfbb68487f612b5e3f /include | |
parent | 6885083a7e4f94938ca0a98e2c6c69a84eb08a1f (diff) | |
parent | a6e48dead331c3c19e070992d2d571e74a1d9a8d (diff) | |
download | busybox-w32-0abe89bc214c9d1f16f32c4339792066b875b7c6.tar.gz busybox-w32-0abe89bc214c9d1f16f32c4339792066b875b7c6.tar.bz2 busybox-w32-0abe89bc214c9d1f16f32c4339792066b875b7c6.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'include')
-rw-r--r-- | include/libbb.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/libbb.h b/include/libbb.h index 0aa44eb37..cbb178c0b 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
@@ -1867,10 +1867,19 @@ unsigned size_from_HISTFILESIZE(const char *hp) FAST_FUNC; | |||
1867 | # else | 1867 | # else |
1868 | # define MAX_HISTORY 0 | 1868 | # define MAX_HISTORY 0 |
1869 | # endif | 1869 | # endif |
1870 | typedef const char *get_exe_name_t(int i) FAST_FUNC; | ||
1870 | typedef struct line_input_t { | 1871 | typedef struct line_input_t { |
1871 | int flags; | 1872 | int flags; |
1872 | int timeout; | 1873 | int timeout; |
1873 | const char *path_lookup; | 1874 | const char *path_lookup; |
1875 | # if ENABLE_FEATURE_TAB_COMPLETION \ | ||
1876 | && (ENABLE_ASH || ENABLE_SH_IS_ASH || ENABLE_BASH_IS_ASH \ | ||
1877 | || ENABLE_HUSH || ENABLE_SH_IS_HUSH || ENABLE_BASH_IS_HUSH \ | ||
1878 | ) | ||
1879 | /* function to fetch additional application-specific names to match */ | ||
1880 | get_exe_name_t *get_exe_name; | ||
1881 | # define EDITING_HAS_get_exe_name 1 | ||
1882 | # endif | ||
1874 | # if MAX_HISTORY | 1883 | # if MAX_HISTORY |
1875 | int cnt_history; | 1884 | int cnt_history; |
1876 | int cur_history; | 1885 | int cur_history; |
@@ -1917,6 +1926,10 @@ int read_line_input(const char* prompt, char* command, int maxsize) FAST_FUNC; | |||
1917 | read_line_input(prompt, command, maxsize) | 1926 | read_line_input(prompt, command, maxsize) |
1918 | #endif | 1927 | #endif |
1919 | 1928 | ||
1929 | #ifndef EDITING_HAS_get_exe_name | ||
1930 | # define EDITING_HAS_get_exe_name 0 | ||
1931 | #endif | ||
1932 | |||
1920 | 1933 | ||
1921 | #ifndef COMM_LEN | 1934 | #ifndef COMM_LEN |
1922 | # ifdef TASK_COMM_LEN | 1935 | # ifdef TASK_COMM_LEN |