Changeset 7933748

Timestamp:

Feb 21, 2003, 10:50:15 AM (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:

ed2412d

Parents:

2c8d62e

Message:

Added a 'loadloginsubs' command to load login subscriptions from a
  file
Added a 'loadsubs' command to eventually phase out the 'load-subs'
  command

Files:

• ChangeLog (modified) (1 diff)
• commands.c (modified) (2 diffs)
• functions.c (modified) (1 diff)
• owl.c (modified) (1 diff)
• zephyr.c (modified) (2 diffs)

ChangeLog

@@ -23 +23 @@
         Renamed old instances of zsig_exec in the code to zsigproc
         Don't print the stderr from zsigproc
+        Added a 'loadloginsubs' command to load login subscriptions from a
+          file
+        Added a 'loadsubs' command to eventually phase out the 'load-subs'
+          command
 
 1.2.8

commands.c

@@ -365 +365 @@
               "load subscriptions from a file",
               "load-subs <file>\n", ""),
+
+  OWLCMD_ARGS("loadsubs", owl_command_loadsubs, OWL_CTX_ANY,
+              "load subscriptions from a file",
+              "loadsubs <file>\n", ""),
+
+  OWLCMD_ARGS("loadloginsubs", owl_command_loadloginsubs, OWL_CTX_ANY,
+              "load login subscriptions from a file",
+              "loadloginsubs <file>\n",
+              "The file should contain a list of usernames, one per line."),
 
   OWLCMD_VOID("about", owl_command_about, OWL_CTX_INTERACTIVE,
@@ -933 +942 @@
   } else {
     owl_function_makemsg("Wrong number of arguments for load-subs.");
-    return NULL;
-  }
-  return NULL;
+    return(NULL);
+  }
+  return(NULL);
+}
+
+
+char *owl_command_loadloginsubs(int argc, char **argv, char *buff) {
+  if (argc == 2) {
+    owl_function_loadloginsubs(argv[1]);
+  } else if (argc == 1) {
+    owl_function_loadloginsubs(NULL);
+  } else {
+    owl_function_makemsg("Wrong number of arguments for load-subs.");
+    return(NULL);
+  }
+  return(NULL);
 }
 

functions.c

@@ -522 +522 @@
   } else {
     owl_function_makemsg("Error subscribing to messages from file.");
+  }
+}
+
+void owl_function_loadloginsubs(char *file) {
+  int ret;
+  ret=owl_zephyr_loadloginsubs(file);
+  if (ret==0) {
+    owl_function_makemsg("Subscribed to login messages from file.");
+  } else if (ret==-1) {
+    owl_function_makemsg("Could not open file for login subscriptions.");
+  } else {
+    owl_function_makemsg("Error subscribing to login messages from file.");
   }
 }

owl.c

@@ -205 +205 @@
   /* load login subs */
   if (owl_global_is_loginsubs(&g)) {
-    loadloginsubs(NULL);
+    owl_function_loadloginsubs(NULL);
   }
 

zephyr.c

@@ -81 +81 @@
 }
 
-int loadloginsubs(char *filename) {
+int owl_zephyr_loadloginsubs(char *filename) {
   FILE *file;
   ZSubscription_t subs[3001];
@@ -122 +122 @@
 
   /* sub with defaults */
-  if (ZSubscribeTo(subs,count,0) != ZERR_NONE) {
+  if (ZSubscribeToSansDefaults(subs,count,0) != ZERR_NONE) {
     fprintf(stderr, "Error subbing\n");
     ret=-2;