Libc-997.90.3.tar.gz

[apple/libc.git] / gen / wordexp.c

diff --git a/gen/wordexp.c b/gen/wordexp.c
index 1a10891b4c9d0f6bb8d8b727e5652038f020bd39..7de775c9ecee21d8f3858c461ae53e67ac592121 100644 (file)
--- a/gen/wordexp.c
+++ b/gen/wordexp.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2005, 2008 Apple Inc. All rights reserved.

  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 


@@ -21,6 +21,21 @@
  * @APPLE_LICENSE_HEADER_END@
  */
 
  * @APPLE_LICENSE_HEADER_END@
  */
 

+#include <TargetConditionals.h>
+
+#if TARGET_OS_IPHONE
+/* <rdar://problem/13875458> */
+
+#include <wordexp.h>
+int wordexp(const char *restrict words __unused, wordexp_t *restrict pwordexp __unused, int flags __unused) {
+    return WRDE_NOSPACE;
+}
+
+void wordfree(wordexp_t *pwordexp __unused) {
+}
+
+#else
+

 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>


@@ -31,80 +46,90 @@
 #include <unistd.h>
 #include <paths.h>
 #include <strings.h>
 #include <unistd.h>
 #include <paths.h>
 #include <strings.h>

+#include <spawn.h>

 #include <sys/errno.h>
 
 // For _NSGetEnviron() -- which gives us a pointer to environ
 #include <crt_externs.h>
 
 extern size_t malloc_good_size(size_t size);
 #include <sys/errno.h>
 
 // For _NSGetEnviron() -- which gives us a pointer to environ
 #include <crt_externs.h>
 
 extern size_t malloc_good_size(size_t size);

-extern int errno;

 
 

-pthread_once_t re_init_c = PTHREAD_ONCE_INIT;
-static regex_t re_cmd, re_goodchars, re_subcmd_syntax_err_kludge;
+static pthread_once_t re_init_c = PTHREAD_ONCE_INIT;
+static regex_t re_cmd, re_goodchars, re_subcmd_syntax_err_kludge, re_quoted_string;

 
 

-/* Similar to popen, but catures stderr for you.  Doesn't interoperate
+/* Similar to popen, but captures stderr for you.  Doesn't interoperate

   with pclose.  Call wait4 on your own */
   with pclose.  Call wait4 on your own */

-pid_t popen_oe(char *cmd, FILE **out, FILE **err) {
+static pid_t popen_oe(char *cmd, FILE **out, FILE **err) {

     int out_pipe[2], err_pipe[2];
     char *argv[4];
     pid_t pid;
     int out_pipe[2], err_pipe[2];
     char *argv[4];
     pid_t pid;

+    posix_spawn_file_actions_t file_actions;
+    int errrtn;

 
 

+    if ((errrtn = posix_spawn_file_actions_init(&file_actions)) != 0) {
+       errno = errrtn;
+       return 0;
+    }

     if (pipe(out_pipe) < 0) {
     if (pipe(out_pipe) < 0) {

+       posix_spawn_file_actions_destroy(&file_actions);

        return 0;
     }
     if (pipe(err_pipe) < 0) {
        return 0;
     }
     if (pipe(err_pipe) < 0) {

+       posix_spawn_file_actions_destroy(&file_actions);

        close(out_pipe[0]);
        close(out_pipe[1]);
        return 0;
     }
 
        close(out_pipe[0]);
        close(out_pipe[1]);
        return 0;
     }
 

+    if (out_pipe[1] != STDOUT_FILENO) {
+       posix_spawn_file_actions_adddup2(&file_actions, out_pipe[1], STDOUT_FILENO);
+       posix_spawn_file_actions_addclose(&file_actions, out_pipe[1]);
+    }
+    posix_spawn_file_actions_addclose(&file_actions, out_pipe[0]);
+    if (err_pipe[1] != STDERR_FILENO) {
+       posix_spawn_file_actions_adddup2(&file_actions, err_pipe[1], STDERR_FILENO);
+       posix_spawn_file_actions_addclose(&file_actions, err_pipe[1]);
+    }
+    posix_spawn_file_actions_addclose(&file_actions, err_pipe[0]);
+

     argv[0] = "sh";
     argv[1] = "-c";
     argv[2] = cmd;
     argv[3] = NULL;
 
     argv[0] = "sh";
     argv[1] = "-c";
     argv[2] = cmd;
     argv[3] = NULL;
 

-    switch(pid = vfork()) {
-       case -1:
-           close(out_pipe[0]);
-           close(out_pipe[1]);
-           close(err_pipe[0]);
-           close(err_pipe[1]);
-           return 0;
-       case 0:
-           if (out_pipe[1] != STDOUT_FILENO) {
-               dup2(out_pipe[1], STDOUT_FILENO);
-               close(out_pipe[1]);
-           }
-           close(out_pipe[0]);
-           if (err_pipe[1] != STDERR_FILENO) {
-               dup2(err_pipe[1], STDERR_FILENO);
-               close(err_pipe[1]);
-           }
-           close(err_pipe[0]);
-           execve(_PATH_BSHELL, argv, *_NSGetEnviron());
-           _exit(127);
-       default:
-           *out = fdopen(out_pipe[0], "r");
-           assert(*out);
-           close(out_pipe[1]);
-           *err = fdopen(err_pipe[0], "r");
-           assert(*err);
-           close(err_pipe[1]);
-
-           return pid;
+    errrtn = posix_spawn(&pid, _PATH_BSHELL, &file_actions, NULL, argv, *_NSGetEnviron());
+    posix_spawn_file_actions_destroy(&file_actions);
+
+    if (errrtn != 0) {
+       close(out_pipe[0]);
+       close(out_pipe[1]);
+       close(err_pipe[0]);
+       close(err_pipe[1]);
+       errno = errrtn;
+       return 0;

     }
     }

+
+    *out = fdopen(out_pipe[0], "r");
+    assert(*out);
+    close(out_pipe[1]);
+    *err = fdopen(err_pipe[0], "r");
+    assert(*err);
+    close(err_pipe[1]);
+
+    return pid;

 }
 
 }
 

