noexpand always false.

[splint.git] / src / fileLib.c

diff --git a/src/fileLib.c b/src/fileLib.c
index 2f5dcac727f42d83ad81fbea286df7416b4a023a..fece625b0be08299eafbff4c5d7960056ac2a5d2 100644 (file)
--- a/src/fileLib.c
+++ b/src/fileLib.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
@@ -17,17 +17,17 @@
 ** 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
 */
 /*
 ** fileLib.c
 */
 
-# include "lclintMacros.nf"
+# include "splintMacros.nf"
 # include "basic.h"
-# include "portab.h"
+# include "osd.h"
 
 bool
 fileLib_isCExtension (cstring ext)
@@ -73,7 +73,6 @@ fileLib_isLCLFile (cstring s)
   /*@noaccess cstring@*/
 }
 
-# ifndef NOLCL
 /*@only@*/ cstring fileLib_removePath (cstring s)
 {
   /*@access cstring@*/
@@ -89,7 +88,6 @@ fileLib_isLCLFile (cstring s)
   else return (mstring_copy (t + 1));
   /*@noaccess cstring@*/
 }
-# endif
 
 /*@only@*/ cstring
 fileLib_removePathFree (/*@only@*/ cstring s)
@@ -163,7 +161,7 @@ fileLib_addExtension (/*@temp@*/ cstring s, cstring suffix)
 
   if (strrchr (s, '.') == (char *) 0)
     {
-      /* <<< was mstring_concatFree1 --- bug detected by lclint >>> */
+      /* <<< was mstring_concatFree1 --- bug detected by splint >>> */
       return (cstring_concat (s, suffix));
     }
   else
@@ -222,10 +220,10 @@ cstring fileLib_cleanName (cstring s)
 {
   if (cstring_equalPrefixLit (s, "./")) 
     {
-      return cstring_copySegment (s, 2, cstring_length (s) - 1);
+      cstring res = cstring_copySegment (s, 2, cstring_length (s) - 1);
+      cstring_free (s);
+      return res;
     }
 
-
-
-  return cstring_copy (s);
+  return s;
 }