shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-26 03:22:00 +03:00
Code

strv: detect non-assignments in env blocks properly in env_append()

Browse Source
This commit is contained in:
Lennart Poettering 2011-04-16 01:50:10 +02:00
parent ede27aab11
commit 5d6ab905c0
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/strv.c
View File

@ -358,7 +358,10 @@ char **strv_remove(char **l, const char *s) {
if (!l) if (!l)
return NULL; return NULL;
/* Drops every occurrence of s in the string list */ assert(s);
/* Drops every occurrence of s in the string list, edits
* in-place. */
for (f = t = l; *f; f++) { for (f = t = l; *f; f++) {
@ -387,7 +390,12 @@ static int env_append(char **r, char ***k, char **a) {
for (; *a; a++) { for (; *a; a++) {
char **j; char **j;
size_t n = strcspn(*a, "=") + 1; size_t n;
n = strcspn(*a, "=");
if ((*a)[n] == '=')
n++;
for (j = r; j < *k; j++) for (j = r; j < *k; j++)
if (strncmp(*j, *a, n) == 0) if (strncmp(*j, *a, n) == 0)