128, 128, 0
};
-
-char *safestrncpy(char *dest, const char *src, size_t n)
+/*
+ * copy a string into a buffer of a known size. abort if we exceed the limits
+ *
+ * dest the targetbuffer
+ * src the source string
+ * n the size od dest
+ *
+ * returns the number of characters copied if dest is big enough, -n if not.
+ */
+int safestrncpy(char *dest, const char *src, size_t n)
{
int i = 0;
do {
dest[i] = src[i];
- if (dest[i] == 0) return(dest);
+ if (dest[i] == 0) return i;
++i;
} while (i<n);
dest[n - 1] = 0;
- return dest;
+ return -i;
}
return strdup(line);
}
- result = (char*) malloc(strlen(UTF8_HEADER) + 4 + length * 2);
+ result = (char*) malloc(sizeof(UTF8_HEADER) + 4 + length * 2);
strncpy (result, UTF8_HEADER, strlen (UTF8_HEADER));
CtdlEncodeBase64(result + strlen(UTF8_HEADER), line, length, 0);
end = strlen (result);
return result;
}
-
/*
- * Strip leading and trailing spaces from a string
+ * removes double slashes from pathnames
+ * allows / disallows trailing slashes
*/
-void striplt(char *buf)
+void StripSlashes(char *Dir, int TrailingSlash)
{
- size_t len;
- int a;
+ char *a, *b;
+
+ a = b = Dir;
+
+ while (!IsEmptyStr(a)) {
+ if (*a == '/') {
+ while (*a == '/')
+ a++;
+ *b = '/';
+ b++;
+ }
+ else {
+ *b = *a;
+ b++; a++;
+ }
+ }
+ if ((TrailingSlash) && (*(b - 1) != '/')){
+ *b = '/';
+ b++;
+ }
+ *b = '\0';
- if (buf==NULL) return;
- if (IsEmptyStr(buf)) return;
- len = strlen(buf);
- while ((!IsEmptyStr(buf)) && (isspace(buf[len - 1])))
- buf[--len] = 0;
- if (IsEmptyStr(buf)) return;
- a = 0;
- while ((!IsEmptyStr(buf)) && (isspace(buf[a])))
- a++;
- if (a > 0)
- memmove(buf, &buf[a], len - a + 1);
}
+/*
+ * Strip leading and trailing spaces from a string
+ */
+size_t striplt(char *buf) {
+ char *first_nonspace = NULL;
+ char *last_nonspace = NULL;
+ char *ptr;
+ size_t new_len = 0;
+
+ if ((buf == NULL) || (*buf == '\0')) {
+ return 0;
+ }
+
+ for (ptr=buf; *ptr!=0; ++ptr) {
+ if (!isspace(*ptr)) {
+ if (!first_nonspace) {
+ first_nonspace = ptr;
+ }
+ last_nonspace = ptr;
+ }
+ }
+ if ((!first_nonspace) || (!last_nonspace)) {
+ buf[0] = 0;
+ return 0;
+ }
+ new_len = last_nonspace - first_nonspace + 1;
+ memmove(buf, first_nonspace, new_len);
+ buf[new_len] = 0;
+ return new_len;
+}
/**
* Determine whether the specified message number is contained within the
* specified sequence set.
*/
-int is_msg_in_sequence_set(char *mset, long msgnum) {
+int is_msg_in_sequence_set(const char *mset, long msgnum) {
int num_sets;
int s;
char setstr[128], lostr[128], histr[128];
* Strip a boundarized substring out of a string (for example, remove
* parentheses and anything inside them).
*/
-void stripout(char *str, char leftboundary, char rightboundary) {
+int stripout(char *str, char leftboundary, char rightboundary) {
int a;
int lb = (-1);
int rb = (-1);
if ( (lb > 0) && (rb > lb) ) {
strcpy(&str[lb - 1], &str[rb + 1]);
+ return 1;
}
else if ( (lb == 0) && (rb > lb) ) {
strcpy(str, &str[rb + 1]);
+ return 1;
}
-
+ return 0;
}
* The code is roughly based on the strstr() replacement from 'tin' written
* by Urs Jannsen.
*/
-char *bmstrcasestr(char *text, char *pattern) {
+inline static const char *_bmstrcasestr_len(const char *text, size_t textlen, const char *pattern, size_t patlen) {
register unsigned char *p, *t;
register int i, j, *delta;
register size_t p1;
int deltaspace[256];
- size_t textlen;
- size_t patlen;
- textlen = strlen (text);
- patlen = strlen (pattern);
+ if (!text) return(NULL);
+ if (!pattern) return(NULL);
/* algorithm fails if pattern is empty */
if ((p1 = patlen) == 0)
return (NULL);
}
+/*
+ * bmstrcasestr() -- case-insensitive substring search
+ *
+ * This uses the Boyer-Moore search algorithm and is therefore quite fast.
+ * The code is roughly based on the strstr() replacement from 'tin' written
+ * by Urs Jannsen.
+ */
+const char *bmstrcasestr(const char *text, const char *pattern) {
+ size_t textlen;
+ size_t patlen;
+
+ if (!text) return(NULL);
+ if (!pattern) return(NULL);
+
+ textlen = strlen (text);
+ patlen = strlen (pattern);
+
+ return _bmstrcasestr_len(text, textlen, pattern, patlen);
+}
+const char *bmstrcasestr_len(const char *text, size_t textlen, const char *pattern, size_t patlen) {
+ return _bmstrcasestr_len(text, textlen, pattern, patlen);
+}
/*
* Local replacement for controversial C library function that generates
* Determine whether the specified message number is contained within the specified set.
* Returns nonzero if the specified message number is in the specified message set string.
*/
-int is_msg_in_mset(char *mset, long msgnum) {
+int is_msg_in_mset(const char *mset, long msgnum) {
int num_sets;
int s;
char setstr[SIZ], lostr[SIZ], histr[SIZ]; /* was 1024 */
/*
- * \brief searches for a paternn within asearch string
- * \param search the string to search
- * \param patn the pattern to find in string
- * \returns position in string
+ * searches for a pattern within a search string
+ * returns position in string
*/
int pattern2(char *search, char *patn)
{
}
-/**
- * \brief Strip leading and trailing spaces from a string; with premeasured and adjusted length.
- * \param buf the string to modify
- * \param len length of the string.
+/*
+ * Strip leading and trailing spaces from a string; with premeasured and adjusted length.
+ * buf - the string to modify
+ * len - length of the string.
*/
void stripltlen(char *buf, int *len)
{
}
}
+
+/*
+ * Convert all whitespace characters in a supplied string to underscores
+ */
+void convert_spaces_to_underscores(char *str)
+{
+ int len;
+ int i;
+
+ if (!str) return;
+
+ len = strlen(str);
+ for (i=0; i<len; ++i) {
+ if (isspace(str[i])) {
+ str[i] = '_';
+ }
+ }
+}
+
+