X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/e04c2d50fd96f3f31bc96851c55c6efecc10469c..405fc4dacbe6be6ae706217bf8489d0a872a88cd:/server/servutil.c
diff --git a/server/servutil.c b/server/servutil.c
index 06b409ec..ed73e6d2 100644
--- a/server/servutil.c
+++ b/server/servutil.c
@@ -1,7 +1,5 @@
/* -*-c-*-
*
- * $Id$
- *
* Various handy server-only utilities
*
* (c) 2001 Straylight/Edgeware
@@ -11,19 +9,18 @@
*
* This file is part of Trivial IP Encryption (TrIPE).
*
- * TrIPE is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * TrIPE is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your
+ * option) any later version.
*
- * TrIPE is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * TrIPE is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
*
* You should have received a copy of the GNU General Public License
- * along with TrIPE; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with TrIPE. If not, see .
*/
/*----- Header files ------------------------------------------------------*/
@@ -32,45 +29,10 @@
/*----- Global variables --------------------------------------------------*/
-octet buf_i[PKBUFSZ], buf_o[PKBUFSZ], buf_t[PKBUFSZ];
+octet buf_i[PKBUFSZ], buf_o[PKBUFSZ], buf_t[PKBUFSZ], buf_u[PKBUFSZ];
/*----- Main code ---------------------------------------------------------*/
-/* --- @mpstr@ --- *
- *
- * Arguments: @mp *m@ = a multiprecision integer
- *
- * Returns: A pointer to the integer's textual representation.
- *
- * Use: Converts a multiprecision integer to a string. Corrupts
- * @buf_t@.
- */
-
-const char *mpstr(mp *m)
-{
- if (mp_writestring(m, (char *)buf_t, sizeof(buf_t), 10))
- return ("");
- return ((const char *)buf_t);
-}
-
-/* --- @gestr@ --- *
- *
- * Arguments: @group *g@ = a group
- * @ge *x@ = a group element
- *
- * Returns: A pointer to the element's textual representation.
- *
- * Use: Converts a group element to a string. Corrupts
- * @buf_t@.
- */
-
-const char *gestr(group *g, ge *x)
-{
- if (group_writestring(g, x, (char *)buf_t, sizeof(buf_t)))
- return ("");
- return ((const char *)buf_t);
-}
-
/* --- @timestr@ --- *
*
* Arguments: @time_t t@ = a time to convert
@@ -78,7 +40,7 @@ const char *gestr(group *g, ge *x)
* Returns: A pointer to a textual representation of the time.
*
* Use: Converts a time to a textual representation. Corrupts
- * @buf_t@.
+ * @buf_u@.
*/
const char *timestr(time_t t)
@@ -87,8 +49,25 @@ const char *timestr(time_t t)
if (!t)
return ("NEVER");
tm = localtime(&t);
- strftime((char *)buf_t, sizeof(buf_t), "%Y-%m-%dT%H:%M:%S", tm);
- return ((const char *)buf_t);
+ strftime((char *)buf_u, sizeof(buf_u), "%Y-%m-%dT%H:%M:%S", tm);
+ return ((const char *)buf_u);
+}
+
+/* --- @mystrieq@ --- *
+ *
+ * Arguments: @const char *x, *y@ = two strings
+ *
+ * Returns: True if @x@ and @y are equal, up to case.
+ */
+
+int mystrieq(const char *x, const char *y)
+{
+ for (;;) {
+ if (!*x && !*y) return (1);
+ if (tolower((unsigned char)*x) != tolower((unsigned char)*y))
+ return (0);
+ x++; y++;
+ }
}
/* --- @seq_reset@ --- *