diff options
Diffstat (limited to 'extension')
-rw-r--r-- | extension/ChangeLog | 102 | ||||
-rw-r--r-- | extension/Makefile.am | 14 | ||||
-rw-r--r-- | extension/Makefile.in | 60 | ||||
-rw-r--r-- | extension/configh.in | 15 | ||||
-rwxr-xr-x | extension/configure | 7 | ||||
-rw-r--r-- | extension/configure.ac | 7 | ||||
-rw-r--r-- | extension/errlist.h | 455 | ||||
-rw-r--r-- | extension/errno.c | 145 | ||||
-rw-r--r-- | extension/select.c | 544 | ||||
-rw-r--r-- | extension/siglist.h | 76 |
10 files changed, 1404 insertions, 21 deletions
diff --git a/extension/ChangeLog b/extension/ChangeLog index f324bdeb..c7974e48 100644 --- a/extension/ChangeLog +++ b/extension/ChangeLog @@ -148,6 +148,108 @@ * gawkdirfd.h (FAKE_FD_VALUE): Move definition up in the file to give clean compile on MinGW. +2013-07-07 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * configure.ac (AC_CHECK_FUNCS): Check for fcntl. + * select.c (set_non_blocking): Check that fcntl and O_NONBLOCK are + available. + +2013-07-07 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * select.c (signal_handler): On platforms lacking sigaction, reset + the signal handler each time a signal is trapped to protect in case + the system resets it to default. + +2013-07-05 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * select.c (signal_result): New function to set result string from + signal function and detect when we need to roll back. + (do_signal): Now takes an optional 3rd override argument. Instead + of returning -1 or 0, we now return information about the previously + installed signal handler: default, ignore, trap, or unknown. An + empty string is returned on error. If it is an unknown handler, + and override is not non-zero, we roll back the handler and return "". + +2013-07-05 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * select.c (set_non_blocking): Do not attempt F_SETFL if F_GETFL fails. + (do_set_non_blocking): Add support for case when called with a single + "" argument. + +2013-07-05 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * select.c (do_signal): If sigaction is unavailable, fall back to + signal and hope that it does the right thing. + +2013-07-05 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * configure.ac (AC_CHECK_FUNCS): Add kill and sigprocmask. + * select.c (get_signal_number): Change error messages since now may + be called by "kill" as well as "select_signal". + (do_signal): Add a lint warning if there are more than 2 args. + (do_kill): Add new function to send a signal. + (do_select): Support platforms where sigprocmask is not available. + There will be a race condition on such platforms, but that is not + easily avoided. + +2013-07-02 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * select.c (do_select): Now that the API flatten_array call has been + patched to ensure that the index values are strings, we can remove + the code to check for the AWK_NUMBER case. + +2013-07-02 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * select.c (do_select): Do not treat a numeric command value as a + file descriptor unless the command type is empty. + +2013-07-02 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * Makefile.am (EXTRA_DIST): Add errlist.h and siglist.h. + +2013-07-02 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * select.c (set_non_blocking): New helper function to call fcntl. + (do_set_non_blocking): Add support for the case where there's a single + integer fd argument. + +2013-07-01 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * select.c (do_set_non_blocking): Implement new set_non_blocking + function. + (func_table): Add set_non_blocking. + +2013-07-01 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * errlist.h: New file containing a list of all the errno values I could + find. + * errno.c: Implement a new errno extension providing strerror, + errno2name, and name2errno. + * Makefile.am (pkgextension_LTLIBRARIES): Add errno.la. + (errno_la_SOURCES, errno_la_LDFLAGS, errno_la_LIBADD): Build new errno + extension. + * select.c (ext_version): Fix version string. + * siglist.h: Update to newest glibc version. + +2013-07-01 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * siglist.h: New file copied from glibc to provide a mapping between + signal number and name. + * select.c: Add a new "select_signal" function and provide support + for trapping signals. + (do_select): Add support for a 5th argument to contain an array + of returned signals. Improve the argument processing, and add + better warning messages. + +2013-06-30 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * Makefile.am (pkgextension_LTLIBRARIES): Add select.la. + (select_la_SOURCES, select_la_LDFLAGS, select_la_LIBADD): Build new + select extension. + * configure.ac (AC_CHECK_HEADERS): Add signal.h. + (AC_CHECK_FUNCS): Add sigaction. + * select.c: Implement the new select extension. + 2013-06-10 Arnold D. Robbins <arnold@skeeve.com> * configure.ac (AC_HEADER_MAJOR): New macro added. diff --git a/extension/Makefile.am b/extension/Makefile.am index e6678c54..c8b1f53c 100644 --- a/extension/Makefile.am +++ b/extension/Makefile.am @@ -35,6 +35,7 @@ RM = rm -f # Note: rwarray does not currently compile. pkgextension_LTLIBRARIES = \ + errno.la \ filefuncs.la \ fnmatch.la \ fork.la \ @@ -45,6 +46,7 @@ pkgextension_LTLIBRARIES = \ revoutput.la \ revtwoway.la \ rwarray.la \ + select.la \ testext.la \ time.la @@ -52,6 +54,10 @@ MY_MODULE_FLAGS = -module -avoid-version -no-undefined # on Cygwin, gettext requires that we link with -lintl MY_LIBS = $(LTLIBINTL) +errno_la_SOURCES = errno.c +errno_la_LDFLAGS = $(MY_MODULE_FLAGS) +errno_la_LIBADD = $(MY_LIBS) + filefuncs_la_SOURCES = filefuncs.c stack.h stack.c gawkfts.h \ gawkfts.c gawkdirfd.h filefuncs_la_LDFLAGS = $(MY_MODULE_FLAGS) @@ -93,6 +99,10 @@ rwarray_la_SOURCES = rwarray.c rwarray_la_LDFLAGS = $(MY_MODULE_FLAGS) rwarray_la_LIBADD = $(MY_LIBS) +select_la_SOURCES = select.c +select_la_LDFLAGS = $(MY_MODULE_FLAGS) +select_la_LIBADD = $(MY_LIBS) + time_la_SOURCES = time.c time_la_LDFLAGS = $(MY_MODULE_FLAGS) time_la_LIBADD = $(MY_LIBS) @@ -115,8 +125,10 @@ uninstall-recursive: uninstall-so EXTRA_DIST = build-aux/config.rpath \ ChangeLog \ ChangeLog.0 \ + errlist.h \ fts.3 \ - README.fts + README.fts \ + siglist.h dist_man_MANS = \ filefuncs.3am fnmatch.3am fork.3am inplace.3am \ diff --git a/extension/Makefile.in b/extension/Makefile.in index 46168e4e..821d6112 100644 --- a/extension/Makefile.in +++ b/extension/Makefile.in @@ -167,13 +167,19 @@ am__installdirs = "$(DESTDIR)$(pkgextensiondir)" \ LTLIBRARIES = $(pkgextension_LTLIBRARIES) am__DEPENDENCIES_1 = am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) -filefuncs_la_DEPENDENCIES = $(am__DEPENDENCIES_2) -am_filefuncs_la_OBJECTS = filefuncs.lo stack.lo gawkfts.lo -filefuncs_la_OBJECTS = $(am_filefuncs_la_OBJECTS) +errno_la_DEPENDENCIES = $(am__DEPENDENCIES_2) +am_errno_la_OBJECTS = errno.lo +errno_la_OBJECTS = $(am_errno_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__v_lt_1 = +errno_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(errno_la_LDFLAGS) $(LDFLAGS) -o $@ +filefuncs_la_DEPENDENCIES = $(am__DEPENDENCIES_2) +am_filefuncs_la_OBJECTS = filefuncs.lo stack.lo gawkfts.lo +filefuncs_la_OBJECTS = $(am_filefuncs_la_OBJECTS) filefuncs_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(filefuncs_la_LDFLAGS) $(LDFLAGS) -o $@ @@ -231,6 +237,12 @@ rwarray_la_OBJECTS = $(am_rwarray_la_OBJECTS) rwarray_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(rwarray_la_LDFLAGS) $(LDFLAGS) -o $@ +select_la_DEPENDENCIES = $(am__DEPENDENCIES_2) +am_select_la_OBJECTS = select.lo +select_la_OBJECTS = $(am_select_la_OBJECTS) +select_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(select_la_LDFLAGS) $(LDFLAGS) -o $@ testext_la_DEPENDENCIES = $(am__DEPENDENCIES_2) am_testext_la_OBJECTS = testext.lo testext_la_OBJECTS = $(am_testext_la_OBJECTS) @@ -277,16 +289,18 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(filefuncs_la_SOURCES) $(fnmatch_la_SOURCES) \ - $(fork_la_SOURCES) $(inplace_la_SOURCES) $(ordchr_la_SOURCES) \ - $(readdir_la_SOURCES) $(readfile_la_SOURCES) \ - $(revoutput_la_SOURCES) $(revtwoway_la_SOURCES) \ - $(rwarray_la_SOURCES) $(testext_la_SOURCES) $(time_la_SOURCES) -DIST_SOURCES = $(filefuncs_la_SOURCES) $(fnmatch_la_SOURCES) \ - $(fork_la_SOURCES) $(inplace_la_SOURCES) $(ordchr_la_SOURCES) \ - $(readdir_la_SOURCES) $(readfile_la_SOURCES) \ - $(revoutput_la_SOURCES) $(revtwoway_la_SOURCES) \ - $(rwarray_la_SOURCES) $(testext_la_SOURCES) $(time_la_SOURCES) +SOURCES = $(errno_la_SOURCES) $(filefuncs_la_SOURCES) \ + $(fnmatch_la_SOURCES) $(fork_la_SOURCES) $(inplace_la_SOURCES) \ + $(ordchr_la_SOURCES) $(readdir_la_SOURCES) \ + $(readfile_la_SOURCES) $(revoutput_la_SOURCES) \ + $(revtwoway_la_SOURCES) $(rwarray_la_SOURCES) \ + $(select_la_SOURCES) $(testext_la_SOURCES) $(time_la_SOURCES) +DIST_SOURCES = $(errno_la_SOURCES) $(filefuncs_la_SOURCES) \ + $(fnmatch_la_SOURCES) $(fork_la_SOURCES) $(inplace_la_SOURCES) \ + $(ordchr_la_SOURCES) $(readdir_la_SOURCES) \ + $(readfile_la_SOURCES) $(revoutput_la_SOURCES) \ + $(revtwoway_la_SOURCES) $(rwarray_la_SOURCES) \ + $(select_la_SOURCES) $(testext_la_SOURCES) $(time_la_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ ctags-recursive dvi-recursive html-recursive info-recursive \ install-data-recursive install-dvi-recursive \ @@ -518,6 +532,7 @@ RM = rm -f # Note: rwarray does not currently compile. pkgextension_LTLIBRARIES = \ + errno.la \ filefuncs.la \ fnmatch.la \ fork.la \ @@ -528,12 +543,16 @@ pkgextension_LTLIBRARIES = \ revoutput.la \ revtwoway.la \ rwarray.la \ + select.la \ testext.la \ time.la MY_MODULE_FLAGS = -module -avoid-version -no-undefined # on Cygwin, gettext requires that we link with -lintl MY_LIBS = $(LTLIBINTL) +errno_la_SOURCES = errno.c +errno_la_LDFLAGS = $(MY_MODULE_FLAGS) +errno_la_LIBADD = $(MY_LIBS) filefuncs_la_SOURCES = filefuncs.c stack.h stack.c gawkfts.h \ gawkfts.c gawkdirfd.h @@ -566,6 +585,9 @@ revtwoway_la_LIBADD = $(MY_LIBS) rwarray_la_SOURCES = rwarray.c rwarray_la_LDFLAGS = $(MY_MODULE_FLAGS) rwarray_la_LIBADD = $(MY_LIBS) +select_la_SOURCES = select.c +select_la_LDFLAGS = $(MY_MODULE_FLAGS) +select_la_LIBADD = $(MY_LIBS) time_la_SOURCES = time.c time_la_LDFLAGS = $(MY_MODULE_FLAGS) time_la_LIBADD = $(MY_LIBS) @@ -575,8 +597,10 @@ testext_la_LIBADD = $(MY_LIBS) EXTRA_DIST = build-aux/config.rpath \ ChangeLog \ ChangeLog.0 \ + errlist.h \ fts.3 \ - README.fts + README.fts \ + siglist.h dist_man_MANS = \ filefuncs.3am fnmatch.3am fork.3am inplace.3am \ @@ -676,6 +700,9 @@ clean-pkgextensionLTLIBRARIES: rm -f $${locs}; \ } +errno.la: $(errno_la_OBJECTS) $(errno_la_DEPENDENCIES) $(EXTRA_errno_la_DEPENDENCIES) + $(AM_V_CCLD)$(errno_la_LINK) -rpath $(pkgextensiondir) $(errno_la_OBJECTS) $(errno_la_LIBADD) $(LIBS) + filefuncs.la: $(filefuncs_la_OBJECTS) $(filefuncs_la_DEPENDENCIES) $(EXTRA_filefuncs_la_DEPENDENCIES) $(AM_V_CCLD)$(filefuncs_la_LINK) -rpath $(pkgextensiondir) $(filefuncs_la_OBJECTS) $(filefuncs_la_LIBADD) $(LIBS) @@ -706,6 +733,9 @@ revtwoway.la: $(revtwoway_la_OBJECTS) $(revtwoway_la_DEPENDENCIES) $(EXTRA_revtw rwarray.la: $(rwarray_la_OBJECTS) $(rwarray_la_DEPENDENCIES) $(EXTRA_rwarray_la_DEPENDENCIES) $(AM_V_CCLD)$(rwarray_la_LINK) -rpath $(pkgextensiondir) $(rwarray_la_OBJECTS) $(rwarray_la_LIBADD) $(LIBS) +select.la: $(select_la_OBJECTS) $(select_la_DEPENDENCIES) $(EXTRA_select_la_DEPENDENCIES) + $(AM_V_CCLD)$(select_la_LINK) -rpath $(pkgextensiondir) $(select_la_OBJECTS) $(select_la_LIBADD) $(LIBS) + testext.la: $(testext_la_OBJECTS) $(testext_la_DEPENDENCIES) $(EXTRA_testext_la_DEPENDENCIES) $(AM_V_CCLD)$(testext_la_LINK) -rpath $(pkgextensiondir) $(testext_la_OBJECTS) $(testext_la_LIBADD) $(LIBS) @@ -718,6 +748,7 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/errno.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filefuncs.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fnmatch.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fork.Plo@am__quote@ @@ -729,6 +760,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/revoutput.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/revtwoway.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rwarray.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/select.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stack.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testext.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/time.Plo@am__quote@ diff --git a/extension/configh.in b/extension/configh.in index 5842f2f4..57c9ec3e 100644 --- a/extension/configh.in +++ b/extension/configh.in @@ -40,6 +40,9 @@ /* Define to 1 if you have the <dlfcn.h> header file. */ #undef HAVE_DLFCN_H +/* Define to 1 if you have the `fcntl' function. */ +#undef HAVE_FCNTL + /* Define to 1 if you have the `fdopendir' function. */ #undef HAVE_FDOPENDIR @@ -67,6 +70,9 @@ /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H +/* Define to 1 if you have the `kill' function. */ +#undef HAVE_KILL + /* Define to 1 if you have the <limits.h> header file. */ #undef HAVE_LIMITS_H @@ -82,6 +88,15 @@ /* Define to 1 if you have the `select' function. */ #undef HAVE_SELECT +/* Define to 1 if you have the `sigaction' function. */ +#undef HAVE_SIGACTION + +/* Define to 1 if you have the <signal.h> header file. */ +#undef HAVE_SIGNAL_H + +/* Define to 1 if you have the `sigprocmask' function. */ +#undef HAVE_SIGPROCMASK + /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H diff --git a/extension/configure b/extension/configure index 2105648d..006c9d79 100755 --- a/extension/configure +++ b/extension/configure @@ -14052,7 +14052,7 @@ else $as_echo "no" >&6; } fi -for ac_header in fnmatch.h limits.h sys/time.h sys/select.h sys/param.h +for ac_header in fnmatch.h limits.h sys/time.h sys/select.h sys/param.h signal.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -14309,8 +14309,9 @@ $as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h fi -for ac_func in fdopendir fnmatch gettimeofday \ - getdtablesize nanosleep select GetSystemTimeAsFileTime +for ac_func in fcntl fdopendir fnmatch gettimeofday \ + getdtablesize kill nanosleep select sigaction sigprocmask \ + GetSystemTimeAsFileTime do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" diff --git a/extension/configure.ac b/extension/configure.ac index 1f876a0e..37e306f3 100644 --- a/extension/configure.ac +++ b/extension/configure.ac @@ -66,13 +66,14 @@ else AC_MSG_RESULT([no]) fi -AC_CHECK_HEADERS(fnmatch.h limits.h sys/time.h sys/select.h sys/param.h) +AC_CHECK_HEADERS(fnmatch.h limits.h sys/time.h sys/select.h sys/param.h signal.h) AC_HEADER_DIRENT AC_HEADER_MAJOR AC_HEADER_TIME -AC_CHECK_FUNCS(fdopendir fnmatch gettimeofday \ - getdtablesize nanosleep select GetSystemTimeAsFileTime) +AC_CHECK_FUNCS(fcntl fdopendir fnmatch gettimeofday \ + getdtablesize kill nanosleep select sigaction sigprocmask \ + GetSystemTimeAsFileTime) GAWK_FUNC_DIRFD GAWK_PREREQ_DIRFD diff --git a/extension/errlist.h b/extension/errlist.h new file mode 100644 index 00000000..caa6d63b --- /dev/null +++ b/extension/errlist.h @@ -0,0 +1,455 @@ +/* + * errlist.h - List of errno values. + */ + +/* + * Copyright (C) 2013 the Free Software Foundation, Inc. + * + * This file is part of GAWK, the GNU implementation of the + * AWK Programming Language. + * + * GAWK is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * GAWK is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef E2BIG +init_errno (E2BIG, "E2BIG") +#endif +#ifdef EACCES +init_errno (EACCES, "EACCES") +#endif +#ifdef EADDRINUSE +init_errno (EADDRINUSE, "EADDRINUSE") +#endif +#ifdef EADDRNOTAVAIL +init_errno (EADDRNOTAVAIL, "EADDRNOTAVAIL") +#endif +#ifdef EADV +init_errno (EADV, "EADV") +#endif +#ifdef EAFNOSUPPORT +init_errno (EAFNOSUPPORT, "EAFNOSUPPORT") +#endif +#ifdef EAGAIN +init_errno (EAGAIN, "EAGAIN") +#endif +#ifdef EALREADY +init_errno (EALREADY, "EALREADY") +#endif +#ifdef EAUTH +init_errno (EAUTH, "EAUTH") +#endif +#ifdef EBADE +init_errno (EBADE, "EBADE") +#endif +#ifdef EBADF +init_errno (EBADF, "EBADF") +#endif +#ifdef EBADFD +init_errno (EBADFD, "EBADFD") +#endif +#ifdef EBADMSG +init_errno (EBADMSG, "EBADMSG") +#endif +#ifdef EBADR +init_errno (EBADR, "EBADR") +#endif +#ifdef EBADRPC +init_errno (EBADRPC, "EBADRPC") +#endif +#ifdef EBADRQC +init_errno (EBADRQC, "EBADRQC") +#endif +#ifdef EBADSLT +init_errno (EBADSLT, "EBADSLT") +#endif +#ifdef EBFONT +init_errno (EBFONT, "EBFONT") +#endif +#ifdef EBUSY +init_errno (EBUSY, "EBUSY") +#endif +#ifdef ECANCELED +init_errno (ECANCELED, "ECANCELED") +#endif +#ifdef ECHILD +init_errno (ECHILD, "ECHILD") +#endif +#ifdef ECHRNG +init_errno (ECHRNG, "ECHRNG") +#endif +#ifdef ECOMM +init_errno (ECOMM, "ECOMM") +#endif +#ifdef ECONNABORTED +init_errno (ECONNABORTED, "ECONNABORTED") +#endif +#ifdef ECONNREFUSED +init_errno (ECONNREFUSED, "ECONNREFUSED") +#endif +#ifdef ECONNRESET +init_errno (ECONNRESET, "ECONNRESET") +#endif +#ifdef EDEADLK +init_errno (EDEADLK, "EDEADLK") +#endif +#ifdef EDEADLOCK +#if !defined(EDEADLK) || (EDEADLK != EDEADLOCK) +init_errno (EDEADLOCK, "EDEADLOCK") +#endif +#endif +#ifdef EDESTADDRREQ +init_errno (EDESTADDRREQ, "EDESTADDRREQ") +#endif +#ifdef EDOM +init_errno (EDOM, "EDOM") +#endif +#ifdef EDOTDOT +init_errno (EDOTDOT, "EDOTDOT") +#endif +#ifdef EDQUOT +init_errno (EDQUOT, "EDQUOT") +#endif +#ifdef EEXIST +init_errno (EEXIST, "EEXIST") +#endif +#ifdef EFAULT +init_errno (EFAULT, "EFAULT") +#endif +#ifdef EFBIG +init_errno (EFBIG, "EFBIG") +#endif +#ifdef EFTYPE +init_errno (EFTYPE, "EFTYPE") +#endif +#ifdef EHOSTDOWN +init_errno (EHOSTDOWN, "EHOSTDOWN") +#endif +#ifdef EHOSTUNREACH +init_errno (EHOSTUNREACH, "EHOSTUNREACH") +#endif +#ifdef EIDRM +init_errno (EIDRM, "EIDRM") +#endif +#ifdef EILSEQ +init_errno (EILSEQ, "EILSEQ") +#endif +#ifdef EINPROGRESS +init_errno (EINPROGRESS, "EINPROGRESS") +#endif +#ifdef EINTR +init_errno (EINTR, "EINTR") +#endif +#ifdef EINVAL +init_errno (EINVAL, "EINVAL") +#endif +#ifdef EIO +init_errno (EIO, "EIO") +#endif +#ifdef EISCONN +init_errno (EISCONN, "EISCONN") +#endif +#ifdef EISDIR +init_errno (EISDIR, "EISDIR") +#endif +#ifdef EISNAM +init_errno (EISNAM, "EISNAM") +#endif +#ifdef EKEYEXPIRED +init_errno (EKEYEXPIRED, "EKEYEXPIRED") +#endif +#ifdef EKEYREJECTED +init_errno (EKEYREJECTED, "EKEYREJECTED") +#endif +#ifdef EKEYREVOKED +init_errno (EKEYREVOKED, "EKEYREVOKED") +#endif +#ifdef EL2HLT +init_errno (EL2HLT, "EL2HLT") +#endif +#ifdef EL2NSYNC +init_errno (EL2NSYNC, "EL2NSYNC") +#endif +#ifdef EL3HLT +init_errno (EL3HLT, "EL3HLT") +#endif +#ifdef EL3RST +init_errno (EL3RST, "EL3RST") +#endif +#ifdef ELAST +init_errno (ELAST, "ELAST") +#endif +#ifdef ELIBACC +init_errno (ELIBACC, "ELIBACC") +#endif +#ifdef ELIBBAD +init_errno (ELIBBAD, "ELIBBAD") +#endif +#ifdef ELIBEXEC +init_errno (ELIBEXEC, "ELIBEXEC") +#endif +#ifdef ELIBMAX +init_errno (ELIBMAX, "ELIBMAX") +#endif +#ifdef ELIBSCN +init_errno (ELIBSCN, "ELIBSCN") +#endif +#ifdef ELNRNG +init_errno (ELNRNG, "ELNRNG") +#endif +#ifdef ELOOP +init_errno (ELOOP, "ELOOP") +#endif +#ifdef EMEDIUMTYPE +init_errno (EMEDIUMTYPE, "EMEDIUMTYPE") +#endif +#ifdef EMFILE +init_errno (EMFILE, "EMFILE") +#endif +#ifdef EMLINK +init_errno (EMLINK, "EMLINK") +#endif +#ifdef EMSGSIZE +init_errno (EMSGSIZE, "EMSGSIZE") +#endif +#ifdef EMULTIHOP +init_errno (EMULTIHOP, "EMULTIHOP") +#endif +#ifdef ENAMETOOLONG +init_errno (ENAMETOOLONG, "ENAMETOOLONG") +#endif +#ifdef ENAVAIL +init_errno (ENAVAIL, "ENAVAIL") +#endif +#ifdef ENEEDAUTH +init_errno (ENEEDAUTH, "ENEEDAUTH") +#endif +#ifdef ENETDOWN +init_errno (ENETDOWN, "ENETDOWN") +#endif +#ifdef ENETRESET +init_errno (ENETRESET, "ENETRESET") +#endif +#ifdef ENETUNREACH +init_errno (ENETUNREACH, "ENETUNREACH") +#endif +#ifdef ENFILE +init_errno (ENFILE, "ENFILE") +#endif +#ifdef ENOANO +init_errno (ENOANO, "ENOANO") +#endif +#ifdef ENOBUFS +init_errno (ENOBUFS, "ENOBUFS") +#endif +#ifdef ENOCSI +init_errno (ENOCSI, "ENOCSI") +#endif +#ifdef ENODATA +init_errno (ENODATA, "ENODATA") +#endif +#ifdef ENODEV +init_errno (ENODEV, "ENODEV") +#endif +#ifdef ENOENT +init_errno (ENOENT, "ENOENT") +#endif +#ifdef ENOEXEC +init_errno (ENOEXEC, "ENOEXEC") +#endif +#ifdef ENOKEY +init_errno (ENOKEY, "ENOKEY") +#endif +#ifdef ENOLCK +init_errno (ENOLCK, "ENOLCK") +#endif +#ifdef ENOLINK +init_errno (ENOLINK, "ENOLINK") +#endif +#ifdef ENOMEDIUM +init_errno (ENOMEDIUM, "ENOMEDIUM") +#endif +#ifdef ENOMEM +init_errno (ENOMEM, "ENOMEM") +#endif +#ifdef ENOMSG +init_errno (ENOMSG, "ENOMSG") +#endif +#ifdef ENONET +init_errno (ENONET, "ENONET") +#endif +#ifdef ENOPKG +init_errno (ENOPKG, "ENOPKG") +#endif +#ifdef ENOPROTOOPT +init_errno (ENOPROTOOPT, "ENOPROTOOPT") +#endif +#ifdef ENOSPC +init_errno (ENOSPC, "ENOSPC") +#endif +#ifdef ENOSR +init_errno (ENOSR, "ENOSR") +#endif +#ifdef ENOSTR +init_errno (ENOSTR, "ENOSTR") +#endif +#ifdef ENOSYS +init_errno (ENOSYS, "ENOSYS") +#endif +#ifdef ENOTBLK +init_errno (ENOTBLK, "ENOTBLK") +#endif +#ifdef ENOTCONN +init_errno (ENOTCONN, "ENOTCONN") +#endif +#ifdef ENOTDIR +init_errno (ENOTDIR, "ENOTDIR") +#endif +#ifdef ENOTEMPTY +init_errno (ENOTEMPTY, "ENOTEMPTY") +#endif +#ifdef ENOTNAM +init_errno (ENOTNAM, "ENOTNAM") +#endif +#ifdef ENOTRECOVERABLE +init_errno (ENOTRECOVERABLE, "ENOTRECOVERABLE") +#endif +#ifdef ENOTSOCK +init_errno (ENOTSOCK, "ENOTSOCK") +#endif +#ifdef ENOTTY +init_errno (ENOTTY, "ENOTTY") +#endif +#ifdef ENOTUNIQ +init_errno (ENOTUNIQ, "ENOTUNIQ") +#endif +#ifdef ENXIO +init_errno (ENXIO, "ENXIO") +#endif +#ifdef EOPNOTSUPP +init_errno (EOPNOTSUPP, "EOPNOTSUPP") +#endif +#ifdef EOVERFLOW +init_errno (EOVERFLOW, "EOVERFLOW") +#endif +#ifdef EOWNERDEAD +init_errno (EOWNERDEAD, "EOWNERDEAD") +#endif +#ifdef EPERM +init_errno (EPERM, "EPERM") +#endif +#ifdef EPFNOSUPPORT +init_errno (EPFNOSUPPORT, "EPFNOSUPPORT") +#endif +#ifdef EPIPE +init_errno (EPIPE, "EPIPE") +#endif +#ifdef EPROCLIM +init_errno (EPROCLIM, "EPROCLIM") +#endif +#ifdef EPROCUNAVAIL +init_errno (EPROCUNAVAIL, "EPROCUNAVAIL") +#endif +#ifdef EPROGMISMATCH +init_errno (EPROGMISMATCH, "EPROGMISMATCH") +#endif +#ifdef EPROGUNAVAIL +init_errno (EPROGUNAVAIL, "EPROGUNAVAIL") +#endif +#ifdef EPROTO +init_errno (EPROTO, "EPROTO") +#endif +#ifdef EPROTONOSUPPORT +init_errno (EPROTONOSUPPORT, "EPROTONOSUPPORT") +#endif +#ifdef EPROTOTYPE +init_errno (EPROTOTYPE, "EPROTOTYPE") +#endif +#ifdef ERANGE +init_errno (ERANGE, "ERANGE") +#endif +#ifdef EREMCHG +init_errno (EREMCHG, "EREMCHG") +#endif +#ifdef EREMOTE +init_errno (EREMOTE, "EREMOTE") +#endif +#ifdef EREMOTEIO +init_errno (EREMOTEIO, "EREMOTEIO") +#endif +#ifdef ERESTART +init_errno (ERESTART, "ERESTART") +#endif +#ifdef ERFKILL +init_errno (ERFKILL, "ERFKILL") +#endif +#ifdef EROFS +init_errno (EROFS, "EROFS") +#endif +#ifdef ERPCMISMATCH +init_errno (ERPCMISMATCH, "ERPCMISMATCH") +#endif +#ifdef ESHUTDOWN +init_errno (ESHUTDOWN, "ESHUTDOWN") +#endif +#ifdef ESOCKTNOSUPPORT +init_errno (ESOCKTNOSUPPORT, "ESOCKTNOSUPPORT") +#endif +#ifdef ESPIPE +init_errno (ESPIPE, "ESPIPE") +#endif +#ifdef ESRCH +init_errno (ESRCH, "ESRCH") +#endif +#ifdef ESRMNT +init_errno (ESRMNT, "ESRMNT") +#endif +#ifdef ESTALE +init_errno (ESTALE, "ESTALE") +#endif +#ifdef ESTRPIPE +init_errno (ESTRPIPE, "ESTRPIPE") +#endif +#ifdef ETIME +init_errno (ETIME, "ETIME") +#endif +#ifdef ETIMEDOUT +init_errno (ETIMEDOUT, "ETIMEDOUT") +#endif +#ifdef ETOOMANYREFS +init_errno (ETOOMANYREFS, "ETOOMANYREFS") +#endif +#ifdef ETXTBSY +init_errno (ETXTBSY, "ETXTBSY") +#endif +#ifdef EUCLEAN +init_errno (EUCLEAN, "EUCLEAN") +#endif +#ifdef EUNATCH +init_errno (EUNATCH, "EUNATCH") +#endif +#ifdef EUSERS +init_errno (EUSERS, "EUSERS") +#endif +#ifdef EWOULDBLOCK +#if !defined(EAGAIN) || (EWOULDBLOCK != EAGAIN) +init_errno (EWOULDBLOCK, "EWOULDBLOCK") +#endif +#endif +#ifdef EXDEV +init_errno (EXDEV, "EXDEV") +#endif +#ifdef EXFULL +init_errno (EXFULL, "EXFULL") +#endif diff --git a/extension/errno.c b/extension/errno.c new file mode 100644 index 00000000..2eafa437 --- /dev/null +++ b/extension/errno.c @@ -0,0 +1,145 @@ +/* + * errno.c - Builtin functions to map errno values. + */ + +/* + * Copyright (C) 2013 the Free Software Foundation, Inc. + * + * This file is part of GAWK, the GNU implementation of the + * AWK Programming Language. + * + * GAWK is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * GAWK is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include <stdio.h> +#include <assert.h> +#include <errno.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> + +#include <sys/types.h> +#include <sys/stat.h> + +#include "gawkapi.h" + +#include "gettext.h" +#define _(msgid) gettext(msgid) +#define N_(msgid) msgid + +static const gawk_api_t *api; /* for convenience macros to work */ +static awk_ext_id_t *ext_id; +static const char *ext_version = "errno extension: version 1.0"; +static awk_bool_t (*init_func)(void) = NULL; + +int plugin_is_GPL_compatible; + +static const char *const errno2name[] = { +#define init_errno(A, B) [A] = B, +#include "errlist.h" +#undef init_errno +}; +#define NUMERR sizeof(errno2name)/sizeof(errno2name[0]) + +/* do_strerror --- call strerror */ + +static awk_value_t * +do_strerror(int nargs, awk_value_t *result) +{ + awk_value_t errnum; + + if (do_lint && nargs > 1) + lintwarn(ext_id, _("strerror: called with too many arguments")); + + if (get_argument(0, AWK_NUMBER, & errnum)) { + const char *str = gettext(strerror(errnum.num_value)); + return make_const_string(str, strlen(str), result); + } + if (do_lint) { + if (nargs == 0) + lintwarn(ext_id, _("strerror: called with no arguments")); + else + lintwarn(ext_id, _("strerror: called with inappropriate argument(s)")); + } + return make_null_string(result); +} + +/* do_errno2name --- convert an integer errno value to it's symbolic name */ + +static awk_value_t * +do_errno2name(int nargs, awk_value_t *result) +{ + awk_value_t errnum; + const char *str; + + if (do_lint && nargs > 1) + lintwarn(ext_id, _("errno2name: called with too many arguments")); + + if (get_argument(0, AWK_NUMBER, & errnum)) { + int i = errnum.num_value; + + if ((i == errnum.num_value) && (i >= 0) && ((size_t)i < NUMERR) && errno2name[i]) + return make_const_string(errno2name[i], strlen(errno2name[i]), result); + warning(ext_id, _("errno2name: called with invalid argument")); + } else if (do_lint) { + if (nargs == 0) + lintwarn(ext_id, _("errno2name: called with no arguments")); + else + lintwarn(ext_id, _("errno2name: called with inappropriate argument(s)")); + } + return make_null_string(result); +} + +/* do_name2errno --- convert a symbolic errno name to an integer */ + +static awk_value_t * +do_name2errno(int nargs, awk_value_t *result) +{ + awk_value_t err; + const char *str; + + if (do_lint && nargs > 1) + lintwarn(ext_id, _("name2errno: called with too many arguments")); + + if (get_argument(0, AWK_STRING, & err)) { + size_t i; + + for (i = 0; i < NUMERR; i++) { + if (errno2name[i] && ! strcasecmp(err.str_value.str, errno2name[i])) + return make_number(i, result); + } + warning(ext_id, _("name2errno: called with invalid argument")); + } else if (do_lint) { + if (nargs == 0) + lintwarn(ext_id, _("name2errno: called with no arguments")); + else + lintwarn(ext_id, _("name2errno: called with inappropriate argument(s)")); + } + return make_number(-1, result); +} + +static awk_ext_func_t func_table[] = { + { "strerror", do_strerror, 1 }, + { "errno2name", do_errno2name, 1 }, + { "name2errno", do_name2errno, 1 }, +}; + +/* define the dl_load function using the boilerplate macro */ + +dl_load_func(func_table, errno, "") diff --git a/extension/select.c b/extension/select.c new file mode 100644 index 00000000..9aefaeac --- /dev/null +++ b/extension/select.c @@ -0,0 +1,544 @@ +/* + * select.c - Builtin functions to provide select I/O multiplexing. + */ + +/* + * Copyright (C) 2013 the Free Software Foundation, Inc. + * + * This file is part of GAWK, the GNU implementation of the + * AWK Programming Language. + * + * GAWK is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * GAWK is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include <stdio.h> +#include <assert.h> +#include <errno.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> +#include <fcntl.h> + +#include <sys/types.h> +#include <sys/stat.h> + +#include "gawkapi.h" + +#include "gettext.h" +#define _(msgid) gettext(msgid) +#define N_(msgid) msgid + +static const gawk_api_t *api; /* for convenience macros to work */ +static awk_ext_id_t *ext_id; +static const char *ext_version = "select extension: version 1.0"; +static awk_bool_t (*init_func)(void) = NULL; + +int plugin_is_GPL_compatible; + +#if defined(HAVE_SELECT) && defined(HAVE_SYS_SELECT_H) +#include <sys/select.h> +#endif + +#ifdef HAVE_SIGNAL_H +#include <signal.h> +#endif + +static const char *const signum2name[] = { +#define init_sig(A, B, C) [A] = B, +#include "siglist.h" +#undef init_sig +}; +#define NUMSIG sizeof(signum2name)/sizeof(signum2name[0]) + +#define MIN_VALID_SIGNAL 1 /* 0 is not allowed! */ +/* + * We would like to use NSIG, but I think this seems to be a BSD'ism that is not + * POSIX-compliant. It is used internally by glibc, but not always + * available. We add a buffer to the maximum number in the provided mapping + * in case the list is not comprehensive: + */ +#define MAX_VALID_SIGNAL (NUMSIG+100) +#define IS_VALID_SIGNAL(X) \ + (((X) >= MIN_VALID_SIGNAL) && ((X) <= MAX_VALID_SIGNAL)) + +static int +signame2num(const char *name) +{ + size_t i; + + if (strncasecmp(name, "sig", 3) == 0) + /* skip "sig" prefix */ + name += 3; + for (i = MIN_VALID_SIGNAL; i < NUMSIG; i++) { + if (signum2name[i] && ! strcasecmp(signum2name[i], name)) + return i; + } + return -1; +} + +static volatile struct { + int flag; + sigset_t mask; +} caught; + +static void +signal_handler(int signum) +{ + /* + * All signals should be blocked, so we do not have to worry about + * whether sigaddset is thread-safe. It is documented to be + * async-signal-safe. + */ + sigaddset(& caught.mask, signum); + caught.flag = 1; +#ifndef HAVE_SIGACTION + /* + * On platforms without sigaction, we do not know how the legacy + * signal API will behave. There does not appear to be an autoconf + * test for whether the signal handler is reset to default each time + * a signal is trapped, so we do this to be safe. + */ + signal(signum, signal_handler); +#endif +} + +static int +integer_string(const char *s, long *x) +{ + char *endptr; + + *x = strtol(s, & endptr, 10); + return ((endptr != s) && (*endptr == '\0')) ? 0 : -1; +} + +static int +get_signal_number(awk_value_t signame) +{ + int x; + + switch (signame.val_type) { + case AWK_NUMBER: + x = signame.num_value; + if ((x != signame.num_value) || ! IS_VALID_SIGNAL(x)) { + update_ERRNO_string(_("invalid signal number")); + return -1; + } + return x; + case AWK_STRING: + if ((x = signame2num(signame.str_value.str)) >= 0) + return x; + { + long z; + if ((integer_string(signame.str_value.str, &z) == 0) && IS_VALID_SIGNAL(z)) + return z; + } + update_ERRNO_string(_("invalid signal name")); + return -1; + default: + update_ERRNO_string(_("signal name argument must be string or numeric")); + return -1; + } +} + +static awk_value_t * +signal_result(awk_value_t *result, void (*func)(int)) +{ + awk_value_t override; + + if (func == SIG_DFL) + return make_const_string("default", 7, result); + if (func == SIG_IGN) + return make_const_string("ignore", 6, result); + if (func == signal_handler) + return make_const_string("trap", 4, result); + if (get_argument(2, AWK_NUMBER, & override) && override.num_value) + return make_const_string("unknown", 7, result); + /* need to roll it back! */ + update_ERRNO_string(_("select_signal: override not requested for unknown signal handler")); + make_null_string(result); + return NULL; +} + +/* do_signal --- trap signals */ + +static awk_value_t * +do_signal(int nargs, awk_value_t *result) +{ + awk_value_t signame, disposition; + int signum; + void (*func)(int); + + if (do_lint && nargs > 3) + lintwarn(ext_id, _("select_signal: called with too many arguments")); + if (! get_argument(0, AWK_UNDEFINED, & signame)) { + update_ERRNO_string(_("select_signal: missing required signal name argument")); + return make_null_string(result); + } + if ((signum = get_signal_number(signame)) < 0) + return make_null_string(result); + if (! get_argument(1, AWK_STRING, & disposition)) { + update_ERRNO_string(_("select_signal: missing required signal disposition argument")); + return make_null_string(result); + } + if (strcasecmp(disposition.str_value.str, "default") == 0) + func = SIG_DFL; + else if (strcasecmp(disposition.str_value.str, "ignore") == 0) + func = SIG_IGN; + else if (strcasecmp(disposition.str_value.str, "trap") == 0) + func = signal_handler; + else { + update_ERRNO_string(_("select_signal: invalid disposition argument")); + return make_null_string(result); + } + +#ifdef HAVE_SIGPROCMASK +/* Temporarily block this signal in case we need to roll back the handler! */ +#define PROTECT \ + sigset_t set, oldset; \ + sigemptyset(& set); \ + sigaddset(& set, signum); \ + sigprocmask(SIG_BLOCK, &set, &oldset); +#define RELEASE sigprocmask(SIG_SETMASK, &oldset, NULL); +#else +/* Brain-damaged platform, so we will have to live with the race condition. */ +#define PROTECT +#define RELEASE +#endif + +#ifdef HAVE_SIGACTION + { + awk_value_t override; + struct sigaction sa, prev; + sa.sa_handler = func; + sigfillset(& sa.sa_mask); /* block all signals in handler */ + sa.sa_flags = SA_RESTART; + { + PROTECT + if (sigaction(signum, &sa, &prev) < 0) { + update_ERRNO_int(errno); + RELEASE + return make_null_string(result); + } + if (signal_result(result, prev.sa_handler)) { + RELEASE + return result; + } + /* roll it back! */ + sigaction(signum, &prev, NULL); + RELEASE + return result; + } + } +#else + /* + * Fall back to signal; this is available on all platforms. We can + * only hope that it does the right thing. + */ + { + void (*prev)(int); + PROTECT + if ((prev = signal(signum, func)) == SIG_ERR) { + update_ERRNO_int(errno); + RELEASE + return make_null_string(result); + } + if (signal_result(result, prev)) { + RELEASE + return result; + } + /* roll it back! */ + signal(signum, prev); + RELEASE + return result; + } +#endif +} + +/* do_kill --- send a signal */ + +static awk_value_t * +do_kill(int nargs, awk_value_t *result) +{ +#ifdef HAVE_KILL + awk_value_t pidarg, signame; + pid_t pid; + int signum; + int rc; + + if (do_lint && nargs > 2) + lintwarn(ext_id, _("kill: called with too many arguments")); + if (! get_argument(0, AWK_NUMBER, & pidarg)) { + update_ERRNO_string(_("kill: missing required pid argument")); + return make_number(-1, result); + } + pid = pidarg.num_value; + if (pid != pidarg.num_value) { + update_ERRNO_string(_("kill: pid argument must be an integer")); + return make_number(-1, result); + } + if (! get_argument(1, AWK_UNDEFINED, & signame)) { + update_ERRNO_string(_("kill: missing required signal name argument")); + return make_number(-1, result); + } + if ((signum = get_signal_number(signame)) < 0) + return make_number(-1, result); + if ((rc = kill(pid, signum)) < 0) + update_ERRNO_int(errno); + return make_number(rc, result); +#else + update_ERRNO_string(_("kill: not supported on this platform")); + return make_number(-1, result); +#endif +} + +/* do_select --- I/O multiplexing */ + +static awk_value_t * +do_select(int nargs, awk_value_t *result) +{ + static const char *argname[] = { "read", "write", "except" }; + struct { + awk_value_t array; + awk_flat_array_t *flat; + fd_set bits; + int *array2fd; + } fds[3]; + awk_value_t timeout_arg; + int i; + struct timeval maxwait; + struct timeval *timeout; + int nfds = 0; + int rc; + awk_value_t sigarr; + int dosig = 0; + + if (do_lint && nargs > 5) + lintwarn(ext_id, _("select: called with too many arguments")); + +#define EL fds[i].flat->elements[j] + if (nargs == 5) { + dosig = 1; + if (! get_argument(4, AWK_ARRAY, &sigarr)) { + warning(ext_id, _("select: the signal argument must be an array")); + update_ERRNO_string(_("select: bad signal parameter")); + return make_number(-1, result); + } + clear_array(sigarr.array_cookie); + } + + for (i = 0; i < sizeof(fds)/sizeof(fds[0]); i++) { + size_t j; + + if (! get_argument(i, AWK_ARRAY, & fds[i].array)) { + warning(ext_id, _("select: bad array parameter `%s'"), argname[i]); + update_ERRNO_string(_("select: bad array parameter")); + return make_number(-1, result); + } + /* N.B. flatten_array fails for empty arrays, so that's OK */ + FD_ZERO(&fds[i].bits); + if (flatten_array(fds[i].array.array_cookie, &fds[i].flat)) { + emalloc(fds[i].array2fd, int *, fds[i].flat->count*sizeof(int), "select"); + for (j = 0; j < fds[i].flat->count; j++) { + long x; + fds[i].array2fd[j] = -1; + /* note: the index is always delivered as a string */ + + if (((EL.value.val_type == AWK_UNDEFINED) || ((EL.value.val_type == AWK_STRING) && ! EL.value.str_value.len)) && (integer_string(EL.index.str_value.str, &x) == 0) && (x >= 0)) + fds[i].array2fd[j] = x; + else if (EL.value.val_type == AWK_STRING) { + const awk_input_buf_t *buf; + if ((buf = get_file(EL.index.str_value.str, EL.index.str_value.len, EL.value.str_value.str, EL.value.str_value.len)) != NULL) + fds[i].array2fd[j] = buf->fd; + else + warning(ext_id, _("select: get_file(`%s', `%s') failed in `%s' array"), EL.index.str_value.str, EL.value.str_value.str, argname[i]); + } + else + warning(ext_id, _("select: command type should be a string for `%s' in `%s' array"), EL.index.str_value.str, argname[i]); + if (fds[i].array2fd[j] < 0) { + update_ERRNO_string(_("select: get_file failed")); + if (! release_flattened_array(fds[i].array.array_cookie, fds[i].flat)) + warning(ext_id, _("select: release_flattened_array failed")); + free(fds[i].array2fd); + return make_number(-1, result); + } + FD_SET(fds[i].array2fd[j], &fds[i].bits); + if (nfds <= fds[i].array2fd[j]) + nfds = fds[i].array2fd[j]+1; + } + } + else + fds[i].flat = NULL; + } + if (dosig && caught.flag) { + /* take a quick poll, but do not block, since signals have been trapped */ + maxwait.tv_sec = maxwait.tv_usec = 0; + timeout = &maxwait; + } + else if (get_argument(3, AWK_NUMBER, &timeout_arg)) { + double secs = timeout_arg.num_value; + if (secs < 0) { + warning(ext_id, _("select: treating negative timeout as zero")); + secs = 0; + } + maxwait.tv_sec = secs; + maxwait.tv_usec = (secs-(double)maxwait.tv_sec)*1000000.0; + timeout = &maxwait; + } else + timeout = NULL; + + if ((rc = select(nfds, &fds[0].bits, &fds[1].bits, &fds[2].bits, timeout)) < 0) + update_ERRNO_int(errno); + + if (dosig && caught.flag) { + int i; + sigset_t trapped; +#ifdef HAVE_SIGPROCMASK + /* + * Block signals while we copy and reset the mask to eliminate + * a race condition whereby a signal could be missed. + */ + sigset_t set, oldset; + sigfillset(& set); + sigprocmask(SIG_SETMASK, &set, &oldset); +#endif + /* + * Reset flag to 0 first. If we don't have sigprocmask, + * that may reduce the chance of missing a signal. + */ + caught.flag = 0; + trapped = caught.mask; + sigemptyset(& caught.mask); +#ifdef HAVE_SIGPROCMASK + sigprocmask(SIG_SETMASK, &oldset, NULL); +#endif + /* populate sigarr with trapped signals */ + /* + * XXX this is very inefficient! Note that get_signal_number + * ensures that we trap only signals between MIN_VALID_SIGNAL + * and MAX_VALID_SIGNAL. + */ + for (i = MIN_VALID_SIGNAL; i <= MAX_VALID_SIGNAL; i++) { + if (sigismember(& trapped, i) > 0) { + awk_value_t idx, val; + if ((i < NUMSIG) && signum2name[i]) + set_array_element(sigarr.array_cookie, make_number(i, &idx), make_const_string(signum2name[i], strlen(signum2name[i]), &val)); + else + set_array_element(sigarr.array_cookie, make_number(i, &idx), make_null_string(&val)); + } + } + } + + if (rc < 0) { + /* bit masks are undefined, so delete all array entries */ + for (i = 0; i < sizeof(fds)/sizeof(fds[0]); i++) { + if (fds[i].flat) { + size_t j; + for (j = 0; j < fds[i].flat->count; j++) + EL.flags |= AWK_ELEMENT_DELETE; + if (! release_flattened_array(fds[i].array.array_cookie, fds[i].flat)) + warning(ext_id, _("select: release_flattened_array failed")); + free(fds[i].array2fd); + } + } + return make_number(rc, result); + } + + for (i = 0; i < sizeof(fds)/sizeof(fds[0]); i++) { + if (fds[i].flat) { + size_t j; + /* remove array elements not set in the bit mask */ + for (j = 0; j < fds[i].flat->count; j++) { + if (! FD_ISSET(fds[i].array2fd[j], &fds[i].bits)) + EL.flags |= AWK_ELEMENT_DELETE; + } + if (! release_flattened_array(fds[i].array.array_cookie, fds[i].flat)) + warning(ext_id, _("select: release_flattened_array failed")); + free(fds[i].array2fd); + } + } +#undef EL + + /* Set the return value */ + return make_number(rc, result); +} + +static int +set_non_blocking(int fd) +{ +#if defined(HAVE_FCNTL) && defined(O_NONBLOCK) + int flags; + + if (((flags = fcntl(fd, F_GETFL)) == -1) || + (fcntl(fd, F_SETFL, (flags|O_NONBLOCK)) == -1)) { + update_ERRNO_int(errno); + return -1; + } + return 0; +#else + update_ERRNO_string(_("set_non_blocking: not supported on this platform")); + return -1; +#endif +} + +/* do_set_non_blocking --- Set a file to be non-blocking */ + +static awk_value_t * +do_set_non_blocking(int nargs, awk_value_t *result) +{ + awk_value_t cmd, cmdtype; + int fd; + + if (do_lint && nargs > 2) + lintwarn(ext_id, _("set_non_blocking: called with too many arguments")); + /* + * N.B. If called with a single "" arg, we want it to work! In that + * case, the 1st arg is an empty string, and get_argument fails on the + * 2nd arg. Note that API get_file promises not to access the type + * argument if the name argument is an empty string. + */ + if (get_argument(0, AWK_NUMBER, & cmd) && + (cmd.num_value == (fd = cmd.num_value)) && + ! get_argument(1, AWK_STRING, & cmdtype)) + return make_number(set_non_blocking(fd), result); + else if (get_argument(0, AWK_STRING, & cmd) && + (get_argument(1, AWK_STRING, & cmdtype) || + (! cmd.str_value.len && (nargs == 1)))) { + const awk_input_buf_t *buf; + if ((buf = get_file(cmd.str_value.str, cmd.str_value.len, cmdtype.str_value.str, cmdtype.str_value.len)) != NULL) + return make_number(set_non_blocking(buf->fd), result); + warning(ext_id, _("set_non_blocking: get_file(`%s', `%s') failed"), cmd.str_value.str, cmdtype.str_value.str); + } else if (do_lint) { + if (nargs < 2) + lintwarn(ext_id, _("set_non_blocking: called with too few arguments")); + else + lintwarn(ext_id, _("set_non_blocking: called with inappropriate argument(s)")); + } + return make_number(-1, result); +} + +static awk_ext_func_t func_table[] = { + { "select", do_select, 5 }, + { "select_signal", do_signal, 3 }, + { "set_non_blocking", do_set_non_blocking, 2 }, + { "kill", do_kill, 2 }, +}; + +/* define the dl_load function using the boilerplate macro */ + +dl_load_func(func_table, select, "") diff --git a/extension/siglist.h b/extension/siglist.h new file mode 100644 index 00000000..7ecb8ab1 --- /dev/null +++ b/extension/siglist.h @@ -0,0 +1,76 @@ +/* Canonical list of all signal names. + Copyright (C) 1996-2012 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +/* This file should be usable for any platform, since it just associates + the SIG* macros with text names and descriptions. The actual values + come from <bits/signum.h> (via <signal.h>). For any signal macros do not + exist on every platform, we can use #ifdef tests here and still use + this single common file for all platforms. */ + +/* This file is included multiple times. */ + +/* Standard signals */ + init_sig (SIGHUP, "HUP", N_("Hangup")) + init_sig (SIGINT, "INT", N_("Interrupt")) + init_sig (SIGQUIT, "QUIT", N_("Quit")) + init_sig (SIGILL, "ILL", N_("Illegal instruction")) + init_sig (SIGTRAP, "TRAP", N_("Trace/breakpoint trap")) + init_sig (SIGABRT, "ABRT", N_("Aborted")) + init_sig (SIGFPE, "FPE", N_("Floating point exception")) + init_sig (SIGKILL, "KILL", N_("Killed")) + init_sig (SIGBUS, "BUS", N_("Bus error")) + init_sig (SIGSEGV, "SEGV", N_("Segmentation fault")) + init_sig (SIGPIPE, "PIPE", N_("Broken pipe")) + init_sig (SIGALRM, "ALRM", N_("Alarm clock")) + init_sig (SIGTERM, "TERM", N_("Terminated")) + init_sig (SIGURG, "URG", N_("Urgent I/O condition")) + init_sig (SIGSTOP, "STOP", N_("Stopped (signal)")) + init_sig (SIGTSTP, "TSTP", N_("Stopped")) + init_sig (SIGCONT, "CONT", N_("Continued")) + init_sig (SIGCHLD, "CHLD", N_("Child exited")) + init_sig (SIGTTIN, "TTIN", N_("Stopped (tty input)")) + init_sig (SIGTTOU, "TTOU", N_("Stopped (tty output)")) + init_sig (SIGIO, "IO", N_("I/O possible")) + init_sig (SIGXCPU, "XCPU", N_("CPU time limit exceeded")) + init_sig (SIGXFSZ, "XFSZ", N_("File size limit exceeded")) + init_sig (SIGVTALRM, "VTALRM", N_("Virtual timer expired")) + init_sig (SIGPROF, "PROF", N_("Profiling timer expired")) + init_sig (SIGUSR1, "USR1", N_("User defined signal 1")) + init_sig (SIGUSR2, "USR2", N_("User defined signal 2")) + +/* Variations */ +#ifdef SIGEMT + init_sig (SIGEMT, "EMT", N_("EMT trap")) +#endif +#ifdef SIGSYS + init_sig (SIGSYS, "SYS", N_("Bad system call")) +#endif +#ifdef SIGSTKFLT + init_sig (SIGSTKFLT, "STKFLT", N_("Stack fault")) +#endif +#ifdef SIGINFO + init_sig (SIGINFO, "INFO", N_("Information request")) +#elif defined(SIGPWR) && (!defined(SIGLOST) || (SIGPWR != SIGLOST)) + init_sig (SIGPWR, "PWR", N_("Power failure")) +#endif +#ifdef SIGLOST + init_sig (SIGLOST, "LOST", N_("Resource lost")) +#endif +#ifdef SIGWINCH + init_sig (SIGWINCH, "WINCH", N_("Window changed")) +#endif |