Changeset 448421b in tol

Timestamp:

Jan 3, 2012, 5:33:17 PM (15 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

0d27864

Parents:

c495c08

Message:

refs #1118, using PExec as a more appropiate name, also implementing automatic protect of arguments with spaces (pending check on windows)

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@3981 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/btol/set_type/setgra.cpp (modified) (4 diffs)

tol/btol/set_type/setgra.cpp

@@ -2788 +2788 @@
 
 //--------------------------------------------------------------------
-DeclareContensClass(BSet, BSetTemporary, BSetPOpen);
-DefExtOpr(1, BSetPOpen, "POpen", 1, 1,
+DeclareContensClass(BSet, BSetTemporary, BSetPExec);
+DefExtOpr(1, BSetPExec, "PExec", 1, 1,
           "Set", 
           "(Set Args)",
@@ -2796 +2796 @@
           BOperClassify::System_);
 
-#define POPEN
-#ifdef POPEN
-//--------------------------------------------------------------------
-void BSetPOpen::CalcContens()
+#ifdef WIN32
+void escapeCmdArg( const char *input, BText &output )
+{
+  const char *pCh = input;
+  int bs = 0;
+  int need = 0;
+  
+  while ( *pCh ) {
+    if ( !bs && *pCh == ' ' ) {
+      need = 1;
+      break;
+    }
+    bs = ((*pCh == '\\') && !bs);
+    ++pCh;
+  }
+  if ( need ) {
+    output = "\"";
+    output += input;
+    output += "\"";
+  } else {
+    output = input;
+  }
+}
+#else
+void escapeCmdArg( const char *input, BText &output )
+{
+  const char *pCh = input;
+  output = "";
+  int bs = 0;
+  
+  while ( *pCh ) {
+    if ( !bs && *pCh == ' ' ) {
+      output += "\\ ";
+    } else {
+      output += *pCh;
+    }
+    bs = ((*pCh == '\\') && !bs);
+    ++pCh;
+  }
+}
+#endif
+
+//--------------------------------------------------------------------
+void BSetPExec::CalcContens()
 //--------------------------------------------------------------------
 {
@@ -2816 +2856 @@
         badArg = 1;
       }
-      const BText &txt = Text( arg );
-          /*
-          char *start = txt.Buffer();
-          char *end ;
-          char *tmp = new char[ txt.Length() ];
-          do {
-                end = start;
-                int bs = 0;
-                while ( *end ) {
-                  if ( !bs && isspace( *end ) ) break;
-                  bs = *end == '\\';
-                  ++end
-                }
-          }
-          while ( *end ) {
-            cmd += strncpy( tmp, start, end - start );
-                cmd += "\\ ";
-                start = end + 1;
-          }
-          delete []tmp;
-          */
-      cmd += txt;
-      cmd += " ";
+      BText &_arg = Text( arg ), escapedArg;
+      escapeCmdArg( _arg, escapedArg );
+      if ( i > 1 ) {
+        cmd += " ";
+      }
+      cmd += escapedArg;
     }
     if ( !badArg ) {
@@ -2875 +2898 @@
   contens_.RobElement(result);  
 }
-#endif