#endif
#include "sysdep.h"
+#include <stdlib.h>
+#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
#include <string.h>
+#include <stdarg.h>
#if TIME_WITH_SYS_TIME
# include <sys/time.h>
#include "tools.h"
#include "citadel.h"
-#ifdef CIT_CLIENT
-#include "screen.h"
-#else
-extern int err_printf(char *fmt, ...);
-#endif
-
#define TRUE 1
#define FALSE 0
char *safestrncpy(char *dest, const char *src, size_t n)
{
if (dest == NULL || src == NULL) {
- err_printf("safestrncpy: NULL argument\n");
+ fprintf(stderr, "safestrncpy: NULL argument\n");
abort();
}
strncpy(dest, src, n);
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;
/*
- * decode_base64() and encode_base64() are adaptations of code by
+ * CtdlDecodeBase64() and encode_base64() are adaptations of code by
* John Walker, found in full in the file "base64.c" included with this
* distribution. The difference between those functions and these is that
* these are intended to encode/decode small string buffers, and those are
* 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 CtdlDecodeBase64(char *dest, char *source, size_t length)
{
int i, c;
int dpos = 0;
{
while ((strlen(buf) > 0) && (isspace(buf[0])))
strcpy(buf, &buf[1]);
- while (isspace(buf[strlen(buf) - 1]))
+ while ((strlen(buf) > 0) && (isspace(buf[strlen(buf) - 1])))
buf[strlen(buf) - 1] = 0;
}
/*
* 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, int seconds) {
+void fmt_date(char *buf, size_t n, time_t thetime, int seconds) {
struct tm *tm;
int hour;
else if (hour > 12) hour = hour - 12;
if (seconds) {
- sprintf(buf, "%s %d %4d %d:%02d:%02d%s",
+ snprintf(buf, n, "%s %d %4d %d:%02d:%02d%s",
ascmonths[tm->tm_mon],
tm->tm_mday,
tm->tm_year + 1900,
( (tm->tm_hour >= 12) ? "pm" : "am" )
);
} else {
- sprintf(buf, "%s %d %4d %d:%02d%s",
+ snprintf(buf, n, "%s %d %4d %d:%02d%s",
ascmonths[tm->tm_mon],
tm->tm_mday,
tm->tm_year + 1900,
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 {
}
}
+
+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]);
+ }
+}
+
+
+/*
+ * Citadelian replacement for tmpnam()
+ */
+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);
+}
+
+
+/*
+ * Citadelian replacement for tmpfile()
+ */
+FILE *CtdlTempFile(void) {
+ char filename[SIZ];
+ FILE *fp;
+
+ strcpy(filename, tmpnam(NULL));
+ fp = fopen(filename, "w+b");
+ unlink(filename);
+ return(fp);
+}
projects / citadel.git / blobdiff