Changeset 8ee73f8d for readconfig.c

Timestamp:

Jun 30, 2002, 2:54:22 AM (21 years ago)

Author:

Erik Nygren <nygren@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:

039213e

Parents:

d36f2cb

Message:

	Fixed a memory reference bug in delete and undelete commands.
	Added support for perl to call directly back into owl.
	Changed the implementation of owl::command("...") to immediately
	        call back into owl.  This allows perl to get the return
		value of strings returned by owl commands.
	Added the getview command which returns the name of the current
	        view's filter.
	Added the getvar command which returns the value of a variable.
	Added an example to examples/owlconf.erik which uses TAB to
		narrow and restore the view.
	Added an example to examples/owlconf.erik which uses M-c to
		color messages matching the current one green.

File:

• readconfig.c (modified) (7 diffs)

readconfig.c

@@ -10 +10 @@
 static const char fileIdent[] = "$Id$";
 
+
+
+EXTERN_C void boot_owl (pTHX_ CV* cv);
+
+static void owl_perl_xs_init(pTHX) {
+  char *file = __FILE__;
+  dXSUB_SYS;
+  {
+    newXS("owl::bootstrap", boot_owl, file);
+  }
+}
+
+
 int owl_readconfig(char *file) {
   int ret;
   PerlInterpreter *p;
-  char buff[1024], filename[1024];
+  char *codebuff, filename[1024];
   char *embedding[5];
   struct stat statbuff;
@@ -22 +35 @@
     strcpy(filename, file);
   }
-
   embedding[0]="";
   embedding[1]=filename;
@@ -39 +51 @@
   }
 
-  ret=perl_parse(p, NULL, 2, embedding, NULL);
+  ret=perl_parse(p, owl_perl_xs_init, 2, embedding, NULL);
   if (ret) return(-1);
 
@@ -61 +73 @@
   perl_get_av("owl::fields", TRUE);
   
-  /* load in owl_command() */
-  strcpy(buff, "sub owl::command {                           \n");
-  strcat(buff, "  my $command = shift;                       \n");
-  strcat(buff, "  push @owl::commands, $command;             \n");
-  strcat(buff, "}                                            \n");
-  perl_eval_pv(buff, FALSE);
+  /* perl bootstrapping code*/
+  codebuff = 
+    "                                             \n"
+    "package owl;                                 \n"
+    "                                             \n"
+    "bootstrap owl 0.01;                          \n"
+    "                                             \n"
+    "package main;                                \n";
+
+  perl_eval_pv(codebuff, FALSE);
 
 
@@ -79 +95 @@
 /* caller is responsible for freeing returned string */
 char *owl_config_execute(char *line) {
-  STRLEN n_a;
-  SV *command, *response;
-  AV *commands;
-  int numcommands, i;
+  STRLEN len;
+  SV *response;
   char *out, *preout;
 
@@ -90 +104 @@
   response = perl_eval_pv(line, FALSE);
 
-  preout=SvPV(response, n_a);
+  preout=SvPV(response, len);
   /* leave enough space in case we have to add a newline */
   out = owl_malloc(strlen(preout)+2);
-  strcpy(out, preout);
+  strncpy(out, preout, len);
+  out[len] = '\0';
   if (!strlen(out) || out[strlen(out)-1]!='\n') {
     strcat(out, "\n");
   }
-
-  /* execute all the commands, cleaning up the arrays as we go */
-  commands=perl_get_av("owl::commands", TRUE);
-  numcommands=av_len(commands)+1;
-  for (i=0; i<numcommands; i++) {
-    command=av_shift(commands);
-    owl_function_command_norv(SvPV(command, n_a));
-  }
-  av_undef(commands);
 
   return(out);
@@ -214 +220 @@
   }
 }
+