X-Git-Url: http://andersk.mit.edu/gitweb/splint.git/blobdiff_plain/52e90c0f77bb0e3edb043873b71a73459d4ae8ab..HEAD:/src/fileTable.c diff --git a/src/fileTable.c b/src/fileTable.c index 98daa02..0b23d1b 100644 --- a/src/fileTable.c +++ b/src/fileTable.c @@ -1,6 +1,6 @@ /* ** Splint - annotation-assisted static program checker -** Copyright (C) 1994-2002 University of Virginia, +** Copyright (C) 1994-2003 University of Virginia, ** Massachusetts Institute of Technology ** ** This program is free software; you can redistribute it and/or modify it @@ -44,14 +44,25 @@ * - Added conditional stuff (#define and #include) for IBM's compiler. */ +# include +# include +# include # include "splintMacros.nf" -# include "llbasic.h" +# include "basic.h" # include "osd.h" # include "llmain.h" -# include "portab.h" + +# ifdef WIN32 +# include +# else # if defined(__IBMC__) && defined(OS2) # include +# include # define getpid _getpid +# define S_IRUSR S_IREAD +# define S_IWUSR S_IWRITE +# define S_IXUSR S_IEXEC +# endif # endif /*@access fileId*/ @@ -93,6 +104,12 @@ fileTable_getIndex (fileTable ft, cstring s) 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); @@ -178,7 +195,6 @@ ftentry_create (/*@keep@*/ cstring tn, bool temp, fileType typ, fileId der) } t->fname = tn; - t->basename = cstring_undefined; t->ftemp = temp; t->ftype = typ; @@ -212,10 +228,11 @@ fileTable_create () ft->nopen = 0; ft->nopenspace = FTBASESIZE; ft->openelements = (foentry *) dmalloc (FTBASESIZE * sizeof (*ft->openelements)); - + return (ft); } +/*@-bounds@*/ static void fileTable_grow (fileTable ft) { @@ -236,7 +253,7 @@ fileTable_grow (fileTable ft) sfree (ft->elements); ft->elements = newent; } - +/*@=bounds@*/ static void fileTable_growOpen (fileTable ft) { @@ -269,7 +286,22 @@ fileTable_internAddEntry (fileTable ft, /*@only@*/ ftentry e) 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); + } + else + { + cstringTable_insert (ft->htable, cstring_copy (e->fname), ft->nentries); + } + + /* evans 2002-07-12: + Before, there was no cstring_copy above, and e->fname was free'd in the if branch. + Splint should have caught this, and produced a warning for this assignment. + Why not? + */ ft->elements[ft->nentries] = e; ft->nentries++; @@ -299,7 +331,6 @@ fileTable_addFilePrim (fileTable ft, /*@temp@*/ cstring name, cstring absname = osd_absolutePath (NULL, name); int tindex = fileTable_getIndex (ft, absname); - DPRINTF (("Got abs path: %s", absname)); llassert (ft != fileTable_undefined); if (tindex != NOT_FOUND) @@ -460,7 +491,6 @@ fileTable_addXHFile (fileTable ft, cstring name) return (fileTable_addFilePrim (ft, name, FALSE, FILE_XH, fileId_invalid)); } -# ifndef NOLCL fileId fileTable_addImportFile (fileTable ft, cstring name) { @@ -472,11 +502,8 @@ fileTable_addLCLFile (fileTable ft, cstring name) { return (fileTable_addFilePrim (ft, name, FALSE, FILE_HEADER, fileId_invalid)); } -# endif -# ifndef NOLCL static int tmpcounter = 0; -# endif fileId fileTable_addMacrosFile (fileTable ft) @@ -538,7 +565,6 @@ fileTable_addCTempFile (fileTable ft, fileId fid) return res; } -# ifndef NOLCL fileId fileTable_addltemp (fileTable ft) { @@ -585,7 +611,6 @@ fileTable_addltemp (fileTable ft) cstring_free (newname); return (ret); } -# endif bool fileTable_exists (fileTable ft, cstring s) @@ -636,7 +661,18 @@ fileTable_setFilePath (fileTable ft, fileId fid, cstring path) 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) { @@ -773,7 +809,7 @@ fileTable_cleanup (fileTable ft) if (msg) { (void) fflush (g_warningstream); - fprintf (stderr, "< cleaning"); + displayScanOpen (cstring_makeLiteral ("cleaning")); } for (i = 0; i < ft->nentries; i++) @@ -795,7 +831,7 @@ fileTable_cleanup (fileTable ft) } else if (fileId_isValid (fe->fder)) { - /*@i423 this should use close (fd) also... */ + /* this should use close (fd) also... */ (void) osd_unlink (fe->fname); } else if (fe->ftype == FILE_MACROS) @@ -815,21 +851,13 @@ fileTable_cleanup (fileTable ft) if (msg && ((i % skip) == 0)) { - (void) fflush (g_warningstream); - - if (i == 0) { - fprintf (stderr, " "); - } else { - fprintf (stderr, "."); - } - - (void) fflush (stderr); + displayScanContinue (cstring_makeLiteral (i == 0 ? " " : ".")); } } - + if (msg) { - fprintf (stderr, " >\n"); + displayScanClose (); } } @@ -851,6 +879,7 @@ fileTable_free (/*@only@*/ fileTable f) cstringTable_free (f->htable); sfree (f->elements); + sfree (f->openelements); /*!! why didn't splint report this? */ sfree (f); } @@ -902,7 +931,7 @@ static /*@only@*/ cstring makeTempName (cstring dir, cstring pre, cstring suf) static int pid = 0; static /*@owned@*/ char *msg = NULL; static /*@only@*/ cstring pidname = NULL; - int maxlen; + size_t maxlen; cstring smsg; llassert (cstring_length (pre) <= 3); @@ -948,7 +977,6 @@ static /*@only@*/ cstring makeTempName (cstring dir, cstring pre, cstring suf) smsg = message ("%s%s%s%s%s", dir, pre, pidname, cstring_fromChars (msg), suf); nextMsg (msg); } - return smsg; } @@ -984,9 +1012,122 @@ fileTable_addOpen (fileTable ft, /*@observer@*/ FILE *f, /*@only@*/ cstring fnam ft->nopen++; } -FILE *fileTable_openFile (fileTable ft, cstring fname, char *mode) +FILE *fileTable_createFile (fileTable ft, cstring fname) +{ +# if defined (WIN32) && !defined (BCC32) + int fdesc = _open (cstring_toCharsSafe (fname), + O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, + _S_IWRITE | S_IREAD); +# else + int fdesc = open (cstring_toCharsSafe (fname), + O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, + S_IRUSR | S_IWUSR); +# endif + + 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) +{ +# if defined (WIN32) && !defined (BCC32) + int fdesc = _open (cstring_toCharsSafe (fname), + O_RDWR | O_CREAT | O_TRUNC | O_EXCL, + _S_IREAD | _S_IWRITE); +# else + int fdesc = open (cstring_toCharsSafe (fname), + O_RDWR | O_CREAT | O_TRUNC | O_EXCL, + S_IRUSR | S_IWUSR); +# endif + + 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), mode); + 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)); @@ -1010,7 +1151,7 @@ bool fileTable_closeFile (fileTable ft, FILE *f) 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]);