picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tree-wide: use '"' instead of '\"'

Browse source 
The escape used previously was redundant and made things more confusing.
This commit is contained in:
Louis Taylor 2019-01-15 18:51:31 +00:00
parent e4a8db1fbd
commit e768a4f032
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/basic/env-file.c
View file

@ -112,7 +112,7 @@ static int parse_env_file_internal(
} else if (c == '\'') } else if (c == '\'')
state = SINGLE_QUOTE_VALUE; state = SINGLE_QUOTE_VALUE;
else if (c == '\"') else if (c == '"')
state = DOUBLE_QUOTE_VALUE; state = DOUBLE_QUOTE_VALUE;
else if (c == '\\') else if (c == '\\')
state = VALUE_ESCAPE; state = VALUE_ESCAPE;
@ -195,7 +195,7 @@ static int parse_env_file_internal(
break; break;
case DOUBLE_QUOTE_VALUE: case DOUBLE_QUOTE_VALUE:
if (c == '\"') if (c == '"')
state = PRE_VALUE; state = PRE_VALUE;
else if (c == '\\') else if (c == '\\')
state = DOUBLE_QUOTE_VALUE_ESCAPE; state = DOUBLE_QUOTE_VALUE_ESCAPE;
@ -517,7 +517,7 @@ static void write_env_var(FILE *f, const char *v) {
fwrite_unlocked(v, 1, p-v, f); fwrite_unlocked(v, 1, p-v, f);
if (string_has_cc(p, NULL) || chars_intersect(p, WHITESPACE SHELL_NEED_QUOTES)) { if (string_has_cc(p, NULL) || chars_intersect(p, WHITESPACE SHELL_NEED_QUOTES)) {
fputc_unlocked('\"', f); fputc_unlocked('"', f);
for (; *p; p++) { for (; *p; p++) {
if (strchr(SHELL_NEED_ESCAPE, *p)) if (strchr(SHELL_NEED_ESCAPE, *p))
@ -526,7 +526,7 @@ static void write_env_var(FILE *f, const char *v) {
fputc_unlocked(*p, f); fputc_unlocked(*p, f);
} }
fputc_unlocked('\"', f); fputc_unlocked('"', f);
} else } else
fputs_unlocked(p, f); fputs_unlocked(p, f);

2
src/boot/efi/boot.c
View file

@ -1000,7 +1000,7 @@ skip:
value++; value++;
/* unquote */ /* unquote */
if (value[0] == '\"' && line[linelen-1] == '\"') { if (value[0] == '"' && line[linelen-1] == '"') {
value++; value++;
line[linelen-1] = '\0'; line[linelen-1] = '\0';
} }

4
src/shared/logs-show.c
View file

@ -724,7 +724,7 @@ void json_escape(
fputs(" ]", f); fputs(" ]", f);
} else { } else {
fputc('\"', f); fputc('"', f);
while (l > 0) { while (l > 0) {
if (IN_SET(*p, '"', '\\')) { if (IN_SET(*p, '"', '\\')) {
@ -741,7 +741,7 @@ void json_escape(
l--; l--;
} }
fputc('\"', f); fputc('"', f);
} }
} }

2
src/shared/xml.c
View file

@ -191,7 +191,7 @@ int xml_tokenize(const char **p, char **name, void **state, unsigned *line) {
if (*c == '=') { if (*c == '=') {
c++; c++;
if (IN_SET(*c, '\'', '\"')) { if (IN_SET(*c, '\'', '"')) {
/* Tag with a quoted value */ /* Tag with a quoted value */
e = strchr(c+1, *c); e = strchr(c+1, *c);