mirror of
https://github.com/sheumann/hush.git
synced 2024-08-21 11:28:57 +00:00
Fix escape char problem.
This commit is contained in:
parent
9bd71e8323
commit
8c2d3f46ab
17
lash.c
17
lash.c
@ -797,9 +797,13 @@ static void globLastArgument(struct childProgram *prog, int *argcPtr,
|
||||
/* we need to remove whatever \ quoting is still present */
|
||||
src = dst = prog->argv[argc_l - 1];
|
||||
while (*src) {
|
||||
if (*src != '\\')
|
||||
if (*src == '\\') {
|
||||
src++;
|
||||
*dst++ = process_escape_sequence(&src);
|
||||
} else {
|
||||
*dst++ = *src;
|
||||
src++;
|
||||
src++;
|
||||
}
|
||||
}
|
||||
*dst = '\0';
|
||||
} else if (!rc) {
|
||||
@ -812,11 +816,16 @@ static void globLastArgument(struct childProgram *prog, int *argcPtr,
|
||||
}else{
|
||||
src = dst = prog->argv[argc_l - 1];
|
||||
while (*src) {
|
||||
if (*src != '\\')
|
||||
if (*src == '\\') {
|
||||
src++;
|
||||
*dst++ = process_escape_sequence(&src);
|
||||
} else {
|
||||
*dst++ = *src;
|
||||
src++;
|
||||
src++;
|
||||
}
|
||||
}
|
||||
*dst = '\0';
|
||||
|
||||
prog->globResult.gl_pathc=0;
|
||||
if (flags==0)
|
||||
prog->globResult.gl_pathv=NULL;
|
||||
|
17
sh.c
17
sh.c
@ -797,9 +797,13 @@ static void globLastArgument(struct childProgram *prog, int *argcPtr,
|
||||
/* we need to remove whatever \ quoting is still present */
|
||||
src = dst = prog->argv[argc_l - 1];
|
||||
while (*src) {
|
||||
if (*src != '\\')
|
||||
if (*src == '\\') {
|
||||
src++;
|
||||
*dst++ = process_escape_sequence(&src);
|
||||
} else {
|
||||
*dst++ = *src;
|
||||
src++;
|
||||
src++;
|
||||
}
|
||||
}
|
||||
*dst = '\0';
|
||||
} else if (!rc) {
|
||||
@ -812,11 +816,16 @@ static void globLastArgument(struct childProgram *prog, int *argcPtr,
|
||||
}else{
|
||||
src = dst = prog->argv[argc_l - 1];
|
||||
while (*src) {
|
||||
if (*src != '\\')
|
||||
if (*src == '\\') {
|
||||
src++;
|
||||
*dst++ = process_escape_sequence(&src);
|
||||
} else {
|
||||
*dst++ = *src;
|
||||
src++;
|
||||
src++;
|
||||
}
|
||||
}
|
||||
*dst = '\0';
|
||||
|
||||
prog->globResult.gl_pathc=0;
|
||||
if (flags==0)
|
||||
prog->globResult.gl_pathv=NULL;
|
||||
|
17
shell/lash.c
17
shell/lash.c
@ -797,9 +797,13 @@ static void globLastArgument(struct childProgram *prog, int *argcPtr,
|
||||
/* we need to remove whatever \ quoting is still present */
|
||||
src = dst = prog->argv[argc_l - 1];
|
||||
while (*src) {
|
||||
if (*src != '\\')
|
||||
if (*src == '\\') {
|
||||
src++;
|
||||
*dst++ = process_escape_sequence(&src);
|
||||
} else {
|
||||
*dst++ = *src;
|
||||
src++;
|
||||
src++;
|
||||
}
|
||||
}
|
||||
*dst = '\0';
|
||||
} else if (!rc) {
|
||||
@ -812,11 +816,16 @@ static void globLastArgument(struct childProgram *prog, int *argcPtr,
|
||||
}else{
|
||||
src = dst = prog->argv[argc_l - 1];
|
||||
while (*src) {
|
||||
if (*src != '\\')
|
||||
if (*src == '\\') {
|
||||
src++;
|
||||
*dst++ = process_escape_sequence(&src);
|
||||
} else {
|
||||
*dst++ = *src;
|
||||
src++;
|
||||
src++;
|
||||
}
|
||||
}
|
||||
*dst = '\0';
|
||||
|
||||
prog->globResult.gl_pathc=0;
|
||||
if (flags==0)
|
||||
prog->globResult.gl_pathv=NULL;
|
||||
|
Loading…
Reference in New Issue
Block a user