From 35ae01e7b3186a2281dd0eeb9643bb8b0a2a7ece Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 28 Jan 2005 16:11:39 +0000 Subject: [PATCH] sync with sed 4.1.4 Patches applied: * bonzini@gnu.org--2004b/sed--stable--4.1--patch-35 prepare for 4.1.4 release * bonzini@gnu.org--2004b/sed--stable--4.1--patch-37 finishing touches :-) for 4.1.4 Other patch logs that were added are for regex matcher patches, that do not apply to ssed: * bonzini@gnu.org--2004b/sed--stable--4.1--patch-24 fix off by one error in check_dst_limits_calc_pos_1 * bonzini@gnu.org--2004b/sed--stable--4.1--patch-25 simplify handling of subexpressions * bonzini@gnu.org--2004b/sed--stable--4.1--patch-26 do not make single-byte searches go through slow MBCS paths * bonzini@gnu.org--2004b/sed--stable--4.1--patch-27 Fix bugs in the accept_mb optimization. * bonzini@gnu.org--2004b/sed--stable--4.1--patch-28 speed up parentheses * bonzini@gnu.org--2004b/sed--stable--4.1--patch-29 separate parsing and creation of the NFA. Avoid recursion on the parse tree. * bonzini@gnu.org--2004b/sed--stable--4.1--patch-30 speed up transit_state_mb * bonzini@gnu.org--2004b/sed--stable--4.1--patch-34 compute inveclosure only if actually needed. * bonzini@gnu.org--2004b/sed--stable--4.1--patch-36 fix meaning of \B * bonzini@gnu.org--2004b/sed--stable--4.1--patch-38 finally resync with glibc git-archimport-id: bonzini@gnu.org--2004b/sed--ssed--3.61--patch-16 --- ChangeLog | 4 ++++ configure.ac | 2 +- doc/Makefile.am | 15 +++++++++++---- po/af.po | 5 +++-- po/ca.po | 5 +++-- po/cs.po | 5 +++-- po/da.po | 5 +++-- po/de.po | 5 +++-- po/el.po | 5 +++-- po/eo.po | 5 +++-- po/es.po | 5 +++-- po/et.po | 5 +++-- po/fi.po | 5 +++-- po/fr.po | 5 +++-- po/ga.po | 5 +++-- po/gl.po | 5 +++-- po/he.po | 5 +++-- po/hr.po | 5 +++-- po/hu.po | 5 +++-- po/id.po | 5 +++-- po/it.po | 5 +++-- po/ja.po | 5 +++-- po/ko.po | 5 +++-- po/nl.po | 5 +++-- po/pl.po | 5 +++-- po/pt_BR.po | 5 +++-- po/ro.po | 5 +++-- po/ru.po | 5 +++-- po/sk.po | 5 +++-- po/sl.po | 5 +++-- po/sr.po | 5 +++-- po/sv.po | 5 +++-- po/tr.po | 5 +++-- po/zh_CN.po | 5 +++-- sed/regexp.c | 5 +++-- 35 files changed, 112 insertions(+), 69 deletions(-) diff --git a/ChangeLog b/ChangeLog index 40ac47e..316cb0c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-01-25 Paolo Bonzini + + * sed/regexp.c: Fix building on GCC 2.95 and earlier. + 2004-12-26 Paolo Bonzini Do not use leftmost-longest matching for addresses. diff --git a/configure.ac b/configure.ac index 81c31f3..58b6a24 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_INIT(sed, 3.61, bonzini@gnu.org, ssed) 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 diff --git a/doc/Makefile.am b/doc/Makefile.am index 2bfb211..c827f80 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -27,9 +27,12 @@ dist-hook: # sed.html dependant on sed.texi and all the included # sources if MAKEINFO_HTML +docdir = $(datadir)/doc +doc_DATA = sed.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 @@ -38,9 +41,13 @@ endif # These rules are used together with TEXI2HTML if TEXI2HTML_HTML +docdir = $(datadir)/doc +doc_DATA = sed.html + sed.html: sed.texi sed.info - cd $(srcdir) \ - && $(TEXI2HTML) `echo $< | sed 's,.*/,,'` + cp $(srcdir)/*.texi . && \ + $(TEXI2HTML) sed.texi && \ + rn *.texi html: sed.html diff --git a/po/af.po b/po/af.po index e6b9e43..7b958c2 100644 --- a/po/af.po +++ b/po/af.po @@ -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 16:32+0100\n" "PO-Revision-Date: 2004-01-11 21:06+0000\n" "Last-Translator: Ysbeer \n" @@ -14,6 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=n!=1;\n" #: pcre/pcregrep.c:130 @@ -364,7 +365,7 @@ msgstr "Kon nie die lêer %s oopmaak nie: %s" msgid "couldn't edit %s: not a regular file" msgstr "" -#: 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" diff --git a/po/ca.po b/po/ca.po index 853b8d9..3689aa2 100644 --- a/po/ca.po +++ b/po/ca.po @@ -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 16:32+0100\n" "PO-Revision-Date: 2004-07-10 05:51+0200\n" "Last-Translator: Jordi Mallach \n" @@ -14,6 +13,8 @@ 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" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=n!=1;\n" #: pcre/pcregrep.c:130 @@ -348,7 +349,7 @@ msgstr "no s'ha pogut editar %s: 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" diff --git a/po/cs.po b/po/cs.po index 75061d7..a366ca6 100644 --- a/po/cs.po +++ b/po/cs.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 16:32+0100\n" "PO-Revision-Date: 2001-08-05 19:52+02:00\n" "Last-Translator: Vladimir Michl \n" @@ -13,6 +12,8 @@ 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" +"Report-Msgid-Bugs-To: \n" #: pcre/pcregrep.c:130 #, c-format @@ -357,7 +358,7 @@ msgstr "Soubor %s nelze otev msgid "couldn't edit %s: not a regular file" msgstr "" -#: 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 otevøít" diff --git a/po/da.po b/po/da.po index bdb1696..c3dbea1 100644 --- a/po/da.po +++ b/po/da.po @@ -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 16:32+0100\n" "PO-Revision-Date: 2003-10-25 08:00+0200\n" "Last-Translator: Byrial Ole Jensen \n" @@ -13,6 +12,8 @@ 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" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: pcre/pcregrep.c:130 @@ -363,7 +364,7 @@ msgstr "kunne ikke msgid "couldn't edit %s: not a regular file" msgstr "" -#: 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" diff --git a/po/de.po b/po/de.po index 7118465..1fdfb6c 100644 --- a/po/de.po +++ b/po/de.po @@ -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 16:32+0100\n" "PO-Revision-Date: 2003-03-21 22:03:41+0100\n" "Last-Translator: Walter Koch \n" @@ -13,6 +12,8 @@ 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" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: pcre/pcregrep.c:130 @@ -363,7 +364,7 @@ msgstr "Datei %s kann nicht ge msgid "couldn't edit %s: not a regular file" msgstr "" -#: 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 geöffnet werden: %s" diff --git a/po/el.po b/po/el.po index fd03409..446874f 100644 --- a/po/el.po +++ b/po/el.po @@ -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 16:32+0100\n" "PO-Revision-Date: 2002-03-08 12:57+0000\n" "Last-Translator: Simos Xenitellis \n" @@ -13,6 +12,8 @@ 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" +"Report-Msgid-Bugs-To: \n" #: pcre/pcregrep.c:130 #, c-format @@ -362,7 +363,7 @@ msgstr " msgid "couldn't edit %s: not a regular file" msgstr "" -#: 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/po/eo.po b/po/eo.po index 2d2eba7..9c41c5c 100644 --- a/po/eo.po +++ b/po/eo.po @@ -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 16:32+0100\n" "PO-Revision-Date: 2003-10-26 20:57+0000\n" "Last-Translator: Edmund GRIMLEY EVANS \n" @@ -13,6 +12,8 @@ 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" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: pcre/pcregrep.c:130 @@ -363,7 +364,7 @@ msgstr "Ne povis malfermi dosieron %s: %s" msgid "couldn't edit %s: not a regular file" msgstr "" -#: 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" diff --git a/po/es.po b/po/es.po index 98ba57c..beb9ca1 100644 --- a/po/es.po +++ b/po/es.po @@ -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 16:32+0100\n" "PO-Revision-Date: 2003-10-24 12:38-0500\n" "Last-Translator: Cristian Othón Martínez Vera \n" @@ -13,6 +12,8 @@ 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" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: pcre/pcregrep.c:130 @@ -363,7 +364,7 @@ msgstr "No se puede abrir el fichero %s: %s" msgid "couldn't edit %s: not a regular file" msgstr "" -#: 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" diff --git a/po/et.po b/po/et.po index 0273a74..6ef1614 100644 --- a/po/et.po +++ b/po/et.po @@ -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 16:32+0100\n" "PO-Revision-Date: 2004-07-09 16:33+0300\n" "Last-Translator: Toomas Soome \n" @@ -13,6 +12,8 @@ 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" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: pcre/pcregrep.c:130 @@ -347,7 +348,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" diff --git a/po/fi.po b/po/fi.po index 27822d0..c8b34b5 100644 --- a/po/fi.po +++ b/po/fi.po @@ -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 16:32+0100\n" "PO-Revision-Date: 2003-12-07 09:35+0200\n" "Last-Translator: Sami J. Laine \n" @@ -13,6 +12,8 @@ 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" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: pcre/pcregrep.c:130 @@ -363,7 +364,7 @@ msgstr "Tiedostoa %s ei voitu avata: %s" msgid "couldn't edit %s: not a regular file" msgstr "" -#: 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 "Väliaikaistiedostoa %s ei voitu avata: %s" diff --git a/po/fr.po b/po/fr.po index 45b7c60..78b1642 100644 --- a/po/fr.po +++ b/po/fr.po @@ -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 16:32+0100\n" "PO-Revision-Date: 2004-07-12 00:09+0200\n" "Last-Translator: Gaël Quéri \n" @@ -17,6 +16,8 @@ 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" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #: pcre/pcregrep.c:130 @@ -351,7 +352,7 @@ msgstr "impossible d' msgid "couldn't edit %s: not a regular file" msgstr "impossible d'éditer %s: ce n'est pas un fichier régulier" -#: 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" diff --git a/po/ga.po b/po/ga.po index cf4a374..a16595d 100644 --- a/po/ga.po +++ b/po/ga.po @@ -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 16:32+0100\n" "PO-Revision-Date: 2004-07-07 11:04-0500\n" "Last-Translator: Kevin Patrick Scannell \n" @@ -13,6 +12,8 @@ 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" +"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" @@ -350,7 +351,7 @@ msgstr "n msgid "couldn't edit %s: not a regular file" msgstr "níorbh fhéidir %s a chur in eagar: ní gnáthcomhad é" -#: 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 "níorbh fhéidir an comhad sealadach %s a oscailt: %s" diff --git a/po/gl.po b/po/gl.po index 36b1588..589df45 100644 --- a/po/gl.po +++ b/po/gl.po @@ -5,7 +5,6 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0\n" -"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-11-11 16:32+0100\n" "PO-Revision-Date: 2002-10-25 15:57+0200\n" "Last-Translator: Jacobo Tarrío Barreiro \n" @@ -13,6 +12,8 @@ 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" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=n!=1;\n" #: pcre/pcregrep.c:130 @@ -363,7 +364,7 @@ msgstr "Non se puido abri-lo ficheiro %s: %s" msgid "couldn't edit %s: not a regular file" msgstr "" -#: 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" diff --git a/po/he.po b/po/he.po index e59f536..2a4fcd1 100644 --- a/po/he.po +++ b/po/he.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 16:32+0100\n" "PO-Revision-Date: 2001-08-04 20:37+0300\n" "Last-Translator: Eli Zaretskii \n" @@ -13,6 +12,8 @@ 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" +"Report-Msgid-Bugs-To: \n" #: pcre/pcregrep.c:130 #, c-format @@ -357,7 +358,7 @@ msgstr "%s msgid "couldn't edit %s: not a regular file" msgstr "" -#: 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/po/hr.po b/po/hr.po index ffcfb6d..afbb643 100644 --- a/po/hr.po +++ b/po/hr.po @@ -5,7 +5,6 @@ msgid "" msgstr "" "Project-Id-Version: sed 3.02a\n" -"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-11-11 16:32+0100\n" "PO-Revision-Date: 2002-06-14 15:17-01\n" "Last-Translator: Denis Lackovic \n" @@ -13,6 +12,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=(n==1?0:1);\n" "X-Generator: TransDict server\n" @@ -360,7 +361,7 @@ msgstr "Ne mogu otvoriti datoteku %s" msgid "couldn't edit %s: not a regular file" msgstr "" -#: 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" diff --git a/po/hu.po b/po/hu.po index 4fae1ff..d42d07a 100644 --- a/po/hu.po +++ b/po/hu.po @@ -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 16:32+0100\n" "PO-Revision-Date: 2003-10-26 09:28+0100\n" "Last-Translator: Mihály Gyulai \n" @@ -13,6 +12,8 @@ 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" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=1; plural=0;\n" #: pcre/pcregrep.c:130 @@ -363,7 +364,7 @@ msgstr "Nem lehet megnyitni a(z) %s f msgid "couldn't edit %s: not a regular file" msgstr "" -#: 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 fájlt: %s: %s" diff --git a/po/id.po b/po/id.po index f91add1..0b89af3 100644 --- a/po/id.po +++ b/po/id.po @@ -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 16:32+0100\n" "PO-Revision-Date: 2004-04-27 14:56+0700\n" "Last-Translator: Tedi Heriyanto \n" @@ -14,6 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: KBabel 1.3\n" @@ -365,7 +366,7 @@ msgstr "Tidak dapat membuka file %s %s" msgid "couldn't edit %s: not a regular file" msgstr "" -#: 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" diff --git a/po/it.po b/po/it.po index 25b5068..c2ff97f 100644 --- a/po/it.po +++ b/po/it.po @@ -1,7 +1,6 @@ msgid "" msgstr "" "Project-Id-Version: ssed 3.46\n" -"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2004-11-11 16:32+0100\n" "PO-Revision-Date: 2000-12-21 12:44+0100\n" "Last-Translator: Paolo Bonzini \n" @@ -9,6 +8,8 @@ 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" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: pcre/pcregrep.c:130 @@ -336,7 +337,7 @@ msgstr "impossibile modificare il file %s: msgid "couldn't edit %s: not a regular file" msgstr "impossibile modificare il file %s: non è un file regolare" -#: 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" diff --git a/po/ja.po b/po/ja.po index e0008b5..78d96bc 100644 --- a/po/ja.po +++ b/po/ja.po @@ -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 16:32+0100\n" "PO-Revision-Date: 2004-04-21 23:53+0900\n" "Last-Translator: IIDA Yosiaki \n" @@ -17,6 +16,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=EUC-JP\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=1; plural=0;\n" #: pcre/pcregrep.c:130 @@ -367,7 +368,7 @@ msgstr " msgid "couldn't edit %s: not a regular file" msgstr "" -#: 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" diff --git a/po/ko.po b/po/ko.po index 012dd36..d5bb3ab 100644 --- a/po/ko.po +++ b/po/ko.po @@ -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 16:32+0100\n" "PO-Revision-Date: 2001-10-12 17:26+0900\n" "Last-Translator: Jong-Hoon Ryu \n" @@ -13,6 +12,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=EUC-KR\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" +"Report-Msgid-Bugs-To: \n" #: pcre/pcregrep.c:130 #, c-format @@ -357,7 +358,7 @@ msgstr "%s msgid "couldn't edit %s: not a regular file" msgstr "" -#: 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/po/nl.po b/po/nl.po index 8d5f2fb..ebfc3a1 100644 --- a/po/nl.po +++ b/po/nl.po @@ -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 16:32+0100\n" "PO-Revision-Date: 2004-04-09 21:39+0200\n" "Last-Translator: Elros Cyriatan \n" @@ -15,6 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: pcre/pcregrep.c:130 @@ -365,7 +366,7 @@ msgstr "Kon bestand %s niet openen: %s" msgid "couldn't edit %s: not a regular file" msgstr "" -#: 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" diff --git a/po/pl.po b/po/pl.po index 14ebd0b..1050e8a 100644 --- a/po/pl.po +++ b/po/pl.po @@ -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 16:32+0100\n" "PO-Revision-Date: 2004-07-08 19:58+0200\n" "Last-Translator: Wojciech Polak \n" @@ -14,6 +13,8 @@ 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" +"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" @@ -349,7 +350,7 @@ msgstr "nie mo msgid "couldn't edit %s: not a regular file" msgstr "nie mo¿na 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 mo¿na otworzyæ tymczasowego pliku %s: %s" diff --git a/po/pt_BR.po b/po/pt_BR.po index 7a2e00e..4aea70e 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 16:32+0100\n" "PO-Revision-Date: 2002-11-08 17:44-0300\n" "Last-Translator: Aurélio Marinho Jargas \n" @@ -16,6 +15,8 @@ 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" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #: pcre/pcregrep.c:130 @@ -366,7 +367,7 @@ msgstr "N msgid "couldn't edit %s: not a regular file" msgstr "" -#: 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 "Não foi possível abrir o arquivo %s: %s" diff --git a/po/ro.po b/po/ro.po index e2dd1c4..a5b3f70 100644 --- a/po/ro.po +++ b/po/ro.po @@ -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 16:32+0100\n" "PO-Revision-Date: 2003-11-22 12:00-0500\n" "Last-Translator: Laurentiu Buzdugan \n" @@ -15,6 +14,8 @@ 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" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: pcre/pcregrep.c:130 @@ -365,7 +366,7 @@ msgstr "Nu am putut deschide fi msgid "couldn't edit %s: not a regular file" msgstr "" -#: 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 fiºierul temporar %s: %s" diff --git a/po/ru.po b/po/ru.po index 24eb873..411ec82 100644 --- a/po/ru.po +++ b/po/ru.po @@ -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 16:32+0100\n" "PO-Revision-Date: 2004-07-07 17:54+0300\n" "Last-Translator: Pavel Maryanov \n" @@ -14,6 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=KOI8-R\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: KBabel 1.3\n" @@ -349,7 +350,7 @@ msgstr " 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" diff --git a/po/sk.po b/po/sk.po index 6d036a8..b3469c3 100644 --- a/po/sk.po +++ b/po/sk.po @@ -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 16:32+0100\n" "PO-Revision-Date: 2003-10-25 17:22+0200\n" "Last-Translator: Marcel Telka \n" @@ -14,6 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=3; plural= (n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" #: pcre/pcregrep.c:130 @@ -364,7 +365,7 @@ msgstr "Nebolo možné otvoriÅ¥ súbor %s: %s" msgid "couldn't edit %s: not a regular file" msgstr "" -#: 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" diff --git a/po/sl.po b/po/sl.po index f56fd8c..f8db157 100644 --- a/po/sl.po +++ b/po/sl.po @@ -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 16:32+0100\n" "PO-Revision-Date: 2003-04-02 17:20+0200\n" "Last-Translator: Primo¾ Peterlin \n" @@ -14,6 +13,8 @@ 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" +"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" @@ -365,7 +366,7 @@ msgstr "Datoteke %s ni mogo msgid "couldn't edit %s: not a regular file" msgstr "" -#: 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 mogoèe odpreti: %s" diff --git a/po/sr.po b/po/sr.po index 2a5dd62..48a892d 100644 --- a/po/sr.po +++ b/po/sr.po @@ -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 16:32+0100\n" "PO-Revision-Date: 2004-01-13 22:51-0500\n" "Last-Translator: Aleksandar Jelenak \n" @@ -13,6 +12,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \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" @@ -364,7 +365,7 @@ msgstr "Ð�е може Ñ�е отворити датотека %s: %s" msgid "couldn't edit %s: not a regular file" msgstr "" -#: 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" diff --git a/po/sv.po b/po/sv.po index a3500cb..9778738 100644 --- a/po/sv.po +++ b/po/sv.po @@ -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 16:32+0100\n" "PO-Revision-Date: 2004-07-11 11:45+0200\n" "Last-Translator: Christian Rose \n" @@ -13,6 +12,8 @@ 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" +"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: pcre/pcregrep.c:130 @@ -347,7 +348,7 @@ msgstr "kunde inte redigera %s: 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 temporära filen %s: %s" diff --git a/po/tr.po b/po/tr.po index 2fba490..13ae198 100644 --- a/po/tr.po +++ b/po/tr.po @@ -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 16:32+0100\n" "PO-Revision-Date: 2004-05-19 18:06+0300\n" "Last-Translator: Deniz Akkus Kanca \n" @@ -13,6 +12,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" +"Report-Msgid-Bugs-To: \n" "X-Generator: KBabel 1.0.2\n" "Plural-Forms: nplurals=1; plural=0;\n" @@ -365,7 +366,7 @@ msgstr "%d sayıda öğe %s'e yazılamadı: %s" msgid "couldn't edit %s: not a regular file" msgstr "" -#: 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 da356be..52f1ba4 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 16:32+0100\n" "PO-Revision-Date: 2002-08-18 11:11+0800\n" "Last-Translator: Wang Li \n" @@ -13,6 +12,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=gb2312\n" "Content-Transfer-Encoding: 8bit\n" +"Report-Msgid-Bugs-To: \n" +"Report-Msgid-Bugs-To: \n" #: pcre/pcregrep.c:130 #, c-format @@ -357,7 +358,7 @@ msgstr " msgid "couldn't edit %s: not a regular file" msgstr "" -#: 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) {