-void re_init(void) {
-    int rc = regcomp(&re_cmd, "(^|[^\\])(`|\\$\\()", REG_EXTENDED|REG_NOSUB);
+static void re_init(void) {
+    int rc = regcomp(&re_cmd, "(^|[^\\])(`|\\$\\([^(])", REG_EXTENDED|REG_NOSUB);

     /* XXX I'm not sure the { } stuff is correct,
       it may be overly restrictave */
     /* XXX I'm not sure the { } stuff is correct,
       it may be overly restrictave */

-    char *rx = "^([^\\\"'|&;<>(){}]"
+    char *rx = "^([^\\\"'|&;<>(){}\n]"

       "|\\\\."
       "|\\\\."

-      "|'([^']|\\\\')*'"
-      "|\"([^\"]|\\\\\")*\""
-      "|`([^`]|\\\\`)*`"
-      "|\\$(([^)]|\\\\))*\\)"  /* can't do nesting in a regex */
+      "|'(\\\\\\\\|\\\\'|[^'])*'"
+      "|\"(\\\\\\\\|\\\\\"|[^\"])*\""
+      "|`(\\\\\\\\|\\\\`|[^`])*`"
+      "|\\$\\(\\(([^)]|\\\\)*\\)\\)"  /* can't do nesting in a regex */
+      "|\\$\\(([^)]|\\\\)*\\)"  /* can't do nesting in a regex */

       "|\\$\\{[^}]*\\}"
       /* XXX: { } ? */
       ")*$";
       "|\\$\\{[^}]*\\}"
       /* XXX: { } ? */
       ")*$";


@@ -113,6 +138,9 @@ void re_init(void) {
 
     rc = regcomp(&re_subcmd_syntax_err_kludge, 
       "command substitution.*syntax error", REG_EXTENDED|REG_NOSUB);
 
     rc = regcomp(&re_subcmd_syntax_err_kludge, 
       "command substitution.*syntax error", REG_EXTENDED|REG_NOSUB);

+
+    rc = regcomp(&re_quoted_string, 
+      "(^|[^\\])'(\\\\\\\\|\\\\'|[^'])*'", REG_EXTENDED|REG_NOSUB);

 }
 
 /* Returns zero if it can't realloc */
 }
 
 /* Returns zero if it can't realloc */


@@ -129,8 +157,39 @@ static int word_alloc(size_t want, wordexp_t *__restrict__ pwe, size_t *have) {
     return 0;
 }
 
     return 0;
 }
 

+static int
+cmd_search(const char *str) {
+    regoff_t first = 0;
+    regoff_t last = strlen(str);
+    regmatch_t m = {first, last};
+    int flags;
+
+    if (last == 0) return REG_NOMATCH; /* empty string */
+
+    flags = REG_STARTEND;
+    while(regexec(&re_quoted_string, str, 1, &m, flags) == 0) {
+       /*
+        * We have matched a single quoted string, from m.rm_so to m.rm_eo.
+        * So the (non-quote string) from first to m.rm_so needs to be
+        * checked for command substitution.  Then we use REG_STARTEND to
+        * look for any other single quote strings after this one.
+        */
+        regmatch_t head = {first, m.rm_so};
+        if (regexec(&re_cmd, str, 1, &head, flags) == 0) {
+            return 0; /* found a command substitution */
+        }
+        flags = REG_NOTBOL | REG_STARTEND;
+        m.rm_so = first = m.rm_eo;
+        m.rm_eo = last;
+    }
+    /* Check the remaining string */
+     flags = REG_STARTEND;
+     if (m.rm_so > 0) flags |= REG_NOTBOL;
+     return regexec(&re_cmd, str, 1, &m, flags);
+}
+

 /* XXX this is _not_ designed to be fast */
 /* XXX this is _not_ designed to be fast */

