diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Config/version.mk | 4 | ||||
| -rw-r--r-- | Etc/FAQ.yo | 24 | ||||
| -rw-r--r-- | Src/Modules/zftp.c | 11 |
4 files changed, 36 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog index 438ad96d4..45e7122da 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2000-05-28 Peter Stephenson <pws@pwstephenson.fsnet.co.uk> + + * 11616: Src/Modules/zftp.c: configure test for netinet/in_systm.h + is broken on several architectures, so just include it everywhere + except cygwin. + 2000-05-28 Oliver Kiddle <opk@zsh.org> * 11615: Completion/Builtins/_which, Completion/Builtins/_unhash: diff --git a/Config/version.mk b/Config/version.mk index 2d5b6d51e..f7d3691fa 100644 --- a/Config/version.mk +++ b/Config/version.mk @@ -27,5 +27,5 @@ # This must also serve as a shell script, so do not add spaces around the # `=' signs. -VERSION=3.1.7-pre-4 -VERSION_DATE='May 21, 2000' +VERSION=3.1.7 +VERSION_DATE='May 29, 2000' diff --git a/Etc/FAQ.yo b/Etc/FAQ.yo index 31aa721d7..bcd5e0130 100644 --- a/Etc/FAQ.yo +++ b/Etc/FAQ.yo @@ -43,21 +43,19 @@ whenlatex(report(ARG1)(ARG2)(ARG3))\ whenman(report(ARG1)(ARG2)(ARG3))\ whenms(report(ARG1)(ARG2)(ARG3))\ whensgml(report(ARG1)(ARG2)(ARG3))) -myreport(Z-Shell Frequently-Asked Questions)(Peter Stephenson)(2000/04/30) +myreport(Z-Shell Frequently-Asked Questions)(Peter Stephenson)(2000/05/24) COMMENT(-- the following are for Usenet and must appear first)\ description(\ mydit(Archive-Name:) unix-faq/shell/zsh -mydit(Last-Modified:) 2000/04/30 +mydit(Last-Modified:) 2000/05/24 mydit(Submitted-By:) email(pws@pwstephenson.fsnet.co.uk (Peter Stephenson)) mydit(Posting-Frequency:) Monthly mydit(Copyright:) (C) P.W. Stephenson, 1995--2000 (see end of document) ) -bf(Changes since issue posted March 2000:) +bf(Changes since issue posted April 2000:) description( -mydit(3.8) Mention the `keypad mode' horror and fixes (from Bart). -mydit(3.25) Rephrased, example for older versions added. -mydit(5.1) Mention :x and :q modifiers again +mydit(2.5) Mention that tt(${var/old/new}) is a little different from bash. ) This document contains a list of frequently-asked (or otherwise @@ -888,6 +886,20 @@ sect(Similarities with bash) (i.e. POSIX) for longer, and has so far avoided the more abstruse interactive features (programmable completion, etc.) that zsh has. + In recent years there has been a certain amount of crossover in the + extensions, however. Zsh now (3.1.6) has bash's `tt(${var/old/new})' + feature for replacing the text tt(old) with the text(new) in the + parameter tt($var). Note one difference here: while both shells + implement the syntax `tt(${var/#old/new})' and `tt(${var/%old/new})' for + anchoring the match of tt(old) to the start or end of the parameter text, + respectively, in zsh you can't put the `tt(#)' or `tt(%)' inside a + parameter: in other words `tt({var/$old/new})' where tt(old) begins with + a `tt(#)' treats that as an ordinary character in zsh, unlike bash. To + do this sort of thing in zsh you can use (from 3.1.7) the new syntax + for anchors in any pattern, `tt((#s))' to match the start of a string, + and `tt((#e))' to match the end. These require the option + tt(EXTENDED_GLOB) to be set. + sect(Shouldn't zsh be more/less like ksh/(t)csh?) diff --git a/Src/Modules/zftp.c b/Src/Modules/zftp.c index 33632fcda..b1aac07b8 100644 --- a/Src/Modules/zftp.c +++ b/Src/Modules/zftp.c @@ -61,7 +61,16 @@ typedef struct zftp_session *Zftp_session; #include <sys/types.h> #include <sys/socket.h> #include <netdb.h> -#ifdef HAVE_NETINET_IN_SYSTM_H +/* + * For some reason, configure doesn't always detect netinet/in_systm.h. + * On some systems, including linux, this seems to be because gcc is + * throwing up a warning message about the redefinition of + * __USE_LARGEFILE. This means the problem is somewhere in the + * header files where we can't get at it. For now, revert to + * not including this file only on systems where we know it's missing. + * Currently this is just cygwin. + */ +#ifndef __CYGWIN__ # include <netinet/in_systm.h> #endif #include <netinet/in.h> |