source: mainline/uspace/app/bdsh/util.c

Last change on this file was 1c481ee, checked in by Matthieu Riolo <matthieu.riolo@…>, 6 years ago

This commit fixes #684 and adds autocompletion for subdirectories in search_path. The original implementation of find_command()
will find cmd inside the working directory even without
the prefix './'. However, those cmds would have not been visible in
the auto completion. This commit prevents this from happening.

The problem can be traced back to vfs_absolutize() which treats paths
without the './' prefix as relative paths. The changes made unsures
that only relative or absolute pathes will be passed to vfs_absolutize()

This commit also fixes the problem, that subdirectories inside the
search_path would not be autocomplete. BDSH would execute such paths.
The reason being is that such paths was interpreted as relative paths.
Now BDSH makes a distinction between relatives paths or paths inside
search_path

  • Property mode set to 100644
File size: 2.6 KB
Line 
1/*
2 * Copyright (c) 2008 Tim Post
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 *
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.
16 *
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.
27 */
28
29#include <stdio.h>
30#include <str.h>
31#include <stdarg.h>
32#include <stdlib.h>
33#include <vfs/vfs.h>
34#include <abi/errno.h>
35
36#include "config.h"
37#include "errors.h"
38#include "util.h"
39
40extern volatile int cli_errno;
41
42/* Count and return the # of elements in an array */
43unsigned int cli_count_args(char **args)
44{
45 unsigned int i;
46
47 i = 0;
48 while (args[i] != NULL)
49 i++;
50
51 return i;
52}
53
54/*
55 * (re)allocates memory to store the current working directory, gets
56 * and updates the current working directory, formats the prompt
57 * string
58 */
59unsigned int cli_set_prompt(cliuser_t *usr)
60{
61 usr->cwd = (char *) realloc(usr->cwd, PATH_MAX);
62 if (NULL == usr->cwd) {
63 cli_error(CL_ENOMEM, "Can not allocate cwd");
64 cli_errno = CL_ENOMEM;
65 return 1;
66 }
67 if (vfs_cwd_get(usr->cwd, PATH_MAX) != EOK)
68 snprintf(usr->cwd, PATH_MAX, "(unknown)");
69
70 if (usr->prompt)
71 free(usr->prompt);
72 asprintf(&usr->prompt, "%s # ", usr->cwd);
73
74 return 0;
75}
76
77/*
78 * Returns true if the string is a relative or an absolute path
79 */
80bool is_path(const char *cmd)
81{
82
83 bool ret = str_lcmp(cmd, "/", 1) == 0;
84 ret = ret || str_lcmp(cmd, "./", 2) == 0;
85 ret = ret || str_lcmp(cmd, "../", 3) == 0;
86
87 return ret;
88}
Note: See TracBrowser for help on using the repository browser.