Changeset 4357be8 for zephyr.c

Timestamp:

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

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.

File:

• zephyr.c (modified) (7 diffs)

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();