*
*/
-#ifdef DLL_EXPORT
-#define IN_LIBCIT
-#endif
-
#include "sysdep.h"
#include <stdlib.h>
#include <unistd.h>
typedef unsigned char byte; /* Byte type */
static byte dtable[256]; /* base64 encode / decode table */
+/* Month strings for date conversions */
+char *ascmonths[12] = {
+ "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+ "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
+};
char *safestrncpy(char *dest, const char *src, size_t n)
{
}
-/* extract_token_fast() - a smarter string tokenizer */
-void extract_token(char *dest, const char *source, unsigned long parmnum, char separator)
+/*
+ * extract_token() - a string tokenizer
+ */
+void extract_token(char *dest, const char *source, int parmnum, char separator, int maxlen)
{
char *d; /* dest */
const char *s; /* source */
int count = 0;
+ int len = 0;
strcpy(dest, "");
}
if (!s) return; /* Parameter not found */
- for (d = dest; *s && *s != separator; s++, d++) {
+ for (d = dest; *s && *s != separator && ++len<maxlen; s++, d++) {
*d = *s;
}
*d = 0;
/*
- * extract_token() - a smarter string tokenizer
+ * remove_token() - a tokenizer that kills, maims, and destroys
*/
-void extract_token_old(char *dest, const char *source, unsigned long parmnum, char separator)
-{
- int i;
- int len;
- int curr_parm;
-
- strcpy(dest,"");
- len = 0;
- curr_parm = 0;
-
- if (strlen(source)==0) {
- return;
- }
-
- for (i=0; i<strlen(source); ++i) {
- if (source[i]==separator) {
- ++curr_parm;
- }
- else if (curr_parm == parmnum) {
- dest[len+1] = 0;
- dest[len++] = source[i];
- }
- }
-}
-
-
-
-/* remove_token_fast() - a tokenizer that kills, maims, and destroys fast */
-void remove_token(char *source, unsigned long parmnum, char separator)
+void remove_token(char *source, int parmnum, char separator)
{
char *d, *s; /* dest, source */
int count = 0;
}
-/*
- * remove_token() - a tokenizer that kills, maims, and destroys
- */
-void remove_token_old(char *source, int parmnum, char separator)
-{
- int i;
- int len;
- int curr_parm;
- int start, end;
-
- len = 0;
- curr_parm = 0;
- start = (-1);
- end = (-1);
-
- if (strlen(source)==0) {
- return;
- }
-
- for (i=0; i<strlen(source); ++i) {
- if ( (start < 0) && (curr_parm == parmnum) ) {
- start = i;
- }
-
- if ( (end < 0) && (curr_parm == (parmnum+1)) ) {
- end = i;
- }
-
- if (source[i]==separator) {
- ++curr_parm;
- }
- }
-
- if (end < 0) end = strlen(source);
- strcpy(&source[start], &source[end]);
-}
-
-
-
-
/*
* extract_int() - extract an int parm w/o supplying a buffer
*/
-int extract_int(const char *source, unsigned long parmnum)
+int extract_int(const char *source, int parmnum)
{
- char buf[SIZ];
+ char buf[32];
- extract_token(buf, source, parmnum, '|');
+ extract_token(buf, source, parmnum, '|', sizeof buf);
return(atoi(buf));
}
/*
* extract_long() - extract an long parm w/o supplying a buffer
*/
-long extract_long(const char *source, unsigned long parmnum)
+long extract_long(const char *source, int parmnum)
{
- char buf[SIZ];
+ char buf[32];
- extract_token(buf, source, parmnum, '|');
+ extract_token(buf, source, parmnum, '|', sizeof buf);
return(atol(buf));
}
/*
* extract_unsigned_long() - extract an unsigned long parm
*/
-unsigned long extract_unsigned_long(const char *source, unsigned long parmnum)
+unsigned long extract_unsigned_long(const char *source, int parmnum)
{
- char buf[SIZ];
+ char buf[32];
- extract_token(buf, source, parmnum, '|');
+ extract_token(buf, source, parmnum, '|', sizeof buf);
return strtoul(buf, NULL, 10);
}
*/
void striplt(char *buf)
{
+ if (strlen(buf) == 0) return;
while ((strlen(buf) > 0) && (isspace(buf[0])))
strcpy(buf, &buf[1]);
+ if (strlen(buf) == 0) return;
while ((strlen(buf) > 0) && (isspace(buf[strlen(buf) - 1])))
buf[strlen(buf) - 1] = 0;
}
-/*
- * Compare two strings, insensitive to case, punctuation, and non-alnum chars
- */
-int collapsed_strcmp(char *s1, char *s2) {
- char *c1, *c2;
- int i, ret, pos;
-
- c1 = malloc(strlen(s1)+1);
- c2 = malloc(strlen(s2)+1);
- c1[0] = 0;
- c2[0] = 0;
-
- pos = 0;
- for (i=0; i<strlen(s1); ++i) {
- if (isalnum(s1[i])) {
- c1[pos] = tolower(s1[i]);
- c1[++pos] = 0;
- }
- }
-
- pos = 0;
- for (i=0; i<strlen(s2); ++i) {
- if (isalnum(s2[i])) {
- c2[pos] = tolower(s2[i]);
- c2[++pos] = 0;
- }
- }
-
- ret = strcmp(c1, c2);
- free(c1);
- free(c2);
- return(ret);
-}
-
-
/*
* Format a date/time stamp for output
* seconds is whether to print the seconds
*/
void fmt_date(char *buf, size_t n, time_t thetime, int seconds) {
- struct tm *tm;
+ struct tm tm;
int hour;
- char *ascmonths[] = {
- "Jan", "Feb", "Mar", "Apr", "May", "Jun",
- "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
- };
-
strcpy(buf, "");
- tm = localtime(&thetime);
+ localtime_r(&thetime, &tm);
- hour = tm->tm_hour;
+ hour = tm.tm_hour;
if (hour == 0) hour = 12;
else if (hour > 12) hour = hour - 12;
if (seconds) {
snprintf(buf, n, "%s %d %4d %d:%02d:%02d%s",
- ascmonths[tm->tm_mon],
- tm->tm_mday,
- tm->tm_year + 1900,
+ ascmonths[tm.tm_mon],
+ tm.tm_mday,
+ tm.tm_year + 1900,
hour,
- tm->tm_min,
- tm->tm_sec,
- ( (tm->tm_hour >= 12) ? "pm" : "am" )
+ tm.tm_min,
+ tm.tm_sec,
+ ( (tm.tm_hour >= 12) ? "pm" : "am" )
);
} else {
snprintf(buf, n, "%s %d %4d %d:%02d%s",
- ascmonths[tm->tm_mon],
- tm->tm_mday,
- tm->tm_year + 1900,
+ ascmonths[tm.tm_mon],
+ tm.tm_mday,
+ tm.tm_year + 1900,
hour,
- tm->tm_min,
- ( (tm->tm_hour >= 12) ? "pm" : "am" )
+ tm.tm_min,
+ ( (tm.tm_hour >= 12) ? "pm" : "am" )
);
}
}
/*
* Determine whether the specified message number is contained within the
- * specified set.
+ * specified sequence set.
*/
-int is_msg_in_mset(char *mset, long msgnum) {
+int is_msg_in_sequence_set(char *mset, long msgnum) {
int num_sets;
int s;
- char setstr[SIZ], lostr[SIZ], histr[SIZ]; /* was 1024 */
+ char setstr[128], lostr[128], histr[128];
long lo, hi;
- /*
- * Now set it for all specified messages.
- */
num_sets = num_tokens(mset, ',');
for (s=0; s<num_sets; ++s) {
- extract_token(setstr, mset, s, ',');
+ extract_token(setstr, mset, s, ',', sizeof setstr);
- extract_token(lostr, setstr, 0, ':');
+ extract_token(lostr, setstr, 0, ':', sizeof lostr);
if (num_tokens(setstr, ':') >= 2) {
- extract_token(histr, setstr, 1, ':');
+ extract_token(histr, setstr, 1, ':', sizeof histr);
if (!strcmp(histr, "*")) {
snprintf(histr, sizeof histr, "%ld", LONG_MAX);
}
strcpy(&str[lb - 1], &str[rb + 1]);
}
+ else if ( (lb == 0) && (rb > lb) ) {
+ strcpy(str, &str[rb + 1]);
+ }
+
}
strcpy(outbuf, "");
- for (a = 0; a < strlen(strbuf); ++a) {
+ for (a = 0; a < (int)strlen(strbuf); ++a) {
c = 0;
for (b = 0; b < strlen(ec); ++b) {
if (strbuf[a] == ec[b])
}
+
+/*
+ * In our world, we want strcpy() to be able to work with overlapping strings.
+ */
+#ifdef strcpy
+#undef strcpy
+#endif
+char *strcpy(char *dest, const char *src) {
+ memmove(dest, src, (strlen(src) + 1) );
+ return(dest);
+}
+
+
/*
- * Citadelian replacement for tmpnam()
+ * Generate a new, globally unique UID parameter for a calendar etc. object
*/
-char *CtdlTempFileName(char *prefix1, int prefix2) {
+void generate_uuid(char *buf) {
static int seq = 0;
- static char buf[SIZ];
- sprintf(buf, "/tmp/Citadel-%s-%d-%04x-%04x",
- prefix1,
- prefix2,
- (int)getpid(),
- ++seq
+ sprintf(buf, "%lx-%x-%x",
+ time(NULL),
+ getpid(),
+ (seq++)
);
-
- return(buf);
}
-
/*
- * Citadelian replacement for tmpfile()
+ * 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.
*/
-FILE *CtdlTempFile(void) {
- char filename[SIZ];
- FILE *fp;
-
- strcpy(filename, tmpnam(NULL));
- fp = fopen(filename, "w+b");
- unlink(filename);
- return(fp);
+char *bmstrcasestr(char *text, char *pattern) {
+
+ 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);
+
+ /* algorithm fails if pattern is empty */
+ if ((p1 = patlen) == 0)
+ return (text);
+
+ /* code below fails (whenever i is unsigned) if pattern too long */
+ if (p1 > textlen)
+ return (NULL);
+
+ /* set up deltas */
+ delta = deltaspace;
+ for (i = 0; i <= 255; i++)
+ delta[i] = p1;
+ for (p = (unsigned char *) pattern, i = p1; --i > 0;)
+ delta[tolower(*p++)] = i;
+
+ /*
+ * From now on, we want patlen - 1.
+ * In the loop below, p points to the end of the pattern,
+ * t points to the end of the text to be tested against the
+ * pattern, and i counts the amount of text remaining, not
+ * including the part to be tested.
+ */
+ p1--;
+ p = (unsigned char *) pattern + p1;
+ t = (unsigned char *) text + p1;
+ i = textlen - patlen;
+ while(1) {
+ if (tolower(p[0]) == tolower(t[0])) {
+ if (strncasecmp ((const char *)(p - p1), (const char *)(t - p1), p1) == 0) {
+ return ((char *)t - p1);
+ }
+ }
+ j = delta[tolower(t[0])];
+ if (i < j)
+ break;
+ i -= j;
+ t += j;
+ }
+ return (NULL);
}
+
+
+