what you give them. Help stamp out software-hoarding!
-------------------------------------------------------------------------*/
-#include "common.h"
+#include <math.h>
+
+#ifdef _WIN32
+#include <ctype.h>
+#include <windows.h>
+#endif
+#include <sys/stat.h>
+#include "dbuf.h"
+#include "SDCCglobl.h"
#include "SDCCmacro.h"
#include "SDCCutil.h"
#include "newalloc.h"
-#include <sys/stat.h>
+#ifndef _WIN32
+#include "findme.h"
+#endif
+
+#include "version.h"
/** Given an array of name, value string pairs creates a new hash
containing all of the pairs.
return pret;
}
-/** Given an array of string pointers and another string, adds the
- string to the end of the list. The end of the list is assumed to
- be the first NULL pointer.
+/** Prints elements of the set to the file, each element on new line
*/
void
-addToList (const char **list, const char *str)
-{
- /* This is the bad way to do things :) */
- while (*list)
- list++;
- *list = Safe_strdup (str);
- if (!*list)
- {
- werror (E_OUT_OF_MEM, __FILE__, 0);
- exit (1);
- }
- *(++list) = NULL;
-}
-
-/** Given an array of string pointers returns a string containing all
- of the strings seperated by spaces. The returned string is on the
- heap. The join stops when a NULL pointer is hit.
-*/
-char *
-join(const char **pplist)
-{
- buffer[0] = 0;
-
- while (*pplist)
- {
- strncatz(buffer, *pplist, PATH_MAX);
- strncatz(buffer, " ", PATH_MAX);
- pplist++;
- }
-
- return buffer;
-}
-
-/** Given an array of string pointers, returns a string containing all
- of the strings seperated by spaces. The returned string is on the
- heap. n is the number of strings in the list.
-*/
-char *
-joinn(char **pplist, int n)
+fputStrSet(FILE *fp, set *list)
{
- buffer[0] = 0;
-
- while (n--)
- {
- strncatz(buffer, *pplist, PATH_MAX);
- strncatz(buffer, " ", PATH_MAX);
- pplist++;
- }
+ const char *s;
- 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 char
-pathCharTransform(char c)
-{
-#if NATIVE_WIN32
- if (c == '/')
- {
- return DIR_SEPARATOR_CHAR;
- }
- else
- {
- return c;
- }
-#else
- return c;
-#endif
+ for (s = setFirstItem(list); s != NULL; s = setNextItem(list)) {
+ fputs(s, fp);
+ fputc('\n', fp);
+ }
}
-/** Fixes up a potentially mixed path to the proper representation for
- the host. Fixes up in place.
+/** Prepend / append given strings to each item of string set. The result is in a
+ new string set.
*/
-static char *
-fixupPath(char *pin)
+set *
+appendStrSet(set *list, const char *pre, const char *post)
{
- char *p = pin;
-
- while (*p)
- {
- *p = pathCharTransform(*p);
- p++;
- }
- *p = '\0';
+ set *new_list = NULL;
+ const char *item;
+ struct dbuf_s dbuf;
+
+ for (item = setFirstItem(list); item != NULL; item = setNextItem(list)) {
+ dbuf_init(&dbuf, PATH_MAX);
+ if (pre != NULL)
+ dbuf_append(&dbuf, pre, strlen(pre));
+ dbuf_append(&dbuf, item, strlen(item));
+ if (post != NULL)
+ dbuf_append(&dbuf, post, strlen(post));
+ addSet(&new_list, (void *)dbuf_c_str(&dbuf));
+ dbuf_detach(&dbuf);
+ }
- return pin;
+ return new_list;
}
-/** Returns the characters in p2 past the last matching characters in
- p1.
+/** Given a set returns a string containing all of the strings seperated
+ by spaces. The returned string is on the heap.
*/
-char *
-getPathDifference (char *pinto, const char *p1, const char *p2)
+const char *
+joinStrSet(set *list)
{
- char *p = pinto;
+ const char *s;
+ struct dbuf_s dbuf;
-#if NATIVE_WIN32
- /* win32 can have a path at the start. */
- if (strchr(p2, ':'))
- {
- p2 = strchr(p2, ':')+1;
- }
-#endif
+ dbuf_init(&dbuf, PATH_MAX);
- while (*p1 != '\0' && *p2 != '\0')
- {
- if (pathCharsEquivalent(*p1, *p2) == FALSE)
- {
- break;
- }
- p1++;
- p2++;
- }
- while (*p2)
+ for (s = setFirstItem(list); s != NULL; s = setNextItem(list))
{
- *p++ = *p2++;
+ dbuf_append(&dbuf, s, strlen(s));
+ dbuf_append(&dbuf, " ", 1);
}
- *p = '\0';
- return fixupPath(pinto);
+ s = dbuf_c_str(&dbuf);
+ dbuf_detach(&dbuf);
+ return s;
}
-
/** Given a file with path information in the binary files directory,
returns the directory component. Used for discovery of bin
directory of SDCC installation. Returns NULL if the path is
impossible.
*/
+#ifdef _WIN32
char *
getBinPath(const char *prel)
{
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;
+ /* try DOS and *nix dir separator on WIN32 */
+ if (NULL != (p = strrchr(prel, DIR_SEPARATOR_CHAR)) ||
+ NULL != (p = strrchr(prel, UNIX_DIR_SEPARATOR_CHAR))) {
+ len = min((sizeof path) - 1, p - prel);
+ strncpy(path, prel, len);
+ path[len] = '\0';
+ return path;
+ }
+ /* not enough info in prel; do it with module name */
+ else if (0 != GetModuleFileName(NULL, path, sizeof path) &&
+ NULL != (p = strrchr(path, DIR_SEPARATOR_CHAR))) {
+ *p = '\0';
+ return path;
+ }
+ else
+ return NULL;
+}
+#else
+char *
+getBinPath(const char *prel)
+{
+ static char path[PATH_MAX];
+ const char *ret_path;
- len = min((sizeof path) - 1, p - prel);
- strncpy(path, prel, len);
- path[len] = '\0';
+ if (NULL != (ret_path = findProgramPath(prel))) {
+ char *p;
+ size_t len;
- return path;
-}
+ if (NULL != (p = strrchr(ret_path, DIR_SEPARATOR_CHAR)) &&
+ PATH_MAX > (len = p - ret_path)) {
+ memcpy(path, ret_path, len);
+ path[len] = '\0';
+ free((void *)ret_path);
+
+ return path;
+ }
+ else {
+ free((void *)ret_path);
+ return NULL;
+ }
+ }
+ else
+ return NULL;
+}
+#endif
/** Returns true if the given path exists.
*/
}
void
-buildCmdLine2 (char *pbuffer, const char *pcmd, size_t len)
+buildCmdLine2 (char *pbuffer, size_t len, const char *pcmd, ...)
{
+ va_list ap;
char *poutcmd;
+
assert(pbuffer && pcmd);
assert(_mainValues);
- poutcmd = msprintf(_mainValues, pcmd);
+ va_start(ap, pcmd);
+
+ poutcmd = mvsprintf(_mainValues, pcmd, ap);
+
+ va_end(ap);
+
strncpyz(pbuffer, poutcmd, len);
+ Safe_free(poutcmd);
}
void
assert(n > 0);
--n;
- // paranoia...
+ /* paranoia... */
if (strlen(src) > n)
{
fprintf(stderr, "strncpyz prevented buffer overrun!\n");
maxToCopy = n - destLen - 1;
- // paranoia...
+ /* paranoia... */
if (strlen(src) + destLen >= n)
{
fprintf(stderr, "strncatz prevented buffer overrun!\n");
}
+/*-----------------------------------------------------------------*/
+/* getBuildNumber - return build number */
+/*-----------------------------------------------------------------*/
+const char *getBuildNumber(void)
+{
+ return (SDCC_BUILD_NUMBER);
+}
+
#if defined(HAVE_VSNPRINTF) || defined(HAVE_VSPRINTF)
size_t SDCCsnprintf(char *dst, size_t n, const char *fmt, ...)
{
projects / fw / sdcc / blobdiff