diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Makefile.am | 9 | ||||
| -rw-r--r-- | NEWS | 7 | ||||
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | doc/Makefile.am | 9 | ||||
| -rw-r--r-- | doc/sed.1 | 4 | ||||
| -rw-r--r-- | lib/regcomp.c | 13 | ||||
| -rw-r--r-- | lib/regex.c | 2 | ||||
| -rw-r--r-- | lib/regex_internal.c | 2 | ||||
| -rw-r--r-- | lib/regex_internal.h | 2 | ||||
| -rw-r--r-- | lib/regexec.c | 2 | ||||
| -rw-r--r-- | po/af.po | 4 | ||||
| -rw-r--r-- | po/ca.po | 4 | ||||
| -rw-r--r-- | po/cs.po | 4 | ||||
| -rw-r--r-- | po/da.po | 4 | ||||
| -rw-r--r-- | po/de.po | 4 | ||||
| -rw-r--r-- | po/el.po | 4 | ||||
| -rw-r--r-- | po/eo.po | 4 | ||||
| -rw-r--r-- | po/es.po | 4 | ||||
| -rw-r--r-- | po/et.po | 4 | ||||
| -rw-r--r-- | po/fi.po | 4 | ||||
| -rw-r--r-- | po/fr.po | 4 | ||||
| -rw-r--r-- | po/ga.po | 4 | ||||
| -rw-r--r-- | po/gl.po | 4 | ||||
| -rw-r--r-- | po/he.po | 4 | ||||
| -rw-r--r-- | po/hr.po | 4 | ||||
| -rw-r--r-- | po/hu.po | 4 | ||||
| -rw-r--r-- | po/id.po | 4 | ||||
| -rw-r--r-- | po/it.po | 4 | ||||
| -rw-r--r-- | po/ja.po | 4 | ||||
| -rw-r--r-- | po/ko.po | 4 | ||||
| -rw-r--r-- | po/nl.po | 4 | ||||
| -rw-r--r-- | po/pl.po | 4 | ||||
| -rw-r--r-- | po/pt_BR.po | 4 | ||||
| -rw-r--r-- | po/ro.po | 4 | ||||
| -rw-r--r-- | po/ru.po | 4 | ||||
| -rw-r--r-- | po/sk.po | 4 | ||||
| -rw-r--r-- | po/sl.po | 4 | ||||
| -rw-r--r-- | po/sr.po | 4 | ||||
| -rw-r--r-- | po/sv.po | 4 | ||||
| -rw-r--r-- | po/tr.po | 4 | ||||
| -rw-r--r-- | po/zh_CN.po | 4 | ||||
| -rw-r--r-- | sed/regexp.c | 5 |
43 files changed, 112 insertions, 84 deletions
@@ -1,3 +1,7 @@ +2005-01-25 Paolo Bonzini <bonzini@gnu.org> + + * sed/regexp.c: Fix building on GCC 2.95 and earlier. + 2004-12-26 Paolo Bonzini <bonzini@gnu.org> Do not use leftmost-longest matching for addresses. diff --git a/Makefile.am b/Makefile.am index b233d99..06fbb32 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,6 @@ # Automake requirements AUTOMAKE_OPTIONS = gnits 1.8 ACLOCAL_AMFLAGS = -I config -DISTCHECK_CONFIGURE_FLAGS = XGETTEXT='$(SHELL) -c : dummy' PACKAGE = sed @@ -18,6 +17,14 @@ EXTRA_DIST = BUGS THANKS COPYING.DOC README.boot bootstrap.sh \ html: cd doc && make html +DISTCHECK_CONFIGURE_FLAGS = XGETTEXT='$(SHELL) -c : dummy' $(EXTRA_DC_FLAGS) +EXTRA_DC_FLAGS = + +full-distcheck: + make distcheck EXTRA_DC_FLAGS='--enable-html' + make distcheck EXTRA_DC_FLAGS='--disable-i18n' + make distcheck EXTRA_DC_FLAGS='--without-included-regex' + update-regex: HOST=sources.redhat.com && \ BASEURL="http://$$HOST/cgi-bin/cvsweb.cgi/~checkout~/libc/posix" && \ @@ -1,3 +1,10 @@ +Sed 4.1.4 + +* bugfixes for platform without internationalization + +* more thorough testing framework for tarballs (`make full-distcheck') + +---------------------------------------------------------------------------- Sed 4.1.3 * regex addresses do not use leftmost-longest matching. In other words, diff --git a/configure.ac b/configure.ac index d219c40..ea48c5f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,9 @@ dnl Process this file with -*- autoconf -*- to produce a configure script. -AC_INIT(sed, 4.1.2, bonzini@gnu.org, sed) +AC_INIT(sed, 4.1.4, bonzini@gnu.org, sed) AC_CONFIG_AUX_DIR(config) AC_CONFIG_SRCDIR([sed/sed.c]) AM_CONFIG_HEADER(config.h:config_h.in) -AC_PREREQ(2.53) +AC_PREREQ(2.59) AM_INIT_AUTOMAKE SED_FEATURE_VERSION=4.1 @@ -71,6 +71,13 @@ AC_REPLACE_FUNCS(memchr memcmp memmove strerror mkstemp) AC_CHECK_FUNCS(isatty bcopy bzero isascii memcpy memset strchr strtoul popen \ pathconf isblank fchown fchmod setlocale wcrtomb wcscoll btowc) +AC_ARG_ENABLE(i18n, +[ --disable-i18n disable internationalization (default=yes)], , +enable_i18n=yes) +if test "x$enable_i18n" = xno; then + ac_cv_func_wcscoll=false +fi + AC_ARG_WITH(included-regex, [ --with-included-regex use included regex matcher (default=yes)], , with_included_regex=yes) @@ -86,7 +93,7 @@ if test "x$with_included_regex" = xno; then fi AC_ARG_ENABLE(regex-tests, -[ --enable-regex-tests enable regex matcher regression tests (default=no)], +[ --enable-regex-tests enable regex matcher regression tests (default=yes)], [if test "x$with_included_regex" = xno; then enable_regex_tests=no fi], diff --git a/doc/Makefile.am b/doc/Makefile.am index 0dad8e5..e38d735 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -28,8 +28,8 @@ dist-hook: # sources if MAKEINFO_HTML sed.html: sed.texi sed.info - cd $(srcdir) \ - && $(MAKEINFO) --html `echo $< | sed 's,.*/,,'` + builddir=`pwd` && cd $(srcdir) && \ + $(MAKEINFO) --html --no-split -o $$builddir/sed.html sed.texi html: sed.html @@ -39,8 +39,9 @@ endif # These rules are used together with TEXI2HTML if TEXI2HTML_HTML sed.html: sed.texi sed.info - cd $(srcdir) \ - && $(TEXI2HTML) `echo $< | sed 's,.*/,,'` + cp $(srcdir)/*.texi . && \ + $(TEXI2HTML) sed.texi && \ + rn *.texi html: sed.html @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.28. -.TH SED "1" "November 2004" "sed version 4.1.2" "User Commands" +.TH SED "1" "January 2005" "sed version 4.1.3" "User Commands" .SH NAME -sed \- manual page for sed version 4.1.2 +sed \- manual page for sed version 4.1.3 .SH SYNOPSIS .B sed [\fIOPTION\fR]... \fI{script-only-if-no-other-script} \fR[\fIinput-file\fR]... diff --git a/lib/regcomp.c b/lib/regcomp.c index 7f4f63b..586ebc7 100644 --- a/lib/regcomp.c +++ b/lib/regcomp.c @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. @@ -875,9 +875,9 @@ init_dfa (dfa, pat_len) codeset_name = nl_langinfo (CODESET); # else codeset_name = getenv ("LC_ALL"); - if (codeset_name == NULL || codeset[0] == '\0') + if (codeset_name == NULL || codeset_name[0] == '\0') codeset_name = getenv ("LC_CTYPE"); - if (codeset_name == NULL || codeset[0] == '\0') + if (codeset_name == NULL || codeset_name[0] == '\0') codeset_name = getenv ("LANG"); if (codeset_name == NULL) codeset_name = ""; @@ -3314,17 +3314,18 @@ parse_bracket_exp (regexp, dfa, token, syntax, err) } } else +#endif /* not RE_ENABLE_I18N */ { +#ifdef RE_ENABLE_I18N + free_charset (mbcset); +#endif /* Build a tree for simple bracket. */ br_token.type = SIMPLE_BRACKET; br_token.opr.sbcset = sbcset; work_tree = create_token_tree (dfa, NULL, NULL, &br_token); if (BE (work_tree == NULL, 0)) goto parse_bracket_exp_espace; - - free_charset (mbcset); } -#endif /* not RE_ENABLE_I18N */ return work_tree; parse_bracket_exp_espace: diff --git a/lib/regex.c b/lib/regex.c index 7a4f304..1e24fcf 100644 --- a/lib/regex.c +++ b/lib/regex.c @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. diff --git a/lib/regex_internal.c b/lib/regex_internal.c index c3295a8..7284ed3 100644 --- a/lib/regex_internal.c +++ b/lib/regex_internal.c @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. diff --git a/lib/regex_internal.h b/lib/regex_internal.h index e5a1a8d..ae77aeb 100644 --- a/lib/regex_internal.h +++ b/lib/regex_internal.h @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. diff --git a/lib/regexec.c b/lib/regexec.c index cd5a76b..3089983 100644 --- a/lib/regexec.c +++ b/lib/regexec.c @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. @@ -6,7 +6,6 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.9\n" -"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-11-11 15:28+0100\n" "PO-Revision-Date: 2004-01-11 21:06+0000\n" "Last-Translator: Ysbeer <ysbeer@af.org.za>\n" @@ -14,6 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=n!=1;\n" #: sed/compile.c:162 @@ -163,7 +163,7 @@ msgstr "Kon nie die lêer %s oopmaak nie: %s" msgid "couldn't edit %s: not a regular file" msgstr "Kon nie die lêer %s oopmaak nie: %s" -#: sed/execute.c:683 lib/utils.c:196 +#: lib/utils.c:196 sed/execute.c:683 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "Kon nie tydelike lêer %s oopmaak nie: %s" @@ -6,7 +6,6 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.1.1\n" -"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-11-11 15:28+0100\n" "PO-Revision-Date: 2004-07-10 05:51+0200\n" "Last-Translator: Jordi Mallach <jordi@gnu.org>\n" @@ -14,6 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=n!=1;\n" #: sed/compile.c:162 @@ -147,7 +147,7 @@ msgstr "no s'ha pogut editar %s: s un terminal" msgid "couldn't edit %s: not a regular file" msgstr "no s'ha pogut editar %s: no s un fitxer regular" -#: sed/execute.c:683 lib/utils.c:196 +#: lib/utils.c:196 sed/execute.c:683 #, c-format msgid "couldn't open temporary file %s: %s" msgstr "no s'ha pogut obrir el fitxer temporal %s: %s" @@ -5,7 +5,6 @@ msgid "" msgstr "" "Project-Id-Version: sed 3.02.80\n" -"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-11-11 15:28+0100\n" "PO-Revision-Date: 2001-08-05 19:52+02:00\n" "Last-Translator: Vladimir Michl <Vladimir.Michl@seznam.cz>\n" @@ -13,6 +12,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" #: sed/compile.c:162 #, fuzzy @@ -160,7 +160,7 @@ msgstr "Soubor %s nelze otevt" msgid "couldn't edit %s: not a regular file" msgstr "Soubor %s nelze otevt" -#: sed/execute.c:683 lib/utils.c:196 +#: lib/utils.c:196 sed/execute.c:683 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "Soubor %s nelze otevt" @@ -5,7 +5,6 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.8\n" -"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-11-11 15:28+0100\n" "PO-Revision-Date: 2003-10-25 08:00+0200\n" "Last-Translator: Byrial Ole Jensen <byrial@image.dk>\n" @@ -13,6 +12,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: sed/compile.c:162 @@ -162,7 +162,7 @@ msgstr "kunne ikke bne filen %s: %s" msgid "couldn't edit %s: not a regular file" msgstr "kunne ikke bne filen %s: %s" -#: sed/execute.c:683 lib/utils.c:196 +#: lib/utils.c:196 sed/execute.c:683 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "kunne ikke bne midlertidig fil %s: %s" @@ -5,7 +5,6 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.6\n" -"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-11-11 15:28+0100\n" "PO-Revision-Date: 2003-03-21 22:03:41+0100\n" "Last-Translator: Walter Koch <koch@u32.de>\n" @@ -13,6 +12,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: sed/compile.c:162 @@ -162,7 +162,7 @@ msgstr "Datei %s kann nicht geffnet werden: %s" msgid "couldn't edit %s: not a regular file" msgstr "Datei %s kann nicht geffnet werden: %s" -#: sed/execute.c:683 lib/utils.c:196 +#: lib/utils.c:196 sed/execute.c:683 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "Datei %s kann nicht geffnet werden: %s" @@ -5,7 +5,6 @@ msgid "" msgstr "" "Project-Id-Version: GNU sed 3.02.80\n" -"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-11-11 15:28+0100\n" "PO-Revision-Date: 2002-03-08 12:57+0000\n" "Last-Translator: Simos Xenitellis <simos@hellug.gr>\n" @@ -13,6 +12,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-7\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" #: sed/compile.c:162 #, fuzzy @@ -161,7 +161,7 @@ msgstr " %s" msgid "couldn't edit %s: not a regular file" msgstr " %s" -#: sed/execute.c:683 lib/utils.c:196 +#: lib/utils.c:196 sed/execute.c:683 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr " %s" @@ -5,7 +5,6 @@ msgid "" msgstr "" "Project-Id-Version: GNU sed 4.0.8\n" -"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-11-11 15:28+0100\n" "PO-Revision-Date: 2003-10-26 20:57+0000\n" "Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n" @@ -13,6 +12,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8-bit\n" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: sed/compile.c:162 @@ -162,7 +162,7 @@ msgstr "Ne povis malfermi dosieron %s: %s" msgid "couldn't edit %s: not a regular file" msgstr "Ne povis malfermi dosieron %s: %s" -#: sed/execute.c:683 lib/utils.c:196 +#: lib/utils.c:196 sed/execute.c:683 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "Ne povis malfermi dumtempan dosieron %s: %s" @@ -5,7 +5,6 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.8\n" -"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-11-11 15:28+0100\n" "PO-Revision-Date: 2003-10-24 12:38-0500\n" "Last-Translator: Cristian Othn Martnez Vera <cfuga@itam.mx>\n" @@ -13,6 +12,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: sed/compile.c:162 @@ -162,7 +162,7 @@ msgstr "No se puede abrir el fichero %s: %s" msgid "couldn't edit %s: not a regular file" msgstr "No se puede abrir el fichero %s: %s" -#: sed/execute.c:683 lib/utils.c:196 +#: lib/utils.c:196 sed/execute.c:683 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "No se puede abrir el fichero temporal %s: %s" @@ -5,7 +5,6 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.1.1\n" -"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-11-11 15:28+0100\n" "PO-Revision-Date: 2004-07-09 16:33+0300\n" "Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n" @@ -13,6 +12,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-15\n" "Content-Transfer-Encoding: 8-bit\n" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: sed/compile.c:162 @@ -146,7 +146,7 @@ msgstr "%s ei saa toimetada: see on terminal" msgid "couldn't edit %s: not a regular file" msgstr "%s ei saa toimetada: see ei ole tavaline fail" -#: sed/execute.c:683 lib/utils.c:196 +#: lib/utils.c:196 sed/execute.c:683 #, c-format msgid "couldn't open temporary file %s: %s" msgstr "ajutist faili %s ei saa avada: %s" @@ -5,7 +5,6 @@ msgid "" msgstr "" "Project-Id-Version: sed-4.0.8\n" -"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-11-11 15:28+0100\n" "PO-Revision-Date: 2003-12-07 09:35+0200\n" "Last-Translator: Sami J. Laine <sami.laine@iki.fi>\n" @@ -13,6 +12,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: sed/compile.c:162 @@ -162,7 +162,7 @@ msgstr "Tiedostoa %s ei voitu avata: %s" msgid "couldn't edit %s: not a regular file" msgstr "Tiedostoa %s ei voitu avata: %s" -#: sed/execute.c:683 lib/utils.c:196 +#: lib/utils.c:196 sed/execute.c:683 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "Vliaikaistiedostoa %s ei voitu avata: %s" @@ -9,7 +9,6 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.1.1\n" -"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-11-11 15:28+0100\n" "PO-Revision-Date: 2004-07-12 00:09+0200\n" "Last-Translator: Gal Quri <gael@lautre.net>\n" @@ -17,6 +16,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #: sed/compile.c:162 @@ -150,7 +150,7 @@ msgstr "impossible d'diter %s: est un terminal" msgid "couldn't edit %s: not a regular file" msgstr "impossible d'diter %s: ce n'est pas un fichier rgulier" -#: sed/execute.c:683 lib/utils.c:196 +#: lib/utils.c:196 sed/execute.c:683 #, c-format msgid "couldn't open temporary file %s: %s" msgstr "impossible d'ouvrir le fichier temporaire %s: %s" @@ -5,7 +5,6 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.1.1\n" -"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-11-11 15:28+0100\n" "PO-Revision-Date: 2004-07-07 11:04-0500\n" "Last-Translator: Kevin Patrick Scannell <scannell@SLU.EDU>\n" @@ -13,6 +12,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=4; plural=n==1 ? 0 : (n>1 && n<7) ? 1 : (n>6 && n " "<11) ? 2 : 3;\n" @@ -149,7 +149,7 @@ msgstr "norbh fhidir %s a chur in eagar; is teirminal " msgid "couldn't edit %s: not a regular file" msgstr "norbh fhidir %s a chur in eagar: n gnthcomhad " -#: sed/execute.c:683 lib/utils.c:196 +#: lib/utils.c:196 sed/execute.c:683 #, c-format msgid "couldn't open temporary file %s: %s" msgstr "norbh fhidir an comhad sealadach %s a oscailt: %s" @@ -5,7 +5,6 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0\n" -"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-11-11 15:28+0100\n" "PO-Revision-Date: 2002-10-25 15:57+0200\n" "Last-Translator: Jacobo Tarro Barreiro <jtarrio@trasno.net>\n" @@ -13,6 +12,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=n!=1;\n" #: sed/compile.c:162 @@ -162,7 +162,7 @@ msgstr "Non se puido abri-lo ficheiro %s: %s" msgid "couldn't edit %s: not a regular file" msgstr "Non se puido abri-lo ficheiro %s: %s" -#: sed/execute.c:683 lib/utils.c:196 +#: lib/utils.c:196 sed/execute.c:683 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "Non se puido abri-lo ficheiro %s: %s" @@ -5,7 +5,6 @@ msgid "" msgstr "" "Project-Id-Version: sed 3.02.80\n" -"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-11-11 15:28+0100\n" "PO-Revision-Date: 2001-08-04 20:37+0300\n" "Last-Translator: Eli Zaretskii <eliz@gnu.org>\n" @@ -13,6 +12,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-8\n" "Content-Transfer-Encoding: 8-bit\n" +"Report-Msgid-Bugs-To: \n" #: sed/compile.c:162 #, fuzzy @@ -160,7 +160,7 @@ msgstr "%s " msgid "couldn't edit %s: not a regular file" msgstr "%s " -#: sed/execute.c:683 lib/utils.c:196 +#: lib/utils.c:196 sed/execute.c:683 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "%s " @@ -5,7 +5,6 @@ msgid "" msgstr "" "Project-Id-Version: sed 3.02a\n" -"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-11-11 15:28+0100\n" "PO-Revision-Date: 2002-06-14 15:17-01\n" "Last-Translator: Denis Lackovic <delacko@fly.srk.fer.hr>\n" @@ -13,6 +12,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=(n==1?0:1);\n" "X-Generator: TransDict server\n" @@ -162,7 +162,7 @@ msgstr "Ne mogu otvoriti datoteku %s" msgid "couldn't edit %s: not a regular file" msgstr "Ne mogu otvoriti datoteku %s" -#: sed/execute.c:683 lib/utils.c:196 +#: lib/utils.c:196 sed/execute.c:683 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "Ne mogu otvoriti datoteku %s" @@ -5,7 +5,6 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.8\n" -"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-11-11 15:28+0100\n" "PO-Revision-Date: 2003-10-26 09:28+0100\n" "Last-Translator: Mihly Gyulai <gyulai@fbi.hu>\n" @@ -13,6 +12,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=1; plural=0;\n" #: sed/compile.c:162 @@ -162,7 +162,7 @@ msgstr "Nem lehet megnyitni a(z) %s fjlt: %s" msgid "couldn't edit %s: not a regular file" msgstr "Nem lehet megnyitni a(z) %s fjlt: %s" -#: sed/execute.c:683 lib/utils.c:196 +#: lib/utils.c:196 sed/execute.c:683 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "Nem lehet megnyitni az tmeneti fjlt: %s: %s" @@ -6,7 +6,6 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.9\n" -"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-11-11 15:28+0100\n" "PO-Revision-Date: 2004-04-27 14:56+0700\n" "Last-Translator: Tedi Heriyanto <tedi_h@gmx.net>\n" @@ -14,6 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: KBabel 1.3\n" @@ -164,7 +164,7 @@ msgstr "Tidak dapat membuka file %s %s" msgid "couldn't edit %s: not a regular file" msgstr "Tidak dapat membuka file %s %s" -#: sed/execute.c:683 lib/utils.c:196 +#: lib/utils.c:196 sed/execute.c:683 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "Tidak dapat membuka file temporer %s %s" @@ -5,7 +5,6 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0a\n" -"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-11-11 15:28+0100\n" "PO-Revision-Date: 2002-11-26 12:44+0100\n" "Last-Translator: Paolo Bonzini <bonzini@gnu.org>\n" @@ -13,6 +12,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=n != 1;\n" # sed/compile.c:166 @@ -175,7 +175,7 @@ msgid "couldn't edit %s: not a regular file" msgstr "impossibile modificare %s: non un file normale" # lib/utils.c:131 -#: sed/execute.c:683 lib/utils.c:196 +#: lib/utils.c:196 sed/execute.c:683 #, c-format msgid "couldn't open temporary file %s: %s" msgstr "impossibile aprire il file temporaneo %s: %s" @@ -9,7 +9,6 @@ msgid "" msgstr "" "Project-Id-Version: GNU sed 4.0.6\n" -"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-11-11 15:28+0100\n" "PO-Revision-Date: 2004-04-21 23:53+0900\n" "Last-Translator: IIDA Yosiaki <iida@gnu.org>\n" @@ -17,6 +16,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=EUC-JP\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=1; plural=0;\n" #: sed/compile.c:162 @@ -166,7 +166,7 @@ msgstr "ե%sޤǤ: %s" msgid "couldn't edit %s: not a regular file" msgstr "ե%sޤǤ: %s" -#: sed/execute.c:683 lib/utils.c:196 +#: lib/utils.c:196 sed/execute.c:683 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "եޤǤ: %s: %s" @@ -5,7 +5,6 @@ msgid "" msgstr "" "Project-Id-Version: GNU sed 3.02.80\n" -"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-11-11 15:28+0100\n" "PO-Revision-Date: 2001-10-12 17:26+0900\n" "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n" @@ -13,6 +12,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=EUC-KR\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" #: sed/compile.c:162 #, fuzzy @@ -160,7 +160,7 @@ msgstr "%s ϴ" msgid "couldn't edit %s: not a regular file" msgstr "%s ϴ" -#: sed/execute.c:683 lib/utils.c:196 +#: lib/utils.c:196 sed/execute.c:683 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "%s ϴ" @@ -7,7 +7,6 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.9\n" -"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-11-11 15:28+0100\n" "PO-Revision-Date: 2004-04-09 21:39+0200\n" "Last-Translator: Elros Cyriatan <cyriatan@fastmail.fm>\n" @@ -15,6 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: sed/compile.c:162 @@ -164,7 +164,7 @@ msgstr "Kon bestand %s niet openen: %s" msgid "couldn't edit %s: not a regular file" msgstr "Kon bestand %s niet openen: %s" -#: sed/execute.c:683 lib/utils.c:196 +#: lib/utils.c:196 sed/execute.c:683 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "Kon tijdelijk bestand %s niet openen: %s" @@ -6,7 +6,6 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.1.1\n" -"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-11-11 15:28+0100\n" "PO-Revision-Date: 2004-07-08 19:58+0200\n" "Last-Translator: Wojciech Polak <polak@gnu.org>\n" @@ -14,6 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" @@ -148,7 +148,7 @@ msgstr "nie mona edytowa %s: plik jest terminalem" msgid "couldn't edit %s: not a regular file" msgstr "nie mona edytowa %s: to nie jest regularny plik" -#: sed/execute.c:683 lib/utils.c:196 +#: lib/utils.c:196 sed/execute.c:683 #, c-format msgid "couldn't open temporary file %s: %s" msgstr "nie mona otworzy tymczasowego pliku %s: %s" diff --git a/po/pt_BR.po b/po/pt_BR.po index 7ddec18..ac76497 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -8,7 +8,6 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.1\n" -"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-11-11 15:28+0100\n" "PO-Revision-Date: 2002-11-08 17:44-0300\n" "Last-Translator: Aurlio Marinho Jargas <aurelio@verde666.org>\n" @@ -16,6 +15,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #: sed/compile.c:162 @@ -165,7 +165,7 @@ msgstr "No foi possvel abrir o arquivo %s: %s" msgid "couldn't edit %s: not a regular file" msgstr "No foi possvel abrir o arquivo %s: %s" -#: sed/execute.c:683 lib/utils.c:196 +#: lib/utils.c:196 sed/execute.c:683 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "No foi possvel abrir o arquivo %s: %s" @@ -7,7 +7,6 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.8\n" -"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-11-11 15:28+0100\n" "PO-Revision-Date: 2003-11-22 12:00-0500\n" "Last-Translator: Laurentiu Buzdugan <buzdugan@voyager.net>\n" @@ -15,6 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: sed/compile.c:162 @@ -164,7 +164,7 @@ msgstr "Nu am putut deschide fiierul %s: %s" msgid "couldn't edit %s: not a regular file" msgstr "Nu am putut deschide fiierul %s: %s" -#: sed/execute.c:683 lib/utils.c:196 +#: lib/utils.c:196 sed/execute.c:683 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "Nu am putut deschide fiierul temporar %s: %s" @@ -6,7 +6,6 @@ msgid "" msgstr "" "Project-Id-Version: sed-4.1.1\n" -"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-11-11 15:28+0100\n" "PO-Revision-Date: 2004-07-07 17:54+0300\n" "Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n" @@ -14,6 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=KOI8-R\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: KBabel 1.3\n" @@ -148,7 +148,7 @@ msgstr " %s: " msgid "couldn't edit %s: not a regular file" msgstr " %s: " -#: sed/execute.c:683 lib/utils.c:196 +#: lib/utils.c:196 sed/execute.c:683 #, c-format msgid "couldn't open temporary file %s: %s" msgstr " %s: %s" @@ -6,7 +6,6 @@ msgid "" msgstr "" "Project-Id-Version: GNU sed 4.0.8\n" -"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-11-11 15:28+0100\n" "PO-Revision-Date: 2003-10-25 17:22+0200\n" "Last-Translator: Marcel Telka <marcel@telka.sk>\n" @@ -14,6 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=3; plural= (n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" #: sed/compile.c:162 @@ -163,7 +163,7 @@ msgstr "Nebolo možné otvoriť súbor %s: %s" msgid "couldn't edit %s: not a regular file" msgstr "Nebolo možné otvoriť súbor %s: %s" -#: sed/execute.c:683 lib/utils.c:196 +#: lib/utils.c:196 sed/execute.c:683 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "Nebolo možné otvoriť dočasný súbor %s: %s" @@ -6,7 +6,6 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.6\n" -"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-11-11 15:28+0100\n" "PO-Revision-Date: 2003-04-02 17:20+0200\n" "Last-Translator: Primo Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n" @@ -14,6 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8-bit\n" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" "%100==4 ? 3 : 0);\n" @@ -164,7 +164,7 @@ msgstr "Datoteke %s ni mogoe odpreti: %s" msgid "couldn't edit %s: not a regular file" msgstr "Datoteke %s ni mogoe odpreti: %s" -#: sed/execute.c:683 lib/utils.c:196 +#: lib/utils.c:196 sed/execute.c:683 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "Datoteke %s ni mogoe odpreti: %s" @@ -5,7 +5,6 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.9\n" -"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-11-11 15:28+0100\n" "PO-Revision-Date: 2004-01-13 22:51-0500\n" "Last-Translator: Aleksandar Jelenak <jelenak@netlinkplus.net>\n" @@ -13,6 +12,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : (n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" @@ -163,7 +163,7 @@ msgstr "Не може се отворити датотека %s: %s" msgid "couldn't edit %s: not a regular file" msgstr "Не може се отворити датотека %s: %s" -#: sed/execute.c:683 lib/utils.c:196 +#: lib/utils.c:196 sed/execute.c:683 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "Не могу отворити привремену датотеку %s: %s" @@ -5,7 +5,6 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.1.1\n" -"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-11-11 15:28+0100\n" "PO-Revision-Date: 2004-07-11 11:45+0200\n" "Last-Translator: Christian Rose <menthos@menthos.com>\n" @@ -13,6 +12,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: sed/compile.c:162 @@ -146,7 +146,7 @@ msgstr "kunde inte redigera %s: r en terminal" msgid "couldn't edit %s: not a regular file" msgstr "kunde inte redigera %s: inte en vanlig fil" -#: sed/execute.c:683 lib/utils.c:196 +#: lib/utils.c:196 sed/execute.c:683 #, c-format msgid "couldn't open temporary file %s: %s" msgstr "kunde inte ppna temporra filen %s: %s" @@ -5,7 +5,6 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.9\n" -"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-11-11 15:28+0100\n" "PO-Revision-Date: 2004-05-19 18:06+0300\n" "Last-Translator: Deniz Akkus Kanca <deniz@arayan.com>\n" @@ -13,6 +12,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" "X-Generator: KBabel 1.0.2\n" "Plural-Forms: nplurals=1; plural=0;\n" @@ -163,7 +163,7 @@ msgstr "%d sayıda öğe %s'e yazılamadı: %s" msgid "couldn't edit %s: not a regular file" msgstr "%d sayıda öğe %s'e yazılamadı: %s" -#: sed/execute.c:683 lib/utils.c:196 +#: lib/utils.c:196 sed/execute.c:683 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "Geçici dosya %s açılamadı: %s" diff --git a/po/zh_CN.po b/po/zh_CN.po index b85e167..a391cf3 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -5,7 +5,6 @@ msgid "" msgstr "" "Project-Id-Version: sed 3.02.80\n" -"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-11-11 15:28+0100\n" "PO-Revision-Date: 2002-08-18 11:11+0800\n" "Last-Translator: Wang Li <charles@linux.net.cn>\n" @@ -13,6 +12,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=gb2312\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" #: sed/compile.c:162 #, fuzzy @@ -160,7 +160,7 @@ msgstr "ļ %s" msgid "couldn't edit %s: not a regular file" msgstr "ļ %s" -#: sed/execute.c:683 lib/utils.c:196 +#: lib/utils.c:196 sed/execute.c:683 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "ļ %s" diff --git a/sed/regexp.c b/sed/regexp.c index 070ad95..56b4caa 100644 --- a/sed/regexp.c +++ b/sed/regexp.c @@ -1,5 +1,5 @@ /* GNU SED, a batch stream editor. - Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -61,7 +61,6 @@ compile_regex_1 (new_regex, needed_sub) } #else const char *error; - new_regex->pattern.fastmap = malloc (1 << (sizeof (char) * 8)); int syntax = ((extended_regexp_flags & REG_EXTENDED) ? RE_SYNTAX_POSIX_EXTENDED : RE_SYNTAX_POSIX_BASIC) @@ -75,6 +74,8 @@ compile_regex_1 (new_regex, needed_sub) syntax |= needed_sub ? 0 : RE_NO_SUB; #endif + new_regex->pattern.fastmap = malloc (1 << (sizeof (char) * 8)); + /* If REG_NEWLINE is set, newlines are treated differently. */ if (new_regex->flags & REG_NEWLINE) { |