Changeset dca3b27

Timestamp:

Oct 7, 2009, 5:05:57 PM (15 years ago)

Author:

Karl Ramm <kcr@1ts.org>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

77c87b2

Parents:

6c171f1

git-author:

Karl Ramm <kcr@1ts.org> (09/23/09 10:51:42)

git-committer:

Karl Ramm <kcr@1ts.org> (10/07/09 17:05:57)

Message:

Make owl_zephyr_zlocate return a dynamically allocated result

(and cleanup it and owl_function_zlocate)

Files:

• functions.c (modified) (2 diffs)
• zephyr.c (modified) (2 diffs)

functions.c

@@ -1941 +1941 @@
 {
   owl_fmtext fm;
-  char *ptr, buff[LINE];
+  char *ptr;
+  char *result;
   int i;
 
@@ -1947 +1948 @@
 
   for (i=0; i<argc; i++) {
-    ptr=long_zuser(argv[i]);
-    owl_zephyr_zlocate(ptr, buff, auth);
-    owl_fmtext_append_normal(&fm, buff);
+    ptr = long_zuser(argv[i]);
+    result = owl_zephyr_zlocate(ptr, auth);
+    owl_fmtext_append_normal(&fm, result);
+    owl_free(result);
     owl_free(ptr);
   }

zephyr.c

@@ -911 +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
@@ -918 +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
 }