diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-07-07 12:04:55 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-07-07 15:25:55 +0200 |
| commit | 6294aa76d818e831de4592b41a37e225fd0871f9 (patch) | |
| tree | ddf0aa3a760fbe4dc1126d4fd872e0d525203197 /src/shared/util.h | |
| parent | 7568345034f2890af745747783c5abfbf6eccf0f (diff) | |
util: don't consider tabs special in string_has_cc() anymore
Instead, take a list of exceptions to our usual CC check
Diffstat (limited to 'src/shared/util.h')
| -rw-r--r-- | src/shared/util.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/shared/util.h b/src/shared/util.h index e23069c016..8544940eab 100644 --- a/src/shared/util.h +++ b/src/shared/util.h @@ -382,7 +382,8 @@ bool fstype_is_network(const char *fstype); int chvt(int vt); int read_one_char(FILE *f, char *ret, usec_t timeout, bool *need_nl); -int ask(char *ret, const char *replies, const char *text, ...) _printf_(3, 4); +int ask_char(char *ret, const char *replies, const char *text, ...) _printf_(3, 4); +int ask_string(char **ret, const char *text, ...) _printf_(2, 3); int reset_terminal_fd(int fd, bool switch_to_text); int reset_terminal(const char *name); @@ -692,7 +693,7 @@ _alloc_(2, 3) static inline void *memdup_multiply(const void *p, size_t a, size_ bool filename_is_safe(const char *p) _pure_; bool path_is_safe(const char *p) _pure_; bool string_is_safe(const char *p) _pure_; -bool string_has_cc(const char *p) _pure_; +bool string_has_cc(const char *p, const char *ok) _pure_; /** * Check if a string contains any glob patterns. |