Changeset 95474d7 for functions.c

Timestamp:

Jan 3, 2005, 10:34:02 PM (19 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:

15b34fd

Parents:

4e0f545

Message:

In load-subs: Print an error message if the file is unreadable or
doesn't exist, UNLESS load-subs is called with no arguments.  In that
case only print an error if the file exists but isn't readable.  Still
prints an error either way if zephyr reports a failure. [BZ 19]

File:

• functions.c (modified) (2 diffs)

functions.c

@@ -854 +854 @@
 }
 
+
+/* Load zephyr subscriptions from the named 'file' and load zephyr's
+ * default subscriptions as well.  An error message is printed if
+ * 'file' can't be opened or if zephyr reports an error in
+ * subscribing.
+ *
+ * If 'file' is NULL, this look for the default filename
+ * $HOME/.zephyr.subs.  If the file can not be opened in this case
+ * only, no error message is printed.
+ */
 void owl_function_loadsubs(char *file)
 {
   int ret, ret2;
-
-  ret=owl_zephyr_loadsubs(file);
+  char *foo;
+
+  if (file==NULL) {
+    ret=owl_zephyr_loadsubs(NULL, 0);
+  } else {
+    ret=owl_zephyr_loadsubs(file, 1);
+  }
 
   /* for backwards compatibility for now */
@@ -864 +879 @@
 
   if (!owl_context_is_interactive(owl_global_get_context(&g))) return;
-  if (ret==0) {
-    owl_function_makemsg("Subscribed to messages from file.");
+
+  foo=file?file:"file";
+  if (ret==0 && ret2==0) {
+    if (!file) {
+      owl_function_makemsg("Subscribed to messages.");
+    } else {
+      owl_function_makemsg("Subscribed to messages from %s", file);
+    }
   } else if (ret==-1) {
-    owl_function_error("Could not open file.");
+    owl_function_error("Could not read %s", foo);
   } else {
-    owl_function_error("Error subscribing to messages from file.");
+    owl_function_error("Error subscribing to messages");
   }
 }