Changeset 2527615

Timestamp:

Oct 12, 2002, 11:14:41 AM (22 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:

b12c219

Parents:

d023c25

Message:

The 'zlocate' command can now handle multiple users

Files:

• ChangeLog (modified) (1 diff)
• commands.c (modified) (2 diffs)
• functions.c (modified) (1 diff)
• zephyr.c (modified) (1 diff)

ChangeLog

@@ -4 +4 @@
         Outgoing messages now go through the config for formatting
         Zaway now makes an outgoing message, instead of an admin message
+        The 'zlocate' command can now handle multiple users
         
 1.2.6

commands.c

@@ -366 +366 @@
   OWLCMD_ARGS("zlocate", owl_command_zlocate, OWL_CTX_INTERACTIVE,
               "locate a user",
-              "zlocate [-d] <user>", 
-              "Performs a zlocate on a user and puts the result into\n"
-              "a popwin.  If -d is specified, does not authenticate\n"
+              "zlocate [-d] <user> ...", 
+              "Performs a zlocate on one ore more users and puts the result\n"
+              "int a popwin.  If -d is specified, does not authenticate\n"
               "the lookup request.\n"),
   
@@ -1335 +1335 @@
 
 char *owl_command_zlocate(int argc, char **argv, char *buff) {
-  if (argc==2) {
-    owl_function_zlocate(argv[1], 1);
-  } else if (argc==3) {
-    if (!strcmp(argv[1], "-d")) {
-      owl_function_zlocate(argv[2], 0);
+  int auth;
+  
+  if (argc<2) {
+    owl_function_makemsg("Too few arguments for zlocate command");
+    return NULL;
+  }
+
+  auth=1;
+  if (!strcmp(argv[1], "-d")) {
+    if (argc>2) {
+      auth=0;
+      argc--;
+      argv++;
     } else {
-      owl_function_makemsg("Invalid option to the zlocate command");
+      owl_function_makemsg("Missing arguments for zlocate command");
       return NULL;
     }
-  } else {
-    owl_function_makemsg("Wrong number of arguments for zlocate command");
-    return NULL;
-  }
+  }
+
+  argc--;
+  argv++;
+  owl_function_zlocate(argc, argv, auth);
   return NULL;
 }

functions.c

@@ -1588 +1588 @@
 }
 
-void owl_function_zlocate(char *user, int auth) {
-  char buff[LINE], myuser[LINE];
-  char *ptr;
-
-  strcpy(myuser, user);
-  ptr=strchr(myuser, '@');
-  if (!ptr) {
-    strcat(myuser, "@");
-    strcat(myuser, ZGetRealm());
-  }
-
-  owl_zephyr_zlocate(myuser, buff, auth);
-  owl_function_popless_text(buff);
+void owl_function_zlocate(int argc, char **argv, int auth) {
+  owl_fmtext fm;
+  char *ptr, buff[LINE];
+  int i;
+
+  owl_fmtext_init_null(&fm);
+
+  for (i=0; i<argc; i++) {
+    ptr=long_zuser(argv[i]);
+    owl_zephyr_zlocate(ptr, buff, auth);
+    owl_fmtext_append_normal(&fm, buff);
+    owl_free(ptr);
+  }
+
+  owl_function_popless_fmtext(&fm);
+  owl_fmtext_free(&fm);
 }
 

zephyr.c

@@ -384 +384 @@
 
   if (numlocs==0) {
-    strcpy(out, "Hidden or not logged-in\n");
+    myuser=short_zuser(user);
+    sprintf(out, "%s: Hidden or not logged-in\n", myuser);
+    owl_free(myuser);
     return;
   }