Changeset d03091c

Timestamp:

Nov 1, 2006, 12:59:52 AM (18 years ago)

Author:

Sam Hartman <hartmans@mit.edu>

Branches:

master, barnowl_perlaim, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

38ffdf9

Parents:

8862725

git-author:

Sam Hartman <hartmans@mit.edu> (10/31/06 23:53:05)

git-committer:

Sam Hartman <hartmans@mit.edu> (11/01/06 00:59:52)

Message:

Reorder configuration handling so that perlwrap.m is pulled in before   .owlconf.
Initialize perl *always* even without owlconf.
Disable -c command line argument

Files:

• owl.c (modified) (2 diffs)
• perlconfig.c (modified) (2 diffs)
• perlwrap.pm (modified) (2 diffs)

owl.c

@@ -108 +108 @@
       }
       configfile=argv[1];
+      abort(); /*We dirty hackers have broken -c for now--hartmans*/
       argv+=2;
       argc-=2;
@@ -311 +312 @@
   owl_function_debugmsg("startup: processing config file");
   owl_context_set_readconfig(owl_global_get_context(&g));
-  perlerr=owl_perlconfig_readconfig(configfile);
+  perlerr=owl_perlconfig_readconfig();
   if (perlerr) {
     endwin();

perlconfig.c

@@ -162 +162 @@
 }
 
-char *owl_perlconfig_readconfig(char *file)
-{
-  int ret, fd;
+char *owl_perlconfig_readconfig(void)
+{
+  int ret;
   PerlInterpreter *p;
-  char filename[1024];
-  char *embedding[5];
   char *err;
-  struct stat statbuff;
-
-  if (file==NULL) {
-    sprintf(filename, "%s/%s", getenv("HOME"), ".owlconf");
-  } else {
-    strcpy(filename, file);
-  }
-  embedding[0]="";
-  embedding[1]=filename;
-  embedding[2]=0;
+  char *args[4] = {"", "-e", "0;", NULL};
+
 
   /* create and initialize interpreter */
@@ -187 +177 @@
   owl_global_set_no_have_config(&g);
 
-  /* Before we let perl have at it, we'll do our own checks on the the
-   *  file to see if it's present, readnable etc.
-   */
-
-  /* Not present, start without it */
-  ret=stat(filename, &statbuff);
-  if (ret) {
-    return(NULL);
-  }
-
-  /* present, but stat thinks it's unreadable */
-  if (! (statbuff.st_mode & S_IREAD)) {
-    return(owl_sprintf("%s present but not readable", filename));
-  }
-
-  /* can we open it? */
-  fd=open(filename, O_RDONLY);
-  if (fd==-1) {
-    return(owl_sprintf("could not open %s for reading", filename));
-  }
-  close(fd);
-
-  ret=perl_parse(p, owl_perl_xs_init, 2, embedding, NULL);
+
+  ret=perl_parse(p, owl_perl_xs_init, 2, args, NULL);
   if (ret || SvTRUE(ERRSV)) {
     STRLEN n_a;

perlwrap.pm

@@ -17 +17 @@
 use lib($::ENV{'HOME'}."/.owl/lib");
 
+
+our $configfile = $::ENV{'HOME'}."/.owlconf";
 
 # populate global variable space for legacy owlconf files 
@@ -283 +285 @@
 package main;
 
+# load the config  file
+if (-r $owl::configfile) {
+do $owl::configfile or die $@;
+}
+
 1;