Changeset e3d9c77 for zephyr.c

Timestamp:

Oct 26, 2003, 3:23:38 PM (21 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

bc08664

Parents:

70b53ec

Message:

Write owl_text_quote
Moved some functions between util.c, text.c and zephyr.c

File:

• zephyr.c (modified) (2 diffs)

zephyr.c

@@ -485 +485 @@
 
   if (owl_global_is_smartstrip(&g)) {
-    to=owl_util_smartstripped_user(owl_message_get_sender(m));
+    to=owl_zephyr_smartstripped_user(owl_message_get_sender(m));
   } else {
     to=owl_strdup(owl_message_get_sender(m));
@@ -794 +794 @@
 }
   
+
+
+/* Strip a local realm fron the zephyr user name.
+ * The caller must free the return
+ */
+char *short_zuser(char *in)
+{
+  char *out, *ptr;
+
+  out=owl_strdup(in);
+  ptr=strchr(out, '@');
+  if (ptr) {
+    if (!strcasecmp(ptr+1, owl_zephyr_get_realm())) {
+      *ptr='\0';
+    }
+  }
+  return(out);
+}
+
+/* Append a local realm to the zephyr user name if necessary.
+ * The caller must free the return.
+ */
+char *long_zuser(char *in)
+{
+  char *ptr;
+
+  if (NULL != (ptr=strchr(in, '@'))) {
+    return owl_strdup(in);
+  } else {
+    return owl_sprintf("%s@%s", in, owl_zephyr_get_realm());
+  }
+}
+
+
+/* strip out the instance from a zsender's principal.  Preserves the
+ * realm if present.  daemon.webzephyr is a special case.  The
+ * caller must free the return
+ */
+char *owl_zephyr_smartstripped_user(char *in)
+{
+  char *ptr, *realm, *out;
+
+  out=owl_strdup(in);
+
+  /* bail immeaditly if we don't have to do any work */
+  ptr=strchr(in, '.');
+  if (!strchr(in, '/') && !ptr) {
+    /* no '/' and no '.' */
+    return(out);
+  }
+  if (ptr && strchr(in, '@') && (ptr > strchr(in, '@'))) {
+    /* There's a '.' but it's in the realm */
+    return(out);
+  }
+  if (!strncasecmp(in, OWL_WEBZEPHYR_PRINCIPAL, strlen(OWL_WEBZEPHYR_PRINCIPAL))) {
+    return(out);
+  }
+
+  /* remove the realm from ptr, but hold on to it */
+  realm=strchr(out, '@');
+  if (realm) realm[0]='\0';
+
+  /* strip */
+  ptr=strchr(out, '.');
+  if (!ptr) ptr=strchr(out, '/');
+  ptr[0]='\0';
+
+  /* reattach the realm if we had one */
+  if (realm) {
+    strcat(out, "@");
+    strcat(out, realm+1);
+  }
+
+  return(out);
+}