Changeset ac70242 for readconfig.c

Timestamp:

Apr 20, 2003, 12:05:15 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:

69894d2

Parents:

801c7cb

Message:

Makefile.in: define DATADIR, for default owlconf.
Makefile.in: provide "all" and "install" rules.
configure.in: try also libdes and libkrb4, for people using heimdal
configure.in: see if des_ecb_encrypt is already prototyped.
configure.in: minor changes to work with new autoconf without needing acconfig.h.
configure.in: find the install program.
configure.in: test for use_default_colors since some versions of
  solaris don't have it, so we can at least compile something
  vaguely working there.
keypress.c: ifdefs for keys not defined on at least some solarises.
owl.c: don't call use_default_colors if we don't have it
readconfig.c: added *commented out* code to try to find a
  system-default owlconf if the user doesn't have one.  Have to
  ponder if I want this
zcrypt.c: don't prototype des_ecb_encrypt if there is a prototype in
  des.h.
zcrypt.c: include owl.h so we get the configure-generated config.h
Change to codelist.pl to deal with new code style

File:

• readconfig.c (modified) (3 diffs)

readconfig.c

@@ -11 +11 @@
 static const char fileIdent[] = "$Id$";
 
-
-
 extern XS(boot_owl);
 
@@ -45 +43 @@
   perl_construct(p);
 
+  /* start by assuming no config */
   owl_global_set_no_have_config(&g);
 
@@ -52 +51 @@
   }
 
+  /* This is the CMU code for reading a site owlconf.  Not sure if I
+     want it yet */
+  /*
+  ret=stat(filename, &statbuff);
+  if (ret) {
+    sprintf(filename, "%s/%s", DATADIR, "owl/owlconf");
+    ret=stat(filename, &statbuff);
+    if (ret) {
+      return(0);
+    }
+  }
+  */
+
   ret=perl_parse(p, owl_perl_xs_init, 2, embedding, NULL);
   if (ret) return(-1);
-
   ret=perl_run(p);
   if (ret) return(-1);
 
+  /* if we get this far, we have a good config file */
   owl_global_set_have_config(&g);