*
*/
-#ifdef DLL_EXPORT
-#define IN_LIBCIT
-#endif
-
#include "sysdep.h"
#include <stdlib.h>
#include <unistd.h>
char *safestrncpy(char *dest, const char *src, size_t n)
{
+ int i = 0;
+
if (dest == NULL || src == NULL) {
fprintf(stderr, "safestrncpy: NULL argument\n");
abort();
}
- strncpy(dest, src, n);
+
+ do {
+ dest[i] = src[i];
+ if (dest[i] == 0) return(dest);
+ ++i;
+ } while (i<n);
dest[n - 1] = 0;
return dest;
}
/*
* num_tokens() - discover number of parameters/tokens in a string
*/
-int num_tokens(const char *source, char tok) {
- int a;
+int num_tokens(const char *source, char tok)
+{
int count = 1;
+ const char *ptr = source;
- if (source == NULL) return(0);
- for (a=0; a<strlen(source); ++a) {
- if (source[a]==tok) ++count;
+ if (source == NULL) {
+ return (0);
}
- return(count);
+
+ while (*ptr != '\0') {
+ if (*ptr++ == tok) {
+ ++count;
+ }
+ }
+
+ return (count);
}
-/* extract_token() - 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;
}
-/* remove_token() - a tokenizer that kills, maims, and destroys fast */
-void remove_token(char *source, unsigned long parmnum, char separator)
+/*
+ * remove_token() - a tokenizer that kills, maims, and destroys
+ */
+void remove_token(char *source, int parmnum, char separator)
{
char *d, *s; /* dest, source */
int count = 0;
/*
* 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);
}
}
}
+/*
+ * if we send out non ascii subjects, we encode it this way.
+ */
+char *rfc2047encode(char *line, long length)
+{
+ char *AlreadyEncoded;
+ char *result;
+ long end;
+#define UTF8_HEADER "=?UTF-8?B?"
+
+ /* check if we're already done */
+ AlreadyEncoded = strstr(line, "=?");
+ if ((AlreadyEncoded != NULL) &&
+ ((strstr(AlreadyEncoded, "?B?") != NULL)||
+ (strstr(AlreadyEncoded, "?Q?") != NULL)))
+ {
+ return strdup(line);
+ }
+
+ result = (char*) malloc(strlen(UTF8_HEADER) + 4 + length * 2);
+ strncpy (result, UTF8_HEADER, strlen (UTF8_HEADER));
+ CtdlEncodeBase64(result + strlen(UTF8_HEADER), line, length);
+ end = strlen (result);
+ result[end]='?';
+ result[end+1]='=';
+ result[end+2]='\0';
+ return result;
+}
/*
*/
void striplt(char *buf)
{
- while ((strlen(buf) > 0) && (isspace(buf[0])))
+ if (IsEmptyStr(buf)) return;
+ while ((!IsEmptyStr(buf)) && (isspace(buf[0])))
strcpy(buf, &buf[1]);
- while ((strlen(buf) > 0) && (isspace(buf[strlen(buf) - 1])))
+ if (IsEmptyStr(buf)) return;
+ while ((!IsEmptyStr(buf)) && (isspace(buf[strlen(buf) - 1])))
buf[strlen(buf) - 1] = 0;
}
* 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;
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(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])
}
+
/*
- * Citadelian replacement for tmpnam()
+ * In our world, we want strcpy() to be able to work with overlapping strings.
*/
-char *CtdlTempFileName(char *prefix1, int prefix2) {
- static int seq = 0;
- static char buf[SIZ];
-
- sprintf(buf, "/tmp/Citadel-%s-%d-%04x-%04x",
- prefix1,
- prefix2,
- (int)getpid(),
- ++seq
- );
-
- return(buf);
+#ifdef strcpy
+#undef strcpy
+#endif
+char *strcpy(char *dest, const char *src) {
+ memmove(dest, src, (strlen(src) + 1) );
+ return(dest);
}
/*
- * Citadelian replacement for tmpfile()
+ * Generate a new, globally unique UID parameter for a calendar etc. object
*/
-FILE *CtdlTempFile(void) {
- char filename[SIZ];
- FILE *fp;
-
- strcpy(filename, tmpnam(NULL));
- fp = fopen(filename, "w+b");
- unlink(filename);
- return(fp);
-}
+void generate_uuid(char *buf) {
+ static int seq = 0;
+ sprintf(buf, "%lx-"F_XPID_T"-%x",
+ time(NULL),
+ getpid(),
+ (seq++)
+ );
+}
/*
- * bmstrcasestr() is a variant of strstr() that is both case-insensitive
- * and uses the Boyer-Moore search algorithm.
- *
- * Original code: copyright (c) 1997-1998 by Urs Janssen <urs@tin.org>
- * Modifications: copyright (c) 2003 by Art Cancro <ajc@uncensored.citadel.org>
+ * 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.
*/
-char *bmstrcasestr(char *text, char *pattern)
-{
+char *bmstrcasestr(char *text, char *pattern) {
+
register unsigned char *p, *t;
register int i, j, *delta;
register size_t p1;
size_t textlen;
size_t patlen;
- if (text == NULL) return(NULL);
- if (pattern == NULL) return(NULL);
-
- textlen = strlen(text);
- patlen = strlen(pattern);
+ textlen = strlen (text);
+ patlen = strlen (pattern);
/* algorithm fails if pattern is empty */
if ((p1 = patlen) == 0)
for (i = 0; i <= 255; i++)
delta[i] = p1;
for (p = (unsigned char *) pattern, i = p1; --i > 0;)
- delta[*p++] = i;
+ delta[tolower(*p++)] = i;
/*
* From now on, we want patlen - 1.
p = (unsigned char *) pattern + p1;
t = (unsigned char *) text + p1;
i = textlen - patlen;
- while (1) {
- if (tolower(*p) == tolower(*t)
- && strncasecmp((p - p1), (t - p1), p1) == 0)
- return ((char *) t - p1);
- j = delta[*t];
+ 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;
}
return (NULL);
}
+
+
+
+/*
+ * Local replacement for controversial C library function that generates
+ * names for temporary files. Included to shut up compiler warnings.
+ */
+void CtdlMakeTempFileName(char *name, int len) {
+ int i = 0;
+
+ while (i++, i < 100) {
+ snprintf(name, len, "/tmp/ctdl."F_XPID_T".%04x",
+ getpid(),
+ rand()
+ );
+ if (!access(name, F_OK)) {
+ return;
+ }
+ }
+}
projects / citadel.git / blobdiff