luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated PaOpen() to handle a Tcl variable of the type ${X} as well as 

just plain $X (i.e., ignore any brackets around the variable) when
doing variable expansion.
This commit is contained in:
Tim Edwards 2020-12-04 14:46:48 -05:00
parent 414f4a8ccb
commit 1b3299ec90
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
8.3.91 8.3.92

6
utils/path.c
View File

@ -119,7 +119,7 @@ PaExpand(psource, pdest, size)
{ {
char *ps, *pd; char *ps, *pd;
struct passwd *passwd, *getpwnam(); struct passwd *passwd, *getpwnam();
char expandName[100], *string, *newEntry; char expandName[512], *string, *newEntry;
HashEntry *h; HashEntry *h;
int i, length; int i, length;
@ -135,7 +135,7 @@ PaExpand(psource, pdest, size)
*pd = *++ps; *pd = *++ps;
if (isspace(*pd) || (*pd=='\0') || (*pd=='/') || (*pd==':')) if (isspace(*pd) || (*pd=='\0') || (*pd=='/') || (*pd==':'))
break; break;
if (i < 99) pd++; if (i < 511) pd++;
} }
*pd = '\0'; *pd = '\0';
@ -196,7 +196,7 @@ PaExpand(psource, pdest, size)
*pd = *++ps; *pd = *++ps;
if (isspace(*pd) || (*pd=='\0') || (*pd=='/') || (*pd==':')) if (isspace(*pd) || (*pd=='\0') || (*pd=='/') || (*pd==':'))
break; break;
if (i < 99) pd++; if ((i < 511) && (*pd != '{') && (*pd != '}')) pd++;
} }
saveChar = *pd; saveChar = *pd;
*pd = '\0'; *pd = '\0';