| 93,7 → 93,7 |
|---|
| |
| /* Its a good idea to allocate path, plus we (may) need a copy of |
| * path to tokenize if parents are specified */ |
| if (NULL == (tmp = cli_strdup(path))) { |
| if (NULL == (tmp = str_dup(path))) { |
| cli_error(CL_ENOMEM, "%s: path too big?", cmdname); |
| return 1; |
| } |
| 128,9 → 128,9 |
|---|
| absolute = 1; |
| |
| /* TODO: Canonify the path prior to tokenizing it, see below */ |
| dirs[i] = cli_strtok(tmp, "/"); |
| dirs[i] = strtok(tmp, "/"); |
| while (dirs[i] && i < 255) |
| dirs[++i] = cli_strtok(NULL, "/"); |
| dirs[++i] = strtok(NULL, "/"); |
| |
| if (NULL == dirs[0]) |
| return 1; |
| 149,7 → 149,7 |
|---|
| while (dirs[i] != NULL) { |
| /* Sometimes make or scripts conjoin odd paths. Account for something |
| * like this: ../../foo/bar/../foo/foofoo/./bar */ |
| if (!strcmp(dirs[i], "..") || !strcmp(dirs[i], ".")) { |
| if (!str_cmp(dirs[i], "..") || !str_cmp(dirs[i], ".")) { |
| if (0 != (chdir(dirs[i]))) { |
| cli_error(CL_EFAIL, "%s: impossible path: %s", |
| cmdname, path); |