- x32 rebuild

[packages/lftp.git] / lftp-bug-121.patch

From 8e8e146c9763635d510c8a065c2c143068dc58d6 Mon Sep 17 00:00:00 2001
From: "Alexander V. Lukyanov" <lavv17f@gmail.com>
Date: Wed, 21 Jan 2015 19:28:52 +0300
Subject: [PATCH] (ArgV::CombineShellQuoted) new method; use it for FishDirList

This fixes a problem with ls (fish protocol) when called with an
argument containing spaces and other special symbols.
---
 src/ArgV.cc | 19 +++++++++++++++++++
 src/ArgV.h  |  4 ++++
 src/Fish.h  |  2 +-
 src/misc.cc | 41 ++++++++++++++++++++++-------------------
 src/misc.h  |  1 +
 5 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/src/ArgV.cc b/src/ArgV.cc
index fdf9379..785966d 100644
--- a/src/ArgV.cc
+++ b/src/ArgV.cc
@@ -72,6 +72,25 @@ char *ArgV::Combine(int start,int end) const
    }
 }
 
+char *ArgV::CombineShellQuoted(int start) const
+{
+   xstring res("");
+   if(start>=Count())
+      return res.borrow();
+   for(;;)
+   {
+      for(const char *arg=String(start++); *arg; arg++)
+      {
+	 if (is_shell_special(*arg))
+	    res.append('\\');
+	 res.append(*arg);
+      }
+      if(start>=Count())
+	 return(res.borrow());
+      res.append(' ');
+   }
+}
+
 int ArgV::getopt_long(const char *opts,const struct option *lopts,int *lind)
 {
    optind=ind;
diff --git a/src/ArgV.h b/src/ArgV.h
index 442d6a3..c911733 100644
--- a/src/ArgV.h
+++ b/src/ArgV.h
@@ -42,6 +42,10 @@ class ArgV : public StringSet
    void Add(const char *a) { Append(a); } // alias
 
    char *Combine(int start_index=0,int end_index=0) const;
+
+   // for the UNIX shell
+   char *CombineShellQuoted(int start) const;
+   // for lftp's CmdExec
    char *CombineQuoted(int start_index=0) const;
    char *CombineCmd(int i=0) const;
 
diff --git a/src/Fish.h b/src/Fish.h
index dd9112d..5493e59 100644
--- a/src/Fish.h
+++ b/src/Fish.h
@@ -150,7 +150,7 @@ class FishDirList : public DirList
 
 public:
    FishDirList(Fish *s,ArgV *a)
-      : DirList(s,a), pattern(args->Combine(1)) {}
+      : DirList(s,a), pattern(args->CombineShellQuoted(1)) {}
    const char *Status();
    int Do();
 
diff --git a/src/misc.cc b/src/misc.cc
index 9e253ef..b31e523 100644
--- a/src/misc.cc
+++ b/src/misc.cc
@@ -882,6 +882,26 @@ const char *memrchr(const char *buf,char c,size_t len)
    return 0;
 }
 
+bool is_shell_special(char c)
+{
+   switch (c)
+   {
+   case '\'':
+   case '(': case ')':
+   case '!': case '{': case '}':		/* reserved words */
+   case '^':
+   case '$': case '`':			/* expansion chars */
+   case '*': case '[': case '?': case ']':	/* globbing chars */
+   case ' ': case '\t': case '\n':		/* IFS white space */
+   case '"': case '\\':		/* quoting chars */
+   case '|': case '&': case ';':		/* shell metacharacters */
+   case '<': case '>':
+   case '#':				/* comment char */
+      return true;
+   }
+   return false;
+}
+
 const xstring& shell_encode(const char *string)
 {
    if(!string)
@@ -901,26 +921,9 @@ const xstring& shell_encode(const char *string)
    int c;
    for (const char *s = string; s && (c = *s); s++)
    {
-      switch (c)
-      {
-      case '\'':
-      case '(': case ')':
-      case '!': case '{': case '}':		/* reserved words */
-      case '^':
-      case '$': case '`':			/* expansion chars */
-      case '*': case '[': case '?': case ']':	/* globbing chars */
-      case ' ': case '\t': case '\n':		/* IFS white space */
-      case '"': case '\\':		/* quoting chars */
-      case '|': case '&': case ';':		/* shell metacharacters */
-      case '<': case '>':
-      case '#':				/* comment char */
+      if (is_shell_special(c))
 	 *r++ = '\\';
-	 *r++ = c;
-	 break;
-      default:
-	 *r++ = c;
-	 break;
-      }
+      *r++ = c;
    }
    result.set_length(r-result);
    return (result);
diff --git a/src/misc.h b/src/misc.h
index 4cda301..f93d25e 100644
--- a/src/misc.h
+++ b/src/misc.h
@@ -123,6 +123,7 @@ static inline char *memrchr(char *buf,char c,size_t len) {
    return const_cast<char*>(memrchr(const_cast<const char*>(buf),c,len));
 }
 
+bool is_shell_special(char c);
 const xstring& shell_encode(const char *);
 void remove_tags(char *buf);
 void rtrim(char *s);