dispinclude not working in 4.1.2pre

[Dominique Frise <Dominique.Frise (at) unil.ch>]

Hi Henrik,

The dispinclude is not working in the latest snapshot I downloaded.
Hobbit was compiled under Solaris 9.
The problem seems to be in function stackfgets in lib/stackio.c.

I added following if statement to make it work:

[super (at) iris lib]# diff stackio.c stackio.c.dist
407c407,408
< 		if (extraincl && (strncmp(*buffer, extraincl, strlen(extraincl)) == 0)) {
---
> 		if ( (strncmp(*buffer, "include ", 8) == 0) ||
> 		     (extraincl && (strncmp(*buffer, extraincl, strlen(extraincl)) == 0)) ) {
410,424d410
< 			eol = strchr(*buffer, '\n'); if (eol) *eol = '\0';
< 			newfn = *buffer + strlen(extraincl);
< 			newfn += strspn(newfn, " \t");
< 		
< 			if (*newfn && (stackfopen(newfn, "r", (void **)fdhead->listhead) != NULL))
< 				return stackfgets(buffer, bufferlen, extraincl);< 			else {
< 				errprintf("WARNING: Cannot open extra-include file '%s', line was:%s\n", 
newfn, buffer);
< 				if (eol) *eol = '\n';
< 				return result;
< 			}
< 		}
< 		else if (strncmp(*buffer, "include ", 8) == 0) {
< 			char *newfn, *eol;
<


Dominique