diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2018-04-30 21:23:02 -0700 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2018-04-30 21:23:02 -0700 |
| commit | 02e868874af2b01dfec60881716a36d2bb97328c (patch) | |
| tree | c38c1431eab3a9ef715ff342fdba04ac06a76749 | |
| parent | 796b586c1ddaf9427a5a1843bf5c9809521e9d27 (diff) | |
| parent | d2262d743f156fcca499b0c1b1706717a686aaa2 (diff) | |
| download | egawk-02e868874af2b01dfec60881716a36d2bb97328c.tar.gz egawk-02e868874af2b01dfec60881716a36d2bb97328c.tar.bz2 egawk-02e868874af2b01dfec60881716a36d2bb97328c.zip | |
Merge branch 'master' into feature/fix-comments
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | gawkapi.h | 2 | ||||
| -rw-r--r-- | test/ChangeLog | 6 | ||||
| -rw-r--r-- | test/readdir0.awk | 8 |
4 files changed, 18 insertions, 4 deletions
@@ -1,3 +1,9 @@ +2018-04-30 Arnold D. Robbins <arnold@skeeve.com> + + * gawkapi.h [dl_load_func]: Minor improvement in version mismatch + message as suggested by Manuel Collado + <m-collado@users.sourceforge.net>. + 2018-04-18 Arnold D. Robbins <arnold@skeeve.com> * config.sub: Updated from GNULIB. @@ -1111,7 +1111,7 @@ int dl_load(const gawk_api_t *const api_p, awk_ext_id_t id) \ if (api->major_version != GAWK_API_MAJOR_VERSION \ || api->minor_version < GAWK_API_MINOR_VERSION) { \ fprintf(stderr, #extension ": version mismatch with gawk!\n"); \ - fprintf(stderr, "\tmy version (%d, %d), gawk version (%d, %d)\n", \ + fprintf(stderr, "\tmy version (API %d.%d), gawk version (API %d.%d)\n", \ GAWK_API_MAJOR_VERSION, GAWK_API_MINOR_VERSION, \ api->major_version, api->minor_version); \ exit(1); \ diff --git a/test/ChangeLog b/test/ChangeLog index 77666536..ad18eb6e 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,9 @@ +2018-04-30 Arnold D. Robbins <arnold@skeeve.com> + + * readdir0.awk: Handle symbolic links in the top level + source directory. (Useful if testing for PC where the PC + test makefile wants a gawk.exe to exist.) + 2018-04-20 Arnold D. Robbins <arnold@skeeve.com> * Makefile.am (readdir_retest): Use $(srcdir) to reference source diff --git a/test/readdir0.awk b/test/readdir0.awk index 2b7674a4..012826ed 100644 --- a/test/readdir0.awk +++ b/test/readdir0.awk @@ -1,7 +1,6 @@ # NOTE: This program is not a generalized parser for the output of 'ls'. # It's job is to read the output of ls from the gawk source code directory, -# where we know there are no symbolic links, nor are there files with -# spaces in their file names, etc. +# where we know there are no files with spaces in their file names, etc. BEGIN { # analyze results from readdir extension while ((getline x < extout) > 0) { @@ -32,7 +31,10 @@ BEGIN { type_let = substr($0, 1, 1) if (type_let == "-") type_let = "f" - type[$NF] = type_let + if (type_let == "l") + type[$(NF-2)] = type_let + else + type[$NF] = type_let } close(longlist) |