aboutsummaryrefslogtreecommitdiff
path: root/libpkgconf/argvsplit.c
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2017-12-15 15:26:00 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2017-12-15 15:26:00 +0300
commit9e89d3920a74f59b78f6edfaec5b9fac4b635b0d (patch)
tree3d6d777ee32d9541ee1e7ea9401537f5973de32a /libpkgconf/argvsplit.c
parent00824fd4db22e931193a0c86e38b22025b79306f (diff)
Merge with latest upstream package version (master branch)
Diffstat (limited to 'libpkgconf/argvsplit.c')
-rw-r--r--libpkgconf/argvsplit.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/libpkgconf/argvsplit.c b/libpkgconf/argvsplit.c
index 4553154..02ce1a3 100644
--- a/libpkgconf/argvsplit.c
+++ b/libpkgconf/argvsplit.c
@@ -88,12 +88,7 @@ pkgconf_argv_split(const char *src, int *argc, char ***argv)
*dst_iter++ = *src_iter;
}
else
- {
- if (*src_iter == '\\')
- *dst_iter++ = '\\';
-
*dst_iter++ = *src_iter;
- }
escaped = false;
}
@@ -101,7 +96,7 @@ pkgconf_argv_split(const char *src, int *argc, char ***argv)
{
if (*src_iter == quote)
quote = 0;
- else if (*src_iter == '\\')
+ else if (*src_iter == '\\' && quote != '\'')
escaped = true;
else
*dst_iter++ = *src_iter;