-/* wordexp is also rife with security "chalenges", unless you pass it
+/* wordexp is also rife with security "challenges", unless you pass it

   WRDE_NOCMD it *must* support subshell expansion, and even if you
   don't beause it has to support so much of the standard shell (all
   the odd little variable expansion options for example) it is hard
   WRDE_NOCMD it *must* support subshell expansion, and even if you
   don't beause it has to support so much of the standard shell (all
   the odd little variable expansion options for example) it is hard


@@ -143,7 +202,7 @@ int wordexp(const char *__restrict__ words,
       about 20 chars */
     size_t cbuf_l = 1024;
     char *cbuf = NULL;
       about 20 chars */
     size_t cbuf_l = 1024;
     char *cbuf = NULL;

-    /* Put a NUL byte between eaach word, and at the end */
+    /* Put a NUL byte between each word, and at the end */

     char *cmd = "/usr/bin/perl -e 'print join(chr(0), @ARGV), chr(0)' -- ";
     size_t wordv_l = 0, wordv_i = 0;
     int rc;
     char *cmd = "/usr/bin/perl -e 'print join(chr(0), @ARGV), chr(0)' -- ";
     size_t wordv_l = 0, wordv_i = 0;
     int rc;


@@ -154,11 +213,11 @@ int wordexp(const char *__restrict__ words,
     pthread_once(&re_init_c, re_init);
 
     if (flags & WRDE_NOCMD) {
     pthread_once(&re_init_c, re_init);
 
     if (flags & WRDE_NOCMD) {

-       /* Thi attmpts to match any backticks or $(...)'s, but there may be
+       /* This attempts to match any backticks or $(...)'s, but there may be

          other ways to do subshell expansion that the standard doesn't
          other ways to do subshell expansion that the standard doesn't

-         cover, but I don't know of any -- failures here aare a potential
+         cover, but I don't know of any -- failures here are a potential

          security risk */
          security risk */

-       rc = regexec(&re_cmd, words, 0, NULL, 0);
+       rc = cmd_search(words);

        if (rc != REG_NOMATCH) {
            /* Technically ==0 is WRDE_CMDSUB, and != REG_NOMATCH is
              "some internal error", but failing to catch those here
        if (rc != REG_NOMATCH) {
            /* Technically ==0 is WRDE_CMDSUB, and != REG_NOMATCH is
              "some internal error", but failing to catch those here


@@ -196,6 +255,8 @@ int wordexp(const char *__restrict__ words,
            }
            bzero(pwe->we_wordv + wordv_i, pwe->we_offs * sizeof(char *));
            wordv_i = wend;
            }
            bzero(pwe->we_wordv + wordv_i, pwe->we_offs * sizeof(char *));
            wordv_i = wend;

+       } else {
+           pwe->we_offs = 0;

        }
     }
 
        }
     }
 


@@ -234,8 +295,8 @@ int wordexp(const char *__restrict__ words,
     }
     
     char *word = NULL;
     }
     
     char *word = NULL;

-    int word_l = 0;
-    int word_i = 0;
+    size_t word_l = 0;
+    size_t word_i = 0;

     int ch;
 
     while(EOF != (ch = fgetc(out))) {
     int ch;
 
     while(EOF != (ch = fgetc(out))) {


@@ -275,7 +336,7 @@ int wordexp(const char *__restrict__ words,
 
     char err_buf[1024];
     size_t err_sz = fread(err_buf, 1, sizeof(err_buf) -1, err);
 
     char err_buf[1024];
     size_t err_sz = fread(err_buf, 1, sizeof(err_buf) -1, err);

-    err_buf[(err_sz >= 0) ? err_sz : 0] = '\0';
+    err_buf[err_sz] = '\0';

     if (flags & WRDE_SHOWERR) {
        fputs(err_buf, stderr);
     }
     if (flags & WRDE_SHOWERR) {
        fputs(err_buf, stderr);
     }


@@ -283,7 +344,7 @@ int wordexp(const char *__restrict__ words,
     pid_t got_pid = 0;
     int status;
     do {
     pid_t got_pid = 0;
     int status;
     do {

-       pid = wait4(pid, &status, 0, NULL);
+       got_pid = wait4(pid, &status, 0, NULL);

     } while(got_pid == -1 && errno == EINTR);
 
     fclose(out);
     } while(got_pid == -1 && errno == EINTR);
 
     fclose(out);


@@ -317,9 +378,11 @@ void wordfree(wordexp_t *pwe) {
     }
 
     int i = 0, e = pwe->we_wordc + pwe->we_offs;
     }
 
     int i = 0, e = pwe->we_wordc + pwe->we_offs;

-    for(i = 0; i < e; i++) {
+    for(i = pwe->we_offs; i < e; i++) {

        free(pwe->we_wordv[i]);
     }
     free(pwe->we_wordv);
     pwe->we_wordv = NULL;
 }
        free(pwe->we_wordv[i]);
     }
     free(pwe->we_wordv);
     pwe->we_wordv = NULL;
 }

+
+#endif /* TARGET_OS_IPHONE */