diff -r 158b860440c0 -r 7c36121e2dfe sourcemm/util.cpp --- a/sourcemm/util.cpp Wed Oct 05 21:51:02 2005 +0000 +++ b/sourcemm/util.cpp Thu Oct 06 00:59:01 2005 +0000 @@ -10,7 +10,10 @@ #include #include +#include +#include #include "util.h" +#include "oslink.h" /** * @brief Utility functons @@ -55,11 +58,43 @@ i++; // If whitespace chars in buffer then adjust string so first non-whitespace char is at start of buffer + // :TODO: change this to not use memcpy()! if (i != buffer) memcpy(buffer, i, (strlen(i) + 1) * sizeof(char)); } } +//:TODO: this should skip string literals +void UTIL_TrimComments(char *buffer) +{ + int num_sc = 0; + size_t len = strlen(buffer); + if (buffer) + { + for (int i=(int)len-1; i>=0; i--) + { + if (buffer[i] == '/') + { + if (++num_sc >= 2 && i==0) + { + buffer[i] = '\0'; + return; + } + } else { + if (num_sc >= 2) + { + buffer[i] = '\0'; + return; + } + num_sc = 0; + } + //size_t won't go below 0, manually break out + if (i == 0) + break; + } + } +} + /* UTIL_TrimLeft * Removes whitespace characters from right side of string */ @@ -69,7 +104,7 @@ if (buffer) { // Loop through buffer backwards while replacing whitespace chars with null chars - for (unsigned int i = strlen(buffer) - 1; i >= 0; i--) + for (int i = (int)strlen(buffer) - 1; i >= 0; i--) { if (isspace(buffer[i])) buffer[i] = '\0'; @@ -79,3 +114,110 @@ } } +/* UTIL_KeySplit + * Breaks a string at the first space until it reaches a nonspace + */ +void UTIL_KeySplit(const char *str, char *buf1, size_t len1, char *buf2, size_t len2) +{ + size_t start; + size_t len = strlen(str); + + for (start=0; start= len1) + break; + buf1[c] = str[i]; + } + buf1[c] = '\0'; + + for (start=end; start= len2) + break; + buf2[c] = str[start]; + } + buf2[c] = '\0'; +} + +/** + * Formats a path name for an OS + */ +void UTIL_PathFmt(char *buffer, size_t len, const char *fmt, ...) +{ + va_list ap; + va_start(ap,fmt); + size_t mylen = vsnprintf(buffer, len, fmt, ap); + va_end(ap); + + for (size_t i=0; i