* Numerous warning fixes and cleanups for compile on Linux for IBM S/390

[citadel.git] / citadel / tools.c

diff --git a/citadel/tools.c b/citadel/tools.c
index 2c21bfe7ae30da84a2d0cf690c42a59a894b746e..049987bd4ea4f901b1aee0561059b68fbac2c1e9 100644 (file)
--- a/citadel/tools.c
+++ b/citadel/tools.c
@@ -10,6 +10,8 @@
 #endif
 
 #include "sysdep.h"
+#include <stdlib.h>
+#include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -30,21 +32,6 @@
 #include "tools.h"
 #include "citadel.h"
 
-#ifdef CIT_CLIENT
-#include "screen.h"
-#else
-int err_printf(char *fmt, ...);
-int err_printf(char *fmt, ...)
-{
-       va_list ap;
-       int retval;
-       va_start(ap, fmt);
-       retval = fprintf(stderr, fmt, ap);
-       va_end(ap);
-       return retval;
-}
-#endif
-
 #define TRUE  1
 #define FALSE 0
 
@@ -55,7 +42,7 @@ static byte dtable[256];            /* base64 encode / decode table */
 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);
@@ -98,10 +85,41 @@ int num_tokens(char *source, char tok) {
        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;
@@ -128,10 +146,53 @@ void extract_token(char *dest, char *source, int parmnum, char separator)
 
 
 
+/* 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;
@@ -193,7 +254,7 @@ long extract_long(char *source, long int parmnum)
 
 
 /*
- * 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
@@ -260,7 +321,7 @@ void encode_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 CtdlDecodeBase64(char *dest, char *source, size_t length)
 {
     int i, c;
     int dpos = 0;
@@ -329,7 +390,7 @@ void striplt(char *buf)
 {
         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;
 }
 
@@ -534,3 +595,74 @@ void stripallbut(char *str, char leftboundary, char rightboundary) {
        }
 
 }
+
+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);
+}