- Thu Aug 17 22:53:03 UTC 2000

[libfaim.git] / aim_util.c

diff --git a/aim_util.c b/aim_util.c
index a83a9974d7029e10eebfce3ac6ae53a00f9d1d7d..9bbf828a9c5d587d4053f1d7c176283fd3a1d929 100644 (file)
--- a/aim_util.c
+++ b/aim_util.c
@@ -4,25 +4,36 @@
  *
  */
 
-#include "aim.h"
+#include <faim/aim.h>
+#include <ctype.h>
 
-int aimutil_put8(u_char *buf, u_char data)
+#define AIMUTIL_USEMACROS
+
+#ifdef AIMUTIL_USEMACROS
+/* macros in faim/aim.h */
+#else
+inline int aimutil_put8(u_char *buf, u_char data)
 {
   buf[0] = (u_char)data&0xff;
   return 1;
 }
 
+inline u_char aimutil_get8(u_char *buf)
+{
+  return buf[0];
+}
+
 /*
  * Endian-ness issues here?
  */
-int aimutil_put16(u_char *buf, u_short data)
+inline int aimutil_put16(u_char *buf, u_short data)
 {
   buf[0] = (u_char)(data>>8)&0xff;
   buf[1] = (u_char)(data)&0xff;
   return 2;
 }
 
-u_short aimutil_get16(u_char *buf)
+inline u_short aimutil_get16(u_char *buf)
 {
   u_short val;
   val = (buf[0] << 8) & 0xff00;
@@ -30,7 +41,7 @@ u_short aimutil_get16(u_char *buf)
   return val;
 }
 
-int aimutil_put32(u_char *buf, u_long data)
+inline int aimutil_put32(u_char *buf, u_long data)
 {
   buf[0] = (u_char)(data>>24)&0xff;
   buf[1] = (u_char)(data>>16)&0xff;
@@ -39,7 +50,7 @@ int aimutil_put32(u_char *buf, u_long data)
   return 4;
 }
 
-u_long aimutil_get32(u_char *buf)
+inline u_long aimutil_get32(u_char *buf)
 {
   u_long val;
   val = (buf[0] << 24) & 0xff000000;
@@ -48,8 +59,9 @@ u_long aimutil_get32(u_char *buf)
   val+= (buf[3]      ) & 0x000000ff;
   return val;
 }
+#endif /* AIMUTIL_USEMACROS */
 
-int aimutil_putstr(u_char *dest, const u_char *src, int len)
+inline int aimutil_putstr(u_char *dest, const u_char *src, int len)
 {
   memcpy(dest, src, len);
   return len;
@@ -150,3 +162,68 @@ char *aimutil_itemidx(char *toSearch, int index, char dl)
     }
   return toReturn;
 }
+
+/*
+ * int snlen(const char *)
+ * 
+ * This takes a screen name and returns its length without
+ * spaces.  If there are no spaces in the SN, then the 
+ * return is equal to that of strlen().
+ *
+ */
+int aim_snlen(const char *sn)
+{
+  int i = 0;
+  const char *curPtr = NULL;
+
+  if (!sn)
+    return 0;
+
+  curPtr = sn;
+  while ( (*curPtr) != (char) NULL) {
+      if ((*curPtr) != ' ')
+       i++;
+      curPtr++;
+    }
+
+  return i;
+}
+
+/*
+ * int sncmp(const char *, const char *)
+ *
+ * This takes two screen names and compares them using the rules
+ * on screen names for AIM/AOL.  Mainly, this means case and space
+ * insensitivity (all case differences and spacing differences are
+ * ignored).
+ *
+ * Return: 0 if equal
+ *     non-0 if different
+ *
+ */
+
+int aim_sncmp(const char *sn1, const char *sn2)
+{
+  const char *curPtr1 = NULL, *curPtr2 = NULL;
+
+  if (aim_snlen(sn1) != aim_snlen(sn2))
+    return 1;
+
+  curPtr1 = sn1;
+  curPtr2 = sn2;
+  while ( (*curPtr1 != (char) NULL) && (*curPtr2 != (char) NULL) ) {
+    if ( (*curPtr1 == ' ') || (*curPtr2 == ' ') ) {
+      if (*curPtr1 == ' ')
+       curPtr1++;
+      if (*curPtr2 == ' ')
+       curPtr2++;
+    } else {
+      if ( toupper(*curPtr1) != toupper(*curPtr2))
+       return 1;
+      curPtr1++;
+      curPtr2++;
+    }
+  }
+
+  return 0;
+}