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

Added tilde expansion handling for .INCLUDE statements to the 

SPICE netlist read routine.
This commit is contained in:
Tim Edwards 2017-06-19 12:38:27 -04:00
parent 5cd68b9ef1
commit af7bc39bbf
1 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
base/spice.c
View File

@ -25,8 +25,10 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#include <stdarg.h> /* what about varargs, like in pdutils.c ??? */ #include <stdarg.h> /* what about varargs, like in pdutils.c ??? */
#endif #endif
#ifdef IBMPC #include <stdlib.h> /* for calloc(), free(), getenv() */
#include <stdlib.h> /* for calloc(), free() */ #ifndef IBMPC
#include <sys/types.h> /* for getpwnam() tilde expansion */
#include <pwd.h>
#endif #endif
#ifdef TCL_NETGEN #ifdef TCL_NETGEN
@ -743,7 +745,7 @@ skip_ends:
SpiceSkipNewLine(); SpiceSkipNewLine();
} }
else if (matchnocase(nexttok, ".INCLUDE")) { else if (matchnocase(nexttok, ".INCLUDE")) {
char *iname, *iptr, *quotptr, *pathend; char *iname, *iptr, *quotptr, *pathend, *userpath = NULL;
SpiceTokNoNewline(); SpiceTokNoNewline();
if (nexttok == NULL) continue; /* Ignore if no filename */ if (nexttok == NULL) continue; /* Ignore if no filename */
@ -755,12 +757,44 @@ skip_ends:
pathend = strrchr(fname, '/'); pathend = strrchr(fname, '/');
iptr = nexttok; iptr = nexttok;
while (*iptr == '\'' || *iptr == '\"' || *iptr == '`') iptr++; while (*iptr == '\'' || *iptr == '\"' || *iptr == '`') iptr++;
if ((pathend != NULL) && (*iptr != '/')) { if ((pathend != NULL) && (*iptr != '/') && (*iptr != '~')) {
*pathend = '\0'; *pathend = '\0';
iname = (char *)MALLOC(strlen(fname) + strlen(iptr) + 2); iname = (char *)MALLOC(strlen(fname) + strlen(iptr) + 2);
sprintf(iname, "%s/%s", fname, iptr); sprintf(iname, "%s/%s", fname, iptr);
*pathend = '/'; *pathend = '/';
} }
#ifndef IBMPC
else if ((*iptr == '~') && (*(iptr + 1) == '/')) {
/* For ~/<path>, substitute tilde from $HOME */
userpath = getenv("HOME");
iname = (char *)MALLOC(strlen(userpath) + strlen(iptr));
sprintf(fname, "%s%s", userpath, iptr + 1);
}
else if (*iptr == '~') {
/* For ~<user>/<path>, substitute tilde from getpwnam() */
struct passwd *passwd;
char *pathstart;
pathstart = strchr(iptr, '/');
if (pathstart) *pathstart = '\0';
passwd = getpwnam(iptr + 1);
if (passwd != NULL) {
userpath = passwd->pw_dir;
if (pathstart) {
*pathstart = '/';
iname = (char *)MALLOC(strlen(userpath) + strlen(pathstart) + 1);
sprintf(fname, "%s%s", userpath, pathstart);
}
else {
/* Almost certainly an error, but make the substitution anyway */
iname = STRDUP(userpath);
}
}
else {
/* Probably an error, but copy the filename verbatim */
iname = STRDUP(iptr);
}
}
#endif
else else
iname = STRDUP(iptr); iname = STRDUP(iptr);