mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-08 20:41:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Support of disable of shell variables substitution in the command line.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2011-10-12 16:16:43 +04:00
parent e2c5363eb9
commit 1233059de6
1 changed files with 57 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
src/filemanager/command.c
View File

@ -83,6 +83,9 @@ WInput *cmdline;
static gboolean static gboolean
examine_cd (const char *_path) examine_cd (const char *_path)
{ {
typedef enum { copy_sym, subst_var } state_t;
state_t state = copy_sym;
gboolean result; gboolean result;
size_t qlen; size_t qlen;
char *path_tilde, *path; char *path_tilde, *path;
@ -100,44 +103,68 @@ examine_cd (const char *_path)
/* Variable expansion */ /* Variable expansion */
for (p = path_tilde, r = q; *p != '\0' && r < q + MC_MAXPATHLEN;) for (p = path_tilde, r = q; *p != '\0' && r < q + MC_MAXPATHLEN;)
{ {
if (*p != '$' || (p[1] == '[' || p[1] == '(')) switch (state)
*(r++) = *(p++);
else
{ {
const char *t; case copy_sym:
if (p[0] == '\\' && p[1] == '$')
p++;
if (*p == '{')
{ {
/* skip backslash */
p++; p++;
s = strchr (p, '}'); /* copy dollar */
*(r++) = *(p++);
} }
else if (p[0] != '$' || p[1] == '[' || p[1] == '(')
*(r++) = *(p++);
else else
s = NULL; state = subst_var;
if (s == NULL) break;
s = strchr (p, PATH_SEP);
if (s == NULL) case subst_var:
s = strchr (p, '\0');
c = *s;
*s = '\0';
t = getenv (p);
*s = c;
if (t == NULL)
{ {
*(r++) = '$'; const char *t;
if (*(p - 1) != '$')
*(r++) = '{'; /* skip dollar */
} p++;
else
{ if (p[0] != '{')
if (r + strlen (t) < q + MC_MAXPATHLEN) s = NULL;
else
{ {
strcpy (r, t);
r = strchr (r, '\0');
}
p = s;
if (*s == '}')
p++; p++;
s = strchr (p, '}');
}
if (s == NULL)
s = strchr (p, PATH_SEP);
if (s == NULL)
s = strchr (p, '\0');
c = *s;
*s = '\0';
t = getenv (p);
*s = c;
if (t == NULL)
{
*(r++) = '$';
if (p[-1] != '$')
*(r++) = '{';
}
else
{
size_t tlen;
tlen = strlen (t);
if (r + tlen < q + MC_MAXPATHLEN)
{
strncpy (r, t, tlen + 1);
r += tlen;
}
p = s;
if (*s == '}')
p++;
}
state = copy_sym;
break;
} }
} }
} }