Changeset 42abb10

Timestamp:

Sep 16, 2002, 2:51:33 PM (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:

af2ca19

Parents:

425c013

Message:

There is now a 'zlist' command that acts like 'znol -l'
'l' is bound to 'zlist'

Files:

• ChangeLog (modified) (1 diff)
• commands.c (modified) (2 diffs)
• functions.c (modified) (1 diff)
• keys.c (modified) (1 diff)
• util.c (modified) (7 diffs)

ChangeLog

@@ -3 +3 @@
         'zlog in' will now take an optional thrid argument to set the
              'tty' variable before setting the zlocation
+        There is now a 'zlist' command that acts like 'znol -l'
+        'l' is bound to 'zlist'
         
 1.2.3

commands.c

@@ -185 +185 @@
               "display help on using owl",
               "help [command]", ""),
+
+  OWLCMD_ARGS("zlist", owl_command_zlist, OWL_CTX_INTERACTIVE,
+              "List users logged in",
+              "znol [-f file]",
+              "Print a znol-style listing of users logged in"),
   
   OWLCMD_VOID("recv:shiftleft", owl_command_shift_left, OWL_CTX_INTERACTIVE,
@@ -717 +722 @@
   owl_function_help_for_command(argv[1]);
   return NULL;
+}
+
+char *owl_command_zlist(int argc, char **argv) {
+  int elapsed=0, timesort=0;
+  char *file=NULL;
+
+  argc--;
+  argv++;
+  while (argc) {
+    if (!strcmp(argv[0], "-e")) {
+      elapsed=1;
+      argc--;
+      argv++;
+    } else if (!strcmp(argv[0], "-t")) {
+      timesort=1;
+      argc--;
+      argv++;
+    } else if (!strcmp(argv[0], "-f")) {
+      if (argc==1) {
+        owl_function_makemsg("zlist: -f needs an argument");
+        return(NULL);
+      }
+      file=argv[1];
+      argc-=2;
+      argv+=2;
+    } else {
+      owl_function_makemsg("zlist: unknown argument");
+      return(NULL);
+    }
+  }
+  owl_function_zlist(file, elapsed, timesort);
+  return(NULL);
 }
 

functions.c

@@ -2391 +2391 @@
   return(plaintext);
 }
+
+/* popup a znol listing.  If file is NULL use the default .anyone */
+/* this doesn't obey 'elapsed' or 'timesort' yet */
+void owl_function_zlist(char *file, int elapsed, int timesort) {
+  char *ourfile, *tmp, buff[LINE], *line;
+  FILE *f;
+  int numlocs, ret, i;
+  ZLocations_t location[200];
+  owl_fmtext fm;
+
+  if (file==NULL) {
+    tmp=owl_global_get_homedir(&g);
+    if (!tmp) {
+      owl_function_makemsg("Could not determine home directory");
+      return;
+    }
+    ourfile=owl_malloc(strlen(tmp)+50);
+    sprintf(ourfile, "%s/.anyone", owl_global_get_homedir(&g));
+  } else {
+    ourfile=owl_strdup(file);
+  }
+
+  f=fopen(ourfile, "r");
+  if (!f) {
+    owl_function_makemsg("Error opening file %s", ourfile);
+    return;
+  }
+
+  owl_fmtext_init_null(&fm);
+    
+  while (fgets(buff, LINE, f)!=NULL) {
+    /* ignore comments, blank lines etc. */
+    if (buff[0]=='#') continue;
+    if (buff[0]=='\n') continue;
+    if (buff[0]=='\0') continue;
+
+    /* strip the \n */
+    buff[strlen(buff)-1]='\0';
+
+    /* ingore from # on */
+    tmp=strchr(buff, '#');
+    if (tmp) tmp[0]='\0';
+
+    /* ingore from SPC */
+    tmp=strchr(buff, ' ');
+    if (tmp) tmp[0]='\0';
+
+    /* stick on the local realm. */
+    if (!strchr(buff, '@')) {
+      strcat(buff, "@");
+      strcat(buff, ZGetRealm());
+    }
+
+    ret=ZLocateUser(buff, &numlocs, ZAUTH);
+    if (ret!=ZERR_NONE) {
+      owl_function_makemsg("Error getting location for %s", buff);
+      continue;
+    }
+
+    numlocs=200;
+    ret=ZGetLocations(location, &numlocs);
+    if (ret==0) {
+      for (i=0; i<numlocs; i++) {
+        line=malloc(strlen(location[i].host)+strlen(location[i].time)+strlen(location[i].tty)+100);
+        tmp=short_zuser(buff);
+        sprintf(line, "%-10.10s %-24.24s %-12.12s  %20.20s\n",
+                tmp,
+                location[i].host,
+                location[i].tty,
+                location[i].time);
+        owl_fmtext_append_normal(&fm, line);
+        owl_free(tmp);
+      }
+      if (numlocs>=200) {
+        owl_fmtext_append_normal(&fm, "Too many locations found for this user, truncating.\n");
+      }
+    }
+  }
+  fclose(f);
+
+  owl_function_popless_fmtext(&fm);
+  owl_fmtext_free(&fm);
+
+  owl_free(ourfile);
+}

