Changeset 00f9a7d

Timestamp:

Jan 8, 2007, 6:50:12 PM (18 years ago)

Author:

Nelson Elhage <nelhage@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:

f265f94

Parents:

15bd5ef

git-author:

Nelson Elhage <nelhage@mit.edu> (01/08/07 18:50:09)

git-committer:

Nelson Elhage <nelhage@mit.edu> (01/08/07 18:50:12)

Message:

Bring back the -c option, and no longer choke if .owlconf doesn't
return true.

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;
@@ -305 +304 @@
   owl_function_debugmsg("startup: processing config file");
   owl_context_set_readconfig(owl_global_get_context(&g));
-  perlerr=owl_perlconfig_readconfig();
+  perlerr=owl_perlconfig_readconfig(configfile);
   if (perlerr) {
     endwin();

perlconfig.c

@@ -220 +220 @@
 
 
-char *owl_perlconfig_readconfig(void)
+char *owl_perlconfig_readconfig(char * file)
 {
   int ret;
@@ -267 +267 @@
   perl_get_sv("owl::host", TRUE);
   perl_get_av("owl::fields", TRUE);
-  
+
+  if(file) {
+    SV * cfg = get_sv("owl::configfile", TRUE);
+    sv_setpv(cfg, file);
+  }
+
   perl_eval_pv(owl_perlwrap_codebuff, FALSE);
 

perlwrap.pm

@@ -18 +18 @@
 
 
-our $configfile = $::ENV{'HOME'}."/.owlconf";
+our $configfile;
+
+$configfile ||= $::ENV{'HOME'}."/.owlconf";
 
 # populate global variable space for legacy owlconf files 
@@ -455 +457 @@
 # load the config  file
 if (-r $owl::configfile) {
-do $owl::configfile or die $@;
+    undef $!;
+    undef $@;
+    do $owl::configfile;
+    die $@ if $@;
+    die $! if $!;
 }