what you give them. Help stamp out software-hoarding!
-------------------------------------------------------------------------*/
-#ifdef _WIN32
+#include <math.h>
#include <ctype.h>
+
+#ifdef _WIN32
#include <windows.h>
#endif
#include <sys/stat.h>
#include "SDCCmacro.h"
#include "SDCCutil.h"
#include "newalloc.h"
+#include "dbuf_string.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.
*/
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));
+ dbuf_append_str(&dbuf, pre);
+ dbuf_append_str(&dbuf, item);
if (post != NULL)
- dbuf_append(&dbuf, post, strlen(post));
- addSet(&new_list, (void *)dbuf_c_str(&dbuf));
- dbuf_detach(&dbuf);
+ dbuf_append_str(&dbuf, post);
+
+ /* null terminate the buffer */
+ dbuf_c_str(&dbuf);
+ addSet(&new_list, dbuf_detach(&dbuf));
}
return new_list;
for (s = setFirstItem(list); s != NULL; s = setNextItem(list))
{
- dbuf_append(&dbuf, s, strlen(s));
- dbuf_append(&dbuf, " ", 1);
+ dbuf_append_str(&dbuf, s);
+ dbuf_append_char(&dbuf, ' ');
}
s = dbuf_c_str(&dbuf);
return s;
}
+/** Split the path string to the directory and file name (including extension) components.
+ The directory component doesn't contain trailing directory separator.
+ Returns true if the path contains the directory separator. */
+int
+dbuf_splitPath(const char *path, struct dbuf_s *dir, struct dbuf_s *file)
+{
+ const char *p;
+ int ret;
+ const char *end = &path[strlen(path)];
+
+ for (p = end - 1; p >= path && !IS_DIR_SEPARATOR(*p); --p)
+ ;
+
+ ret = p >= path;
+
+ if (NULL != dir)
+ {
+ int len = p - path;
+
+ if (0 < len)
+ dbuf_append(dir, path, len);
+ }
+
+ if (NULL != file)
+ {
+ int len;
+
+ ++p;
+ len = end - p;
+
+ if (0 < len)
+ dbuf_append(file, p, len);
+ }
+
+ return ret;
+}
+
+/** Split the path string to the file name (including directory) and file extension components.
+ The file name component doesn't contain trailing extension separator.
+ Returns true if the path contains the extension separator. */
+int
+dbuf_splitFile(const char *path, struct dbuf_s *file, struct dbuf_s *ext)
+{
+ const char *p;
+ const char *end = &path[strlen(path)];
+
+ for (p = end - 1; p >= path && !IS_DIR_SEPARATOR(*p) && '.' != *p; --p)
+ ;
+
+ if (p < path || '.' != *p)
+ {
+ dbuf_append_str(file, path);
+
+ return 0;
+ }
+ else
+ {
+ if (NULL != file)
+ {
+ int len = p - path;
+
+ if (0 < len)
+ dbuf_append(file, path, len);
+ }
+
+ if (NULL != ext)
+ {
+ int len;
+
+ ++p;
+ len = end - p;
+
+ if (0 < len)
+ dbuf_append(ext, p, len);
+ }
+
+ return 1;
+ }
+}
+
+/** Combile directory and the file name to a path string using the DIR_SEPARATOR_CHAR.
+ */
+void
+dbuf_makePath(struct dbuf_s *path,const char *dir, const char *file)
+{
+ if (dir != NULL)
+ dbuf_append_str(path, dir);
+
+ dbuf_append_char(path, DIR_SEPARATOR_CHAR);
+
+ if (file != NULL)
+ dbuf_append_str(path, file);
+}
+
/** 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 *
+const char *
getBinPath(const char *prel)
{
- char *p;
- size_t len;
- static char path[PATH_MAX];
-
- /* 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) != 0 &&
- NULL != (p = strrchr(path, DIR_SEPARATOR_CHAR))) {
- *p = '\0';
- return path;
- }
+ struct dbuf_s path;
+ const char *p;
+
+ dbuf_init(&path, 128);
+ dbuf_splitPath(prel, &path, NULL);
+
+ p = dbuf_c_str(&path);
+ if ('\0' != *p)
+ return p;
else
- return NULL;
+ {
+ char module[PATH_MAX];
+
+ dbuf_destroy(&path);
+
+ /* not enough info in prel; do it with module name */
+ if (0 != GetModuleFileName(NULL, module, sizeof (module)))
+ {
+ dbuf_init(&path, 128);
+
+ dbuf_splitPath(module, &path, NULL);
+ return dbuf_c_str(&path);
+ }
+ else
+ return NULL;
+ }
}
#else
-char *
+const char *
getBinPath(const char *prel)
{
- static char path[PATH_MAX];
+ struct dbuf_s path;
const char *ret_path;
- if (NULL != (ret_path = findProgramPath(prel))) {
- char *p;
- size_t len;
-
- 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);
+ if (NULL != (ret_path = findProgramPath(prel)))
+ {
+ dbuf_splitPath(prel, path, NULL);
- return path;
- }
- else {
free((void *)ret_path);
- return NULL;
+ return dbuf_c_str(path);
}
- }
else
return NULL;
}
}
+/*-----------------------------------------------------------------*/
+/* 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, ...)
{
return len;
}
-
#endif
+
+/** Pragma tokenizer
+ */
+void
+init_pragma_token(struct pragma_token_s *token)
+{
+ dbuf_init(&token->dbuf, 16);
+ token->type = TOKEN_UNKNOWN;
+}
+
+char *
+get_pragma_token(const char *s, struct pragma_token_s *token)
+{
+ dbuf_set_length(&token->dbuf, 0);
+
+ /* skip leading spaces */
+ while ('\n' != *s && isspace(*s))
+ ++s;
+
+ if ('\0' == *s || '\n' == *s)
+ {
+ token->type = TOKEN_EOL;
+ }
+ else
+ {
+ char *end;
+
+ long val = strtol(s, &end, 0);
+
+ if (end != s && ('\0' == *end || isspace(*end)))
+ {
+ token->val.int_val = val;
+ token->type = TOKEN_INT;
+ dbuf_append(&token->dbuf, s, end - s);
+ s = end;
+ }
+ else
+ {
+ while ('\0' != *s && !isspace(*s))
+ {
+ dbuf_append_char(&token->dbuf, *s);
+ ++s;
+ }
+
+ token->type = TOKEN_STR;
+ }
+ }
+
+ return (char *)s;
+}
+
+const char *
+get_pragma_string(struct pragma_token_s *token)
+{
+ return dbuf_c_str(&token->dbuf);
+}
+
+void
+free_pragma_token(struct pragma_token_s *token)
+{
+ dbuf_destroy(&token->dbuf);
+}
projects / fw / sdcc / blobdiff