Changeset a0a5179 for functions.c

Timestamp:

Nov 19, 2003, 11:19:03 PM (20 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:

f1645da

Parents:

52f3507

Message:

blist works for AIM even if the zephyr .anyone can't be read
AIM Buddy debugging

File:

• functions.c (modified) (3 diffs)

functions.c

@@ -3000 +3000 @@
   owl_fmtext_init_null(&fm);
 
+  /* AIM first */
   if (aim && owl_global_is_aimloggedin(&g)) {
     bl=owl_global_get_buddylist(&g);
@@ -3014 +3015 @@
         timestr=owl_strdup("");
       }
-      foo=owl_sprintf("  %-20.20s %-12.12s\n",
-                      owl_buddy_get_name(b),
-                      timestr);
+      foo=owl_sprintf("  %-20.20s %-12.12s\n", owl_buddy_get_name(b), timestr);
       owl_fmtext_append_normal(&fm, foo);
       owl_free(timestr);
@@ -3027 +3026 @@
     if (file==NULL) {
       tmp=owl_global_get_homedir(&g);
-      if (!tmp) {
-        owl_function_error("Could not determine home directory");
-        return;
-      }
-      ourfile=owl_malloc(strlen(tmp)+50);
-      sprintf(ourfile, "%s/.anyone", owl_global_get_homedir(&g));
+      ourfile=owl_sprintf("%s/.anyone", owl_global_get_homedir(&g));
     } else {
       ourfile=owl_strdup(file);
     }
-    
+
+    owl_fmtext_append_bold(&fm, "Zephyr users logged in:\n");
     f=fopen(ourfile, "r");
     if (!f) {
-      owl_function_error("Error opening file %s: %s",
-                           ourfile,
-                           strerror(errno) ? strerror(errno) : "");
-      return;
-    }
-
-    owl_fmtext_append_bold(&fm, "Zephyr users logged in:\n");
-    
-    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_error("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);
+      owl_fmtext_append_normal(&fm, "  Error opening file ");
+      owl_fmtext_append_normal(&fm, ourfile);
+      owl_fmtext_append_normal(&fm, "\n");
+      owl_function_error("Error opening file %s: %s", ourfile, strerror(errno) ? strerror(errno) : "");
+    } else {
+      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());
         }
-        if (numlocs>=200) {
-          owl_fmtext_append_normal(&fm, "  Too many locations found for this user, truncating.\n");
+        
+        ret=ZLocateUser(buff, &numlocs, ZAUTH);
+        if (ret!=ZERR_NONE) {
+          owl_function_error("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);
+      fclose(f);
+    }
     owl_free(ourfile);
   }