From 9e89d3920a74f59b78f6edfaec5b9fac4b635b0d Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Fri, 15 Dec 2017 15:26:00 +0300 Subject: Merge with latest upstream package version (master branch) --- libpkgconf/argvsplit.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'libpkgconf/argvsplit.c') 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; -- cgit v1.1