diff --git a/BUGS b/BUGS index 3e12c4a..77f7821 100644 --- a/BUGS +++ b/BUGS @@ -113,7 +113,7 @@ regex syntax clashes (problems with backslashes) only happens if you are on the GNU system, using GNU libc's regular expression matcher instead of compiling the one supplied with GNU sed. In a Danish locale, for example, the regular expression `^[a-z]$' - matches the string `aa', because aa is a single collating symbol that + matches the string `aa', because `aa' is a single collating symbol that comes after `a' and before `b'; `ll' behaves similarly in Spanish locales, or `ij' in Dutch locales. diff --git a/ChangeLog b/ChangeLog index 89b7c67..4a663be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-05-15 Hans-Bernhard Bröker + + * sed/basicdefs.h (OB_MALLOC): Turn VCAST into void * cast. + 2006-02-03 Paolo Bonzini * sed/compile.c (compile_program) : Pass false to match_slash. diff --git a/basicdefs.h b/basicdefs.h index c36cc6f..a1a479b 100644 --- a/basicdefs.h +++ b/basicdefs.h @@ -124,7 +124,7 @@ typedef unsigned long countT; #define FREE(x) (ck_free(VCAST(VOID *)x)) #define MEMCPY(d,s,l) (memcpy(VCAST(VOID *)(d),VCAST(const VOID *)(s),l)) #define MEMMOVE(d,s,l) (memmove(VCAST(VOID *)(d),VCAST(const VOID *)(s),l)) -#define OB_MALLOC(o,n,t) (VCAST(t *)obstack_alloc(o,(n)*sizeof(t))) +#define OB_MALLOC(o,n,t) ((t *)(void *)obstack_alloc(o,(n)*sizeof(t))) #define obstack_chunk_alloc ck_malloc #define obstack_chunk_free ck_free diff --git a/doc/sed.texi b/doc/sed.texi index 02d80d6..6afc9bb 100644 --- a/doc/sed.texi +++ b/doc/sed.texi @@ -2873,8 +2873,8 @@ to the original name: if you rename or delete files, you're actually modifying the contents of the directory, so the operation depends on the permissions of the directory, not of the file. For this same reason, @command{sed} does not let you use @option{-i} on a writeable file -in a read-only directory (but unbelievably nobody reports that as a -bug@dots{}). +in a read-only directory, and will break hard or symbolic links when +@option{-i} is used on such a file. @item @code{0a} does not work (gives an error) There is no line 0. 0 is a special address that is only used to treat diff --git a/lib/regcomp.c b/lib/regcomp.c index d35ae5f..9f10de7 100644 --- a/lib/regcomp.c +++ b/lib/regcomp.c @@ -557,8 +557,13 @@ weak_alias (__regerror, regerror) a worthwhile optimization. */ static const bitset_t utf8_sb_map = { - /* Set the first 128 bits. */ - [0 ... 0x80 / BITSET_WORD_BITS - 1] = BITSET_WORD_MAX +#if BITSET_WORD_MAX == 0xFFFFFFFFL + BITSET_WORD_MAX, BITSET_WORD_MAX, BITSET_WORD_MAX, BITSET_WORD_MAX +#elif BITSET_WORD_MAX == 0xFFFFFFFFFFFFFFFFL + BITSET_WORD_MAX, BITSET_WORD_MAX +#else +#error invalid BITSET_WORD_BITS setting +#endif }; #endif diff --git a/lib/regex.c b/lib/regex.c index d2d4f28..48ca593 100644 --- a/lib/regex.c +++ b/lib/regex.c @@ -57,6 +57,10 @@ #undefs RE_DUP_MAX and sets it to the right value. */ #include +#ifndef HAVE__BOOL +#include "stdbool.h" +#endif /* not defined HAVE__BOOL */ + #include #include "regex_internal.h" diff --git a/po/af.po b/po/af.po index 8e10341..965dd8b 100644 --- a/po/af.po +++ b/po/af.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-03 10:26+0100\n" +"POT-Creation-Date: 2006-03-16 08:54+0100\n" "PO-Revision-Date: 2004-01-11 21:06+0000\n" "Last-Translator: Ysbeer \n" "Language-Team: Afrikaans \n" diff --git a/po/ca.po b/po/ca.po index a99b5a6..091f66c 100644 --- a/po/ca.po +++ b/po/ca.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-03 10:26+0100\n" +"POT-Creation-Date: 2006-03-16 08:54+0100\n" "PO-Revision-Date: 2004-07-10 05:51+0200\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" diff --git a/po/cs.po b/po/cs.po index caf786a..d390474 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: sed 3.02.80\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-03 10:26+0100\n" +"POT-Creation-Date: 2006-03-16 08:54+0100\n" "PO-Revision-Date: 2001-08-05 19:52+02:00\n" "Last-Translator: Vladimir Michl \n" "Language-Team: Czech \n" diff --git a/po/da.po b/po/da.po index e96878f..bedfe06 100644 --- a/po/da.po +++ b/po/da.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-03 10:26+0100\n" +"POT-Creation-Date: 2006-03-16 08:54+0100\n" "PO-Revision-Date: 2003-10-25 08:00+0200\n" "Last-Translator: Byrial Ole Jensen \n" "Language-Team: Danish \n" diff --git a/po/de.po b/po/de.po index 0b0eae3..bd7bce3 100644 --- a/po/de.po +++ b/po/de.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-03 10:26+0100\n" +"POT-Creation-Date: 2006-03-16 08:54+0100\n" "PO-Revision-Date: 2003-03-21 22:03:41+0100\n" "Last-Translator: Walter Koch \n" "Language-Team: German \n" diff --git a/po/el.po b/po/el.po index 99bbc99..10b36f9 100644 --- a/po/el.po +++ b/po/el.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU sed 3.02.80\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-03 10:26+0100\n" +"POT-Creation-Date: 2006-03-16 08:54+0100\n" "PO-Revision-Date: 2002-03-08 12:57+0000\n" "Last-Translator: Simos Xenitellis \n" "Language-Team: Greek \n" diff --git a/po/eo.po b/po/eo.po index 50a0e76..e746c6c 100644 --- a/po/eo.po +++ b/po/eo.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU sed 4.0.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-03 10:26+0100\n" +"POT-Creation-Date: 2006-03-16 08:54+0100\n" "PO-Revision-Date: 2003-10-26 20:57+0000\n" "Last-Translator: Edmund GRIMLEY EVANS \n" "Language-Team: Esperanto \n" diff --git a/po/es.po b/po/es.po index 08008db..615a2ff 100644 --- a/po/es.po +++ b/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-03 10:26+0100\n" +"POT-Creation-Date: 2006-03-16 08:54+0100\n" "PO-Revision-Date: 2003-10-24 12:38-0500\n" "Last-Translator: Cristian Othón Martínez Vera \n" "Language-Team: Spanish \n" diff --git a/po/et.po b/po/et.po index e5f0af8..f40acc0 100644 --- a/po/et.po +++ b/po/et.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-03 10:26+0100\n" +"POT-Creation-Date: 2006-03-16 08:54+0100\n" "PO-Revision-Date: 2004-07-09 16:33+0300\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" diff --git a/po/fi.po b/po/fi.po index f29cd3d..d9e1a51 100644 --- a/po/fi.po +++ b/po/fi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: sed-4.0.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-03 10:26+0100\n" +"POT-Creation-Date: 2006-03-16 08:54+0100\n" "PO-Revision-Date: 2003-12-07 09:35+0200\n" "Last-Translator: Sami J. Laine \n" "Language-Team: Finnish \n" diff --git a/po/fr.po b/po/fr.po index 523c229..83c71cd 100644 --- a/po/fr.po +++ b/po/fr.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-03 10:26+0100\n" +"POT-Creation-Date: 2006-03-16 08:54+0100\n" "PO-Revision-Date: 2004-07-12 00:09+0200\n" "Last-Translator: Gaël Quéri \n" "Language-Team: French \n" diff --git a/po/ga.po b/po/ga.po index 9946346..c978ef6 100644 --- a/po/ga.po +++ b/po/ga.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-03 10:26+0100\n" +"POT-Creation-Date: 2006-03-16 08:54+0100\n" "PO-Revision-Date: 2004-07-07 11:04-0500\n" "Last-Translator: Kevin Patrick Scannell \n" "Language-Team: Irish \n" diff --git a/po/gl.po b/po/gl.po index dd62411..45e6586 100644 --- a/po/gl.po +++ b/po/gl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-03 10:26+0100\n" +"POT-Creation-Date: 2006-03-16 08:54+0100\n" "PO-Revision-Date: 2002-10-25 15:57+0200\n" "Last-Translator: Jacobo Tarrío Barreiro \n" "Language-Team: Galician \n" diff --git a/po/he.po b/po/he.po index 5140626..cdef7d9 100644 --- a/po/he.po +++ b/po/he.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: sed 3.02.80\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-03 10:26+0100\n" +"POT-Creation-Date: 2006-03-16 08:54+0100\n" "PO-Revision-Date: 2001-08-04 20:37+0300\n" "Last-Translator: Eli Zaretskii \n" "Language-Team: Hebrew \n" diff --git a/po/hr.po b/po/hr.po index e5d9552..8259c46 100644 --- a/po/hr.po +++ b/po/hr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: sed 3.02a\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-03 10:26+0100\n" +"POT-Creation-Date: 2006-03-16 08:54+0100\n" "PO-Revision-Date: 2002-06-14 15:17-01\n" "Last-Translator: Denis Lackovic \n" "Language-Team: Croatian \n" diff --git a/po/hu.po b/po/hu.po index 7979521..b46a278 100644 --- a/po/hu.po +++ b/po/hu.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-03 10:26+0100\n" +"POT-Creation-Date: 2006-03-16 08:54+0100\n" "PO-Revision-Date: 2003-10-26 09:28+0100\n" "Last-Translator: Mihály Gyulai \n" "Language-Team: Hungarian \n" diff --git a/po/id.po b/po/id.po index 352213e..c0fb754 100644 --- a/po/id.po +++ b/po/id.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-03 10:26+0100\n" +"POT-Creation-Date: 2006-03-16 08:54+0100\n" "PO-Revision-Date: 2004-04-27 14:56+0700\n" "Last-Translator: Tedi Heriyanto \n" "Language-Team: Indonesian \n" diff --git a/po/it.po b/po/it.po index 8f14913..6465b06 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0a\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-03 10:26+0100\n" +"POT-Creation-Date: 2006-03-16 08:54+0100\n" "PO-Revision-Date: 2002-11-26 12:44+0100\n" "Last-Translator: Paolo Bonzini \n" "Language-Team: Italian \n" diff --git a/po/ja.po b/po/ja.po index c25e257..aef77dc 100644 --- a/po/ja.po +++ b/po/ja.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU sed 4.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-03 10:26+0100\n" +"POT-Creation-Date: 2006-03-16 08:54+0100\n" "PO-Revision-Date: 2005-02-01 21:02+0900\n" "Last-Translator: IIDA Yosiaki \n" "Language-Team: Japanese \n" diff --git a/po/ko.po b/po/ko.po index 5d9d46a..9765e7f 100644 --- a/po/ko.po +++ b/po/ko.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU sed 3.02.80\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-03 10:26+0100\n" +"POT-Creation-Date: 2006-03-16 08:54+0100\n" "PO-Revision-Date: 2001-10-12 17:26+0900\n" "Last-Translator: Jong-Hoon Ryu \n" "Language-Team: Korean \n" diff --git a/po/nl.po b/po/nl.po index ad08f5d..e79169e 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-03 10:26+0100\n" +"POT-Creation-Date: 2006-03-16 08:54+0100\n" "PO-Revision-Date: 2005-04-12 20:09+0200\n" "Last-Translator: Taco Witte \n" "Language-Team: Dutch \n" diff --git a/po/pl.po b/po/pl.po index 47cff40..d3bddd3 100644 --- a/po/pl.po +++ b/po/pl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-03 10:26+0100\n" +"POT-Creation-Date: 2006-03-16 08:54+0100\n" "PO-Revision-Date: 2004-07-08 19:58+0200\n" "Last-Translator: Wojciech Polak \n" "Language-Team: Polish \n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 1890f95..3d224ca 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-03 10:26+0100\n" +"POT-Creation-Date: 2006-03-16 08:54+0100\n" "PO-Revision-Date: 2002-11-08 17:44-0300\n" "Last-Translator: Aurélio Marinho Jargas \n" "Language-Team: Brazilian Portuguese \n" diff --git a/po/ro.po b/po/ro.po index 5ecbbb6..d61dd5d 100644 --- a/po/ro.po +++ b/po/ro.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-03 10:26+0100\n" +"POT-Creation-Date: 2006-03-16 08:54+0100\n" "PO-Revision-Date: 2003-11-22 12:00-0500\n" "Last-Translator: Laurentiu Buzdugan \n" "Language-Team: Romanian \n" diff --git a/po/ru.po b/po/ru.po index 21300ac..da056f7 100644 --- a/po/ru.po +++ b/po/ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: sed-4.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-03 10:26+0100\n" +"POT-Creation-Date: 2006-03-16 08:54+0100\n" "PO-Revision-Date: 2004-07-07 17:54+0300\n" "Last-Translator: Pavel Maryanov \n" "Language-Team: Russian \n" diff --git a/po/sed.pot b/po/sed.pot index dca524c..9e5f752 100644 --- a/po/sed.pot +++ b/po/sed.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-03 10:26+0100\n" +"POT-Creation-Date: 2006-03-16 08:54+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/sk.po b/po/sk.po index 258f7f8..a7f2147 100644 --- a/po/sk.po +++ b/po/sk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU sed 4.0.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-03 10:26+0100\n" +"POT-Creation-Date: 2006-03-16 08:54+0100\n" "PO-Revision-Date: 2003-10-25 17:22+0200\n" "Last-Translator: Marcel Telka \n" "Language-Team: Slovak \n" diff --git a/po/sl.po b/po/sl.po index 00f5ba9..b0128a8 100644 --- a/po/sl.po +++ b/po/sl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-03 10:26+0100\n" +"POT-Creation-Date: 2006-03-16 08:54+0100\n" "PO-Revision-Date: 2003-04-02 17:20+0200\n" "Last-Translator: Primo¾ Peterlin \n" "Language-Team: Slovenian \n" diff --git a/po/sr.po b/po/sr.po index c27e2b9..e201640 100644 --- a/po/sr.po +++ b/po/sr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-03 10:26+0100\n" +"POT-Creation-Date: 2006-03-16 08:54+0100\n" "PO-Revision-Date: 2004-01-13 22:51-0500\n" "Last-Translator: Aleksandar Jelenak \n" "Language-Team: Serbian \n" diff --git a/po/sv.po b/po/sv.po index 50671fb..4ed6d32 100644 --- a/po/sv.po +++ b/po/sv.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-03 10:26+0100\n" +"POT-Creation-Date: 2006-03-16 08:54+0100\n" "PO-Revision-Date: 2004-07-11 11:45+0200\n" "Last-Translator: Christian Rose \n" "Language-Team: Swedish \n" diff --git a/po/tr.po b/po/tr.po index b32485a..ff4d057 100644 --- a/po/tr.po +++ b/po/tr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-03 10:26+0100\n" +"POT-Creation-Date: 2006-03-16 08:54+0100\n" "PO-Revision-Date: 2004-05-19 18:06+0300\n" "Last-Translator: Deniz Akkus Kanca \n" "Language-Team: Turkish \n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 8709ff7..1d19ee1 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: sed 3.02.80\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-03 10:26+0100\n" +"POT-Creation-Date: 2006-03-16 08:54+0100\n" "PO-Revision-Date: 2002-08-18 11:11+0800\n" "Last-Translator: Wang Li \n" "Language-Team: Chinese (simplified) \n"