Subversion Repositories HelenOS

Rev

Rev 4346 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 4346 Rev 4348
Line 69... Line 69...
69 
static char *find_command(char *cmd)
 69 
static char *find_command(char *cmd)
70 
{
 70 
{
71 
    char *path_tok;
 71 
    char *path_tok;
72 
    char *path[PATH_MAX];
 72 
    char *path[PATH_MAX];
73 
    int n = 0, i = 0;
 73 
    int n = 0, i = 0;
74 
    size_t x = strlen(cmd) + 2;
 74 
    size_t x = str_size(cmd) + 2;
75 
 
 75 
 
76 
    found = (char *)malloc(PATH_MAX);
 76 
    found = (char *)malloc(PATH_MAX);
77 
 
 77 
 
78 
    /* The user has specified a full or relative path, just give it back. */
 78 
    /* The user has specified a full or relative path, just give it back. */
79 
    if (-1 != try_access(cmd)) {
 79 
    if (-1 != try_access(cmd)) {
80 
        return (char *) cmd;
 80 
        return (char *) cmd;
81 
    }
 81 
    }
82 
 
 82 
 
83 
    path_tok = strdup(PATH);
 83 
    path_tok = str_dup(PATH);
84 
 
 84 
 
85 
    /* Extract the PATH env to a path[] array */
 85 
    /* Extract the PATH env to a path[] array */
86 
    path[n] = strtok(path_tok, PATH_DELIM);
 86 
    path[n] = strtok(path_tok, PATH_DELIM);
87 
    while (NULL != path[n]) {
 87 
    while (NULL != path[n]) {
88 
        if ((strlen(path[n]) + x ) > PATH_MAX) {
 88 
        if ((str_size(path[n]) + x ) > PATH_MAX) {
89 
            cli_error(CL_ENOTSUP,
 89 
            cli_error(CL_ENOTSUP,
90 
                "Segment %d of path is too large, search ends at segment %d",
 90 
                "Segment %d of path is too large, search ends at segment %d",
91 
                n, n-1);
 91 
                n, n-1);
92 
            break;
 92 
            break;
93 
        }
 93 
        }
Line 112... Line 112...
112 
unsigned int try_exec(char *cmd, char **argv)
 112 
unsigned int try_exec(char *cmd, char **argv)
113 
{
 113 
{
114 
    task_id_t tid;
 114 
    task_id_t tid;
115 
    char *tmp;
 115 
    char *tmp;
116 
 
 116 
 
117 
    tmp = strdup(find_command(cmd));
 117 
    tmp = str_dup(find_command(cmd));
118 
    free(found);
 118 
    free(found);
119 
 
 119 
 
120 
    tid = task_spawn((const char *)tmp, argv);
 120 
    tid = task_spawn((const char *)tmp, argv);
121 
    free(tmp);
 121 
    free(tmp);
122 
 
 122