diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configh.in | 4 | ||||
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/gawk.info | 176 | ||||
| -rw-r--r-- | doc/gawk.texi | 6 | ||||
| -rw-r--r-- | doc/gawktexi.in | 6 | ||||
| -rw-r--r-- | extension/ChangeLog | 7 | ||||
| -rw-r--r-- | extension/configh.in | 4 | ||||
| -rwxr-xr-x | extension/configure | 3 | ||||
| -rw-r--r-- | extension/configure.ac | 2 | ||||
| -rw-r--r-- | extension/filefuncs.c | 4 | ||||
| -rw-r--r-- | pc/ChangeLog | 4 | ||||
| -rw-r--r-- | pc/config.h | 4 | ||||
| -rw-r--r-- | posix/ChangeLog | 5 | ||||
| -rw-r--r-- | posix/gawkmisc.c | 2 | ||||
| -rw-r--r-- | vms/ChangeLog | 4 | ||||
| -rw-r--r-- | vms/vms-conf.h | 4 |
19 files changed, 130 insertions, 122 deletions
@@ -1,8 +1,13 @@ 2013-05-27 Arnold D. Robbins <arnold@skeeve.com> - * configure.ac: (AM_INIT_AUTOMAKE): Add dist-lzip to quiet + * configure.ac (AM_INIT_AUTOMAKE): Add dist-lzip to quiet outside maintainer warnings. + Unrelated: + + * configure.ac (AC_STRUCT_ST_BLKSIZE): Replaced with call to + AC_CHECK_MEMBERS. + 2013-05-26 Arnold D. Robbins <arnold@skeeve.com> * getopt.c: For Mac OS X, also include <stdlib.h> to avoid @@ -234,10 +234,6 @@ /* Define to 1 if `tm_zone' is a member of `struct tm'. */ #undef HAVE_STRUCT_TM_TM_ZONE -/* Define to 1 if your `struct stat' has `st_blksize'. Deprecated, use - `HAVE_STRUCT_STAT_ST_BLKSIZE' instead. */ -#undef HAVE_ST_BLKSIZE - /* Define to 1 if you have the `system' function. */ #undef HAVE_SYSTEM @@ -10556,11 +10556,8 @@ cat >>confdefs.h <<_ACEOF _ACEOF -$as_echo "#define HAVE_ST_BLKSIZE 1" >>confdefs.h - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } if ${ac_cv_header_time+:} false; then : diff --git a/configure.ac b/configure.ac index 3cf77bee..b401cb40 100644 --- a/configure.ac +++ b/configure.ac @@ -359,7 +359,7 @@ dnl check for mpfr support GNUPG_CHECK_MPFR dnl checks for structure members -AC_STRUCT_ST_BLKSIZE +AC_CHECK_MEMBERS([struct stat.st_blksize]) AC_HEADER_TIME AC_STRUCT_TM AC_STRUCT_TIMEZONE diff --git a/doc/ChangeLog b/doc/ChangeLog index b54d7820..34cf4155 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,8 @@ +2013-05-27 Arnold D. Robbins <arnold@skeeve.com> + + * gawtexi.in: Sample filefuncs.c extension code: Change test from + ifdef HAVE_ST_BLKSIZE to HAVE_STRUCT_STAT_ST_BLKSIZE. + 2013-05-21 Arnold D. Robbins <arnold@skeeve.com> * gawktexi.in (Quick Installation): Add a paragraph advising to diff --git a/doc/gawk.info b/doc/gawk.info index f7c7dcd8..a18ac42d 100644 --- a/doc/gawk.info +++ b/doc/gawk.info @@ -23887,9 +23887,9 @@ The latter part of the function makes selective additions to the destination array, depending upon the availability of certain members and/or the type of the file. It then returns zero, for success: - #ifdef HAVE_ST_BLKSIZE + #ifdef HAVE_STRUCT_STAT_ST_BLKSIZE array_set_numeric(array, "blksize", sbuf->st_blksize); - #endif /* HAVE_ST_BLKSIZE */ + #endif /* HAVE_STRUCT_STAT_ST_BLKSIZE */ pmode = format_mode(sbuf->st_mode); array_set(array, "pmode", make_const_string(pmode, strlen(pmode), @@ -25783,8 +25783,8 @@ are: what header files are available, so that they can be correctly included, what (supposedly) standard functions are actually available in your C libraries, and various miscellaneous facts about your operating system. For example, there may not be an `st_blksize' -element in the `stat' structure. In this case, `HAVE_ST_BLKSIZE' is -undefined. +element in the `stat' structure. In this case, +`HAVE_STRUCT_STAT_ST_BLKSIZE' is undefined. It is possible for your C compiler to lie to `configure'. It may do so by not exiting with an error when a library function is not @@ -32494,89 +32494,89 @@ Node: Finding Extensions951075 Node: Extension Example951635 Node: Internal File Description952366 Node: Internal File Ops956054 -Ref: Internal File Ops-Footnote-1967538 -Node: Using Internal File Ops967678 -Ref: Using Internal File Ops-Footnote-1970031 -Node: Extension Samples970297 -Node: Extension Sample File Functions971821 -Node: Extension Sample Fnmatch980308 -Node: Extension Sample Fork982034 -Node: Extension Sample Inplace983252 -Node: Extension Sample Ord985030 -Node: Extension Sample Readdir985866 -Node: Extension Sample Revout987398 -Node: Extension Sample Rev2way987991 -Node: Extension Sample Read write array988681 -Node: Extension Sample Readfile990564 -Node: Extension Sample API Tests991382 -Node: Extension Sample Time991907 -Node: gawkextlib993271 -Node: Language History996031 -Node: V7/SVR3.1997553 -Node: SVR4999874 -Node: POSIX1001316 -Node: BTL1002702 -Node: POSIX/GNU1003436 -Node: Common Extensions1008971 -Node: Ranges and Locales1010277 -Ref: Ranges and Locales-Footnote-11014895 -Ref: Ranges and Locales-Footnote-21014922 -Ref: Ranges and Locales-Footnote-31015182 -Node: Contributors1015403 -Node: Installation1020282 -Node: Gawk Distribution1021176 -Node: Getting1021660 -Node: Extracting1022486 -Node: Distribution contents1024178 -Node: Unix Installation1029439 -Node: Quick Installation1030056 -Node: Additional Configuration Options1032500 -Node: Configuration Philosophy1033977 -Node: Non-Unix Installation1036319 -Node: PC Installation1036777 -Node: PC Binary Installation1038076 -Node: PC Compiling1039924 -Node: PC Testing1042868 -Node: PC Using1044044 -Node: Cygwin1048229 -Node: MSYS1049229 -Node: VMS Installation1049743 -Node: VMS Compilation1050346 -Ref: VMS Compilation-Footnote-11051353 -Node: VMS Installation Details1051411 -Node: VMS Running1053046 -Node: VMS Old Gawk1054653 -Node: Bugs1055127 -Node: Other Versions1058979 -Node: Notes1064580 -Node: Compatibility Mode1065380 -Node: Additions1066163 -Node: Accessing The Source1067090 -Node: Adding Code1068530 -Node: New Ports1074575 -Node: Derived Files1078710 -Ref: Derived Files-Footnote-11084031 -Ref: Derived Files-Footnote-21084065 -Ref: Derived Files-Footnote-31084665 -Node: Future Extensions1084763 -Node: Implementation Limitations1085344 -Node: Extension Design1086596 -Node: Old Extension Problems1087750 -Ref: Old Extension Problems-Footnote-11089258 -Node: Extension New Mechanism Goals1089315 -Ref: Extension New Mechanism Goals-Footnote-11092681 -Node: Extension Other Design Decisions1092867 -Node: Extension Future Growth1094973 -Node: Old Extension Mechanism1095809 -Node: Basic Concepts1097549 -Node: Basic High Level1098230 -Ref: figure-general-flow1098501 -Ref: figure-process-flow1099100 -Ref: Basic High Level-Footnote-11102329 -Node: Basic Data Typing1102514 -Node: Glossary1105869 -Node: Copying1131331 -Node: GNU Free Documentation License1168888 -Node: Index1194025 +Ref: Internal File Ops-Footnote-1967562 +Node: Using Internal File Ops967702 +Ref: Using Internal File Ops-Footnote-1970055 +Node: Extension Samples970321 +Node: Extension Sample File Functions971845 +Node: Extension Sample Fnmatch980332 +Node: Extension Sample Fork982058 +Node: Extension Sample Inplace983276 +Node: Extension Sample Ord985054 +Node: Extension Sample Readdir985890 +Node: Extension Sample Revout987422 +Node: Extension Sample Rev2way988015 +Node: Extension Sample Read write array988705 +Node: Extension Sample Readfile990588 +Node: Extension Sample API Tests991406 +Node: Extension Sample Time991931 +Node: gawkextlib993295 +Node: Language History996055 +Node: V7/SVR3.1997577 +Node: SVR4999898 +Node: POSIX1001340 +Node: BTL1002726 +Node: POSIX/GNU1003460 +Node: Common Extensions1008995 +Node: Ranges and Locales1010301 +Ref: Ranges and Locales-Footnote-11014919 +Ref: Ranges and Locales-Footnote-21014946 +Ref: Ranges and Locales-Footnote-31015206 +Node: Contributors1015427 +Node: Installation1020306 +Node: Gawk Distribution1021200 +Node: Getting1021684 +Node: Extracting1022510 +Node: Distribution contents1024202 +Node: Unix Installation1029463 +Node: Quick Installation1030080 +Node: Additional Configuration Options1032524 +Node: Configuration Philosophy1034001 +Node: Non-Unix Installation1036355 +Node: PC Installation1036813 +Node: PC Binary Installation1038112 +Node: PC Compiling1039960 +Node: PC Testing1042904 +Node: PC Using1044080 +Node: Cygwin1048265 +Node: MSYS1049265 +Node: VMS Installation1049779 +Node: VMS Compilation1050382 +Ref: VMS Compilation-Footnote-11051389 +Node: VMS Installation Details1051447 +Node: VMS Running1053082 +Node: VMS Old Gawk1054689 +Node: Bugs1055163 +Node: Other Versions1059015 +Node: Notes1064616 +Node: Compatibility Mode1065416 +Node: Additions1066199 +Node: Accessing The Source1067126 +Node: Adding Code1068566 +Node: New Ports1074611 +Node: Derived Files1078746 +Ref: Derived Files-Footnote-11084067 +Ref: Derived Files-Footnote-21084101 +Ref: Derived Files-Footnote-31084701 +Node: Future Extensions1084799 +Node: Implementation Limitations1085380 +Node: Extension Design1086632 +Node: Old Extension Problems1087786 +Ref: Old Extension Problems-Footnote-11089294 +Node: Extension New Mechanism Goals1089351 +Ref: Extension New Mechanism Goals-Footnote-11092717 +Node: Extension Other Design Decisions1092903 +Node: Extension Future Growth1095009 +Node: Old Extension Mechanism1095845 +Node: Basic Concepts1097585 +Node: Basic High Level1098266 +Ref: figure-general-flow1098537 +Ref: figure-process-flow1099136 +Ref: Basic High Level-Footnote-11102365 +Node: Basic Data Typing1102550 +Node: Glossary1105905 +Node: Copying1131367 +Node: GNU Free Documentation License1168924 +Node: Index1194061 End Tag Table diff --git a/doc/gawk.texi b/doc/gawk.texi index a4e2c6b6..b6c72540 100644 --- a/doc/gawk.texi +++ b/doc/gawk.texi @@ -31856,9 +31856,9 @@ certain members and/or the type of the file. It then returns zero, for success: @example -#ifdef HAVE_ST_BLKSIZE +#ifdef HAVE_STRUCT_STAT_ST_BLKSIZE array_set_numeric(array, "blksize", sbuf->st_blksize); -#endif /* HAVE_ST_BLKSIZE */ +#endif /* HAVE_STRUCT_STAT_ST_BLKSIZE */ pmode = format_mode(sbuf->st_mode); array_set(array, "pmode", make_const_string(pmode, strlen(pmode), @@ -34300,7 +34300,7 @@ they can be correctly included, what (supposedly) standard functions are actually available in your C libraries, and various miscellaneous facts about your operating system. For example, there may not be an @code{st_blksize} element in the @code{stat} structure. In this case, -@samp{HAVE_ST_BLKSIZE} is undefined. +@samp{HAVE_STRUCT_STAT_ST_BLKSIZE} is undefined. @cindex @code{custom.h} file It is possible for your C compiler to lie to @command{configure}. It may diff --git a/doc/gawktexi.in b/doc/gawktexi.in index 66233028..f2bc9c2a 100644 --- a/doc/gawktexi.in +++ b/doc/gawktexi.in @@ -31005,9 +31005,9 @@ certain members and/or the type of the file. It then returns zero, for success: @example -#ifdef HAVE_ST_BLKSIZE +#ifdef HAVE_STRUCT_STAT_ST_BLKSIZE array_set_numeric(array, "blksize", sbuf->st_blksize); -#endif /* HAVE_ST_BLKSIZE */ +#endif /* HAVE_STRUCT_STAT_ST_BLKSIZE */ pmode = format_mode(sbuf->st_mode); array_set(array, "pmode", make_const_string(pmode, strlen(pmode), @@ -33449,7 +33449,7 @@ they can be correctly included, what (supposedly) standard functions are actually available in your C libraries, and various miscellaneous facts about your operating system. For example, there may not be an @code{st_blksize} element in the @code{stat} structure. In this case, -@samp{HAVE_ST_BLKSIZE} is undefined. +@samp{HAVE_STRUCT_STAT_ST_BLKSIZE} is undefined. @cindex @code{custom.h} file It is possible for your C compiler to lie to @command{configure}. It may diff --git a/extension/ChangeLog b/extension/ChangeLog index 62d1f310..4d2d69b8 100644 --- a/extension/ChangeLog +++ b/extension/ChangeLog @@ -1,3 +1,10 @@ +2013-05-27 Arnold D. Robbins <arnold@skeeve.com> + + * configure.ac (AC_STRUCT_ST_BLKSIZE): Replaced with call to + AC_CHECK_MEMBERS. + * filefuncs.c (fill_stat_array): Change test from ifdef + HAVE_ST_BLKSIZE to HAVE_STRUCT_STAT_ST_BLKSIZE. + 2013-05-20 Arnold D. Robbins <arnold@skeeve.com> * gawkdirfd.h [FAKE_FD_VALUE]: Copied here from ../gawkapi.h. diff --git a/extension/configh.in b/extension/configh.in index cc84f4d0..ac8ad05f 100644 --- a/extension/configh.in +++ b/extension/configh.in @@ -90,10 +90,6 @@ /* Define to 1 if `st_blksize' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_BLKSIZE -/* Define to 1 if your `struct stat' has `st_blksize'. Deprecated, use - `HAVE_STRUCT_STAT_ST_BLKSIZE' instead. */ -#undef HAVE_ST_BLKSIZE - /* Define to 1 if you have the <sys/select.h> header file. */ #undef HAVE_SYS_SELECT_H diff --git a/extension/configure b/extension/configure index 23b050d3..26cde4b0 100755 --- a/extension/configure +++ b/extension/configure @@ -6447,12 +6447,9 @@ cat >>confdefs.h <<_ACEOF _ACEOF -$as_echo "#define HAVE_ST_BLKSIZE 1" >>confdefs.h - fi - if test -n "$ac_tool_prefix"; then for ac_prog in ar lib "link -lib" do diff --git a/extension/configure.ac b/extension/configure.ac index 40f29681..82742860 100644 --- a/extension/configure.ac +++ b/extension/configure.ac @@ -39,7 +39,7 @@ AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT_VERSION([0.18.1]) dnl checks for structure members -AC_STRUCT_ST_BLKSIZE +AC_CHECK_MEMBERS([struct stat.st_blksize]) AM_PROG_AR AC_SYS_LARGEFILE diff --git a/extension/filefuncs.c b/extension/filefuncs.c index 5117b32f..9d4b2258 100644 --- a/extension/filefuncs.c +++ b/extension/filefuncs.c @@ -351,11 +351,11 @@ fill_stat_array(const char *name, awk_array_t array, struct stat *sbuf) array_set_numeric(array, "minor", minor(sbuf->st_rdev)); } -#ifdef HAVE_ST_BLKSIZE +#ifdef HAVE_STRUCT_STAT_ST_BLKSIZE array_set_numeric(array, "blksize", sbuf->st_blksize); #elif defined(_WIN32) array_set_numeric(array, "blksize", 4096); -#endif /* HAVE_ST_BLKSIZE */ +#endif /* HAVE_STRUCT_STAT_ST_BLKSIZE */ pmode = format_mode(sbuf->st_mode); array_set(array, "pmode", make_const_string(pmode, strlen(pmode), & tmp)); diff --git a/pc/ChangeLog b/pc/ChangeLog index 2c246fc2..3cb6ce11 100644 --- a/pc/ChangeLog +++ b/pc/ChangeLog @@ -1,3 +1,7 @@ +2013-05-27 Arnold D. Robbins <arnold@skeeve.com> + + * config.h: Remove obsolete HAVE_ST_BLKSIZE. + 2013-05-14 Eli Zaretskii <eliz@gnu.org> * Makefile.tst (AWK): Set AWKLIBPATH so extensions could be found. diff --git a/pc/config.h b/pc/config.h index 079b6dec..1d373b01 100644 --- a/pc/config.h +++ b/pc/config.h @@ -285,10 +285,6 @@ /* Define to 1 if `tm_zone' is a member of `struct tm'. */ #undef HAVE_STRUCT_TM_TM_ZONE -/* Define to 1 if your `struct stat' has `st_blksize'. Deprecated, use - `HAVE_STRUCT_STAT_ST_BLKSIZE' instead. */ -#undef HAVE_ST_BLKSIZE - /* Define to 1 if you have the `system' function. */ #define HAVE_SYSTEM 1 diff --git a/posix/ChangeLog b/posix/ChangeLog index 0f9cc0a0..67fdb42d 100644 --- a/posix/ChangeLog +++ b/posix/ChangeLog @@ -1,3 +1,8 @@ +2013-05-27 Arnold D. Robbins <arnold@skeeve.com> + + * gawkmisc.c (optimal_bufsize): Change check from HAVE_ST_BLKSIZE + to HAVE_STRUCT_STAT_ST_BLKSIZE. + 2013-05-09 Arnold D. Robbins <arnold@skeeve.com> * 4.1.0: Release tar ball made. diff --git a/posix/gawkmisc.c b/posix/gawkmisc.c index 90bf1c38..90a41e4e 100644 --- a/posix/gawkmisc.c +++ b/posix/gawkmisc.c @@ -127,7 +127,7 @@ optimal_bufsize(int fd, struct stat *stb) * guess. We use stdio's BUFSIZ, since that is what it was * meant for in the first place. */ -#ifdef HAVE_ST_BLKSIZE +#ifdef HAVE_STRUCT_STAT_ST_BLKSIZE #define DEFBLKSIZE (stb->st_blksize > 0 ? stb->st_blksize : BUFSIZ) #else #define DEFBLKSIZE BUFSIZ diff --git a/vms/ChangeLog b/vms/ChangeLog index e99b5335..ca3bc436 100644 --- a/vms/ChangeLog +++ b/vms/ChangeLog @@ -1,3 +1,7 @@ +2013-05-27 Arnold D. Robbins <arnold@skeeve.com> + + * vms-conf.h: Remove obsolete HAVE_ST_BLKSIZE. + 2013-05-09 Arnold D. Robbins <arnold@skeeve.com> * 4.1.0: Release tar ball made. diff --git a/vms/vms-conf.h b/vms/vms-conf.h index 897461c2..d53976f6 100644 --- a/vms/vms-conf.h +++ b/vms/vms-conf.h @@ -289,10 +289,6 @@ /* Define to 1 if `tm_zone' is a member of `struct tm'. */ #undef HAVE_STRUCT_TM_TM_ZONE -/* Define to 1 if your `struct stat' has `st_blksize'. Deprecated, use - `HAVE_STRUCT_STAT_ST_BLKSIZE' instead. */ -#undef HAVE_ST_BLKSIZE - /* Define to 1 if you have the `system' function. */ #define HAVE_SYSTEM 1 |