}
extern /*@only@*/ inputStream
- inputStream_create (cstring name, cstring suffix, bool echo)
+inputStream_create (cstring name, cstring suffix, bool echo)
{
char *ps;
inputStream s = (inputStream) dmalloc (sizeof (*s));
-
+ cstring oname;
+
s->name = name;
s->file = NULL;
s->name = cstring_concatFree1 (s->name, suffix);
}
+ oname = s->name;
s->name = fileLib_cleanName (s->name);
+ cstring_free (oname); /* evans 2002-07-12: why no error without this?! */
s->lineNo = 0;
s->charNo = 0;
s->fromString = FALSE;
s->stringSource = NULL;
s->stringSourceTail = NULL;
-
- /*@i3254@*/ return s;
+ s->buffer[0] = '\0';
+
+ return s;
}
extern /*@only@*/ inputStream
return TRUE;
}
- DPRINTF (("Open: %s", s->name));
- s->file = fileTable_openFile (context_fileTable (), s->name, "r");
+ DPRINTF (("Opening: %s", s->name));
+ s->file = fileTable_openReadFile (context_fileTable (), s->name);
return (s->file != 0 || s->fromString);
}