/* This is the bad way to do things :) */
while (*list)
list++;
- *list = strdup (str);
+ *list = Safe_strdup (str);
if (!*list)
{
werror (E_OUT_OF_MEM, __FILE__, 0);
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
char *
joinn(char **pplist, int n)
{
- char *pinto = buffer;
- *pinto = '\0';
+ buffer[0] = 0;
+
+ while (n--)
+ {
+ strncatz(buffer, *pplist, PATH_MAX);
+ strncatz(buffer, " ", PATH_MAX);
+ pplist++;
+ }
+
+ return buffer;
+}
+
+/** Returns TRUE if for the host the two path characters are
+ equivalent.
+*/
+static bool
+pathCharsEquivalent(char c1, char c2)
+{
+#if NATIVE_WIN32
+ /* win32 is case insensitive */
+ if (tolower(c1) == tolower(c2))
+ {
+ return TRUE;
+ }
+ /* And / is equivalent to \ */
+ else if (c1 == '/' && c2 == '\\')
+ {
+ return TRUE;
+ }
+ else if (c1 == '\\' && c2 == '/')
+ {
+ return TRUE;
+ }
+ else
+ {
+ return FALSE;
+ }
+#else
+ /* Assume a Unix host where they must match exactly. */
+ return c1 == 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)
+{
+#if NATIVE_WIN32
+ if (c == '/')
+ {
+ return DIR_SEPARATOR_CHAR;
+ }
+ else
+ {
+ return c;
+ }
+#else
+ return c;
+#endif
+}
+
+/** Fixes up a potentially mixed path to the proper representation for
+ the host. Fixes up in place.
+*/
+static char *
+fixupPath(char *pin)
+{
+ char *p = pin;
- while (n--)
+ while (*p)
{
- strcpy(pinto, *pplist);
- pinto += strlen(*pplist);
- *pinto++ = ' ';
- pplist++;
+ *p = pathCharTransform(*p);
+ p++;
}
- *pinto = '\0';
+ *p = '\0';
- return buffer;
+ return pin;
}
/** Returns the characters in p2 past the last matching characters in
p1.
*/
char *
-getStringDifference (char *pinto, const char *p1, const char *p2)
+getPathDifference (char *pinto, const char *p1, const char *p2)
{
char *p = pinto;
+#if NATIVE_WIN32
+ /* win32 can have a path at the start. */
+ if (strchr(p2, ':'))
+ {
+ p2 = strchr(p2, ':')+1;
+ }
+#endif
+
while (*p1 != '\0' && *p2 != '\0')
{
- if (*p1++ != *p2++)
+ if (pathCharsEquivalent(*p1, *p2) == FALSE)
{
break;
}
+ p1++;
+ p2++;
}
while (*p2)
{
}
*p = '\0';
- return pinto;
+ return fixupPath(pinto);
}
/** Given a file with path information in the binary files directory,
char *
getPrefixFromBinPath (const char *prel)
{
- strcpy(scratchFileName, prel);
+ strncpyz(scratchFileName, prel, PATH_MAX);
/* 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. */
- getStringDifference (buffer, PREFIX, BINDIR);
+ getPathDifference (buffer, PREFIX, BINDIR);
/* Verify that the path in has the expected suffix */
if (strlen(buffer) > strlen(scratchFileName))
/* Not long enough */
return NULL;
}
- if (strcmp(buffer, scratchFileName + strlen(scratchFileName) - strlen(buffer)) != 0)
+
+ if (pathEquivalent (buffer, scratchFileName + strlen(scratchFileName) - strlen(buffer)) == FALSE)
{
/* Doesn't match */
return NULL;
scratchFileName[strlen(scratchFileName) - strlen(buffer)] = '\0';
- return gc_strdup (scratchFileName);
+ return Safe_strdup (scratchFileName);
}
/** Returns true if the given path exists.
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 = msprintf(_mainValues, pcmd);
- strcpy(pbuffer, poutcmd);
+ char *poutcmd;
+ assert(pbuffer && pcmd);
+ assert(_mainValues);
+
+ poutcmd = msprintf(_mainValues, pcmd);
+ strncpyz(pbuffer, poutcmd, len);
}
void
_mainValues = populateStringHash(ppin);
}
-char *
-gc_strdup (const char *s)
-{
- char *ret;
- ret = Safe_calloc (1, strlen (s) + 1);
- strcpy (ret, s);
- return ret;
-}
-
/** Returns true if sz starts with the string given in key.
*/
bool
*nl = '\0';
}
+hTab *
+getRuntimeVariables(void)
+{
+ return _mainValues;
+}
+
+
+/* strncpy() with guaranteed NULL termination. */
+char *strncpyz(char *dest, const char *src, size_t n)
+{
+ assert(n > 0);
+
+ // paranoia...
+ if (strlen(src) >= n)
+ {
+ fprintf(stderr, "strncpyz prevented buffer overrun!\n");
+ }
+
+ strncpy(dest, src, n);
+ dest[n - 1] = 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) || len >= n)
+ {
+ fprintf(stderr, "internal error: sprintf truncated.\n");
+ }
+
+ return len;
+}
+
+#endif
projects / fw / sdcc / blobdiff