Changes in uspace/app/bdsh/exec.c [7e752b2:aa8053f1] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/bdsh/exec.c
r7e752b2 raa8053f1 1 /* Copyright (c) 2008, Tim Post <tinkertim@gmail.com> 1 /* 2 * Copyright (c) 2008 Tim Post 2 3 * All rights reserved. 3 4 * 4 5 * Redistribution and use in source and binary forms, with or without 5 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions 7 * are met: 6 8 * 7 * Redistributions of source code must retain the above copyright notice, this 8 * list of conditions and the following disclaimer. 9 * - Redistributions of source code must retain the above copyright 10 * notice, this list of conditions and the following disclaimer. 11 * - Redistributions in binary form must reproduce the above copyright 12 * notice, this list of conditions and the following disclaimer in the 13 * documentation and/or other materials provided with the distribution. 14 * - The name of the author may not be used to endorse or promote products 15 * derived from this software without specific prior written permission. 9 16 * 10 * Redistributions in binary form must reproduce the above copyright notice, 11 * this list of conditions and the following disclaimer in the documentation 12 * and/or other materials provided with the distribution. 13 * 14 * Neither the name of the original program's authors nor the names of its 15 * contributors may be used to endorse or promote products derived from this 16 * software without specific prior written permission. 17 * 18 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 19 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 20 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 21 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 22 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * POSSIBILITY OF SUCH DAMAGE. 17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR 18 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 19 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 20 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 21 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 22 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 23 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 27 */ 30 28 … … 54 52 static int try_access(const char *); 55 53 54 const char *search_dir[] = { "/app", "/srv", NULL }; 55 56 56 /* work-around for access() */ 57 57 static int try_access(const char *f) … … 71 71 static char *find_command(char *cmd) 72 72 { 73 char *path_tok; 74 char *path[PATH_MAX]; 75 int n = 0, i = 0; 76 size_t x = str_size(cmd) + 2; 73 size_t i; 77 74 78 75 found = (char *)malloc(PATH_MAX); … … 83 80 } 84 81 85 path_tok = str_dup(PATH);86 87 /* Extract the PATH env to a path[] array */88 path[n] = strtok(path_tok, PATH_DELIM);89 while (NULL != path[n]) {90 if ((str_size(path[n]) + x ) > PATH_MAX) {91 cli_error(CL_ENOTSUP,92 "Segment %d of path is too large, search ends at segment %d",93 n, n-1);94 break;95 }96 path[++n] = strtok(NULL, PATH_DELIM);97 }98 99 82 /* We now have n places to look for the command */ 100 for (i =0; path[i]; i++) {83 for (i = 0; search_dir[i] != NULL; i++) { 101 84 memset(found, 0, sizeof(found)); 102 snprintf(found, PATH_MAX, "%s/%s", path[i], cmd);85 snprintf(found, PATH_MAX, "%s/%s", search_dir[i], cmd); 103 86 if (-1 != try_access(found)) { 104 free(path_tok);105 87 return (char *) found; 106 88 } … … 108 90 109 91 /* We didn't find it, just give it back as-is. */ 110 free(path_tok);111 92 return (char *) cmd; 112 93 } 113 94 114 unsigned int try_exec(char *cmd, char **argv )95 unsigned int try_exec(char *cmd, char **argv, iostate_t *io) 115 96 { 116 97 task_id_t tid; 117 98 task_exit_t texit; 118 99 char *tmp; 119 int rc, retval; 100 int rc, retval, i; 101 fdi_node_t file_nodes[3]; 102 fdi_node_t *file_nodes_p[4]; 103 FILE *files[3]; 120 104 121 105 tmp = str_dup(find_command(cmd)); 122 106 free(found); 107 108 files[0] = io->stdin; 109 files[1] = io->stdout; 110 files[2] = io->stderr; 111 112 for (i = 0; i < 3 && files[i] != NULL; i++) { 113 if (fnode(files[i], &file_nodes[i]) == EOK) { 114 file_nodes_p[i] = &file_nodes[i]; 115 } 116 else { 117 file_nodes_p[i] = NULL; 118 } 119 } 120 file_nodes_p[i] = NULL; 123 121 124 rc = task_spawnv (&tid, tmp, (const char **) argv);122 rc = task_spawnvf(&tid, tmp, (const char **) argv, file_nodes_p); 125 123 free(tmp); 126 124
Note:
See TracChangeset
for help on using the changeset viewer.