Changeset 4357be8

Timestamp:

Dec 26, 2003, 2:01:32 PM (21 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:

32eed98

Parents:

bf73bdd

Message:

Don't print an error about loading subs if there is no .zephyr.subs
Do the initial zephyr_buddy_check when pseduologin set to true.

Files:

• ChangeLog (modified) (1 diff)
• functions.c (modified) (1 diff)
• owl.c (modified) (2 diffs)
• owl.h (modified) (1 diff)
• variable.c (modified) (8 diffs)
• zephyr.c (modified) (7 diffs)

ChangeLog

@@ -1 +1 @@
 $Id$
 
+2.1.3-pre-1
+        Don't print an error about loading subs if there is no
+          .zephyr.subs
+        Do the initial zephyr_buddy_check when pseduologin set to true.
+        
 2.1.2
         removed unused filter_depth variable

functions.c

@@ -810 +810 @@
 void owl_function_loadsubs(char *file)
 {
-  int ret;
+  int ret, ret2;
 
   ret=owl_zephyr_loadsubs(file);
+
+  /* for backwards compatibility for now */
+  ret2=owl_zephyr_loaddefaultsubs();
 
   if (!owl_context_is_interactive(owl_global_get_context(&g))) return;

owl.c

@@ -326 +326 @@
   /* load zephyr subs */
   if (initialsubs) {
+    int ret2;
     owl_function_debugmsg("startup: loading initial zephyr subs");
-    /* load normal subscriptions */
-    ret=owl_zephyr_loadsubs(NULL);
-    if (ret==-1) {
-      owl_function_adminmsg("", "Error loading zephyr subscriptions, file inaccessable");
-    } else if (ret!=0) {
+
+    /* load default subscriptions */
+    ret=owl_zephyr_loaddefaultsubs();
+    
+    /* load subscriptions from subs file */
+    ret2=owl_zephyr_loadsubs(NULL);
+
+    if (ret || ret2) {
       owl_function_adminmsg("", "Error loading zephyr subscriptions");
-    }
-    
-    if (ret!=-1) {
+    } else if (ret2!=-1) {
       owl_global_add_userclue(&g, OWL_USERCLUE_CLASSES);
     }
@@ -348 +350 @@
   /* First buddy check to sync the list without notifications */
   owl_function_debugmsg("startup: doing initial zephyr buddy check");
-  owl_function_zephyr_buddy_check(0);
+  /* owl_function_zephyr_buddy_check(0); */
 
   /* set the startup and default style, based on userclue and presence of a

owl.h

@@ -20 +20 @@
 static const char owl_h_fileIdent[] = "$Id$";
 
-#define OWL_VERSION         2.1.2
-#define OWL_VERSION_STRING "2.1.2"
+#define OWL_VERSION         2.1.3-pre-1
+#define OWL_VERSION_STRING "2.1.3-pre-1"
 
 /* Feature that is being tested to redirect stderr through a pipe. 

variable.c

@@ -136 +136 @@
                "" ),
 
-  OWLVAR_BOOL( "pseudologins" /* %OwlVarStub */, 0,
-               "Enable zephyr pseudo logins",
-               "When this is enabled, Owl will periodically check the zephyr\n"
-               "location of users in your .anyone file.  If a user is present\n"
-               "but sent no login message, or a user is not present that sent no\n"
-               "logout message a pseudo login or logout message wil be created\n"),
+  OWLVAR_BOOL_FULL( "pseudologins" /* %OwlVarStub */, 0,
+                    "Enable zephyr pseudo logins",
+                    "When this is enabled, Owl will periodically check the zephyr\n"
+                    "location of users in your .anyone file.  If a user is present\n"
+                    "but sent no login message, or a user is not present that sent no\n"
+                    "logout message a pseudo login or logout message wil be created\n",
+                    NULL, owl_variable_pseudologins_set, NULL),
 
   OWLVAR_BOOL( "ignorelogins" /* %OwlVarStub */, 0,
@@ -352 +353 @@
 /* commonly useful */
 
-int owl_variable_int_validate_gt0(owl_variable *v, void *newval) {
+int owl_variable_int_validate_gt0(owl_variable *v, void *newval)
+{
   if (newval == NULL) return(0);
   else if (*(int*)newval < 1) return(0);
@@ -358 +360 @@
 }
 
-int owl_variable_int_validate_positive(owl_variable *v, void *newval) {
+int owl_variable_int_validate_positive(owl_variable *v, void *newval)
+{
   if (newval == NULL) return(0);
   else if (*(int*)newval < 0) return(0);
@@ -365 +368 @@
 
 /* typewinsize */
-
-int owl_variable_typewinsize_set(owl_variable *v, void *newval) {
+int owl_variable_typewinsize_set(owl_variable *v, void *newval)
+{
   int rv;
   rv = owl_variable_int_set_default(v, newval);
@@ -374 +377 @@
 
 /* debug (cache value in g->debug) */
-int owl_variable_debug_set(owl_variable *v, void *newval) {
+int owl_variable_debug_set(owl_variable *v, void *newval)
+{
   if (newval && (*(int*)newval == 1 || *(int*)newval == 0)) {
     g.debug = *(int*)newval;
@@ -382 +386 @@
 
 /* When 'aaway' is changed, need to notify the AIM server */
-int owl_variable_aaway_set(owl_variable *v, void *newval) {
+int owl_variable_aaway_set(owl_variable *v, void *newval)
+{
   if (newval) {
     if (*(int*)newval == 1) {
@@ -393 +398 @@
 }
 
+int owl_variable_pseudologins_set(owl_variable *v, void *newval)
+{
+  if (newval) {
+    if (*(int*)newval == 1) {
+      owl_function_zephyr_buddy_check(0);
+    }
+  }
+  return owl_variable_bool_set_default(v, newval);
+}
+
 /* note that changing the value of this will clobber 
  * any user setting of this */
-int owl_variable_disable_ctrl_d_set(owl_variable *v, void *newval) {
+int owl_variable_disable_ctrl_d_set(owl_variable *v, void *newval)
+{
 
   if (in_regtest) return owl_variable_int_set_default(v, newval);
@@ -411 +427 @@
 }
 
-int owl_variable_tty_set(owl_variable *v, void *newval) {
+int owl_variable_tty_set(owl_variable *v, void *newval)
+{
   owl_zephyr_set_locationinfo(owl_global_get_hostname(&g), newval);
   return(owl_variable_string_set_default(v, newval));

zephyr.c

@@ -3 +3 @@
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <sys/stat.h>
 #include <string.h>
 #include "owl.h"
@@ -78 +79 @@
   ZSubscription_t subs[3001];
   int count, ret, i;
-
-  ret=0;
-  
+  struct stat statbuff;
+
   if (filename==NULL) {
     sprintf(subsfile, "%s/%s", owl_global_get_homedir(&g), ".zephyr.subs");
@@ -86 +86 @@
     strcpy(subsfile, filename);
   }
+
+  ret=stat(subsfile, &statbuff);
+  if (ret) return(0);
+
+  ret=0;
 
   ZResetAuthentication();
@@ -124 +129 @@
   }
 
-  /* sub with defaults */
-  if (ZSubscribeTo(subs,count,0) != ZERR_NONE) {
+  /* sub without defaults */
+  if (ZSubscribeToSansDefaults(subs,count,0) != ZERR_NONE) {
     owl_function_error("Error subscribing to zephyr notifications.");
     ret=-2;
@@ -143 +148 @@
 }
 
+int owl_zephyr_loaddefaultsubs()
+{
+  ZSubscription_t subs[10];
+    
+  if (ZSubscribeTo(subs,0,0) != ZERR_NONE) {
+    owl_function_error("Error subscribing to default zephyr notifications.");
+    return(-1);
+  }
+  return(0);
+}
+
 int owl_zephyr_loadloginsubs(char *filename)
 {
@@ -150 +166 @@
   char subsfile[1024], buffer[1024];
   int count, ret, i;
-
-  ret=0;
+  struct stat statbuff;
 
   if (filename==NULL) {
@@ -158 +173 @@
     strcpy(subsfile, filename);
   }
+  
+  ret=stat(subsfile, &statbuff);
+  if (ret) return(0);
+
+  ret=0;
 
   ZResetAuthentication();