diff options
Diffstat (limited to 'src/libudev')
-rw-r--r-- | src/libudev/libudev-private.h | 1 | ||||
-rw-r--r-- | src/libudev/libudev-util.c | 19 |
2 files changed, 20 insertions, 0 deletions
diff --git a/src/libudev/libudev-private.h b/src/libudev/libudev-private.h index 5b7f0021e9..1b86384703 100644 --- a/src/libudev/libudev-private.h +++ b/src/libudev/libudev-private.h @@ -165,6 +165,7 @@ int util_log_priority(const char *priority); size_t util_path_encode(const char *src, char *dest, size_t size); void util_remove_trailing_chars(char *path, char c); size_t util_strpcpy(char **dest, size_t size, const char *src); +size_t util_strpcpyf(char **dest, size_t size, const char *src, ...) __attribute__((format(printf, 3, 4))); size_t util_strpcpyl(char **dest, size_t size, const char *src, ...) __attribute__((sentinel)); size_t util_strscpy(char *dest, size_t size, const char *src); size_t util_strscpyl(char *dest, size_t size, const char *src, ...) __attribute__((sentinel)); diff --git a/src/libudev/libudev-util.c b/src/libudev/libudev-util.c index d3bbd05927..0ca86c815d 100644 --- a/src/libudev/libudev-util.c +++ b/src/libudev/libudev-util.c @@ -334,6 +334,25 @@ size_t util_strpcpy(char **dest, size_t size, const char *src) return size; } +size_t util_strpcpyf(char **dest, size_t size, const char *src, ...) +{ + va_list va; + int i; + + va_start(va, src); + i = vsnprintf(*dest, size, src, va); + if (i < (int)size) { + *dest += i; + size -= i; + } else { + *dest += size; + size = 0; + } + va_end(va); + *dest[0] = '\0'; + return size; +} + /* concatenates list of strings, moves dest forward */ size_t util_strpcpyl(char **dest, size_t size, const char *src, ...) { |