fixed bug #635354

[fw/sdcc] / src / SDCCutil.c

diff --git a/src/SDCCutil.c b/src/SDCCutil.c
index 75475d3db84dc76b4e9fec14efc7c05becf532c4..3cd6a0c8b8c7b9c515444c6f23b1ad794bd33f92 100644 (file)
--- a/src/SDCCutil.c
+++ b/src/SDCCutil.c
@@ -71,18 +71,16 @@ addToList (const char **list, const char *str)
 char *
 join(const char **pplist)
 {
-  char *pinto = buffer;
-  *pinto = '\0';
-
-  while (*pplist)
+    buffer[0] = 0;  
+    
+    while (*pplist)
     {
-      strcpy(pinto, *pplist);
-      pinto += strlen(*pplist);
-      *pinto++ = ' ';
-      pplist++;
+       strncatz(buffer, *pplist, PATH_MAX);
+       strncatz(buffer, " ", PATH_MAX);
+       pplist++;
     }
 
-  return buffer;
+    return buffer;
 }
 
 /** Given an array of string pointers, returns a string containing all
@@ -92,19 +90,16 @@ join(const char **pplist)
 char *
 joinn(char **pplist, int n)
 {
-  char *pinto = buffer;
-  *pinto = '\0';
-
-  while (n--)
+    buffer[0] = 0;  
+    
+    while (n--)
     {
-      strcpy(pinto, *pplist);
-      pinto += strlen(*pplist);
-      *pinto++ = ' ';
-      pplist++;
+       strncatz(buffer, *pplist, PATH_MAX);
+       strncatz(buffer, " ", PATH_MAX);
+       pplist++;
     }
-  *pinto = '\0';
 
-  return buffer;
+    return buffer;
 }
 
 /** Returns TRUE if for the host the two path characters are
@@ -138,22 +133,6 @@ pathCharsEquivalent(char c1, char c2)
 #endif
 }
 
-static bool
-pathEquivalent(const char *p1, const char *p2)
-{
-  while (*p1 != '\0' && *p2 != '\0')
-    {
-      if (pathCharsEquivalent (*p1, *p2) == FALSE)
-        {
-          break;
-        }
-      p1++;
-      p2++;
-    }
-
-  return *p1 == *p2;
-}
-
 static char
 pathCharTransform(char c)
 {
@@ -223,39 +202,34 @@ getPathDifference (char *pinto, const char *p1, const char *p2)
   return fixupPath(pinto);
 }
 
+
 /** Given a file with path information in the binary files directory,
-    returns what PREFIX must be to get this path.  Used for discovery
-    of where SDCC is installed.  Returns NULL if the path is
+    returns the directory component. Used for discovery of bin
+    directory of SDCC installation. Returns NULL if the path is
     impossible.
 */
 char *
-getPrefixFromBinPath (const char *prel)
+getBinPath(const char *prel)
 {
-  strcpy(scratchFileName, prel);
-  /* Strip off the /sdcc at the end */
-  *strrchr(scratchFileName, DIR_SEPARATOR_CHAR) = '\0';
-  /* Compute what the difference between the prefix and the bin dir
-     should be. */
-  getPathDifference (buffer, PREFIX, BINDIR);
-
-  /* Verify that the path in has the expected suffix */
-  if (strlen(buffer) > strlen(scratchFileName))
-    {
-      /* Not long enough */
-      return NULL;
-    }
-
-  if (pathEquivalent (buffer, scratchFileName + strlen(scratchFileName) - strlen(buffer)) == FALSE)
-    {
-      /* Doesn't match */
+  char *p;
+  size_t len;
+  static char path[PATH_MAX];
+    
+  if ((p = strrchr(prel, DIR_SEPARATOR_CHAR)) == NULL)
+#ifdef _WIN32
+    /* try *nix dir separator on WIN32 */
+    if ((p = strrchr(prel, UNIX_DIR_SEPARATOR_CHAR)) == NULL)
+#endif
       return NULL;
-    }
 
-  scratchFileName[strlen(scratchFileName) - strlen(buffer)] = '\0';
+  len = min((sizeof path) - 1, p - prel);
+  strncpy(path, prel, len);
+  path[len] = '\0';
 
-  return Safe_strdup (scratchFileName);
+  return path;
 }
 
+
 /** Returns true if the given path exists.
  */
 bool
@@ -272,20 +246,19 @@ void
 setMainValue (const char *pname, const char *pvalue)
 {
   assert(pname);
-  assert(pvalue);
 
   shash_add (&_mainValues, pname, pvalue);
 }
 
 void
-buildCmdLine2 (char *pbuffer, const char *pcmd)
+buildCmdLine2 (char *pbuffer, const char *pcmd, size_t len)
 {
   char *poutcmd;
   assert(pbuffer && pcmd);
   assert(_mainValues);
 
   poutcmd = msprintf(_mainValues, pcmd);
-  strcpy(pbuffer, poutcmd);
+  strncpyz(pbuffer, poutcmd, len);
 }
 
 void
@@ -318,3 +291,77 @@ getRuntimeVariables(void)
 {
   return _mainValues;
 }
+
+
+/* strncpy() with guaranteed NULL termination. */
+char *strncpyz(char *dest, const char *src, size_t n)
+{
+    assert(n > 0);
+
+    --n;
+    // paranoia...
+    if (strlen(src) > n)
+    {
+       fprintf(stderr, "strncpyz prevented buffer overrun!\n");
+    }
+    
+    strncpy(dest, src, n);
+    dest[n] = 0;
+    return dest;
+}
+
+/* like strncat() with guaranteed NULL termination
+ * The passed size should be the size of the dest buffer, not the number of 
+ * bytes to copy.
+ */
+char *strncatz(char *dest, const char *src, size_t n)
+{
+    size_t maxToCopy;
+    size_t destLen = strlen(dest);
+    
+    assert(n > 0);
+    assert(n > destLen);
+    
+    maxToCopy = n - destLen - 1;
+    
+    // paranoia...
+    if (strlen(src) + destLen >= n)
+    {
+       fprintf(stderr, "strncatz prevented buffer overrun!\n");
+    }
+    
+    strncat(dest, src, maxToCopy);
+    dest[n - 1] = 0;
+    return dest;
+}
+
+
+#if defined(HAVE_VSNPRINTF) || defined(HAVE_VSPRINTF)
+size_t SDCCsnprintf(char *dst, size_t n, const char *fmt, ...)
+{
+  va_list args;
+  int len;
+
+  va_start(args, fmt);
+
+# if defined(HAVE_VSNPRINTF)
+  len = vsnprintf(dst, n, fmt, args);
+# else
+  vsprintf(dst, fmt, args);
+  len = strlen(dst) + 1;
+# endif
+
+  va_end(args);
+
+  /* on some gnu systems, vsnprintf returns -1 if output is truncated.
+   * In the C99 spec, vsnprintf returns the number of characters that 
+   * would have been written, were space available.
+   */
+  if ((len < 0) || (size_t) len >= n) {
+    fprintf(stderr, "internal error: sprintf truncated.\n");
+  }
+
+  return len;
+}
+
+#endif