Changes in zephyr.c [6201646:1151f0b]

File:

• zephyr.c (modified) (2 diffs)

zephyr.c

@@ -354 +354 @@
   return(owl_strdup(""));
 }
-
-char *owl_zephyr_get_field_as_utf8(ZNotice_t *n, int j)
-{
-  int i, count, save;
-
-  /* If there's no message here, just run along now */
-  if (n->z_message_len == 0)
-    return(owl_strdup(""));
-
-  count=save=0;
-  for (i = 0; i < n->z_message_len; i++) {
-    if (n->z_message[i]=='\0') {
-      count++;
-      if (count == j) {
-        /* just found the end of the field we're looking for */
-        return(owl_validate_or_convert(n->z_message + save));
-      } else {
-        save = i + 1;
-      }
-    }
-  }
-  /* catch the last field, which might not be null terminated */
-  if (count == j - 1) {
-    char *tmp, *out;
-    tmp = owl_malloc(n->z_message_len-save+5);
-    memcpy(tmp, n->z_message+save, n->z_message_len-save);
-    tmp[n->z_message_len-save]='\0';
-    out = owl_validate_or_convert(tmp);
-    owl_free(tmp);
-    return out;
-  }
-
+#else
+char *owl_zephyr_get_field(void *n, int j)
+{
   return(owl_strdup(""));
-}
-#else
-char *owl_zephyr_get_field(void *n, int j)
-{
-  return(owl_strdup(""));
-}
-char *owl_zephyr_get_field_as_utf8(ZNotice_t *n, int j)
-{
-  return owl_zephyr_get_field(n, j);
 }
 #endif
@@ -601 +563 @@
     }
   } else if (!strcmp(retnotice->z_message, ZSRVACK_NOTSENT)) {
-    if (strcasecmp(retnotice->z_class, "message")) {
-      char buff[1024];
-      owl_function_error("No one subscribed to class class %s", retnotice->z_class);
-      sprintf(buff, "Could not send message to class %s: no one subscribed.\n", retnotice->z_class);
+    #define BUFFLEN 1024
+    if (retnotice->z_recipient == NULL
+        || *retnotice->z_recipient == NULL
+        || *retnotice->z_recipient == '@') {
+      char buff[BUFFLEN];
+      owl_function_error("No one subscribed to class %s", retnotice->z_class);
+      snprintf(buff, BUFFLEN, "Could not send message to class %s: no one subscribed.\n", retnotice->z_class);
       owl_function_adminmsg("", buff);
     } else {
-      char buff[1024];
+      char buff[BUFFLEN];
       tmp = short_zuser(retnotice->z_recipient);
-      owl_function_error("%s: Not logged in or subscribing to messages.", tmp);
-      sprintf(buff, "Could not send message to %s: not logged in or subscribing to messages.\n", tmp);
+      owl_function_error("%s: Not logged in or subscribing.", tmp);
+      snprintf(buff, BUFFLEN, "Could not send message to %s: not logged in or subscribing to", tmp);
+      if(strcmp(retnotice->z_class, "message")) {
+        snprintf(buff, BUFFLEN,
+                 "%s class %s, instance %s.\n", buff,
+                 retnotice->z_class,
+                 retnotice->z_class_inst);
+      } else {
+        snprintf(buff, BUFFLEN,
+                 "%s messages.\n", buff);
+      }
       owl_function_adminmsg("", buff);
       owl_log_outgoing_zephyr_error(tmp, buff);