Changeset b0430a6

Timestamp:

Dec 21, 2003, 8:19:14 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:

2de4f20

Parents:

72836b5

Message:

New zephyr_get_field function

Files:

• ChangeLog (modified) (1 diff)
• functions.c (modified) (2 diffs)
• message.c (modified) (3 diffs)
• perlconfig.c (modified) (2 diffs)
• zephyr.c (modified) (5 diffs)

ChangeLog

@@ -9 +9 @@
         new attributes 'pseudo' 'logintty' and 'loginhost'
         Don't print extra new lines in popless_file
+        New zephyr_get_field function
         
 2.0.14

functions.c

@@ -1479 +1479 @@
           sprintf(buff, "  Field %i   : ", i+1);
           
-          ptr=owl_zephyr_get_field(n, i+1, &len);
-          if (!ptr) break;
+          ptr=owl_zephyr_get_field(n, i+1);
+          len=strlen(ptr);
           if (len<30) {
             strncpy(tmpbuff, ptr, len);
@@ -1489 +1489 @@
             strcat(tmpbuff, "...");
           }
+          owl_free(ptr);
           
           for (j=0; j<strlen(tmpbuff); j++) {

message.c

@@ -714 +714 @@
 {
   struct hostent *hent;
-  int k, len;
   char *ptr, *tmp, *tmp2;
 
@@ -755 +754 @@
   if (!strcasecmp(n->z_class, "login") || !strcasecmp(n->z_class, OWL_WEBZEPHYR_CLASS)) {
     if (!strcasecmp(n->z_opcode, "user_login") || !strcasecmp(n->z_opcode, "user_logout")) {
-      ptr=owl_zephyr_get_field(n, 1, &len);
-      tmp=owl_malloc(len+10);
-      strncpy(tmp, ptr, len);
-      tmp[len]='\0';
+      tmp=owl_zephyr_get_field(n, 1);
       owl_message_set_attribute(m, "loginhost", tmp);
       owl_free(tmp);
 
-      ptr=owl_zephyr_get_field(n, 3, &len);
-      tmp=owl_malloc(len+10);
-      strncpy(tmp, ptr, len);
-      tmp[len]='\0';
+      tmp=owl_zephyr_get_field(n, 3);
       owl_message_set_attribute(m, "logintty", tmp);
       owl_free(tmp);
@@ -786 +779 @@
 
   /* set the body */
-  ptr=owl_zephyr_get_message(n, &k);
-  tmp=owl_malloc(k+10);
-  memcpy(tmp, ptr, k);
-  tmp[k]='\0';
+  tmp=owl_zephyr_get_message(n);
   if (owl_global_is_newlinestrip(&g)) {
     tmp2=owl_util_stripnewlines(tmp);

perlconfig.c

@@ -26 +26 @@
   HV *h;
   SV *hr;
-  char *ptr, *ptr2, *blessas;
-  int len, i, j;
+  char *ptr, *blessas;
+  int i, j;
 
   if (!m) return &PL_sv_undef;
@@ -43 +43 @@
     j=owl_zephyr_get_num_fields(owl_message_get_notice(m));
     for (i=0; i<j; i++) {
-      ptr=owl_zephyr_get_field(owl_message_get_notice(m), i+1, &len);
-      ptr2=owl_malloc(len+1);
-      memcpy(ptr2, ptr, len);
-      ptr2[len]='\0';
-      av_push(av_zfields, newSVpvn(ptr2, len));
-      owl_free(ptr2);
+      ptr=owl_zephyr_get_field(owl_message_get_notice(m), i+1);
+      av_push(av_zfields, newSVpvn(ptr, strlen(ptr)));
+      owl_free(ptr);
     }
     hv_store(h, "fields", strlen("fields"), newRV_noinc((SV*)av_zfields), 0);

zephyr.c

@@ -257 +257 @@
 }
 
-#ifdef HAVE_LIBZEPHYR
-char *owl_zephyr_get_field(ZNotice_t *n, int j, int *k)
-{
-  /* return a pointer to the Jth field, place the length in k.  If the
-     field doesn't exist return an emtpy string */
+/* return a pointer to the data in the Jth field, (NULL terminated by
+ * definition).  Caller must free the return.
+ */
+#ifdef HAVE_LIBZEPHYR
+char *owl_zephyr_get_field(ZNotice_t *n, int j)
+{
   int i, count, save;
+  char *out;
 
   count=save=0;
@@ -270 +272 @@
       if (count==j) {
         /* just found the end of the field we're looking for */
-        *k=i-save;
-        return(n->z_message+save);
+        return(owl_strdup(n->z_message+save));
       } else {
         save=i+1;
@@ -277 +278 @@
     }
   }
-  /* catch the last field */
+  /* catch the last field, which might not be null terminated */
   if (count==j-1) {
-    *k=n->z_message_len-save;
-    return(n->z_message+save);
-  }
-  
-  *k=0;
-  return("");
+    out=owl_malloc(n->z_message_len-save+5);
+    memcpy(out, n->z_message+save, n->z_message_len-save);
+    out[n->z_message_len-save]='\0';
+    return(out);
+  }
+
+  return(owl_strdup(""));
 }
 #else
 char *owl_zephyr_get_field(void *n, int j, int *k)
 {
-  return("");
-}
-#endif
+  return(owl_strdup(""));
+}
+#endif
+
 
 #ifdef HAVE_LIBZEPHYR
@@ -313 +316 @@
 
 #ifdef HAVE_LIBZEPHYR
-char *owl_zephyr_get_message(ZNotice_t *n, int *k)
-{
-  /* return a pointer to the message, place the message length in k */
+/* return a pointer to the message, place the message length in k */
+char *owl_zephyr_get_message(ZNotice_t *n)
+{
   if (!strcasecmp(n->z_opcode, "ping")) {
-    *k=0;
     return("");
   }
 
-  return(owl_zephyr_get_field(n, 2, k));
+  return(owl_zephyr_get_field(n, 2));
 }
 #endif
@@ -793 +795 @@
 }
   
-
 /* Strip a local realm fron the zephyr user name.
  * The caller must free the return