Changeset 2404c3a

Timestamp:

Oct 3, 2003, 7:34:01 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:

f933403

Parents:

87c6ef1

Message:

Added the "source" command

Files:

• ChangeLog (modified) (1 diff)
• buddylist.c (modified) (3 diffs)
• commands.c (modified) (2 diffs)
• functions.c (modified) (1 diff)
• global.c (modified) (1 diff)
• owl.c (modified) (2 diffs)
• owl.h (modified) (1 diff)

ChangeLog

@@ -1 +1 @@
 $Id$
 
+2.0.8-pre-4
+        Added the 'source' command.
+        
 2.0.8-pre-3   
         Make sure that a newline is always at the end of messages

buddylist.c

@@ -7 +7 @@
   owl_list_create(&(b->buddies));
   owl_list_create(&(b->idletimes));
+  /* owl_list_create(&(g->buddymsg_queue)); */
 }
 
@@ -92 +93 @@
 {
   if (!owl_buddylist_is_buddy_loggedin(b, screenname)) return;
+  
   owl_aim_get_idle(screenname);
 }
@@ -142 +144 @@
 }
 
-/* set the idle time for user 'screenname'.  If the given
- * screenname is not on the buddy list do nothing
+/* Set the idle time for user 'screenname'.  If the given screenname
+ * is not on the buddy list do nothing.  If there is a queued request
+ * for this screename, remove it from the queue.
  */
 void owl_buddylist_set_idletime(owl_buddylist *b, char *screenname, int minutes)

commands.c

@@ -226 +226 @@
               "dump <filename>",
               "Dump messages in current view to the named file."),
+
+  OWLCMD_ARGS("source", owl_command_source, OWL_CTX_ANY,
+              "execute owl commands from a file",
+              "source <filename>",
+              "Execute the owl commands in <filename>.\n"),
 
   OWLCMD_ARGS("addbuddy", owl_command_addbuddy, OWL_CTX_INTERACTIVE,
@@ -1049 +1054 @@
 
   owl_function_dump(argv[1]);
+  return(NULL);
+}
+
+char *owl_command_source(int argc, char **argv, char *buff)
+{
+  if (argc!=2) {
+    owl_function_makemsg("usage: source <filename>");
+    return(NULL);
+  }
+
+  owl_function_source(argv[1]);
   return(NULL);
 }

functions.c

@@ -3159 +3159 @@
 }
 
-void owl_function_execstartup(void)
+/* Execute owl commands from the given filename.  If the filename
+ * is NULL, use the default owl startup commands file.
+ */
+void owl_function_source(char *filename)
 {
   FILE *file;
-  char *filename;
   char buff[LINE];
 
-  filename=owl_sprintf("%s/%s", owl_global_get_homedir(&g), OWL_STARTUP_FILE);
-  file=fopen(filename, "r");
-  owl_free(filename);
+  if (!filename) {
+    filename=owl_sprintf("%s/%s", owl_global_get_homedir(&g), OWL_STARTUP_FILE);
+    file=fopen(filename, "r");
+    owl_free(filename);
+  } else {
+    file=fopen(filename, "r");
+  }
   if (!file) {
     /* just fail silently if it doesn't exist */

global.c

@@ -97 +97 @@
   owl_timer_create_countdown(&(g->aim_buddyinfo_timer), 60);
   owl_buddylist_init(&(g->buddylist));
+    
   g->response=NULL;
   g->havezephyr=0;

owl.c

@@ -128 +128 @@
   }
 
-    
   /* owl global init */
   owl_global_init(&g);
@@ -223 +222 @@
 
   /* process the startup file */
-  owl_function_execstartup();
+  owl_function_source(NULL);
 
   /* read the config file */

owl.h

@@ -21 +21 @@
 static const char owl_h_fileIdent[] = "$Id$";
 
-#define OWL_VERSION         2.0.8-pre-3
-#define OWL_VERSION_STRING "2.0.8-pre-3"
+#define OWL_VERSION         2.0.8-pre-4
+#define OWL_VERSION_STRING "2.0.8-pre-4"
 
 #define OWL_DEBUG 0