Changeset e5210c9

Timestamp:

Feb 19, 2013, 8:29:05 PM (12 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10

Children:

69f74c2

Parents:

897fc1c

git-author:

David Benjamin <davidben@mit.edu> (06/09/12 23:04:33)

git-committer:

David Benjamin <davidben@mit.edu> (02/19/13 20:29:05)

Message:

dlsym the functions we need after use Glib and before use BarnOwl

After use Glib so the library is loaded. Before use BarnOwl so we try to
use them before they're available.

Files:

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

owl.c

@@ -478 +478 @@
   char **argv_copy;
   char *perlout, *perlerr;
-  const char *dlerr;
   const owl_style *s;
   const char *dir;
@@ -555 +554 @@
   }
 
-  dlerr = owl_closure_init();
-  if(dlerr) {
-    endwin();
-    fprintf(stderr, "Error binding gtk2-perl functions from C: %s\n",dlerr);
-    fflush(stderr);
-    fprintf(stdout, "Error binding gtk2-perl functions from C: %s\n",dlerr);
-    fflush(stdout);
-    exit(1);
-  }
-  
   owl_global_complete_setup(&g);
 

perlconfig.c

@@ -331 +331 @@
   char *err;
   const char *args[4] = {"", "-e", "0;", NULL};
+  const char *dlerr;
   AV *inc;
   char *path;
@@ -388 +389 @@
   g_free(path);
 
+  /* Load up perl-Glib. */
+  eval_pv("use Glib;", FALSE);
+
+  /* Now, before BarnOwl tries to use them, get the relevant function pointers out. */
+  dlerr = owl_closure_init();
+  if (dlerr) {
+    return g_strdup(dlerr);
+  }
+
+  /* And now it's safe to import BarnOwl. */
   eval_pv("use BarnOwl;", FALSE);