* - Added conditional stuff (#define and #include) for IBM's compiler.
*/
+# include <sys/types.h>
+# include <sys/stat.h>
+# include <fcntl.h>
# include "splintMacros.nf"
# include "llbasic.h"
# include "osd.h"
# include "llmain.h"
# include "portab.h"
+
# if defined(__IBMC__) && defined(OS2)
# include <process.h>
+# include <io.h>
# define getpid _getpid
+# define S_IRUSR S_IREAD
+# define S_IWUSR S_IWRITE
+# define S_IXUSR S_IEXEC
# endif
/*@access fileId*/
+static void
+fileTable_addOpen (fileTable p_ft, /*@observer@*/ FILE *p_f, /*@only@*/ cstring p_fname)
+ /*@modifies p_ft@*/ ;
+
static bool fileTable_inRange (fileTable ft, fileId fid) /*@*/
{
return (fileTable_isDefined (ft) && (fid >= 0) && (fid < ft->nentries));
cstring abspath;
if (ft == NULL) return NOT_FOUND;
abspath = osd_absolutePath (cstring_undefined, s);
+
+ if (context_getFlag (FLG_CASEINSENSITIVEFILENAMES))
+ {
+ abspath = cstring_downcase (abspath);
+ }
+
DPRINTF (("Absolute path: %s: %s", s, abspath));
res = cstringTable_lookup (ft->htable, abspath);
cstring_free (abspath);
{
if (fileId_isValid (fte->fder))
{
+ llassert (fileTable_isDefined (ft));
+
return message ("%s %q %d (%s)",
fte->fname,
fileType_unparse (fte->ftype),
ft->nspace--;
DPRINTF (("Adding: %s", e->fname));
- cstringTable_insert (ft->htable, e->fname, ft->nentries);
+
+ if (context_getFlag (FLG_CASEINSENSITIVEFILENAMES))
+ {
+ cstring sd = cstring_downcase (e->fname);
+ cstringTable_insert (ft->htable, sd, ft->nentries);
+ cstring_free (e->fname);
+ }
+ else
+ {
+ cstringTable_insert (ft->htable, e->fname, ft->nentries);
+ }
+
ft->elements[ft->nentries] = e;
ft->nentries++;
cstring absname = osd_absolutePath (NULL, name);
int tindex = fileTable_getIndex (ft, absname);
- DPRINTF (("Got abs path: %s", absname));
+ /*@i534 fprintf (stderr, "Got abs path: %s", absname); */
llassert (ft != fileTable_undefined);
if (tindex != NOT_FOUND)
e->basename = fileLib_removePathFree (fileLib_removeAnyExtension (absname));
e->fsystem = context_isSystemDir (absname);
+
+ /*
+ ** evans 2002-03-15: change suggested by Jim Zelenka
+ ** support relative paths for system directories
+ */
+
+ if (!e->fsystem)
+ {
+ e->fsystem = context_isSystemDir (name);
+ }
+
e->fspecial = context_isSpecialFile (absname);
if (e->fspecial)
}
+void
+fileTable_addStreamFile (fileTable ft, FILE *fstream, cstring name)
+{
+ fileTable_addOpen (ft, fstream, cstring_copy (name));
+}
+
bool
fileTable_isHeader (fileTable ft, fileId fid)
{
fileId
fileTable_lookupBase (fileTable ft, cstring base)
{
- int tindex = fileTable_getIndex (ft, base);
+ int tindex;
+
+ if (context_getFlag (FLG_CASEINSENSITIVEFILENAMES))
+ {
+ cstring dbase = cstring_downcase (base);
+ tindex = fileTable_getIndex (ft, dbase);
+ cstring_free (dbase);
+ }
+ else
+ {
+ tindex = fileTable_getIndex (ft, base);
+ }
if (tindex == NOT_FOUND)
{
if (msg)
{
- (void) fflush (g_msgstream);
- fprintf (stderr, "< cleaning");
+ (void) fflush (g_warningstream);
+ displayScanOpen (cstring_makeLiteral ("cleaning"));
}
for (i = 0; i < ft->nentries; i++)
if (msg && ((i % skip) == 0))
{
- (void) fflush (g_msgstream);
-
- if (i == 0) {
- fprintf (stderr, " ");
- } else {
- fprintf (stderr, ".");
- }
-
- (void) fflush (stderr);
+ displayScanContinue (cstring_makeLiteral (i == 0 ? " " : "."));
}
}
-
+
if (msg)
{
- fprintf (stderr, " >\n");
+ displayScanClose ();
}
}
smsg = message ("%s%s%s%s%s", dir, pre, pidname, cstring_fromChars (msg), suf);
nextMsg (msg);
}
-
return smsg;
}
ft->nopen++;
}
-FILE *fileTable_openFile (fileTable ft, cstring fname, char *mode)
+FILE *fileTable_createFile (fileTable ft, cstring fname)
{
- FILE *res = fopen (cstring_toCharsSafe (fname), mode);
+ int fdesc = open (cstring_toCharsSafe (fname), O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, S_IRUSR | S_IWUSR);
+
+ if (fdesc == -1)
+ {
+ osd_setTempError ();
+ llfatalerror (message ("Temporary file for "
+ "pre-processor output already exists. Trying to "
+ "open: %s.",
+ fname));
+
+ /*@notreached@*/ return NULL;
+ }
+ else
+ {
+ FILE *res = fdopen (fdesc, "w");
+
+ if (res != NULL)
+ {
+ fileTable_addOpen (ft, res, cstring_copy (fname));
+ DPRINTF (("Opening file: %s / %p", fname, res));
+ }
+ else
+ {
+ DPRINTF (("Error opening: %s", fname));
+ }
+
+ return res;
+ }
+}
+
+FILE *fileTable_createMacrosFile (fileTable ft, cstring fname)
+{
+ int fdesc = open (cstring_toCharsSafe (fname), O_RDWR | O_CREAT | O_TRUNC | O_EXCL, S_IRUSR | S_IWUSR);
+
+ if (fdesc == -1)
+ {
+ osd_setTempError ();
+ llfatalerror (message ("Temporary file for "
+ "pre-processor output already exists. Trying to "
+ "open: %s.",
+ fname));
+
+ /*@notreached@*/ return NULL;
+ }
+ else
+ {
+ FILE *res = fdopen (fdesc, "w+");
+
+ if (res != NULL)
+ {
+ fileTable_addOpen (ft, res, cstring_copy (fname));
+ DPRINTF (("Opening file: %s / %p", fname, res));
+ }
+ else
+ {
+ DPRINTF (("Error opening: %s", fname));
+ }
+
+ return res;
+ }
+}
+
+FILE *fileTable_openReadFile (fileTable ft, cstring fname)
+{
+ FILE *res = fopen (cstring_toCharsSafe (fname), "r");
+
+ if (res != NULL)
+ {
+ fileTable_addOpen (ft, res, cstring_copy (fname));
+ DPRINTF (("Opening read file: %s / %p", fname, res));
+ }
+ else
+ {
+ DPRINTF (("Cannot open read file: %s", fname));
+ }
+
+ return res;
+}
+
+/*
+** Allows overwriting
+*/
+
+FILE *fileTable_openWriteFile (fileTable ft, cstring fname)
+{
+ FILE *res = fopen (cstring_toCharsSafe (fname), "w");
+
+ if (res != NULL) {
+ fileTable_addOpen (ft, res, cstring_copy (fname));
+ DPRINTF (("Opening file: %s / %p", fname, res));
+ }
+
+ return res;
+}
+
+FILE *fileTable_openWriteUpdateFile (fileTable ft, cstring fname)
+{
+ FILE *res = fopen (cstring_toCharsSafe (fname), "w+");
if (res != NULL) {
fileTable_addOpen (ft, res, cstring_copy (fname));
if (ft->openelements[i]->f == f)
{
DPRINTF (("Closing file: %p = %s", f, ft->openelements[i]->fname));
-
+
if (i == ft->nopen - 1)
{
foentry_free (ft->openelements[i]);
{
int i = 0;
+ llassert (fileTable_isDefined (ft));
+
for (i = 0; i < ft->nopen; i++)
{
/*
lldiagmsg (message ("Unclosed file at exit: %s", ft->openelements[i]->fname));
*/
+
+ if (ft->openelements[i]->f != NULL)
+ {
+ (void) fclose (ft->openelements[i]->f); /* No check - cleaning up after errors */
+ }
- (void) fclose (ft->openelements[i]->f); /* No check - cleaning up after errors */
ft->openelements[i]->f = NULL;
foentry_free (ft->openelements[i]);
ft->openelements[i] = NULL;
andersk / splint.git / blobdiff