/*
** 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
** the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
** MA 02111-1307, USA.
**
-** For information on splint: splint@cs.virginia.edu
-** To report a bug: splint-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
*/
/*
* Herbert 06/12/2000:
* - added OS/2 specific includes before osd_getPid()
* - handle files like in WIN32 for OS/2 in osd_fileExists()
+ * Herbert 02/17/2002:
+ * - added OS/2 support to absolute file names
*/
/*@-allmacros*/
# include <sys/stat.h>
/* Fix suggested by Lars Rasmussen */
# include <errno.h>
-# ifdef WIN32
-# include <direct.h>
-# define getcwd _getcwd
-# endif
/* POSIX platforms should defined getpid in unistd.h */
# if defined (WIN32) || (defined(OS2) && defined(__IBMC__))
# include <process.h>
+# include <direct.h>
+# define getcwd _getcwd
# else
# include <unistd.h>
# endif
return (stat (cstring_toCharsSafe (filespec), &buf) == 0);
# else
# if defined (WIN32) || defined (OS2)
- FILE *test = fileTable_openFile (context_fileTable (), filespec, "r");
+ FILE *test = fileTable_openReadFile (context_fileTable (), filespec);
if (test != NULL)
{
# endif
}
-# ifndef NOLCL
-
# ifdef WIN32
extern /*@external@*/ int _flushall (void) /*@modifies fileSystem@*/ ;
# endif
res = system (cstring_toCharsSafe (cmd));
return res;
}
-# endif
# ifndef unlink
/* This should be defined by unistd.h */
bool osd_fileIsReadable (cstring f)
{
- FILE *fl = fileTable_openFile (context_fileTable (), f, "r");
+ FILE *fl = fileTable_openReadFile (context_fileTable (), f);
if (fl != NULL)
{
DPRINTF (("Absolute for: %s", str));
-# ifdef WIN32
+# if defined (WIN32) || defined (OS2) || defined (MSDOS)
if (strlen (str) > 1 && str[1] == ':')
{
/*
static void osd_setWorkingDirectory (void)
{
-# ifdef UNIX
+# if defined (UNIX) || defined (OS2)
char *buf = dmalloc (sizeof (*buf) * MAXPATHLEN);
char *cwd = getcwd (buf, MAXPATHLEN);
{
lldiagmsg (message ("Cannot get working directory: %s\n",
lldecodeerror (errno)));
+ osd_cwd = cstring_makeLiteral ("<missing directory>");
}
else
{
osd_setWorkingDirectory ();
}
+void osd_destroyMod (void)
+{
+ cstring_free (osd_cwd);
+ osd_cwd = cstring_undefined;
+}
+
cstring osd_absolutePath (cstring cwd, cstring filename)
{
-# ifdef UNIX
+# if defined (UNIX) || defined (OS2)
/* Setup the current working directory as needed. */
cstring cwd2 = cstring_isDefined (cwd) ? cwd : osd_cwd;
char *abs_buffer;
llassert (cstring_isDefined (cwd2));
llassert (cstring_isDefined (filename));
- abs_buffer = (char *) dmalloc (size_fromInt (cstring_length (cwd2) + cstring_length (filename) + 2));
+ abs_buffer = (char *) dmalloc (cstring_length (cwd2) + cstring_length (filename) + 2);
endp = abs_buffer;
/*
{
const char *src_p;
- if (filename[0] != '/')
+ if (!osd_isConnectChar (filename[0])
+# ifdef OS2
+ && !(isalpha (filename[0]) && filename[1] == ':')
+# endif
+ )
{
src_p = cwd2;
continue;
}
- *(endp-1) = '/'; /* overwrite null */
+ *(endp-1) = CONNECTCHAR; /* overwrite null */
}
src_p = filename;
{
break;
}
- else if (inp[0] == '/' && outp[-1] == '/')
+ else if (osd_isConnectChar (inp[0]) && osd_isConnectChar (outp[-1]))
{
inp++;
continue;
}
- else if (inp[0] == '.' && outp[-1] == '/')
+ else if (inp[0] == '.' && osd_isConnectChar (outp[-1]))
{
if (inp[1] == '\0')
{
break;
}
- else if (inp[1] == '/')
+ else if (osd_isConnectChar (inp[1]))
{
inp += 2;
continue;
}
else if ((inp[1] == '.')
- && (inp[2] == '\0' || inp[2] == '/'))
+ && (inp[2] == '\0' || osd_isConnectChar (inp[2])))
{
- inp += (inp[2] == '/') ? 3 : 2;
+ inp += (osd_isConnectChar (inp[2])) ? 3 : 2;
outp -= 2;
- while (outp >= abs_buffer && *outp != '/')
+ while (outp >= abs_buffer && !osd_isConnectChar (*outp))
{
outp--;
}
the last character of the returned string is *not* a slash. */
*outp = '\0';
- if (outp[-1] == '/')
+ if (osd_isConnectChar (outp[-1]))
*--outp = '\0';
/*@noaccess cstring@*/
** is longer, then the full absolute filename is returned.
**
** KNOWN BUG: subpart of the original filename is actually a symbolic link.
+**
+** this is really horrible code...surely someone has written a less buggy version of this!
*/
cstring osd_outputPath (cstring filename)
{
-# ifdef UNIX
+ /*@i2534 fix this junky code once and for all! */
+# if defined (UNIX) || defined (OS2)
char *rel_buffer;
char *rel_buf_p;
cstring cwd_p = osd_cwd;
char *path_p;
int unmatched_slash_count = 0;
- size_t filename_len = size_fromInt (cstring_length (filename));
+ size_t filename_len = cstring_length (filename);
+ llassertretval (filename_len > 0, filename);
+
/*@access cstring@*/
path_p = filename;
- rel_buf_p = rel_buffer = (char *) dmalloc (filename_len);
+ rel_buffer = (char *) dmalloc (filename_len);
+ rel_buf_p = rel_buffer;
+ *rel_buf_p = '\0';
+
+ if (cwd_p == NULL)
+ {
+ /* Need to prevent recursive assertion failures */
+ return cstring_copy (filename);
+ }
llassert (cwd_p != NULL);
llassert (path_p != NULL);
path_p++;
}
- if ((*cwd_p == '\0') && (*path_p == '\0' || *path_p == '/')) /* whole pwd matched */
+ if ((*cwd_p == '\0') && (*path_p == '\0' || osd_isConnectChar (*path_p))) /* whole pwd matched */
{
if (*path_p == '\0') /* input *is* the current path! */
- return cstring_makeLiteral (".");
+ {
+ cstring_free (rel_buffer);
+ return cstring_makeLiteral (".");
+ }
else
{
/*@i324 ! splint didn't report an errors for: return ++path_p; */
- return cstring_fromCharsNew (++path_p);
+ cstring_free (rel_buffer);
+ return cstring_fromCharsNew (path_p + 1);
}
}
else
{
+
+ /* drl 2002-10/14 I had to put this code back*/
+ /* the case that needs it is when splint is given an absolute path name of a file outside of the current directory and the subdirectories below the current directory. e.g. cd /home/; splint /tmp/prog.c
+ */
+
+ /* evans 2002-02-05 This is horrible code, which I've removed. I couldn't find any
+ ** test cases that need it, so I hope I'm not breaking anything.
+ */
+ /*#if 0*/
+
if (*path_p != '\0')
{
--cwd_p;
--path_p;
- while (*cwd_p != '/') /* backup to last slash */
+
+ while (cwd_p >= osd_cwd && !osd_isConnectChar (*cwd_p)) /* backup to last slash */
{
--cwd_p;
--path_p;
path_p++;
unmatched_slash_count++;
}
-
+
/* Find out how many directory levels in cwd were *not* matched. */
while (*cwd_p != '\0')
{
- if (*cwd_p++ == '/')
+ if (osd_isConnectChar (*cwd_p++))
unmatched_slash_count++;
}
Reject it if longer than the input. */
if (unmatched_slash_count * 3 + strlen (path_p) >= filename_len)
{
+ cstring_free (rel_buffer);
+ /* fprintf (stderr, "Returning filename: %s [%p]\n", filename); */
return cstring_copy (filename);
}
-
- /*
- ** evans 2001-10-15
- ** I'm trusting the code on this one...don't see how this is guaranteed though.
- */
-
- assertSet (rel_buffer);
+ /*drl 10-14-2002 end previously removed code */
+ /*#endif*/
/* For each of them, put a `../' at the beginning of the short name. */
while (unmatched_slash_count-- > 0)
{
/* Give up if the result gets to be longer
than the absolute path name. */
- if (rel_buffer + filename_len <= rel_buf_p + 3)
+ char * temp_rel_buf_p;
+
+ /*drl This comment is necessary because for some reason Splint
+ does not realize that the pasts where rel_buf_p is released
+ do not reach here*/
+ /*@-usereleased@*/
+ temp_rel_buf_p = rel_buf_p;
+ /*@-usereleased@*/
+
+ if (rel_buffer + filename_len <= temp_rel_buf_p + 3)
{
sfree (rel_buffer);
return cstring_copy (filename);
*rel_buf_p++ = '.';
*rel_buf_p++ = '.';
- *rel_buf_p++ = '/';
+ *rel_buf_p++ = CONNECTCHAR;
}
/* Then tack on the unmatched part of the desired file's name. */
+
do
{
if (rel_buffer + filename_len <= rel_buf_p)
}
} /*@-usereleased@*/
while ((*rel_buf_p++ = *path_p++) != '\0') ;
- /*@=usereleased@*/ /*@i523! shouldn't need these */
+
+ /*@=usereleased@*/ /*@i523! shouldn't need these */
--rel_buf_p;
- if (*(rel_buf_p-1) == '/')
+
+ if (osd_isConnectChar (*(rel_buf_p-1)))
*--rel_buf_p = '\0';
+ /* fprintf (stderr, "Returning buffer: %s [%p]\n", rel_buffer, rel_buffer); */
return rel_buffer;
}
/*@noaccess cstring@*/
andersk / splint.git / blobdiff