A '.' is a legal seperator.
This commit is contained in:
parent
afffbfe8c4
commit
3dbf1e877a
4
lash.c
4
lash.c
@ -1064,7 +1064,7 @@ static int expand_arguments(char *command)
|
|||||||
if (var) {
|
if (var) {
|
||||||
int subst_len = strlen(var);
|
int subst_len = strlen(var);
|
||||||
char *next_dst;
|
char *next_dst;
|
||||||
if ((next_dst=strpbrk(dst+1, " \t~`!$^&*()=|\\{}[];\"'<>?")) == NULL) {
|
if ((next_dst=strpbrk(dst+1, " \t~`!$^&*()=|\\{}[];\"'<>?.")) == NULL) {
|
||||||
next_dst = dst;
|
next_dst = dst;
|
||||||
}
|
}
|
||||||
src = (char*)xrealloc(src, strlen(src) - strlen(next_dst)+strlen(var)+1);
|
src = (char*)xrealloc(src, strlen(src) - strlen(next_dst)+strlen(var)+1);
|
||||||
@ -1078,7 +1078,7 @@ static int expand_arguments(char *command)
|
|||||||
} else {
|
} else {
|
||||||
/* Seems we got an un-expandable variable. So delete it. */
|
/* Seems we got an un-expandable variable. So delete it. */
|
||||||
char *next_dst;
|
char *next_dst;
|
||||||
if ((next_dst=strpbrk(dst+1, " \t~`!$^&*()=|\\{}[];\"'<>?")) != NULL) {
|
if ((next_dst=strpbrk(dst+1, " \t~`!$^&*()=|\\{}[];\"'<>?.")) != NULL) {
|
||||||
/* Move stuff to the end of the string to accommodate filling
|
/* Move stuff to the end of the string to accommodate filling
|
||||||
* the created gap with the new stuff */
|
* the created gap with the new stuff */
|
||||||
memmove(dst, next_dst, next_dst-dst);
|
memmove(dst, next_dst, next_dst-dst);
|
||||||
|
4
sh.c
4
sh.c
@ -1064,7 +1064,7 @@ static int expand_arguments(char *command)
|
|||||||
if (var) {
|
if (var) {
|
||||||
int subst_len = strlen(var);
|
int subst_len = strlen(var);
|
||||||
char *next_dst;
|
char *next_dst;
|
||||||
if ((next_dst=strpbrk(dst+1, " \t~`!$^&*()=|\\{}[];\"'<>?")) == NULL) {
|
if ((next_dst=strpbrk(dst+1, " \t~`!$^&*()=|\\{}[];\"'<>?.")) == NULL) {
|
||||||
next_dst = dst;
|
next_dst = dst;
|
||||||
}
|
}
|
||||||
src = (char*)xrealloc(src, strlen(src) - strlen(next_dst)+strlen(var)+1);
|
src = (char*)xrealloc(src, strlen(src) - strlen(next_dst)+strlen(var)+1);
|
||||||
@ -1078,7 +1078,7 @@ static int expand_arguments(char *command)
|
|||||||
} else {
|
} else {
|
||||||
/* Seems we got an un-expandable variable. So delete it. */
|
/* Seems we got an un-expandable variable. So delete it. */
|
||||||
char *next_dst;
|
char *next_dst;
|
||||||
if ((next_dst=strpbrk(dst+1, " \t~`!$^&*()=|\\{}[];\"'<>?")) != NULL) {
|
if ((next_dst=strpbrk(dst+1, " \t~`!$^&*()=|\\{}[];\"'<>?.")) != NULL) {
|
||||||
/* Move stuff to the end of the string to accommodate filling
|
/* Move stuff to the end of the string to accommodate filling
|
||||||
* the created gap with the new stuff */
|
* the created gap with the new stuff */
|
||||||
memmove(dst, next_dst, next_dst-dst);
|
memmove(dst, next_dst, next_dst-dst);
|
||||||
|
@ -1064,7 +1064,7 @@ static int expand_arguments(char *command)
|
|||||||
if (var) {
|
if (var) {
|
||||||
int subst_len = strlen(var);
|
int subst_len = strlen(var);
|
||||||
char *next_dst;
|
char *next_dst;
|
||||||
if ((next_dst=strpbrk(dst+1, " \t~`!$^&*()=|\\{}[];\"'<>?")) == NULL) {
|
if ((next_dst=strpbrk(dst+1, " \t~`!$^&*()=|\\{}[];\"'<>?.")) == NULL) {
|
||||||
next_dst = dst;
|
next_dst = dst;
|
||||||
}
|
}
|
||||||
src = (char*)xrealloc(src, strlen(src) - strlen(next_dst)+strlen(var)+1);
|
src = (char*)xrealloc(src, strlen(src) - strlen(next_dst)+strlen(var)+1);
|
||||||
@ -1078,7 +1078,7 @@ static int expand_arguments(char *command)
|
|||||||
} else {
|
} else {
|
||||||
/* Seems we got an un-expandable variable. So delete it. */
|
/* Seems we got an un-expandable variable. So delete it. */
|
||||||
char *next_dst;
|
char *next_dst;
|
||||||
if ((next_dst=strpbrk(dst+1, " \t~`!$^&*()=|\\{}[];\"'<>?")) != NULL) {
|
if ((next_dst=strpbrk(dst+1, " \t~`!$^&*()=|\\{}[];\"'<>?.")) != NULL) {
|
||||||
/* Move stuff to the end of the string to accommodate filling
|
/* Move stuff to the end of the string to accommodate filling
|
||||||
* the created gap with the new stuff */
|
* the created gap with the new stuff */
|
||||||
memmove(dst, next_dst, next_dst-dst);
|
memmove(dst, next_dst, next_dst-dst);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user