da6053d0a7
Previously we were a bit sloppy with the index and size types of arrays, we'd regularly use unsigned. While I don't think this ever resulted in real issues I think we should be more careful there and follow a stricter regime: unless there's a strong reason not to use size_t for array sizes and indexes, size_t it should be. Any allocations we do ultimately will use size_t anyway, and converting forth and back between unsigned and size_t will always be a source of problems. Note that on 32bit machines "unsigned" and "size_t" are equivalent, and on 64bit machines our arrays shouldn't grow that large anyway, and if they do we have a problem, however that kind of overly large allocation we have protections for usually, but for overflows we do not have that so much, hence let's add it. So yeah, it's a story of the current code being already "good enough", but I think some extra type hygiene is better. This patch tries to be comprehensive, but it probably isn't and I missed a few cases. But I guess we can cover that later as we notice it. Among smaller fixes, this changes: 1. strv_length()' return type becomes size_t 2. the unit file changes array size becomes size_t 3. DNS answer and query array sizes become size_t Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=76745
56 lines
1.7 KiB
C
56 lines
1.7 KiB
C
/* SPDX-License-Identifier: LGPL-2.1+ */
|
|
#pragma once
|
|
|
|
/***
|
|
This file is part of systemd.
|
|
|
|
Copyright 2013 Lennart Poettering
|
|
***/
|
|
|
|
#include <stdbool.h>
|
|
#include <stddef.h>
|
|
#include <stdio.h>
|
|
|
|
#include "macro.h"
|
|
|
|
bool env_name_is_valid(const char *e);
|
|
bool env_value_is_valid(const char *e);
|
|
bool env_assignment_is_valid(const char *e);
|
|
|
|
enum {
|
|
REPLACE_ENV_USE_ENVIRONMENT = 1u,
|
|
REPLACE_ENV_ALLOW_BRACELESS = 2u,
|
|
REPLACE_ENV_ALLOW_EXTENDED = 4u,
|
|
};
|
|
|
|
char *replace_env_n(const char *format, size_t n, char **env, unsigned flags);
|
|
char **replace_env_argv(char **argv, char **env);
|
|
|
|
static inline char *replace_env(const char *format, char **env, unsigned flags) {
|
|
return replace_env_n(format, strlen(format), env, flags);
|
|
}
|
|
|
|
bool strv_env_is_valid(char **e);
|
|
#define strv_env_clean(l) strv_env_clean_with_callback(l, NULL, NULL)
|
|
char **strv_env_clean_with_callback(char **l, void (*invalid_callback)(const char *p, void *userdata), void *userdata);
|
|
|
|
bool strv_env_name_is_valid(char **l);
|
|
bool strv_env_name_or_assignment_is_valid(char **l);
|
|
|
|
char **strv_env_merge(size_t n_lists, ...);
|
|
char **strv_env_delete(char **x, size_t n_lists, ...); /* New copy */
|
|
|
|
char **strv_env_set(char **x, const char *p); /* New copy ... */
|
|
char **strv_env_unset(char **l, const char *p); /* In place ... */
|
|
char **strv_env_unset_many(char **l, ...) _sentinel_;
|
|
int strv_env_replace(char ***l, char *p); /* In place ... */
|
|
|
|
char *strv_env_get_n(char **l, const char *name, size_t k, unsigned flags) _pure_;
|
|
char *strv_env_get(char **x, const char *n) _pure_;
|
|
|
|
int getenv_bool(const char *p);
|
|
int getenv_bool_secure(const char *p);
|
|
|
|
int serialize_environment(FILE *f, char **environment);
|
|
int deserialize_environment(char ***environment, const char *line);
|