aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--ext.c4
-rw-r--r--old-extension/ChangeLog7
-rw-r--r--old-extension/dbarray.awk2
-rw-r--r--old-extension/record.awk4
-rw-r--r--old-extension/spec_array.c2
-rw-r--r--old-extension/testsparr.awk2
7 files changed, 15 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index b763a7ad..d0e67168 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
* command.y (next_word): Move into ifdef for HAVE_LIBREADLINE,
since it's only used by that code.
+ * ext.c (load_old_ext): Minor improvements.
2014-01-03 Arnold D. Robbins <arnold@skeeve.com>
diff --git a/ext.c b/ext.c
index 9e17761a..60765e07 100644
--- a/ext.c
+++ b/ext.c
@@ -174,9 +174,9 @@ load_old_ext(SRCFILE *s, const char *init_func, const char *fini_func, NODE *obj
fatal(_("`extension' is a gawk extension"));
if (lib_name == NULL)
- fatal(_("load_ext: received NULL lib_name"));
+ fatal(_("extension: received NULL lib_name"));
- if ((dl = dlopen(s->fullpath, flags)) == NULL)
+ if ((dl = dlopen(lib_name, flags)) == NULL)
fatal(_("extension: cannot open library `%s' (%s)"), lib_name,
dlerror());
diff --git a/old-extension/ChangeLog b/old-extension/ChangeLog
index a25295a6..55c8d31d 100644
--- a/old-extension/ChangeLog
+++ b/old-extension/ChangeLog
@@ -1,3 +1,10 @@
+2014-01-07 Arnold D. Robbins <arnold@skeeve.com>
+
+ * dbarray.awk: Use full name for lib to load in extenstion() call.
+ * record.awk: Ditto.
+ * testsparr.awk: Ditto.
+ * spec_array.c [SUPER]: Fix so that it will compile.
+
2013-01-06 Arnold D. Robbins <arnold@skeeve.com>
* bindarr.c, dbarray.awk, fileop.c, record.awk, sparr.c,
diff --git a/old-extension/dbarray.awk b/old-extension/dbarray.awk
index e0a3c093..1e31f58f 100644
--- a/old-extension/dbarray.awk
+++ b/old-extension/dbarray.awk
@@ -3,7 +3,7 @@
# @load "bindarr"
BEGIN {
- extension("bindarr")
+ extension("./bindarr.so")
}
function _db_count(symbol, sq,
diff --git a/old-extension/record.awk b/old-extension/record.awk
index 18a3ce48..ff89110d 100644
--- a/old-extension/record.awk
+++ b/old-extension/record.awk
@@ -30,8 +30,8 @@
#
BEGIN {
- extension("fileop.so")
- extension("bindarr.so")
+ extension("./fileop.so")
+ extension("./bindarr.so")
}
# _record_count --- return the number of records in file
diff --git a/old-extension/spec_array.c b/old-extension/spec_array.c
index 78b24018..248783bb 100644
--- a/old-extension/spec_array.c
+++ b/old-extension/spec_array.c
@@ -40,7 +40,7 @@ typedef struct spec_array {
* the base array is str_array.
*/
-#define SUPER(F) (*str_array_func[AFUNC(F)])
+#define SUPER(F) (*str_array_func[F ## _ind])
/*
diff --git a/old-extension/testsparr.awk b/old-extension/testsparr.awk
index 648a21a2..a9e3119d 100644
--- a/old-extension/testsparr.awk
+++ b/old-extension/testsparr.awk
@@ -1,6 +1,6 @@
# ../gawk -lsparr -f testsparr.awk
BEGIN {
- extension("sparr")
+ extension("./sparr.so")
print SYS["time"]
SYS["readline"] = "sparr.c";
printf("File %s has %d lines\n", SYS["readline"], length(READLINE))