keys.c

@@ -240 +240 @@
 
   BIND_CMD("i",   "info",             "");
+  BIND_CMD("l",   "zlist",            "");
   BIND_CMD("M",   "pop-message",      "");
   BIND_CMD("T",   "delete trash",     "mark all 'trash' messages for deletion");

util.c

@@ -148 +148 @@
 }
 
-/* skips n tokens and returns where that would be.
- * TODO: handle quotes more sanely. */
 char *skiptokens(char *buff, int n) {
+  /* skips n tokens and returns where that would be.
+   * TODO: handle quotes more sanely. */
+  
   int inquotes=0;
   while (*buff && n>0) {
@@ -288 +289 @@
 
 char *stristr(char *a, char *b) {
+  /* exactly like strstr but it's case insensitive */
   char *x, *y, *ret;
 
@@ -306 +308 @@
 }
 
-/* Caller must free response. 
-   Takes in strings which are space-separated lists of tokens
-   and returns a single string containing no token more than once.
-   If prohibit is non-null, no token may start with a character
-   in prohibit.
-*/
 char *owl_util_uniq(char *A, char *B, char *prohibit) {
+  /* Caller must free response. 
+     Takes in strings which are space-separated lists of tokens
+     and returns a single string containing no token more than once.
+     If prohibit is non-null, no token may start with a character
+     in prohibit.
+  */
+  
   char *cat, **tok;
   int toklen, i, j, first=1;
@@ -338 +341 @@
 }
 
-
-
-/* returns if a string is only whitespace */
 int only_whitespace(char *s) {
+  /* returns if a string is only whitespace */
+
   int i;
   for (i=0; s[i]; i++) {
@@ -349 +351 @@
 }
 
+/* hooks for doing memory allocation et. al. in owl */
+
 void *owl_malloc(size_t size) {
   return(malloc(size));
@@ -365 +369 @@
 }
 
-/* allocates memory and returns the string or null.
- * caller must free the string. 
- * from Linux sprintf man page. 
- */
 char *owl_sprintf(const char *fmt, ...) {
+  /* allocates memory and returns the string or null.
+   * caller must free the string. 
+   * from Linux sprintf man page. 
+   */
+  
   int n, size = 100;
   char *p;
   va_list ap;
-  if ((p = owl_malloc (size)) == NULL)
-    return NULL;
+  if ((p = owl_malloc (size)) == NULL) return (NULL);
   while (1) {
     /* Try to print in the allocated space. */
@@ -427 +431 @@
 }
 
-/* Caller must free returned string.
- * Returns a string with any occurances of 'from' replaced with 'to'.
- * Does not currently handle backslash quoting, but may in the future.
- */
 char *owl_util_substitute(char *in, char *from, char *to) {
+  /* Caller must free returned string.
+   * Returns a string with any occurances of 'from' replaced with 'to'.
+   * Does not currently handle backslash quoting, but may in the future.
+   */
+  
   char *out;
   int   outlen, tolen, fromlen, inpos=0, outpos=0;