env-file: add parse_env_data() helper
This commit is contained in:
committed by
Lennart Poettering
parent
226525b432
commit
7876bd5cfc
@@ -420,6 +420,40 @@ int parse_env_file_fd_sentinel(
|
||||
return r;
|
||||
}
|
||||
|
||||
int parse_env_datav(
|
||||
const char *data,
|
||||
size_t size,
|
||||
const char *fname, /* only used for logging */
|
||||
va_list ap) {
|
||||
|
||||
assert(data);
|
||||
|
||||
if (size == SIZE_MAX)
|
||||
size = strlen_ptr(data);
|
||||
|
||||
_cleanup_fclose_ FILE *f = fmemopen_unlocked((void*) data, size, "r");
|
||||
if (!f)
|
||||
return -ENOMEM;
|
||||
|
||||
return parse_env_filev(f, fname, ap);
|
||||
}
|
||||
|
||||
int parse_env_data_sentinel(
|
||||
const char *data,
|
||||
size_t size,
|
||||
const char *fname, /* only used for logging */
|
||||
...) {
|
||||
|
||||
va_list ap;
|
||||
int r;
|
||||
|
||||
va_start(ap, fname);
|
||||
r = parse_env_datav(data, size, fname, ap);
|
||||
va_end(ap);
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
static int load_env_file_push(
|
||||
const char *filename, unsigned line,
|
||||
const char *key, char *value,
|
||||
|
||||
@@ -9,6 +9,11 @@ int parse_env_file_sentinel(FILE *f, const char *fname, ...) _sentinel_;
|
||||
#define parse_env_file(f, fname, ...) parse_env_file_sentinel(f, fname, __VA_ARGS__, NULL)
|
||||
int parse_env_file_fd_sentinel(int fd, const char *fname, ...) _sentinel_;
|
||||
#define parse_env_file_fd(fd, fname, ...) parse_env_file_fd_sentinel(fd, fname, __VA_ARGS__, NULL)
|
||||
|
||||
int parse_env_datav(const char *data, size_t size, const char *fname, va_list ap);
|
||||
int parse_env_data_sentinel(const char *data, size_t size, const char *fname, ...) _sentinel_;
|
||||
#define parse_env_data(text, size, fname, ...) parse_env_data_sentinel(text, size, fname, __VA_ARGS__, NULL)
|
||||
|
||||
int load_env_file(FILE *f, const char *fname, char ***ret);
|
||||
int load_env_file_pairs(FILE *f, const char *fname, char ***ret);
|
||||
int load_env_file_pairs_fd(int fd, const char *fname, char ***ret);
|
||||
|
||||
Reference in New Issue
Block a user