*
*/
+#ifdef DLL_EXPORT
+#define IN_LIBCIT
+#endif
+
#include "sysdep.h"
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
#include <string.h>
-#include <sys/time.h>
+#include <stdarg.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+# include <sys/time.h>
+# else
+# include <time.h>
+# endif
+#endif
+
#include "tools.h"
#include "citadel.h"
int a;
int count = 1;
+ if (source == NULL) return(0);
for (a=0; a<strlen(source); ++a) {
if (source[a]==tok) ++count;
}
return(count);
}
+
+/* extract_token_fast() - a smarter string tokenizer */
+void extract_token(char *dest, char *source, int parmnum, char separator)
+{
+ char *d, *s; /* dest, source */
+ int count = 0;
+
+ strcpy(dest, "");
+
+ /* Locate desired parameter */
+ s = source;
+ while (count < parmnum) {
+ /* End of string, bail! */
+ if (!*s) {
+ s = NULL;
+ break;
+ }
+ if (*s == separator) {
+ count++;
+ }
+ s++;
+ }
+ if (!s) return; /* Parameter not found */
+
+ for (d = dest; *s && *s != separator; s++, d++) {
+ *d = *s;
+ }
+ *d = 0;
+}
+
+
/*
* extract_token() - a smarter string tokenizer
*/
-void extract_token(char *dest, char *source, int parmnum, char separator)
+void extract_token_old(char *dest, char *source, int parmnum, char separator)
{
int i;
int len;
+/* remove_token_fast() - a tokenizer that kills, maims, and destroys fast */
+void remove_token(char *source, int parmnum, char separator)
+{
+ char *d, *s; /* dest, source */
+ int count = 0;
+
+ /* Find desired parameter */
+ d = source;
+ while (count < parmnum) {
+ /* End of string, bail! */
+ if (!*d) {
+ d = NULL;
+ break;
+ }
+ if (*d == separator) {
+ count++;
+ }
+ d++;
+ }
+ if (!d) return; /* Parameter not found */
+
+ /* Find next parameter */
+ s = d;
+ while (*s && *s != separator) {
+ s++;
+ }
+
+ /* Hack and slash */
+ if (*s)
+ strcpy(d, ++s);
+ else if (d == source)
+ *d = 0;
+ else
+ *--d = 0;
+ /*
+ while (*s) {
+ *d++ = *s++;
+ }
+ *d = 0;
+ */
+}
+
+
/*
* remove_token() - a tokenizer that kills, maims, and destroys
*/
-void remove_token(char *source, int parmnum, char separator)
+void remove_token_old(char *source, int parmnum, char separator)
{
int i;
int len;
}
if (end < 0) end = strlen(source);
-
- printf("%d .. %d\n", start, end);
-
strcpy(&source[start], &source[end]);
}
}
-
-void decode_base64(char *dest, char *source)
+/*
+ * Convert base64-encoded to binary. Returns the length of the decoded data.
+ * It will stop after reading 'length' bytes.
+ */
+int decode_base64(char *dest, char *source, size_t length)
{
- int i;
+ int i, c;
int dpos = 0;
int spos = 0;
byte a[4], b[4], o[3];
for (i = 0; i < 4; i++) {
- int c = source[spos++];
+ if (spos >= length) {
+ return(dpos);
+ }
+ c = source[spos++];
if (c == 0) {
if (i > 0) {
- return;
+ return(dpos);
}
- return;
+ return(dpos);
}
if (dtable[c] & 0x80) {
/* Ignoring errors: discard invalid character. */
if (i>=3) dest[dpos++] = o[2];
dest[dpos] = 0;
if (i < 3) {
- return;
+ return(dpos);
}
}
}
/*
* Return the number of occurances of character ch in string st
*/
-int haschar(char *st, int ch)
+int haschar(const char *st, int ch)
{
int a, b;
b = 0;
/*
* Format a date/time stamp for output
+ * seconds is whether to print the seconds
*/
-void fmt_date(char *buf, time_t thetime) {
+void fmt_date(char *buf, size_t n, time_t thetime, int seconds) {
struct tm *tm;
int hour;
if (hour == 0) hour = 12;
else if (hour > 12) hour = hour - 12;
- sprintf(buf, "%s %d %4d %d:%02d%s",
- ascmonths[tm->tm_mon],
- tm->tm_mday,
- tm->tm_year + 1900,
- hour,
- tm->tm_min,
- ( (tm->tm_hour >= 12) ? "pm" : "am" )
- );
+ if (seconds) {
+ snprintf(buf, n, "%s %d %4d %d:%02d:%02d%s",
+ ascmonths[tm->tm_mon],
+ tm->tm_mday,
+ tm->tm_year + 1900,
+ hour,
+ 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,
+ hour,
+ tm->tm_min,
+ ( (tm->tm_hour >= 12) ? "pm" : "am" )
+ );
+ }
}
if (num_tokens(setstr, ':') >= 2) {
extract_token(histr, setstr, 1, ':');
if (!strcmp(histr, "*")) {
- sprintf(histr, "%ld", LONG_MAX);
+ snprintf(histr, sizeof histr, "%ld", LONG_MAX);
}
}
else {
return(0);
}
+
+
+/*
+ * Utility function to "readline" from memory
+ * (returns new pointer)
+ */
+char *memreadline(char *start, char *buf, int maxlen)
+{
+ char ch;
+ char *ptr;
+ int len = 0; /* tally our own length to avoid strlen() delays */
+
+ ptr = start;
+ memset(buf, 0, maxlen);
+
+ while (1) {
+ ch = *ptr++;
+ if ( (len < (maxlen - 1)) && (ch != 13) && (ch != 10) ) {
+ buf[strlen(buf) + 1] = 0;
+ buf[strlen(buf)] = ch;
+ ++len;
+ }
+ if ((ch == 10) || (ch == 0)) {
+ return ptr;
+ }
+ }
+}
+
+
+/*
+ * 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 a;
+ int lb = (-1);
+ int rb = (-1);
+
+ for (a = 0; a < strlen(str); ++a) {
+ if (str[a] == leftboundary) lb = a;
+ if (str[a] == rightboundary) rb = a;
+ }
+
+ if ( (lb > 0) && (rb > lb) ) {
+ strcpy(&str[lb - 1], &str[rb + 1]);
+ }
+
+}
+
+
+/*
+ * Reduce a string down to a boundarized substring (for example, remove
+ * parentheses and anything outside them).
+ */
+void stripallbut(char *str, char leftboundary, char rightboundary) {
+ int a;
+
+ for (a = 0; a < strlen(str); ++ a) {
+ if (str[a] == leftboundary) strcpy(str, &str[a+1]);
+ }
+
+ for (a = 0; a < strlen(str); ++ a) {
+ if (str[a] == rightboundary) str[a] = 0;
+ }
+
+}
+
+char *myfgets(char *s, int size, FILE *stream) {
+ char *ret = fgets(s, size, stream);
+ char *nl;
+
+ if (ret != NULL) {
+ nl = strchr(s, '\n');
+
+ if (nl != NULL)
+ *nl = 0;
+ }
+
+ return ret;
+}
+
+/*
+ * Escape a string for feeding out as a URL.
+ * Output buffer must be big enough to handle escape expansion!
+ */
+void urlesc(char *outbuf, char *strbuf)
+{
+ int a, b, c;
+ char *ec = " #&;`'|*?-~<>^()[]{}$\\";
+
+ strcpy(outbuf, "");
+
+ for (a = 0; a < strlen(strbuf); ++a) {
+ c = 0;
+ for (b = 0; b < strlen(ec); ++b) {
+ if (strbuf[a] == ec[b])
+ c = 1;
+ }
+ b = strlen(outbuf);
+ if (c == 1)
+ sprintf(&outbuf[b], "%%%02x", strbuf[a]);
+ else
+ sprintf(&outbuf[b], "%c", strbuf[a]);
+ }
+}
+
+
projects / citadel.git / blobdiff