Changeset 2989

Timestamp:

Apr 2, 2007, 4:54:36 AM (18 years ago)

Author:

bird

Message:

New single quote handling.

File:

• trunk/libc/src/kNIX/b_initArgv.c (modified) (1 diff)

trunk/libc/src/kNIX/b_initArgv.c

@@ -91 +91 @@
     for (;;)
     {
+        /* skip white spaces */
         while (IS_WHITE(*pszSrc))
             ++pszSrc;
         if (*pszSrc == 0)
             break;
-        char *pfFlags = pbPool;
-        PUTC((char)_ARG_NONZERO);
+
+        /* 
+         * Parse one argument.
+         */
+        char fFlags;
+        char *pfFlags = pbPool ? pbPool++ : &fFlags;
+        *pfFlags = (char)_ARG_NONZERO;
+        cbArgs++;
+        const size_t offArg = cbArgs; 
         PUTV;
-        int cBackspaces = 0;
         char chQuote = 0;
         for (;;)
         {
-            if (!chQuote ? (*pszSrc == '"' || *pszSrc == '\'') : *pszSrc == chQuote)
+            /* End quote. */
+            if (*pszSrc == chQuote && chQuote)
+                chQuote = 0;
+            /* Start of double quote. */
+            else if (!chQuote && *pszSrc == '"')
             {
-                while (cBackspaces >= 2)
+                chQuote = '"';
+                *pfFlags |= _ARG_DQUOTE;
+            }
+            /* 
+             * Only permit the single quote to be used at the start of an argument or
+             * within an already quoted one. This restriction is necessary to support
+             * unquoted filenames containing the single quote char. 
+             */
+            else if (   !chQuote
+                     && *pszSrc == '\''
+                     && (   offArg == cbArgs
+                         || (*pfFlags & _ARG_DQUOTE)))
+            {
+                chQuote = '\'';
+                *pfFlags |= _ARG_DQUOTE;
+            }
+            /* 
+             * The escape character. This is truly magic/weird. 
+             * It doesn't escape anything unless it's in front of a 
+             * double quote character. EMX weirdness...
+             * (Ok, not escaping more than necessary is ok when using \ as path 
+             * separator, but why weird interpretation of \\\\"asdf"?
+             */
+            else if (*pszSrc == '\\' && chQuote != '\'')
+            {
+                int cSlashes = 0;
+                do
                 {
-                    PUTC('\\');
-                    cBackspaces -= 2;
+                    cSlashes++;
+                    pszSrc++;
+                } while (*pszSrc == '\\');
+
+                if (*pszSrc == '"')
+                {
+                    /* Treat it as escapes. */
+                    while (cSlashes >= 2)
+                    {
+                        PUTC('\\');
+                        cSlashes -= 2;
+                    }
+                    if (cSlashes & 1)
+                        PUTC(*pszSrc);
+                    else
+                        pszSrc--;
                 }
-                if (cBackspaces & 1)
-                    PUTC(*pszSrc);
                 else
                 {
-                    chQuote = chQuote ? 0 : *pszSrc;
-                    if (pfFlags != NULL)
-                        *pfFlags |= _ARG_DQUOTE;
+                    /* unmodified, no escaping. */
+                    while (cSlashes-- > 0)
+                        PUTC('\\');
+                    pszSrc--;
                 }
-                cBackspaces = 0;
             }
-            else if (*pszSrc == '\\')
-                ++cBackspaces;
+            /* Check for end of argument. */
+            else if (   *pszSrc == '\0'
+                     || (   IS_WHITE(*pszSrc) 
+                         && !chQuote))
+                break;
+            /* Normal character. */
             else
-            {
-                while (cBackspaces != 0)
-                {
-                    PUTC('\\');
-                    --cBackspaces;
-                }
-                if (*pszSrc == 0 || (IS_WHITE(*pszSrc) && !chQuote))
-                    break;
                 PUTC(*pszSrc);
-            }
             ++pszSrc;
         }