Changes in zephyr.c [32ad44d:dca3b27]

File:

• zephyr.c (modified) (8 diffs)

zephyr.c

@@ -82 +82 @@
 void owl_zephyr_finish_initialization(owl_dispatch *d) {
   Code_t code;
-  char *perl;
 
   owl_select_remove_dispatch(d->fd);
@@ -126 +125 @@
     owl_function_zephyr_buddy_check(0);
   }
-
- perl = owl_perlconfig_execute("BarnOwl::Zephyr::_zephyr_startup()");
- owl_free(perl);
 }
 
@@ -172 +168 @@
   }
 #endif
-  return 0;
+  return(0);
 }
 
@@ -180 +176 @@
   if(owl_global_is_havezephyr(&g))
     return(ZPending());
-#endif
-  return 0;
+  else
+    return 0;
+#else
+  return(0);
+#endif
 }
 
@@ -187 +186 @@
 {
 #ifdef HAVE_LIBZEPHYR
-  if (owl_global_is_havezephyr(&g))
-    return(ZGetRealm());
-#endif
-  return "";
+  return(ZGetRealm());
+#else
+  return("");
+#endif
 }
 
@@ -196 +195 @@
 {
 #ifdef HAVE_LIBZEPHYR
-  if (owl_global_is_havezephyr(&g))
-    return(ZGetSender());
-#endif
-  return "";
+  return(ZGetSender());
+#else
+  return("");
+#endif
 }
 
@@ -912 +911 @@
 #endif
 
-void owl_zephyr_zlocate(const char *user, char *out, int auth)
+char *owl_zephyr_zlocate(const char *user, int auth)
 {
 #ifdef HAVE_LIBZEPHYR
@@ -919 +918 @@
   ZLocations_t locations;
   char *myuser;
-  
-  strcpy(out, "");
+  char *p, *result;
+
   ZResetAuthentication();
-  ret=ZLocateUser(zstr(user),&numlocs,auth?ZAUTH:ZNOAUTH);
-  if (ret != ZERR_NONE) {
-    sprintf(out, "Error locating user %s\n", user);
-    return;
-  }
-
-  if (numlocs==0) {
-    myuser=short_zuser(user);
-    sprintf(out, "%s: Hidden or not logged in\n", myuser);
-    owl_free(myuser);
-    return;
-  }
-    
-  for (;numlocs;numlocs--) {
-    ZGetLocations(&locations,&one);
-    myuser=short_zuser(user);
-    sprintf(out + strlen(out), "%s: %s\t%s\t%s\n", myuser,
-            locations.host ? locations.host : "?",
-            locations.tty ? locations.tty : "?",
-            locations.time ? locations.time : "?");
-    owl_free(myuser);
-  }
+  ret = ZLocateUser(zstr(user), &numlocs, auth ? ZAUTH : ZNOAUTH);
+  if (ret != ZERR_NONE)
+    return owl_sprintf("Error locating user %s: %s\n",
+                       user, error_message(ret));
+
+  myuser = short_zuser(user);
+  if (numlocs == 0) {
+    result = owl_sprintf("%s: Hidden or not logged in\n", myuser);
+  } else {
+    result = owl_strdup("");
+    for (; numlocs; numlocs--) {
+      ZGetLocations(&locations, &one);
+      p = owl_sprintf("%s%s: %s\t%s\t%s\n",
+                          result, myuser,
+                          locations.host ? locations.host : "?",
+                          locations.tty ? locations.tty : "?",
+                          locations.time ? locations.time : "?");
+      owl_free(result);
+      result = p;
+    }
+  }
+
+  return result;
+#else
+  return owl_strdup("");
 #endif
 }