util: don't consider tabs special in string_has_cc() anymore

[elogind.git] / src / shared / util.h

diff --git a/src/shared/util.h b/src/shared/util.h
index e23069c016837ea1cde76d01dbd60cf3d0c8e382..8544940eabdb17743d0aafa23421798065854350 100644 (file)
--- 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 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);
 
 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 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.
 
 /**
  * Check if a string contains any glob patterns.