X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Futil.h;h=a8ccf20bb8268f4ed65246b45372968a9d27df0f;hb=e9e310f8e99c63c764f71ed0c224ccd3cceb90c7;hp=73bd9012fd6d1b15358b923961be136337c4a0ed;hpb=553acb7b6b8d4f16a4747b1f978e8b7888fbfb2c;p=elogind.git diff --git a/src/shared/util.h b/src/shared/util.h index 73bd9012f..a8ccf20bb 100644 --- a/src/shared/util.h +++ b/src/shared/util.h @@ -714,7 +714,7 @@ _alloc_(2, 3) static inline void *memdup_multiply(const void *p, size_t a, size_ return memdup(p, a * b); } -bool filename_is_safe(const char *p) _pure_; +bool filename_is_valid(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, const char *ok) _pure_; @@ -883,6 +883,7 @@ int unlink_noerrno(const char *path); (void *) memset(_new_, 0, _len_); \ }) +/* It's not clear what alignment glibc/gcc alloca() guarantee, hence provide a guaranteed safe version */ #define alloca_align(size, align) \ ({ \ void *_ptr_; \ @@ -1015,8 +1016,9 @@ int bind_remount_recursive(const char *prefix, bool ro); int fflush_and_check(FILE *f); -char *tempfn_xxxxxx(const char *p); -char *tempfn_random(const char *p); +int tempfn_xxxxxx(const char *p, char **ret); +int tempfn_random(const char *p, char **ret); +int tempfn_random_child(const char *p, char **ret); bool is_localhost(const char *hostname);