/*
** Splint - annotation-assisted static program checker
-** Copyright (C) 1994-2001 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
** the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
** MA 02111-1307, USA.
**
-** For information on lclint: lclint-request@cs.virginia.edu
-** To report a bug: lclint-bug@cs.virginia.edu
+** For information on splint: info@splint.org
+** To report a bug: splint-bug@splint.org
** For more information: http://www.splint.org
*/
/*
**
*/
-# include "lclintMacros.nf"
-# include "llbasic.h"
+/*
+ * Herbert 02/17/2002:
+ * - fixed the recognition of Posix headers for OS/2
+ */
+
+# include "splintMacros.nf"
+# include "basic.h"
# include "osd.h"
+# include "version.h"
-# ifndef NOLCL
# include "gram.h"
-
# include "lclscan.h"
-# endif
# include "lcllib.h"
# include "llmain.h"
-# include "portab.h"
/*@-incondefs@*/ /*@-redecl@*/
extern /*:open:*/ /*@dependent@*/ FILE *yyin;
/*@=incondefs@*/ /*@=redecl@*/
/*@constant int NUMLIBS; @*/
-# define NUMLIBS 17
+# define NUMLIBS 25
/*@constant int NUMPOSIXLIBS; @*/
# define NUMPOSIXLIBS 18
static ob_mstring stdlibs[NUMLIBS] =
{
"assert",
+ "complex"
"ctype",
"errno",
- "float",
+ "fenv",
+ "float",
+ "inttypes",
+ "iso646",
"limits",
"locale",
"math",
"setjmp",
"signal",
"stdarg",
+ "stdbool",
"stddef",
+ "stdint",
"stdio",
"stdlib",
- "strings",
"string",
+ "strings", /* some systems use this...they shouldn't */
+ "tgmath",
"time",
- "wchar"
+ "wchar",
+ "wctype"
} ;
static bool loadLCDFile (FILE * p_f, cstring p_name);
/*@access cstring@*/
llassert (cstring_isDefined (xname));
+# if defined (OS2)
+ {
+ /* Posixlibs use forward slashes, so we use them here, too */
+ cstring_replaceAll (xname, '\\', '/');
+ libname = strrchr (xname, '/');
+ DPRINTF (("libname: %s", libname));
+ }
+# else
libname = strrchr (xname, CONNECTCHAR);
+# endif
matchname = libname;
if (libname == NULL)
return TRUE;
}
- if (context_getFlag (FLG_SKIPANSIHEADERS)
+ if (context_getFlag (FLG_SKIPISOHEADERS)
&& context_usingAnsiLibrary ())
{
-
for (i = 0; i < NUMLIBS; i++)
{
if (mstring_equal (libname, stdlibs[i]))
for (i = 0; i < NUMPOSIXLIBS; i++)
{
- if (strchr (posixlibs[i], CONNECTCHAR) != NULL)
+ if (strchr (posixlibs[i], CONNECTCHAR) != NULL
+# if defined (OS2)
+ || strchr (posixlibs[i], ALTCONNECTCHAR) != NULL
+# endif
+ )
{
char *ptr;
+ DPRINTF (("xname: %s, posix: %s", xname, posixlibs[i]));
if ((ptr = strstr (xname, posixlibs[i])) != NULL)
{
if (ptr[strlen (posixlibs[i])] == '\0')
if (context_getFlag (FLG_SKIPPOSIXHEADERS))
{
cstring_free (xname);
- return TRUE;
+ /*@-nullstate@*/
+ return TRUE;
+ /*@=nullstate@*/
+
+ /* evans 2002-03-02:
+ the returned reference is possibly null,
+ but this should not change the null state of the parameter
+ */
}
}
else
cstring_free (xname);
/*@noaccess cstring@*/
+ /*@-nullstate@*/ /* same problem as above */
return FALSE;
+ /*@=nullstate@*/
}
static void printDot (void)
{
- if (context_getFlag (FLG_SHOWSCAN))
- {
- (void) fflush (g_msgstream);
- fprintf (stderr, ".");
- (void) fflush (stderr);
- }
+ displayScanContinue (cstring_makeLiteralTemp ("."));
}
void
FILE *f;
cstring fname = fileLib_addExtension (cfname, cstring_makeLiteralTemp (DUMP_SUFFIX));
- f = fileTable_openFile (context_fileTable (), fname, "w");
+ f = fileTable_openWriteFile (context_fileTable (), fname);
- if (context_getFlag (FLG_SHOWSCAN))
- {
- fprintf (stderr, "< Dumping to %s ", cstring_toCharsSafe (fname));
- }
+ displayScanOpen (message ("Dumping to %s ", fname));
if (f == NULL)
{
*/
fprintf (f, "%s %s\n", LIBRARY_MARKER, cstring_toCharsSafe (fname));
- fprintf (f, ";;%s\n", LCL_VERSION);
+ fprintf (f, ";;Splint %f\n", SPLINT_LIBVERSION);
fprintf (f, ";;lib:%d\n", (int) context_getLibrary ());
fprintf (f, ";;ctTable\n");
check (fileTable_closeFile (context_fileTable (), f));
}
- if (context_getFlag (FLG_SHOWSCAN))
- {
- fprintf (g_msgstream, " >\n");
- }
-
+ displayScanClose ();
cstring_free (fname);
}
}
else
{
- stdlib = fileTable_openFile (context_fileTable (), fpath, "r");
+ stdlib = fileTable_openReadFile (context_fileTable (), fpath);
if (stdlib == NULL)
{
sfree (ot);
check (fileTable_closeFile (context_fileTable (), stdlib));
- stdlib = fileTable_openFile (context_fileTable (), fpath, "r");
+ stdlib = fileTable_openReadFile (context_fileTable (), fpath);
}
llassert (stdlib != NULL);
DPRINTF (("Loading: %s", fpath));
- if (context_getDebug (FLG_SHOWSCAN))
- {
- fprintf (g_msgstream, "< loading standard library %s ",
- cstring_toCharsSafe (fpath));
- result = loadLCDFile (stdlib, fpath);
- fprintf (g_msgstream, " >\n");
- }
- else
- {
- result = loadLCDFile (stdlib, fpath);
- }
+ displayScanOpen (message ("loading standard library %s ", fpath));
+ result = loadLCDFile (stdlib, fpath);
+ displayScanClose ();
check (fileTable_closeFile (context_fileTable (), stdlib));
}
char buf[BUFLEN];
/*
- ** Check version. Should be >= LCLINT_LIBVERSION
+ ** Check version. Should be >= SPLINT_LIBVERSION
*/
if (reader_readLine (f, buf, BUFLEN) == NULL
{
loadllmsg (message ("Load library %s is in obsolete Splint library format. Attempting "
"to continue anyway, but results may be incorrect. Rebuild "
- "the library with this version of lclint.",
+ "the library with this version of splint.",
name));
}
else
}
else
{
- if ((LCLINT_LIBVERSION - version) >= FLT_EPSILON)
+ if ((SPLINT_LIBVERSION - version) >= FLT_EPSILON)
{
cstring vname;
char *nl = strchr (buf, '\n');
vname = cstring_fromChars (buf + 9);
- loadllmsg (message ("Load library %s is in obsolete LCLint library "
- "format (version %s). Attempting "
+ loadllmsg (message ("Load library %s is in obsolete Splint library "
+ "format (version %f (%s), expecting version %f). Attempting "
"to continue anyway, but results may be incorrect. Rebuild "
- "the library with this version of lclint.",
- name, vname));
+ "the library with this version of splint.",
+ name,
+ version,
+ vname,
+ SPLINT_LIBVERSION));
}
else
{
FILE *f;
cstring fname = fileLib_addExtension (cfname, cstring_makeLiteralTemp (DUMP_SUFFIX));
- f = fileTable_openFile (context_fileTable (), fname, "r");
+ f = fileTable_openReadFile (context_fileTable (), fname);
if (f == NULL)
{
- if (context_getDebug (FLG_SHOWSCAN))
- fprintf (g_msgstream, " >\n");
-
+ displayScanClose ();
llfatalerror (message ("Cannot open dump file for loading: %s",
fname));
}
andersk / splint.git / blobdiff