Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-09-12 00:55:11 +00:00
Code Issues Projects Releases Wiki Activity

Fix escape char problem.

Browse Source
This commit is contained in:
Eric Andersen 2000-11-30 00:03:57 +00:00
parent 9bd71e8323
commit 8c2d3f46ab
3 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lash.c
View File

@ -797,9 +797,13 @@ static void globLastArgument(struct childProgram *prog, int *argcPtr,
/* we need to remove whatever \ quoting is still present */ /* we need to remove whatever \ quoting is still present */
src = dst = prog->argv[argc_l - 1]; src = dst = prog->argv[argc_l - 1];
while (*src) { while (*src) {
if (*src != '\\') if (*src == '\\') {
src++;
*dst++ = process_escape_sequence(&src);
} else {
*dst++ = *src; *dst++ = *src;
src++; src++;
}
} }
*dst = '\0'; *dst = '\0';
} else if (!rc) { } else if (!rc) {
@ -812,11 +816,16 @@ static void globLastArgument(struct childProgram *prog, int *argcPtr,
}else{ }else{
src = dst = prog->argv[argc_l - 1]; src = dst = prog->argv[argc_l - 1];
while (*src) { while (*src) {
if (*src != '\\') if (*src == '\\') {
src++;
*dst++ = process_escape_sequence(&src);
} else {
*dst++ = *src; *dst++ = *src;
src++; src++;
}
} }
*dst = '\0'; *dst = '\0';
prog->globResult.gl_pathc=0; prog->globResult.gl_pathc=0;
if (flags==0) if (flags==0)
prog->globResult.gl_pathv=NULL; prog->globResult.gl_pathv=NULL;

17
sh.c
View File

@ -797,9 +797,13 @@ static void globLastArgument(struct childProgram *prog, int *argcPtr,
/* we need to remove whatever \ quoting is still present */ /* we need to remove whatever \ quoting is still present */
src = dst = prog->argv[argc_l - 1]; src = dst = prog->argv[argc_l - 1];
while (*src) { while (*src) {
if (*src != '\\') if (*src == '\\') {
src++;
*dst++ = process_escape_sequence(&src);
} else {
*dst++ = *src; *dst++ = *src;
src++; src++;
}
} }
*dst = '\0'; *dst = '\0';
} else if (!rc) { } else if (!rc) {
@ -812,11 +816,16 @@ static void globLastArgument(struct childProgram *prog, int *argcPtr,
}else{ }else{
src = dst = prog->argv[argc_l - 1]; src = dst = prog->argv[argc_l - 1];
while (*src) { while (*src) {
if (*src != '\\') if (*src == '\\') {
src++;
*dst++ = process_escape_sequence(&src);
} else {
*dst++ = *src; *dst++ = *src;
src++; src++;
}
} }
*dst = '\0'; *dst = '\0';
prog->globResult.gl_pathc=0; prog->globResult.gl_pathc=0;
if (flags==0) if (flags==0)
prog->globResult.gl_pathv=NULL; prog->globResult.gl_pathv=NULL;

17
shell/lash.c
View File

@ -797,9 +797,13 @@ static void globLastArgument(struct childProgram *prog, int *argcPtr,
/* we need to remove whatever \ quoting is still present */ /* we need to remove whatever \ quoting is still present */
src = dst = prog->argv[argc_l - 1]; src = dst = prog->argv[argc_l - 1];
while (*src) { while (*src) {
if (*src != '\\') if (*src == '\\') {
src++;
*dst++ = process_escape_sequence(&src);
} else {
*dst++ = *src; *dst++ = *src;
src++; src++;
}
} }
*dst = '\0'; *dst = '\0';
} else if (!rc) { } else if (!rc) {
@ -812,11 +816,16 @@ static void globLastArgument(struct childProgram *prog, int *argcPtr,
}else{ }else{
src = dst = prog->argv[argc_l - 1]; src = dst = prog->argv[argc_l - 1];
while (*src) { while (*src) {
if (*src != '\\') if (*src == '\\') {
src++;
*dst++ = process_escape_sequence(&src);
} else {
*dst++ = *src; *dst++ = *src;
src++; src++;
}
} }
*dst = '\0'; *dst = '\0';
prog->globResult.gl_pathc=0; prog->globResult.gl_pathc=0;
if (flags==0) if (flags==0)
prog->globResult.gl_pathv=NULL; prog->globResult.gl_pathv=NULL;