diff --git a/ChangeLog b/ChangeLog index 2354f28..646b8e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,40 @@ +2006-09-24 Paolo Bonzini + + * sed/execute.c: Support ACLs. + * lib/utils.c: Move... + * sed/utils.c: ... here, and remove xmalloc. + +2006-08-21 Paolo Bonzini + + * sed/regexp.c: Accept NUL bytes for `.'. Accept 'a\(b' in + POSIXLY_CORRECT/POSIXLY_BASIC posixicity. + +2006-08-03 Paolo Bonzini + + Revert this part of the previous change: + + 2006-08-03 Paolo Bonzini + + * sed/compile.c (get_openfile): Change second argument to char + and turn it into a string within the function. Adjust callers. + +2006-08-03 Paolo Bonzini + Corinna Vinschen + + * lib/getline.c (getline): Remove Windows special casing. + * lib/utils.c (register_open_file, ck_fdopen): New. + (ck_fopen, ck_mkstemp): Use register_open_file. + * lib/utils.h (ck_fdopen): New. + * sed/execute.c (open_next_file): Reopen stdin. + * sed/sed.h (read_mode): New. + * sed/sed.c (read_mode): New. + (main): Set it on --binary. + (usage): Document --binary. + * sed/compile.c (get_openfile): Change second argument to char + and turn it into a string within the function. Adjust callers. + * sed/execute.c (dump_append_queue, open_next_file): Use it + as mode for ck_fopen. + 2006-08-03 Paolo Bonzini * sed/execute.c (str_append): Use is_utf8 to skip useless work. diff --git a/INSTALL b/INSTALL index 54caf7c..23e5f25 100644 --- a/INSTALL +++ b/INSTALL @@ -1,13 +1,16 @@ -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software -Foundation, Inc. +Installation Instructions +************************* - This file is free documentation; the Free Software Foundation gives +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free +Software Foundation, Inc. + +This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. Basic Installation ================== - These are generic installation instructions. +These are generic installation instructions. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -67,9 +70,9 @@ The simplest way to compile this package is: Compilers and Options ===================== - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' -for details on some of the pertinent environment variables. +Some systems require unusual options for compilation or linking that the +`configure' script does not know about. Run `./configure --help' for +details on some of the pertinent environment variables. You can give `configure' initial values for configuration parameters by setting variables in the command line or in the environment. Here @@ -82,7 +85,7 @@ is an example: Compiling For Multiple Architectures ==================================== - You can compile the package for more than one kind of computer at the +You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their own directory. To do this, you must use a version of `make' that supports the `VPATH' variable, such as GNU `make'. `cd' to the @@ -99,19 +102,19 @@ for another architecture. Installation Names ================== - By default, `make install' will install the package's files in -`/usr/local/bin', `/usr/local/man', etc. You can specify an -installation prefix other than `/usr/local' by giving `configure' the -option `--prefix=PATH'. +By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you -give `configure' the option `--exec-prefix=PATH', the package will use -PATH as the prefix for installing programs and libraries. -Documentation and other data files will still use the regular prefix. +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. In addition, if you use an unusual directory layout you can give -options like `--bindir=PATH' to specify different values for particular +options like `--bindir=DIR' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories you can set and what kinds of files go in them. @@ -122,7 +125,7 @@ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. Optional Features ================= - Some packages pay attention to `--enable-FEATURE' options to +Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE is something like `gnu-as' or `x' (for the X Window System). The @@ -137,11 +140,11 @@ you can use the `configure' options `--x-includes=DIR' and Specifying the System Type ========================== - There may be some features `configure' cannot figure out -automatically, but needs to determine by the type of machine the package -will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints -a message saying it cannot guess the machine type, give it the +There may be some features `configure' cannot figure out automatically, +but needs to determine by the type of machine the package will run on. +Usually, assuming the package is built to be run on the _same_ +architectures, `configure' can figure that out, but if it prints a +message saying it cannot guess the machine type, give it the `--build=TYPE' option. TYPE can either be a short name for the system type, such as `sun4', or a canonical name which has the form: @@ -156,7 +159,7 @@ where SYSTEM can have one of these forms: need to know the machine type. If you are _building_ compiler tools for cross-compiling, you should -use the `--target=TYPE' option to select the type of system they will +use the option `--target=TYPE' to select the type of system they will produce code for. If you want to _use_ a cross compiler, that generates code for a @@ -167,9 +170,9 @@ eventually be run) with `--host=TYPE'. Sharing Defaults ================ - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. +If you want to set default values for `configure' scripts to share, you +can create a site shell script called `config.site' that gives default +values for variables like `CC', `cache_file', and `prefix'. `configure' looks for `PREFIX/share/config.site' if it exists, then `PREFIX/etc/config.site' if it exists. Or, you can set the `CONFIG_SITE' environment variable to the location of the site script. @@ -178,7 +181,7 @@ A warning: not all `configure' scripts look for a site script. Defining Variables ================== - Variables not defined in a site shell script can be set in the +Variables not defined in a site shell script can be set in the environment passed to `configure'. However, some packages may run configure again during the build, and the customized values of these variables may be lost. In order to avoid this problem, you should set @@ -186,14 +189,18 @@ them in the `configure' command line, using `VAR=value'. For example: ./configure CC=/usr/local2/bin/gcc -will cause the specified gcc to be used as the C compiler (unless it is -overridden in the site shell script). +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). Here is a another example: + + /bin/bash ./configure CONFIG_SHELL=/bin/bash + +Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent +configuration-related scripts to be executed by `/bin/bash'. `configure' Invocation ====================== - `configure' recognizes the following options to control how it -operates. +`configure' recognizes the following options to control how it operates. `--help' `-h' diff --git a/Makefile.am b/Makefile.am index d2c725e..7e6921b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ # Automake requirements AUTOMAKE_OPTIONS = gnits 1.8 -ACLOCAL_AMFLAGS = -I config +ACLOCAL_AMFLAGS = -I build-aux PACKAGE = sed diff --git a/THANKS b/THANKS index c8a8a32..e902e0b 100644 --- a/THANKS +++ b/THANKS @@ -6,6 +6,7 @@ Andrew Herbert Bruno Haible Chip Salzenberg Chris Weber +Corinna Vinschen David Eckelkamp David J. MacKenzie David Schmidt diff --git a/autoboot b/autoboot new file mode 100644 index 0000000..b2bb8c1 --- /dev/null +++ b/autoboot @@ -0,0 +1,127 @@ +#! /bin/sh + +# Bootstrap this package from CVS. + +# Copyright (C) 2003, 2004, 2005, 2006 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 +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program 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. + +# Written by Paul Eggert. + +package=ssed + +# Ensure file names are sorted consistently across platforms. +# Also, ensure diagnostics are in English, e.g., "wget --help" below. +LC_ALL=C +export LC_ALL + +# Parse options. + +for option +do + case $option in + --help) + echo "$0: usage: $0 [--gnulib-srcdir=DIR] [--cvs-user=USERNAME] [--skip-po]" + exit;; + --gnulib-srcdir=*) + GNULIB_SRCDIR=`expr "$option" : '--gnulib-srcdir=\(.*\)'`;; + --cvs-user=*) + CVS_USER=`expr "$option" : '--cvs-user=\(.*\)'`;; + --skip-po) + ;; + *) + echo >&2 "$0: $option: unknown option" + exit 1;; + esac +done + +echo "$0: Bootstrapping CVS $package..." + +cleanup_gnulib() { + status=$? + rm -fr gnulib + exit $status +} + +# Get gnulib files. + +case ${GNULIB_SRCDIR--} in +-) + if [ ! -d gnulib ]; then + echo "$0: getting gnulib files..." + + case ${CVS_AUTH-pserver} in + pserver) + CVS_PREFIX=':pserver:anonymous@';; + ssh) + CVS_PREFIX="$CVS_USER${CVS_USER+@}";; + *) + echo "$0: $CVS_AUTH: Unknown CVS access method" >&2 + exit 1;; + esac + + case $CVS_RSH in + '') export CVS_RSH=ssh;; + esac + + trap cleanup_gnulib 1 2 13 15 + + cvs -z3 -q -d ${CVS_PREFIX}cvs.savannah.gnu.org:/cvsroot/gnulib co gnulib || + cleanup_gnulib + + trap - 1 2 13 15 + fi + GNULIB_SRCDIR=gnulib +esac + +gnulib_tool=$GNULIB_SRCDIR/gnulib-tool +<$gnulib_tool || exit + +# $gnulib_tool --import --m4-base=build-aux --lib=libsed --no-changelog --makefile-name=gnulib.mk \ +# acl alloca getline getopt gettext memchr memcmp memmove \ +# mkstemp obstack snprintf stdbool strerror strverscmp unlocked-io verify + +# Get translations. + + set po/*.po + if test "$1" != "po/*.po"; then + ls po/*.po | sed 's|.*/||; s|\.po$||' >po/LINGUAS + fi +} + +# Reconfigure, getting other files. + +echo "$0: autopoint --force ..." +autopoint --force || exit + +echo "$0: $gnulib_tool --import ..." +$gnulib_tool --import + +# Make sure aclocal.m4 is not older than input files. +sleep 1 + +for command in \ + 'aclocal --force -I build-aux' \ + 'autoconf --force' \ + 'autoheader --force' \ + 'automake --add-missing --copy --force-missing'; +do + echo "$0: $command ..." + $command || exit +done + + +echo "$0: done. Now you can run './configure'." diff --git a/build-aux/.gitignore b/build-aux/.gitignore new file mode 100644 index 0000000..109f952 --- /dev/null +++ b/build-aux/.gitignore @@ -0,0 +1,82 @@ +codeset.m4 +gettext.m4 +glibc2.m4 +glibc21.m4 +gnulib-comp.m4 +iconv.m4 +install-sh +intdiv0.m4 +intmax.m4 +inttypes-h.m4 +inttypes-pri.m4 +inttypes_h.m4 +lcmessage.m4 +lib-ld.m4 +lib-link.m4 +lib-prefix.m4 +lock.m4 +longdouble.m4 +longlong.m4 +nls.m4 +po.m4 +printf-posix.m4 +progtest.m4 +signed.m4 +size_max.m4 +stdint_h.m4 +texinfo.tex +uintmax_t.m4 +ulonglong.m4 +visibility.m4 +wchar_t.m4 +wint_t.m4 +xsize.m4 +absolute-header.m4 +acl.m4 +alloca.m4 +eoverflow.m4 +error.m4 +exitfail.m4 +extensions.m4 +float_h.m4 +getdelim.m4 +getline.m4 +getopt.m4 +gettimeofday.m4 +gnulib-common.m4 +gnulib-tool.m4 +include_next.m4 +inline.m4 +intl.m4 +intldir.m4 +intlmacosx.m4 +intmax_t.m4 +link-warning.h +localcharset.m4 +malloc.m4 +mbrtowc.m4 +mbstate_t.m4 +memchr.m4 +memcmp.m4 +memmove.m4 +mkstemp.m4 +pathmax.m4 +quote.m4 +quotearg.m4 +realloc.m4 +snprintf.m4 +stdbool.m4 +stdint.m4 +stdio_h.m4 +stdlib_h.m4 +strerror.m4 +strverscmp.m4 +sys_stat_h.m4 +sys_time_h.m4 +tempname.m4 +unistd_h.m4 +unlocked-io.m4 +vasnprintf.m4 +wchar.m4 +wctype.m4 +xalloc.m4 diff --git a/build-aux/gnulib-cache.m4 b/build-aux/gnulib-cache.m4 new file mode 100644 index 0000000..67883a0 --- /dev/null +++ b/build-aux/gnulib-cache.m4 @@ -0,0 +1,32 @@ +# Copyright (C) 2004-2007 Free Software Foundation, Inc. +# +# This file is free software, distributed under the terms of the GNU +# General Public License. As a special exception to the GNU General +# Public License, this file may be distributed as part of a program +# that contains a configuration script generated by Autoconf, under +# the same distribution terms as the rest of that program. +# +# Generated by gnulib-tool. +# +# This file represents the specification of how gnulib-tool is used. +# It acts as a cache: It is written and read by gnulib-tool. +# In projects using CVS, this file is meant to be stored in CVS, +# like the configure.ac and various Makefile.am files. + + +# Specification in the form of a command-line invocation: +# gnulib-tool --import --dir=. --lib=libsed --source-base=lib --m4-base=build-aux --doc-base=doc --aux-dir=build-aux --makefile-name=gnulib.mk --no-libtool --macro-prefix=gl acl alloca getline getopt gettext localcharset memchr memcmp memmove mkstemp obstack pathmax snprintf stat-macros stdbool strerror strverscmp unlocked-io verify + +# Specification in the form of a few gnulib-tool.m4 macro invocations: +gl_LOCAL_DIR([]) +gl_MODULES([acl alloca getline getopt gettext localcharset memchr memcmp memmove mkstemp obstack pathmax snprintf stat-macros stdbool strerror strverscmp unlocked-io verify]) +gl_AVOID([]) +gl_SOURCE_BASE([lib]) +gl_M4_BASE([build-aux]) +gl_PO_BASE([]) +gl_DOC_BASE([doc]) +gl_TESTS_BASE([tests]) +gl_LIB([libsed]) +gl_MAKEFILE_NAME([gnulib.mk]) +gl_MACRO_PREFIX([gl]) +gl_PO_DOMAIN([]) diff --git a/config/help2man b/build-aux/help2man similarity index 100% rename from config/help2man rename to build-aux/help2man diff --git a/config/texi2dvi b/build-aux/texi2dvi similarity index 100% rename from config/texi2dvi rename to build-aux/texi2dvi diff --git a/config/getline.m4 b/config/getline.m4 deleted file mode 100644 index ff8b5f4..0000000 --- a/config/getline.m4 +++ /dev/null @@ -1,41 +0,0 @@ -#serial 4 - -dnl See if there's a working, system-supplied version of the getline function. -dnl We can't just do AC_REPLACE_FUNCS(getline) because some systems -dnl have a function by that name in -linet that doesn't have anything -dnl to do with the function we need. -AC_DEFUN([AM_FUNC_GETLINE], -[dnl - am_getline_needs_run_time_check=no - AC_CHECK_FUNC(getline, - dnl Found it in some library. Verify that it works. - am_getline_needs_run_time_check=yes, - am_cv_func_working_getline=no) - if test $am_getline_needs_run_time_check = yes; then - AC_CACHE_CHECK([for working getline function], am_cv_func_working_getline, - [echo fooN |tr -d '\012'|tr N '\012' > conftest.data - AC_TRY_RUN([ -# include -# include -# include - int main () - { /* Based on a test program from Karl Heuer. */ - char *line = NULL; - size_t siz = 0; - int len; - FILE *in = fopen ("./conftest.data", "r"); - if (!in) - return 1; - len = getline (&line, &siz, in); - exit ((len == 4 && line && strcmp (line, "foo\n") == 0) ? 0 : 1); - } - ], am_cv_func_working_getline=yes dnl The library version works. - , am_cv_func_working_getline=no dnl The library version does NOT work. - , am_cv_func_working_getline=no dnl We're cross compiling. - )]) - fi - - if test $am_cv_func_working_getline = no; then - AC_LIBOBJ(getline) - fi -]) diff --git a/config/gettext-ver.m4 b/config/gettext-ver.m4 deleted file mode 100644 index 7e553f3..0000000 --- a/config/gettext-ver.m4 +++ /dev/null @@ -1 +0,0 @@ -AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) diff --git a/config/stdbool.m4 b/config/stdbool.m4 deleted file mode 100644 index 11804fe..0000000 --- a/config/stdbool.m4 +++ /dev/null @@ -1,66 +0,0 @@ -# Check for stdbool.h that conforms to C99. - -# Copyright (C) 2002-2003 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 -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program 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. - -# This macro is only needed in autoconf <= 2.54. Newer versions of autoconf -# have this macro built-in. - -AC_DEFUN([AC_HEADER_STDBOOL], - [AC_CACHE_CHECK([for stdbool.h that conforms to C99], - [ac_cv_header_stdbool_h], - [AC_TRY_COMPILE( - [ - #include - #ifndef bool - "error: bool is not defined" - #endif - #ifndef false - "error: false is not defined" - #endif - #if false - "error: false is not 0" - #endif - #ifndef true - "error: false is not defined" - #endif - #if true != 1 - "error: true is not 1" - #endif - #ifndef __bool_true_false_are_defined - "error: __bool_true_false_are_defined is not defined" - #endif - - struct s { _Bool s: 1; _Bool t; } s; - - char a[true == 1 ? 1 : -1]; - char b[false == 0 ? 1 : -1]; - char c[__bool_true_false_are_defined == 1 ? 1 : -1]; - char d[(bool) -0.5 == true ? 1 : -1]; - bool e = &s; - char f[(_Bool) -0.0 == false ? 1 : -1]; - char g[true]; - char h[sizeof (_Bool)]; - char i[sizeof s.t]; - ], - [ return !a + !b + !c + !d + !e + !f + !g + !h + !i; ], - [ac_cv_header_stdbool_h=yes], - [ac_cv_header_stdbool_h=no])]) - AC_CHECK_TYPES([_Bool]) - if test $ac_cv_header_stdbool_h = yes; then - AC_DEFINE(HAVE_STDBOOL_H, 1, [Define to 1 if stdbool.h conforms to C99.]) - fi]) diff --git a/config/strverscmp.m4 b/config/strverscmp.m4 deleted file mode 100644 index bb82336..0000000 --- a/config/strverscmp.m4 +++ /dev/null @@ -1,24 +0,0 @@ -# strverscmp.m4 serial 1 -dnl Copyright (C) 2002 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -AC_DEFUN([gl_FUNC_STRVERSCMP], -[ - dnl Persuade glibc to declare strverscmp(). - AC_REQUIRE([AC_GNU_SOURCE]) - - AC_REPLACE_FUNCS(strverscmp) - if test $ac_cv_func_strverscmp = no; then - gl_PREREQ_STRVERSCMP - fi -]) - -# Prerequisites of lib/strverscmp.c. -AC_DEFUN([gl_PREREQ_STRVERSCMP], [ - : -]) - diff --git a/configure.ac b/configure.ac index 71860dd..196b3ed 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with -*- autoconf -*- to produce a configure script. AC_INIT(sed, 3.62, bonzini@gnu.org, ssed) -AC_CONFIG_AUX_DIR(config) +AC_CONFIG_AUX_DIR(build-aux) AC_CONFIG_SRCDIR([sed/sed.c]) AM_CONFIG_HEADER(config.h:config_h.in) AC_PREREQ(2.59) @@ -12,10 +12,7 @@ AC_DEFINE_UNQUOTED(SED_FEATURE_VERSION, "$SED_FEATURE_VERSION", AC_SUBST(SED_FEATURE_VERSION) AC_PROG_CC -AC_PROG_RANLIB -AC_GNU_SOURCE -AC_AIX -AC_MINIX +gl_EARLY AC_ISC_POSIX AC_SYS_LARGEFILE AC_SYS_LONG_FILE_NAMES @@ -44,33 +41,19 @@ if test "$sed_cv_libcp_needed" = yes; then fi AC_HEADER_DIRENT -AC_CHECK_HEADERS(io.h limits.h locale.h stdarg.h alloca.h stddef.h errno.h \ - wchar.h wctype.h sys/file.h, [], [], [AC_INCLUDES_DEFAULT]) +AC_CHECK_HEADERS_ONCE(io.h limits.h locale.h stdarg.h alloca.h stddef.h errno.h \ + wchar.h wctype.h sys/file.h, [], [], [AC_INCLUDES_DEFAULT]) AC_C_CONST AC_TYPE_SIZE_T AC_CHECK_TYPE(ssize_t, int) -AC_HEADER_STDBOOL -if test "$ac_cv_type__Bool" = no; then - HAVE__BOOL=0 -else - HAVE__BOOL=1 -fi -AC_SUBST(HAVE__BOOL) -if test "$ac_cv_header_stdbool_h" = no; then - AC_CONFIG_FILES(lib/stdbool.h:lib/stdbool_.h) -fi - -AC_FUNC_ALLOCA AC_FUNC_VPRINTF -AM_FUNC_GETLINE -AC_FUNC_OBSTACK -AC_FUNC_MBRTOWC -AC_TYPE_MBSTATE_T -gl_FUNC_STRVERSCMP -AC_REPLACE_FUNCS(memchr memcmp memmove strerror snprintf mkstemp) -AC_CHECK_FUNCS(isatty bcopy bzero isascii memcpy memset strchr strtoul popen \ - pathconf isblank fchown fchmod setlocale wcrtomb wcscoll btowc) +AM_GNU_GETTEXT_VERSION(0.15) +AM_GNU_GETTEXT(no-libtool, need-ngettext, ../intl) + +gl_INIT +AC_CHECK_FUNCS_ONCE(isatty bcopy bzero isascii memcpy memset strchr strtoul popen \ + pathconf isblank fchown fchmod setlocale wcrtomb wcscoll btowc) AC_ARG_ENABLE(pcregrep, [ --enable-pcregrep build the pcregrep test program], @@ -108,22 +91,6 @@ AM_CONDITIONAL(MAKEINFO_HTML, test "x$enable_html" = xmakeinfo) AM_CONDITIONAL(TEXI2HTML_HTML, test "x$enable_html" = xtexi2html) -AC_DEFUN([AM_MKINSTALLDIRS], [MKINSTALLDIRS="$mkdir_p" AC_SUBST(MKINSTALLDIRS)]) -AM_GNU_GETTEXT_VERSION(0.14) -AM_GNU_GETTEXT(no-libtool, need-ngettext, ../intl) -AC_CONFIG_COMMANDS([gettext-fix], [ - sed -e "/^mkinstalldirs *=/a\\ -install_sh=$install_sh" \ - -e 's/^mkinstalldirs *=.*/mkinstalldirs=$(MKINSTALLDIRS)/' \ - intl/Makefile > intl/Makefile.tmp - mv intl/Makefile.tmp intl/Makefile - sed -e "/^mkinstalldirs *=/a\\ -install_sh=$install_sh" \ - -e 's/^mkinstalldirs *=.*/mkinstalldirs=$(MKINSTALLDIRS)/' \ - po/Makefile > po/Makefile.tmp - mv po/Makefile.tmp po/Makefile], [ - install_sh="$install_sh"]) - AC_CONFIG_FILES([bootstrap.sh], chmod +x bootstrap.sh) AC_CONFIG_FILES([Makefile doc/Makefile \ lib/Makefile sed/Makefile testsuite/Makefile \ diff --git a/doc/Makefile.am b/doc/Makefile.am index f3dcc51..f9c75e9 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -5,8 +5,8 @@ dist_man_MANS = sed.1 dist_noinst_DATA = sed.x sed-in.texi pcre.html dist_noinst_SCRIPTS = groupify.sed CLEANFILES = sed.html -TEXI2DVI = $(top_srcdir)/config/texi2dvi --expand -HELP2MAN = $(top_srcdir)/config/help2man +TEXI2DVI = $(top_srcdir)/build-aux/texi2dvi --expand +HELP2MAN = $(top_srcdir)/build-aux/help2man SED = $(top_builddir)/sed/sed # To produce better quality output, in the example sed @@ -26,9 +26,7 @@ dist-hook: # This rule is used if --enable-html is passed if BUILD_HTML -docdir = $(datadir)/doc -pkgdocdir = $(datadir)/doc/$(PACKAGE)-$(VERSION) -pkgdoc_DATA = sed.html +doc_DATA = sed.html all: html diff --git a/doc/sed-in.texi b/doc/sed-in.texi index b0d2f86..0ce9bda 100644 --- a/doc/sed-in.texi +++ b/doc/sed-in.texi @@ -277,6 +277,19 @@ standard. If you want to disable only the latter kind of extension, you can set the @code{POSIXLY_CORRECT} variable to a non-empty value. +@item -b +@itemx --binary +@opindex -b +@opindex --binary +This option is available on any platforms, but is only effective where the +operating system makes a distinction between text files and binary files. +When such a distinction is made---as is the case for MS-DOS, Windows, +Cygwin---text files are composed of lines separated by a carriage return +@emph{and} a line feed character, and @command{sed} does not see the +ending CR. When this option is specified, @command{sed} will open +input files in binary mode, thus not requesting this special processing +and considering lines to end at a line feed. + @item -r @itemx --regexp-extended @opindex -r diff --git a/doc/sed.1 b/doc/sed.1 index 65cf8b2..20e53f2 100644 --- a/doc/sed.1 +++ b/doc/sed.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.28. -.TH SUPER-SED "1" "October 2005" "super-sed version 3.62" "User Commands" +.TH SUPER-SED "1" "September 2006" "super-sed version 3.62" "User Commands" .SH NAME super-sed \- stream editor for filtering and transforming text .SH SYNOPSIS diff --git a/doc/sed.texi b/doc/sed.texi index 6afc9bb..c4c575e 100644 --- a/doc/sed.texi +++ b/doc/sed.texi @@ -278,6 +278,32 @@ standard. If you want to disable only the latter kind of extension, you can set the @code{POSIXLY_CORRECT} variable to a non-empty value. +@item -b +@itemx --binary +@opindex -b +@opindex --binary +This option is available on any platforms, but is only effective where the +operating system makes a distinction between text files and binary files. +When such a distinction is made---as is the case for MS-DOS, Windows, +Cygwin---text files are composed of lines separated by a carriage return +@emph{and} a line feed character, and @command{sed} does not see the +ending CR. When this option is specified, @command{sed} will open +input files in binary mode, thus not requesting this special processing +and considering lines to end at a line feed. + +@item -b +@itemx --binary +@opindex -b +@opindex --binary +This option is available on any platforms, but is only effective where the +operating system makes a distinction between text files and binary files. +When such a distinction is made---as is the case for MS-DOS, Windows, +Cygwin---text files are composed of lines separated by a carriage return +@emph{and} a line feed character, and @command{sed} does not see the +ending CR. When this option is specified, @command{sed} will open +input files in binary mode, thus not requesting this special processing +and considering lines to end at a line feed. + @item -r @itemx --regexp-extended @opindex -r diff --git a/lib/.gitignore b/lib/.gitignore new file mode 100644 index 0000000..f6ef3c5 --- /dev/null +++ b/lib/.gitignore @@ -0,0 +1,69 @@ +acl-internal.h +acl.c +acl.h +acl_entries.c +alloca.c +alloca_.h +asnprintf.c +config.charset +error.c +error.h +exitfail.c +exitfail.h +file-has-acl.c +float+.h +float_.h +getdelim.c +getline.c +getopt.c +getopt1.c +getopt_.h +getopt_int.h +gettext.h +gettimeofday.c +gnulib.mk +localcharset.c +localcharset.h +memchr.c +memcmp.c +memmove.c +mkstemp.c +obstack.c +obstack.h +pathmax.h +printf-args.c +printf-args.h +printf-parse.c +printf-parse.h +quote.c +quote.h +quotearg.c +quotearg.h +realloc.c +ref-add.sin +ref-del.sin +size_max.h +snprintf.c +stat-macros.h +stdbool_.h +stdint_.h +stdio_.h +stdlib_.h +strerror.c +strverscmp.c +strverscmp.h +sys_stat_.h +sys_time_.h +tempname.c +tempname.h +unistd_.h +unlocked-io.h +vasnprintf.c +vasnprintf.h +verify.h +wchar_.h +wctype_.h +xalloc-die.c +xalloc.h +xmalloc.c +xsize.h diff --git a/lib/Makefile.am b/lib/Makefile.am index 99ee265..0973582 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,15 +1,12 @@ ## Process this file with automake to produce Makefile.in -noinst_LIBRARIES = libsed.a -noinst_HEADERS = getopt.h utils.h obstack.h strverscmp.h \ - stdbool_.h -libsed_a_SOURCES = getopt1.c getopt.c utils.c -EXTRA_DIST = memmove.c strerror.c +noinst_LIBRARIES = +EXTRA_DIST = +BUILT_SOURCES = +MOSTLYCLEANFILES = +MOSTLYCLEANDIRS = AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir)/intl -I$(top_srcdir)/pcre \ -I$(top_srcdir) -I$(top_builddir)/lib -I$(top_builddir)/intl -libsed_a_LIBADD = @LIBOBJS@ @ALLOCA@ -libsed_a_DEPENDENCIES = $(libsed_a_LIBADD) - -DISTCLEANFILES = stdbool.h +include gnulib.mk diff --git a/lib/alloca.c b/lib/alloca.c deleted file mode 100644 index c1699c4..0000000 --- a/lib/alloca.c +++ /dev/null @@ -1,504 +0,0 @@ -/* alloca.c -- allocate automatically reclaimed memory - (Mostly) portable public-domain implementation -- D A Gwyn - - This implementation of the PWB library alloca function, - which is used to allocate space off the run-time stack so - that it is automatically reclaimed upon procedure exit, - was inspired by discussions with J. Q. Johnson of Cornell. - J.Otto Tennant contributed the Cray support. - - There are some preprocessor constants that can - be defined when compiling for your specific system, for - improved efficiency; however, the defaults should be okay. - - The general concept of this implementation is to keep - track of all alloca-allocated blocks, and reclaim any - that are found to be deeper in the stack than the current - invocation. This heuristic does not reclaim storage as - soon as it becomes invalid, but it will do so eventually. - - As a special case, alloca(0) reclaims storage without - allocating any. It is a good idea to use alloca(0) in - your main control loop, etc. to force garbage collection. */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#ifdef HAVE_STRING_H -#include -#endif -#ifdef HAVE_STDLIB_H -#include -#endif - -#ifdef emacs -#include "blockinput.h" -#endif - -/* If compiling with GCC 2, this file's not needed. */ -#if !defined (__GNUC__) || __GNUC__ < 2 - -/* If someone has defined alloca as a macro, - there must be some other way alloca is supposed to work. */ -#ifndef alloca - -#ifdef emacs -#ifdef static -/* actually, only want this if static is defined as "" - -- this is for usg, in which emacs must undefine static - in order to make unexec workable - */ -#ifndef STACK_DIRECTION -you -lose --- must know STACK_DIRECTION at compile-time -#endif /* STACK_DIRECTION undefined */ -#endif /* static */ -#endif /* emacs */ - -/* If your stack is a linked list of frames, you have to - provide an "address metric" ADDRESS_FUNCTION macro. */ - -#if defined (CRAY) && defined (CRAY_STACKSEG_END) -long i00afunc (); -#define ADDRESS_FUNCTION(arg) (char *) i00afunc (&(arg)) -#else -#define ADDRESS_FUNCTION(arg) &(arg) -#endif - -#if __STDC__ -typedef void *pointer; -#else -typedef char *pointer; -#endif - -#ifndef NULL -#define NULL 0 -#endif - -/* Different portions of Emacs need to call different versions of - malloc. The Emacs executable needs alloca to call xmalloc, because - ordinary malloc isn't protected from input signals. On the other - hand, the utilities in lib-src need alloca to call malloc; some of - them are very simple, and don't have an xmalloc routine. - - Non-Emacs programs expect this to call xmalloc. - - Callers below should use malloc. */ - -#ifndef emacs -#define malloc xmalloc -#endif -extern pointer malloc (); - -/* Define STACK_DIRECTION if you know the direction of stack - growth for your system; otherwise it will be automatically - deduced at run-time. - - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown */ - -#ifndef STACK_DIRECTION -#define STACK_DIRECTION 0 /* Direction unknown. */ -#endif - -#if STACK_DIRECTION != 0 - -#define STACK_DIR STACK_DIRECTION /* Known at compile-time. */ - -#else /* STACK_DIRECTION == 0; need run-time code. */ - -static int stack_dir; /* 1 or -1 once known. */ -#define STACK_DIR stack_dir - -static void -find_stack_direction () -{ - static char *addr = NULL; /* Address of first `dummy', once known. */ - auto char dummy; /* To get stack address. */ - - if (addr == NULL) - { /* Initial entry. */ - addr = ADDRESS_FUNCTION (dummy); - - find_stack_direction (); /* Recurse once. */ - } - else - { - /* Second entry. */ - if (ADDRESS_FUNCTION (dummy) > addr) - stack_dir = 1; /* Stack grew upward. */ - else - stack_dir = -1; /* Stack grew downward. */ - } -} - -#endif /* STACK_DIRECTION == 0 */ - -/* An "alloca header" is used to: - (a) chain together all alloca'ed blocks; - (b) keep track of stack depth. - - It is very important that sizeof(header) agree with malloc - alignment chunk size. The following default should work okay. */ - -#ifndef ALIGN_SIZE -#define ALIGN_SIZE sizeof(double) -#endif - -typedef union hdr -{ - char align[ALIGN_SIZE]; /* To force sizeof(header). */ - struct - { - union hdr *next; /* For chaining headers. */ - char *deep; /* For stack depth measure. */ - } h; -} header; - -static header *last_alloca_header = NULL; /* -> last alloca header. */ - -/* Return a pointer to at least SIZE bytes of storage, - which will be automatically reclaimed upon exit from - the procedure that called alloca. Originally, this space - was supposed to be taken from the current stack frame of the - caller, but that method cannot be made to work for some - implementations of C, for example under Gould's UTX/32. */ - -pointer -alloca (size) - unsigned size; -{ - auto char probe; /* Probes stack depth: */ - register char *depth = ADDRESS_FUNCTION (probe); - -#if STACK_DIRECTION == 0 - if (STACK_DIR == 0) /* Unknown growth direction. */ - find_stack_direction (); -#endif - - /* Reclaim garbage, defined as all alloca'd storage that - was allocated from deeper in the stack than currently. */ - - { - register header *hp; /* Traverses linked list. */ - -#ifdef emacs - BLOCK_INPUT; -#endif - - for (hp = last_alloca_header; hp != NULL;) - if ((STACK_DIR > 0 && hp->h.deep > depth) - || (STACK_DIR < 0 && hp->h.deep < depth)) - { - register header *np = hp->h.next; - - free ((pointer) hp); /* Collect garbage. */ - - hp = np; /* -> next header. */ - } - else - break; /* Rest are not deeper. */ - - last_alloca_header = hp; /* -> last valid storage. */ - -#ifdef emacs - UNBLOCK_INPUT; -#endif - } - - if (size == 0) - return NULL; /* No allocation required. */ - - /* Allocate combined header + user data storage. */ - - { - register pointer new = malloc (sizeof (header) + size); - /* Address of header. */ - - if (new == 0) - abort(); - - ((header *) new)->h.next = last_alloca_header; - ((header *) new)->h.deep = depth; - - last_alloca_header = (header *) new; - - /* User storage begins just after header. */ - - return (pointer) ((char *) new + sizeof (header)); - } -} - -#if defined (CRAY) && defined (CRAY_STACKSEG_END) - -#ifdef DEBUG_I00AFUNC -#include -#endif - -#ifndef CRAY_STACK -#define CRAY_STACK -#ifndef CRAY2 -/* Stack structures for CRAY-1, CRAY X-MP, and CRAY Y-MP */ -struct stack_control_header - { - long shgrow:32; /* Number of times stack has grown. */ - long shaseg:32; /* Size of increments to stack. */ - long shhwm:32; /* High water mark of stack. */ - long shsize:32; /* Current size of stack (all segments). */ - }; - -/* The stack segment linkage control information occurs at - the high-address end of a stack segment. (The stack - grows from low addresses to high addresses.) The initial - part of the stack segment linkage control information is - 0200 (octal) words. This provides for register storage - for the routine which overflows the stack. */ - -struct stack_segment_linkage - { - long ss[0200]; /* 0200 overflow words. */ - long sssize:32; /* Number of words in this segment. */ - long ssbase:32; /* Offset to stack base. */ - long:32; - long sspseg:32; /* Offset to linkage control of previous - segment of stack. */ - long:32; - long sstcpt:32; /* Pointer to task common address block. */ - long sscsnm; /* Private control structure number for - microtasking. */ - long ssusr1; /* Reserved for user. */ - long ssusr2; /* Reserved for user. */ - long sstpid; /* Process ID for pid based multi-tasking. */ - long ssgvup; /* Pointer to multitasking thread giveup. */ - long sscray[7]; /* Reserved for Cray Research. */ - long ssa0; - long ssa1; - long ssa2; - long ssa3; - long ssa4; - long ssa5; - long ssa6; - long ssa7; - long sss0; - long sss1; - long sss2; - long sss3; - long sss4; - long sss5; - long sss6; - long sss7; - }; - -#else /* CRAY2 */ -/* The following structure defines the vector of words - returned by the STKSTAT library routine. */ -struct stk_stat - { - long now; /* Current total stack size. */ - long maxc; /* Amount of contiguous space which would - be required to satisfy the maximum - stack demand to date. */ - long high_water; /* Stack high-water mark. */ - long overflows; /* Number of stack overflow ($STKOFEN) calls. */ - long hits; /* Number of internal buffer hits. */ - long extends; /* Number of block extensions. */ - long stko_mallocs; /* Block allocations by $STKOFEN. */ - long underflows; /* Number of stack underflow calls ($STKRETN). */ - long stko_free; /* Number of deallocations by $STKRETN. */ - long stkm_free; /* Number of deallocations by $STKMRET. */ - long segments; /* Current number of stack segments. */ - long maxs; /* Maximum number of stack segments so far. */ - long pad_size; /* Stack pad size. */ - long current_address; /* Current stack segment address. */ - long current_size; /* Current stack segment size. This - number is actually corrupted by STKSTAT to - include the fifteen word trailer area. */ - long initial_address; /* Address of initial segment. */ - long initial_size; /* Size of initial segment. */ - }; - -/* The following structure describes the data structure which trails - any stack segment. I think that the description in 'asdef' is - out of date. I only describe the parts that I am sure about. */ - -struct stk_trailer - { - long this_address; /* Address of this block. */ - long this_size; /* Size of this block (does not include - this trailer). */ - long unknown2; - long unknown3; - long link; /* Address of trailer block of previous - segment. */ - long unknown5; - long unknown6; - long unknown7; - long unknown8; - long unknown9; - long unknown10; - long unknown11; - long unknown12; - long unknown13; - long unknown14; - }; - -#endif /* CRAY2 */ -#endif /* not CRAY_STACK */ - -#ifdef CRAY2 -/* Determine a "stack measure" for an arbitrary ADDRESS. - I doubt that "lint" will like this much. */ - -static long -i00afunc (long *address) -{ - struct stk_stat status; - struct stk_trailer *trailer; - long *block, size; - long result = 0; - - /* We want to iterate through all of the segments. The first - step is to get the stack status structure. We could do this - more quickly and more directly, perhaps, by referencing the - $LM00 common block, but I know that this works. */ - - STKSTAT (&status); - - /* Set up the iteration. */ - - trailer = (struct stk_trailer *) (status.current_address - + status.current_size - - 15); - - /* There must be at least one stack segment. Therefore it is - a fatal error if "trailer" is null. */ - - if (trailer == 0) - abort (); - - /* Discard segments that do not contain our argument address. */ - - while (trailer != 0) - { - block = (long *) trailer->this_address; - size = trailer->this_size; - if (block == 0 || size == 0) - abort (); - trailer = (struct stk_trailer *) trailer->link; - if ((block <= address) && (address < (block + size))) - break; - } - - /* Set the result to the offset in this segment and add the sizes - of all predecessor segments. */ - - result = address - block; - - if (trailer == 0) - { - return result; - } - - do - { - if (trailer->this_size <= 0) - abort (); - result += trailer->this_size; - trailer = (struct stk_trailer *) trailer->link; - } - while (trailer != 0); - - /* We are done. Note that if you present a bogus address (one - not in any segment), you will get a different number back, formed - from subtracting the address of the first block. This is probably - not what you want. */ - - return (result); -} - -#else /* not CRAY2 */ -/* Stack address function for a CRAY-1, CRAY X-MP, or CRAY Y-MP. - Determine the number of the cell within the stack, - given the address of the cell. The purpose of this - routine is to linearize, in some sense, stack addresses - for alloca. */ - -static long -i00afunc (long address) -{ - long stkl = 0; - - long size, pseg, this_segment, stack; - long result = 0; - - struct stack_segment_linkage *ssptr; - - /* Register B67 contains the address of the end of the - current stack segment. If you (as a subprogram) store - your registers on the stack and find that you are past - the contents of B67, you have overflowed the segment. - - B67 also points to the stack segment linkage control - area, which is what we are really interested in. */ - - stkl = CRAY_STACKSEG_END (); - ssptr = (struct stack_segment_linkage *) stkl; - - /* If one subtracts 'size' from the end of the segment, - one has the address of the first word of the segment. - - If this is not the first segment, 'pseg' will be - nonzero. */ - - pseg = ssptr->sspseg; - size = ssptr->sssize; - - this_segment = stkl - size; - - /* It is possible that calling this routine itself caused - a stack overflow. Discard stack segments which do not - contain the target address. */ - - while (!(this_segment <= address && address <= stkl)) - { -#ifdef DEBUG_I00AFUNC - fprintf (stderr, "%011o %011o %011o\n", this_segment, address, stkl); -#endif - if (pseg == 0) - break; - stkl = stkl - pseg; - ssptr = (struct stack_segment_linkage *) stkl; - size = ssptr->sssize; - pseg = ssptr->sspseg; - this_segment = stkl - size; - } - - result = address - this_segment; - - /* If you subtract pseg from the current end of the stack, - you get the address of the previous stack segment's end. - This seems a little convoluted to me, but I'll bet you save - a cycle somewhere. */ - - while (pseg != 0) - { -#ifdef DEBUG_I00AFUNC - fprintf (stderr, "%011o %011o\n", pseg, size); -#endif - stkl = stkl - pseg; - ssptr = (struct stack_segment_linkage *) stkl; - size = ssptr->sssize; - pseg = ssptr->sspseg; - result += size; - } - return (result); -} - -#endif /* not CRAY2 */ -#endif /* CRAY */ - -#endif /* no alloca */ -#endif /* not GCC version 2 */ diff --git a/lib/getline.c b/lib/getline.c deleted file mode 100644 index defaeda..0000000 --- a/lib/getline.c +++ /dev/null @@ -1,110 +0,0 @@ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#undef _GNU_SOURCE - -#include -#include - -#ifdef HAVE_STRINGS_H -# include -#else -# include -#endif /* HAVE_STRINGS_H */ - -#ifdef HAVE_STDLIB_H -# include -#endif /* HAVE_STDLIB_H */ - -#ifdef HAVE_UNISTD_H -# include -#endif /* HAVE_UNISTD_H */ - -#include -#include - -/* Read up to (and including) a '\n' from STREAM into *LINEPTR - (and null-terminate it). *LINEPTR is a pointer returned from malloc (or - NULL), pointing to *N characters of space. It is realloc'd as - necessary. Returns the number of characters read (not including the - null terminator), or -1 on error or EOF. */ - -size_t -getline (lineptr, n, stream) - char **lineptr; - size_t *n; - FILE *stream; -{ - char *line, *p; - long size, copy; - - if (lineptr == NULL || n == NULL) - { - errno = EINVAL; - return (size_t) -1; - } - - if (ferror (stream)) - return (size_t) -1; - - /* Make sure we have a line buffer to start with. */ - if (*lineptr == NULL || *n < 2) /* !seen and no buf yet need 2 chars. */ - { -#ifndef MAX_CANON -#define MAX_CANON 256 -#endif - if (!*lineptr) - line = (char *) malloc (MAX_CANON); - else - line = (char *) realloc (*lineptr, MAX_CANON); - if (line == NULL) - return (size_t) -1; - *lineptr = line; - *n = MAX_CANON; - } - - line = *lineptr; - size = *n; - - copy = size; - p = line; - - while (1) - { - long len; - - while (--copy > 0) - { - register int c = getc (stream); - if (c == EOF) - goto lose; - else if ((*p++ = c) == '\n') - goto win; - } - - /* Need to enlarge the line buffer. */ - len = p - line; - size *= 2; - line = (char *) realloc (line, size); - if (line == NULL) - goto lose; - *lineptr = line; - *n = size; - p = line + len; - copy = size - len; - } - - lose: - if (p == *lineptr) - return (size_t) -1; - - /* Return a partial line since we got an error in the middle. */ - win: -#if defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__) || defined(MSDOS) || defined(__EMX__) - if (p - 2 >= *lineptr && p[-2] == '\r') - p[-2] = p[-1], --p; -#endif - *p = '\0'; - return p - *lineptr; -} diff --git a/lib/getopt.c b/lib/getopt.c deleted file mode 100644 index d7719dc..0000000 --- a/lib/getopt.c +++ /dev/null @@ -1,1049 +0,0 @@ -/* Getopt for GNU. - NOTE: getopt is now part of the C library, so if you don't know what - "Keep this file name-space clean" means, talk to drepper@gnu.org - before changing it! - - Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98 - Free Software Foundation, Inc. - - NOTE: The canonical source of this file is maintained with the GNU C Library. - Bugs can be reported to bug-glibc@gnu.org. - - 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 the - Free Software Foundation; either version 2, or (at your option) any - later version. - - This program 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. */ - -/* This tells Alpha OSF/1 not to define a getopt prototype in . - Ditto for AIX 3.2 and . */ -#ifndef _NO_PROTO -# define _NO_PROTO -#endif - -#ifdef HAVE_CONFIG_H -# include -#endif - -#if !defined __STDC__ || !__STDC__ -/* This is a separate conditional since some stdc systems - reject `defined (const)'. */ -# ifndef const -# define const -# endif -#endif - -#include - -/* Comment out all this code if we are using the GNU C Library, and are not - actually compiling the library itself. This code is part of the GNU C - Library, but also included in many other GNU distributions. Compiling - and linking in this code is a waste when using the GNU C library - (especially if it is a shared library). Rather than having every GNU - program understand `configure --with-gnu-libc' and omit the object files, - it is simpler to just do this in the source for each such file. */ - -#define GETOPT_INTERFACE_VERSION 2 -#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2 -# include -# if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION -# define ELIDE_CODE -# endif -#endif - -#ifndef ELIDE_CODE - - -/* This needs to come after some library #include - to get __GNU_LIBRARY__ defined. */ -#ifdef __GNU_LIBRARY__ -/* Don't include stdlib.h for non-GNU C libraries because some of them - contain conflicting prototypes for getopt. */ -# include -# include -#endif /* GNU C library. */ - -#ifdef VMS -# include -# if HAVE_STRING_H - 0 -# include -# endif -#endif - -#ifndef _ -/* This is for other GNU distributions with internationalized messages. - When compiling libc, the _ macro is predefined. */ -# ifdef HAVE_LIBINTL_H -# include -# define _(msgid) gettext (msgid) -# else -# define _(msgid) (msgid) -# endif -#endif - -/* This version of `getopt' appears to the caller like standard Unix `getopt' - but it behaves differently for the user, since it allows the user - to intersperse the options with the other arguments. - - As `getopt' works, it permutes the elements of ARGV so that, - when it is done, all the options precede everything else. Thus - all application programs are extended to handle flexible argument order. - - Setting the environment variable POSIXLY_CORRECT disables permutation. - Then the behavior is completely standard. - - GNU application programs can use a third alternative mode in which - they can distinguish the relative order of options and other arguments. */ - -#include "getopt.h" - -/* For communication from `getopt' to the caller. - When `getopt' finds an option that takes an argument, - the argument value is returned here. - Also, when `ordering' is RETURN_IN_ORDER, - each non-option ARGV-element is returned here. */ - -char *optarg = NULL; - -/* Index in ARGV of the next element to be scanned. - This is used for communication to and from the caller - and for communication between successive calls to `getopt'. - - On entry to `getopt', zero means this is the first call; initialize. - - When `getopt' returns -1, this is the index of the first of the - non-option elements that the caller should itself scan. - - Otherwise, `optind' communicates from one call to the next - how much of ARGV has been scanned so far. */ - -/* 1003.2 says this must be 1 before any call. */ -int optind = 1; - -/* Formerly, initialization of getopt depended on optind==0, which - causes problems with re-calling getopt as programs generally don't - know that. */ - -int __getopt_initialized = 0; - -/* The next char to be scanned in the option-element - in which the last option character we returned was found. - This allows us to pick up the scan where we left off. - - If this is zero, or a null string, it means resume the scan - by advancing to the next ARGV-element. */ - -static char *nextchar; - -/* Callers store zero here to inhibit the error message - for unrecognized options. */ - -int opterr = 1; - -/* Set to an option character which was unrecognized. - This must be initialized on some systems to avoid linking in the - system's own getopt implementation. */ - -int optopt = '?'; - -/* Describe how to deal with options that follow non-option ARGV-elements. - - If the caller did not specify anything, - the default is REQUIRE_ORDER if the environment variable - POSIXLY_CORRECT is defined, PERMUTE otherwise. - - REQUIRE_ORDER means don't recognize them as options; - stop option processing when the first non-option is seen. - This is what Unix does. - This mode of operation is selected by either setting the environment - variable POSIXLY_CORRECT, or using `+' as the first character - of the list of option characters. - - PERMUTE is the default. We permute the contents of ARGV as we scan, - so that eventually all the non-options are at the end. This allows options - to be given in any order, even with programs that were not written to - expect this. - - RETURN_IN_ORDER is an option available to programs that were written - to expect options and other ARGV-elements in any order and that care about - the ordering of the two. We describe each non-option ARGV-element - as if it were the argument of an option with character code 1. - Using `-' as the first character of the list of option characters - selects this mode of operation. - - The special argument `--' forces an end of option-scanning regardless - of the value of `ordering'. In the case of RETURN_IN_ORDER, only - `--' can cause `getopt' to return -1 with `optind' != ARGC. */ - -static enum -{ - REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER -} ordering; - -/* Value of POSIXLY_CORRECT environment variable. */ -static char *posixly_correct; - -#ifdef __GNU_LIBRARY__ -/* We want to avoid inclusion of string.h with non-GNU libraries - because there are many ways it can cause trouble. - On some systems, it contains special magic macros that don't work - in GCC. */ -# include -# define my_index strchr -#else - -/* Avoid depending on library functions or files - whose names are inconsistent. */ - -#ifndef getenv -extern char *getenv (); -#endif -#ifndef strncmp -extern int strncmp (); -#endif - -static char * -my_index (str, chr) - const char *str; - int chr; -{ - while (*str) - { - if (*str == chr) - return (char *) str; - str++; - } - return 0; -} - -/* If using GCC, we can safely declare strlen this way. - If not using GCC, it is ok not to declare it. */ -#ifdef __GNUC__ -/* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h. - That was relevant to code that was here before. */ -# if (!defined __STDC__ || !__STDC__) && !defined strlen -/* gcc with -traditional declares the built-in strlen to return int, - and has done so at least since version 2.4.5. -- rms. */ -extern int strlen (const char *); -# endif /* not __STDC__ */ -#endif /* __GNUC__ */ - -#endif /* not __GNU_LIBRARY__ */ - -/* Handle permutation of arguments. */ - -/* Describe the part of ARGV that contains non-options that have - been skipped. `first_nonopt' is the index in ARGV of the first of them; - `last_nonopt' is the index after the last of them. */ - -static int first_nonopt; -static int last_nonopt; - -#ifdef _LIBC -/* Bash 2.0 gives us an environment variable containing flags - indicating ARGV elements that should not be considered arguments. */ - -/* Defined in getopt_init.c */ -extern char *__getopt_nonoption_flags; - -static int nonoption_flags_max_len; -static int nonoption_flags_len; - -static int original_argc; -static char *const *original_argv; - -/* Make sure the environment variable bash 2.0 puts in the environment - is valid for the getopt call we must make sure that the ARGV passed - to getopt is that one passed to the process. */ -static void -__attribute__ ((unused)) -store_args_and_env (int argc, char *const *argv) -{ - /* XXX This is no good solution. We should rather copy the args so - that we can compare them later. But we must not use malloc(3). */ - original_argc = argc; - original_argv = argv; -} -# ifdef text_set_element -text_set_element (__libc_subinit, store_args_and_env); -# endif /* text_set_element */ - -# define SWAP_FLAGS(ch1, ch2) \ - if (nonoption_flags_len > 0) \ - { \ - char __tmp = __getopt_nonoption_flags[ch1]; \ - __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2]; \ - __getopt_nonoption_flags[ch2] = __tmp; \ - } -#else /* !_LIBC */ -# define SWAP_FLAGS(ch1, ch2) -#endif /* _LIBC */ - -/* Exchange two adjacent subsequences of ARGV. - One subsequence is elements [first_nonopt,last_nonopt) - which contains all the non-options that have been skipped so far. - The other is elements [last_nonopt,optind), which contains all - the options processed since those non-options were skipped. - - `first_nonopt' and `last_nonopt' are relocated so that they describe - the new indices of the non-options in ARGV after they are moved. */ - -#if defined __STDC__ && __STDC__ -static void exchange (char **); -#endif - -static void -exchange (argv) - char **argv; -{ - int bottom = first_nonopt; - int middle = last_nonopt; - int top = optind; - char *tem; - - /* Exchange the shorter segment with the far end of the longer segment. - That puts the shorter segment into the right place. - It leaves the longer segment in the right place overall, - but it consists of two parts that need to be swapped next. */ - -#ifdef _LIBC - /* First make sure the handling of the `__getopt_nonoption_flags' - string can work normally. Our top argument must be in the range - of the string. */ - if (nonoption_flags_len > 0 && top >= nonoption_flags_max_len) - { - /* We must extend the array. The user plays games with us and - presents new arguments. */ - char *new_str = malloc (top + 1); - if (new_str == NULL) - nonoption_flags_len = nonoption_flags_max_len = 0; - else - { - memset (__mempcpy (new_str, __getopt_nonoption_flags, - nonoption_flags_max_len), - '\0', top + 1 - nonoption_flags_max_len); - nonoption_flags_max_len = top + 1; - __getopt_nonoption_flags = new_str; - } - } -#endif - - while (top > middle && middle > bottom) - { - if (top - middle > middle - bottom) - { - /* Bottom segment is the short one. */ - int len = middle - bottom; - register int i; - - /* Swap it with the top part of the top segment. */ - for (i = 0; i < len; i++) - { - tem = argv[bottom + i]; - argv[bottom + i] = argv[top - (middle - bottom) + i]; - argv[top - (middle - bottom) + i] = tem; - SWAP_FLAGS (bottom + i, top - (middle - bottom) + i); - } - /* Exclude the moved bottom segment from further swapping. */ - top -= len; - } - else - { - /* Top segment is the short one. */ - int len = top - middle; - register int i; - - /* Swap it with the bottom part of the bottom segment. */ - for (i = 0; i < len; i++) - { - tem = argv[bottom + i]; - argv[bottom + i] = argv[middle + i]; - argv[middle + i] = tem; - SWAP_FLAGS (bottom + i, middle + i); - } - /* Exclude the moved top segment from further swapping. */ - bottom += len; - } - } - - /* Update records for the slots the non-options now occupy. */ - - first_nonopt += (optind - last_nonopt); - last_nonopt = optind; -} - -/* Initialize the internal data when the first call is made. */ - -#if defined __STDC__ && __STDC__ -static const char *_getopt_initialize (int, char *const *, const char *); -#endif -static const char * -_getopt_initialize (argc, argv, optstring) - int argc; - char *const *argv; - const char *optstring; -{ - /* Start processing options with ARGV-element 1 (since ARGV-element 0 - is the program name); the sequence of previously skipped - non-option ARGV-elements is empty. */ - - first_nonopt = last_nonopt = optind; - - nextchar = NULL; - - posixly_correct = getenv ("POSIXLY_CORRECT"); - - /* Determine how to handle the ordering of options and nonoptions. */ - - if (optstring[0] == '-') - { - ordering = RETURN_IN_ORDER; - ++optstring; - } - else if (optstring[0] == '+') - { - ordering = REQUIRE_ORDER; - ++optstring; - } - else if (posixly_correct != NULL) - ordering = REQUIRE_ORDER; - else - ordering = PERMUTE; - -#ifdef _LIBC - if (posixly_correct == NULL - && argc == original_argc && argv == original_argv) - { - if (nonoption_flags_max_len == 0) - { - if (__getopt_nonoption_flags == NULL - || __getopt_nonoption_flags[0] == '\0') - nonoption_flags_max_len = -1; - else - { - const char *orig_str = __getopt_nonoption_flags; - int len = nonoption_flags_max_len = strlen (orig_str); - if (nonoption_flags_max_len < argc) - nonoption_flags_max_len = argc; - __getopt_nonoption_flags = - (char *) malloc (nonoption_flags_max_len); - if (__getopt_nonoption_flags == NULL) - nonoption_flags_max_len = -1; - else - memset (__mempcpy (__getopt_nonoption_flags, orig_str, len), - '\0', nonoption_flags_max_len - len); - } - } - nonoption_flags_len = nonoption_flags_max_len; - } - else - nonoption_flags_len = 0; -#endif - - return optstring; -} - -/* Scan elements of ARGV (whose length is ARGC) for option characters - given in OPTSTRING. - - If an element of ARGV starts with '-', and is not exactly "-" or "--", - then it is an option element. The characters of this element - (aside from the initial '-') are option characters. If `getopt' - is called repeatedly, it returns successively each of the option characters - from each of the option elements. - - If `getopt' finds another option character, it returns that character, - updating `optind' and `nextchar' so that the next call to `getopt' can - resume the scan with the following option character or ARGV-element. - - If there are no more option characters, `getopt' returns -1. - Then `optind' is the index in ARGV of the first ARGV-element - that is not an option. (The ARGV-elements have been permuted - so that those that are not options now come last.) - - OPTSTRING is a string containing the legitimate option characters. - If an option character is seen that is not listed in OPTSTRING, - return '?' after printing an error message. If you set `opterr' to - zero, the error message is suppressed but we still return '?'. - - If a char in OPTSTRING is followed by a colon, that means it wants an arg, - so the following text in the same ARGV-element, or the text of the following - ARGV-element, is returned in `optarg'. Two colons mean an option that - wants an optional arg; if there is text in the current ARGV-element, - it is returned in `optarg', otherwise `optarg' is set to zero. - - If OPTSTRING starts with `-' or `+', it requests different methods of - handling the non-option ARGV-elements. - See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above. - - Long-named options begin with `--' instead of `-'. - Their names may be abbreviated as long as the abbreviation is unique - or is an exact match for some defined option. If they have an - argument, it follows the option name in the same ARGV-element, separated - from the option name by a `=', or else the in next ARGV-element. - When `getopt' finds a long-named option, it returns 0 if that option's - `flag' field is nonzero, the value of the option's `val' field - if the `flag' field is zero. - - The elements of ARGV aren't really const, because we permute them. - But we pretend they're const in the prototype to be compatible - with other systems. - - LONGOPTS is a vector of `struct option' terminated by an - element containing a name which is zero. - - LONGIND returns the index in LONGOPT of the long-named option found. - It is only valid when a long-named option has been found by the most - recent call. - - If LONG_ONLY is nonzero, '-' as well as '--' can introduce - long-named options. */ - -int -_getopt_internal (argc, argv, optstring, longopts, longind, long_only) - int argc; - char *const *argv; - const char *optstring; - const struct option *longopts; - int *longind; - int long_only; -{ - optarg = NULL; - - if (optind == 0 || !__getopt_initialized) - { - if (optind == 0) - optind = 1; /* Don't scan ARGV[0], the program name. */ - optstring = _getopt_initialize (argc, argv, optstring); - __getopt_initialized = 1; - } - - /* Test whether ARGV[optind] points to a non-option argument. - Either it does not have option syntax, or there is an environment flag - from the shell indicating it is not an option. The later information - is only used when the used in the GNU libc. */ -#ifdef _LIBC -# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0' \ - || (optind < nonoption_flags_len \ - && __getopt_nonoption_flags[optind] == '1')) -#else -# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0') -#endif - - if (nextchar == NULL || *nextchar == '\0') - { - /* Advance to the next ARGV-element. */ - - /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been - moved back by the user (who may also have changed the arguments). */ - if (last_nonopt > optind) - last_nonopt = optind; - if (first_nonopt > optind) - first_nonopt = optind; - - if (ordering == PERMUTE) - { - /* If we have just processed some options following some non-options, - exchange them so that the options come first. */ - - if (first_nonopt != last_nonopt && last_nonopt != optind) - exchange ((char **) argv); - else if (last_nonopt != optind) - first_nonopt = optind; - - /* Skip any additional non-options - and extend the range of non-options previously skipped. */ - - while (optind < argc && NONOPTION_P) - optind++; - last_nonopt = optind; - } - - /* The special ARGV-element `--' means premature end of options. - Skip it like a null option, - then exchange with previous non-options as if it were an option, - then skip everything else like a non-option. */ - - if (optind != argc && !strcmp (argv[optind], "--")) - { - optind++; - - if (first_nonopt != last_nonopt && last_nonopt != optind) - exchange ((char **) argv); - else if (first_nonopt == last_nonopt) - first_nonopt = optind; - last_nonopt = argc; - - optind = argc; - } - - /* If we have done all the ARGV-elements, stop the scan - and back over any non-options that we skipped and permuted. */ - - if (optind == argc) - { - /* Set the next-arg-index to point at the non-options - that we previously skipped, so the caller will digest them. */ - if (first_nonopt != last_nonopt) - optind = first_nonopt; - return -1; - } - - /* If we have come to a non-option and did not permute it, - either stop the scan or describe it to the caller and pass it by. */ - - if (NONOPTION_P) - { - if (ordering == REQUIRE_ORDER) - return -1; - optarg = argv[optind++]; - return 1; - } - - /* We have found another option-ARGV-element. - Skip the initial punctuation. */ - - nextchar = (argv[optind] + 1 - + (longopts != NULL && argv[optind][1] == '-')); - } - - /* Decode the current option-ARGV-element. */ - - /* Check whether the ARGV-element is a long option. - - If long_only and the ARGV-element has the form "-f", where f is - a valid short option, don't consider it an abbreviated form of - a long option that starts with f. Otherwise there would be no - way to give the -f short option. - - On the other hand, if there's a long option "fubar" and - the ARGV-element is "-fu", do consider that an abbreviation of - the long option, just like "--fu", and not "-f" with arg "u". - - This distinction seems to be the most useful approach. */ - - if (longopts != NULL - && (argv[optind][1] == '-' - || (long_only && (argv[optind][2] || !my_index (optstring, argv[optind][1]))))) - { - char *nameend; - const struct option *p; - const struct option *pfound = NULL; - int exact = 0; - int ambig = 0; - int indfound = -1; - int option_index; - - for (nameend = nextchar; *nameend && *nameend != '='; nameend++) - /* Do nothing. */ ; - - /* Test all long options for either exact match - or abbreviated matches. */ - for (p = longopts, option_index = 0; p->name; p++, option_index++) - if (!strncmp (p->name, nextchar, nameend - nextchar)) - { - if ((unsigned int) (nameend - nextchar) - == (unsigned int) strlen (p->name)) - { - /* Exact match found. */ - pfound = p; - indfound = option_index; - exact = 1; - break; - } - else if (pfound == NULL) - { - /* First nonexact match found. */ - pfound = p; - indfound = option_index; - } - else - /* Second or later nonexact match found. */ - ambig = 1; - } - - if (ambig && !exact) - { - if (opterr) - fprintf (stderr, _("%s: option `%s' is ambiguous\n"), - argv[0], argv[optind]); - nextchar += strlen (nextchar); - optind++; - optopt = 0; - return '?'; - } - - if (pfound != NULL) - { - option_index = indfound; - optind++; - if (*nameend) - { - /* Don't test has_arg with >, because some C compilers don't - allow it to be used on enums. */ - if (pfound->has_arg) - optarg = nameend + 1; - else - { - if (opterr) - if (argv[optind - 1][1] == '-') - /* --option */ - fprintf (stderr, - _("%s: option `--%s' doesn't allow an argument\n"), - argv[0], pfound->name); - else - /* +option or -option */ - fprintf (stderr, - _("%s: option `%c%s' doesn't allow an argument\n"), - argv[0], argv[optind - 1][0], pfound->name); - - nextchar += strlen (nextchar); - - optopt = pfound->val; - return '?'; - } - } - else if (pfound->has_arg == 1) - { - if (optind < argc) - optarg = argv[optind++]; - else - { - if (opterr) - fprintf (stderr, - _("%s: option `%s' requires an argument\n"), - argv[0], argv[optind - 1]); - nextchar += strlen (nextchar); - optopt = pfound->val; - return optstring[0] == ':' ? ':' : '?'; - } - } - nextchar += strlen (nextchar); - if (longind != NULL) - *longind = option_index; - if (pfound->flag) - { - *(pfound->flag) = pfound->val; - return 0; - } - return pfound->val; - } - - /* Can't find it as a long option. If this is not getopt_long_only, - or the option starts with '--' or is not a valid short - option, then it's an error. - Otherwise interpret it as a short option. */ - if (!long_only || argv[optind][1] == '-' - || my_index (optstring, *nextchar) == NULL) - { - if (opterr) - { - if (argv[optind][1] == '-') - /* --option */ - fprintf (stderr, _("%s: unrecognized option `--%s'\n"), - argv[0], nextchar); - else - /* +option or -option */ - fprintf (stderr, _("%s: unrecognized option `%c%s'\n"), - argv[0], argv[optind][0], nextchar); - } - nextchar = (char *) ""; - optind++; - optopt = 0; - return '?'; - } - } - - /* Look at and handle the next short option-character. */ - - { - char c = *nextchar++; - char *temp = my_index (optstring, c); - - /* Increment `optind' when we start to process its last character. */ - if (*nextchar == '\0') - ++optind; - - if (temp == NULL || c == ':') - { - if (opterr) - { - if (posixly_correct) - /* 1003.2 specifies the format of this message. */ - fprintf (stderr, _("%s: illegal option -- %c\n"), - argv[0], c); - else - fprintf (stderr, _("%s: invalid option -- %c\n"), - argv[0], c); - } - optopt = c; - return '?'; - } - /* Convenience. Treat POSIX -W foo same as long option --foo */ - if (temp[0] == 'W' && temp[1] == ';') - { - char *nameend; - const struct option *p; - const struct option *pfound = NULL; - int exact = 0; - int ambig = 0; - int indfound = 0; - int option_index; - - /* This is an option that requires an argument. */ - if (*nextchar != '\0') - { - optarg = nextchar; - /* If we end this ARGV-element by taking the rest as an arg, - we must advance to the next element now. */ - optind++; - } - else if (optind == argc) - { - if (opterr) - { - /* 1003.2 specifies the format of this message. */ - fprintf (stderr, _("%s: option requires an argument -- %c\n"), - argv[0], c); - } - optopt = c; - if (optstring[0] == ':') - c = ':'; - else - c = '?'; - return c; - } - else - /* We already incremented `optind' once; - increment it again when taking next ARGV-elt as argument. */ - optarg = argv[optind++]; - - /* optarg is now the argument, see if it's in the - table of longopts. */ - - for (nextchar = nameend = optarg; *nameend && *nameend != '='; nameend++) - /* Do nothing. */ ; - - /* Test all long options for either exact match - or abbreviated matches. */ - for (p = longopts, option_index = 0; p->name; p++, option_index++) - if (!strncmp (p->name, nextchar, nameend - nextchar)) - { - if ((unsigned int) (nameend - nextchar) == strlen (p->name)) - { - /* Exact match found. */ - pfound = p; - indfound = option_index; - exact = 1; - break; - } - else if (pfound == NULL) - { - /* First nonexact match found. */ - pfound = p; - indfound = option_index; - } - else - /* Second or later nonexact match found. */ - ambig = 1; - } - if (ambig && !exact) - { - if (opterr) - fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"), - argv[0], argv[optind]); - nextchar += strlen (nextchar); - optind++; - return '?'; - } - if (pfound != NULL) - { - option_index = indfound; - if (*nameend) - { - /* Don't test has_arg with >, because some C compilers don't - allow it to be used on enums. */ - if (pfound->has_arg) - optarg = nameend + 1; - else - { - if (opterr) - fprintf (stderr, _("\ -%s: option `-W %s' doesn't allow an argument\n"), - argv[0], pfound->name); - - nextchar += strlen (nextchar); - return '?'; - } - } - else if (pfound->has_arg == 1) - { - if (optind < argc) - optarg = argv[optind++]; - else - { - if (opterr) - fprintf (stderr, - _("%s: option `%s' requires an argument\n"), - argv[0], argv[optind - 1]); - nextchar += strlen (nextchar); - return optstring[0] == ':' ? ':' : '?'; - } - } - nextchar += strlen (nextchar); - if (longind != NULL) - *longind = option_index; - if (pfound->flag) - { - *(pfound->flag) = pfound->val; - return 0; - } - return pfound->val; - } - nextchar = NULL; - return 'W'; /* Let the application handle it. */ - } - if (temp[1] == ':') - { - if (temp[2] == ':') - { - /* This is an option that accepts an argument optionally. */ - if (*nextchar != '\0') - { - optarg = nextchar; - optind++; - } - else - optarg = NULL; - nextchar = NULL; - } - else - { - /* This is an option that requires an argument. */ - if (*nextchar != '\0') - { - optarg = nextchar; - /* If we end this ARGV-element by taking the rest as an arg, - we must advance to the next element now. */ - optind++; - } - else if (optind == argc) - { - if (opterr) - { - /* 1003.2 specifies the format of this message. */ - fprintf (stderr, - _("%s: option requires an argument -- %c\n"), - argv[0], c); - } - optopt = c; - if (optstring[0] == ':') - c = ':'; - else - c = '?'; - } - else - /* We already incremented `optind' once; - increment it again when taking next ARGV-elt as argument. */ - optarg = argv[optind++]; - nextchar = NULL; - } - } - return c; - } -} - -int -getopt (argc, argv, optstring) - int argc; - char *const *argv; - const char *optstring; -{ - return _getopt_internal (argc, argv, optstring, - (const struct option *) 0, - (int *) 0, - 0); -} - -#endif /* Not ELIDE_CODE. */ - -#ifdef TEST - -/* Compile with -DTEST to make an executable for use in testing - the above definition of `getopt'. */ - -int -main (argc, argv) - int argc; - char **argv; -{ - int c; - int digit_optind = 0; - - while (1) - { - int this_option_optind = optind ? optind : 1; - - c = getopt (argc, argv, "abc:d:0123456789"); - if (c == -1) - break; - - switch (c) - { - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - if (digit_optind != 0 && digit_optind != this_option_optind) - printf ("digits occur in two different argv-elements.\n"); - digit_optind = this_option_optind; - printf ("option %c\n", c); - break; - - case 'a': - printf ("option a\n"); - break; - - case 'b': - printf ("option b\n"); - break; - - case 'c': - printf ("option c with value `%s'\n", optarg); - break; - - case '?': - break; - - default: - printf ("?? getopt returned character code 0%o ??\n", c); - } - } - - if (optind < argc) - { - printf ("non-option ARGV-elements: "); - while (optind < argc) - printf ("%s ", argv[optind++]); - printf ("\n"); - } - - exit (0); -} - -#endif /* TEST */ diff --git a/lib/getopt.h b/lib/getopt.h deleted file mode 100644 index 7056f3d..0000000 --- a/lib/getopt.h +++ /dev/null @@ -1,133 +0,0 @@ -/* Declarations for getopt. - Copyright (C) 1989,90,91,92,93,94,96,97 Free Software Foundation, Inc. - - NOTE: The canonical source of this file is maintained with the GNU C Library. - Bugs can be reported to bug-glibc@gnu.org. - - 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 the - Free Software Foundation; either version 2, or (at your option) any - later version. - - This program 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. */ - -#ifndef _GETOPT_H -#define _GETOPT_H 1 - -#ifdef __cplusplus -extern "C" { -#endif - -/* For communication from `getopt' to the caller. - When `getopt' finds an option that takes an argument, - the argument value is returned here. - Also, when `ordering' is RETURN_IN_ORDER, - each non-option ARGV-element is returned here. */ - -extern char *optarg; - -/* Index in ARGV of the next element to be scanned. - This is used for communication to and from the caller - and for communication between successive calls to `getopt'. - - On entry to `getopt', zero means this is the first call; initialize. - - When `getopt' returns -1, this is the index of the first of the - non-option elements that the caller should itself scan. - - Otherwise, `optind' communicates from one call to the next - how much of ARGV has been scanned so far. */ - -extern int optind; - -/* Callers store zero here to inhibit the error message `getopt' prints - for unrecognized options. */ - -extern int opterr; - -/* Set to an option character which was unrecognized. */ - -extern int optopt; - -/* Describe the long-named options requested by the application. - The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector - of `struct option' terminated by an element containing a name which is - zero. - - The field `has_arg' is: - no_argument (or 0) if the option does not take an argument, - required_argument (or 1) if the option requires an argument, - optional_argument (or 2) if the option takes an optional argument. - - If the field `flag' is not NULL, it points to a variable that is set - to the value given in the field `val' when the option is found, but - left unchanged if the option is not found. - - To have a long-named option do something other than set an `int' to - a compiled-in constant, such as set a value from `optarg', set the - option's `flag' field to zero and its `val' field to a nonzero - value (the equivalent single-letter option character, if there is - one). For long options that have a zero `flag' field, `getopt' - returns the contents of the `val' field. */ - -struct option -{ -#if defined (__STDC__) && __STDC__ - const char *name; -#else - char *name; -#endif - /* has_arg can't be an enum because some compilers complain about - type mismatches in all the code that assumes it is an int. */ - int has_arg; - int *flag; - int val; -}; - -/* Names for the values of the `has_arg' field of `struct option'. */ - -#define no_argument 0 -#define required_argument 1 -#define optional_argument 2 - -#if defined (__STDC__) && __STDC__ -#ifdef __GNU_LIBRARY__ -/* Many other libraries have conflicting prototypes for getopt, with - differences in the consts, in stdlib.h. To avoid compilation - errors, only prototype getopt for the GNU C library. */ -extern int getopt (int argc, char *const *argv, const char *shortopts); -#else /* not __GNU_LIBRARY__ */ -extern int getopt (); -#endif /* __GNU_LIBRARY__ */ -extern int getopt_long (int argc, char *const *argv, const char *shortopts, - const struct option *longopts, int *longind); -extern int getopt_long_only (int argc, char *const *argv, - const char *shortopts, - const struct option *longopts, int *longind); - -/* Internal only. Users should not call this directly. */ -extern int _getopt_internal (int argc, char *const *argv, - const char *shortopts, - const struct option *longopts, int *longind, - int long_only); -#else /* not __STDC__ */ -extern int getopt (); -extern int getopt_long (); -extern int getopt_long_only (); - -extern int _getopt_internal (); -#endif /* __STDC__ */ - -#ifdef __cplusplus -} -#endif - -#endif /* getopt.h */ diff --git a/lib/getopt1.c b/lib/getopt1.c deleted file mode 100644 index d79d9f2..0000000 --- a/lib/getopt1.c +++ /dev/null @@ -1,190 +0,0 @@ -/* getopt_long and getopt_long_only entry points for GNU getopt. - Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98 - Free Software Foundation, Inc. - - NOTE: The canonical source of this file is maintained with the GNU C Library. - Bugs can be reported to bug-glibc@gnu.org. - - 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 the - Free Software Foundation; either version 2, or (at your option) any - later version. - - This program 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 -#endif - -#include "getopt.h" - -#if !defined __STDC__ || !__STDC__ -/* This is a separate conditional since some stdc systems - reject `defined (const)'. */ -#ifndef const -#define const -#endif -#endif - -#include - -/* Comment out all this code if we are using the GNU C Library, and are not - actually compiling the library itself. This code is part of the GNU C - Library, but also included in many other GNU distributions. Compiling - and linking in this code is a waste when using the GNU C library - (especially if it is a shared library). Rather than having every GNU - program understand `configure --with-gnu-libc' and omit the object files, - it is simpler to just do this in the source for each such file. */ - -#define GETOPT_INTERFACE_VERSION 2 -#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2 -#include -#if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION -#define ELIDE_CODE -#endif -#endif - -#ifndef ELIDE_CODE - - -/* This needs to come after some library #include - to get __GNU_LIBRARY__ defined. */ -#ifdef __GNU_LIBRARY__ -#include -#endif - -#ifndef NULL -#define NULL 0 -#endif - -int -getopt_long (argc, argv, options, long_options, opt_index) - int argc; - char *const *argv; - const char *options; - const struct option *long_options; - int *opt_index; -{ - return _getopt_internal (argc, argv, options, long_options, opt_index, 0); -} - -/* Like getopt_long, but '-' as well as '--' can indicate a long option. - If an option that starts with '-' (not '--') doesn't match a long option, - but does match a short option, it is parsed as a short option - instead. */ - -int -getopt_long_only (argc, argv, options, long_options, opt_index) - int argc; - char *const *argv; - const char *options; - const struct option *long_options; - int *opt_index; -{ - return _getopt_internal (argc, argv, options, long_options, opt_index, 1); -} - - -#endif /* Not ELIDE_CODE. */ - -#ifdef TEST - -#include - -int -main (argc, argv) - int argc; - char **argv; -{ - int c; - int digit_optind = 0; - - while (1) - { - int this_option_optind = optind ? optind : 1; - int option_index = 0; - static struct option long_options[] = - { - {"add", 1, 0, 0}, - {"append", 0, 0, 0}, - {"delete", 1, 0, 0}, - {"verbose", 0, 0, 0}, - {"create", 0, 0, 0}, - {"file", 1, 0, 0}, - {0, 0, 0, 0} - }; - - c = getopt_long (argc, argv, "abc:d:0123456789", - long_options, &option_index); - if (c == -1) - break; - - switch (c) - { - case 0: - printf ("option %s", long_options[option_index].name); - if (optarg) - printf (" with arg %s", optarg); - printf ("\n"); - break; - - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - if (digit_optind != 0 && digit_optind != this_option_optind) - printf ("digits occur in two different argv-elements.\n"); - digit_optind = this_option_optind; - printf ("option %c\n", c); - break; - - case 'a': - printf ("option a\n"); - break; - - case 'b': - printf ("option b\n"); - break; - - case 'c': - printf ("option c with value `%s'\n", optarg); - break; - - case 'd': - printf ("option d with value `%s'\n", optarg); - break; - - case '?': - break; - - default: - printf ("?? getopt returned character code 0%o ??\n", c); - } - } - - if (optind < argc) - { - printf ("non-option ARGV-elements: "); - while (optind < argc) - printf ("%s ", argv[optind++]); - printf ("\n"); - } - - exit (0); -} - -#endif /* TEST */ diff --git a/lib/memchr.c b/lib/memchr.c deleted file mode 100644 index 0e3e630..0000000 --- a/lib/memchr.c +++ /dev/null @@ -1,200 +0,0 @@ -/* Copyright (C) 1991, 1993, 1996, 1997 Free Software Foundation, Inc. - Based on strlen implementation by Torbjorn Granlund (tege@sics.se), - with help from Dan Sahlin (dan@sics.se) and - commentary by Jim Blandy (jimb@ai.mit.edu); - adaptation to memchr suggested by Dick Karpinski (dick@cca.ucsf.edu), - and implemented by Roland McGrath (roland@ai.mit.edu). - - NOTE: The canonical source of this file is maintained with the GNU C Library. - Bugs can be reported to bug-glibc@gnu.org. - - 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 the - Free Software Foundation; either version 2, or (at your option) any - later version. - - This program 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 -#endif - -#undef __ptr_t -#if defined (__cplusplus) || (defined (__STDC__) && __STDC__) -# define __ptr_t void * -#else /* Not C++ or ANSI C. */ -# define __ptr_t char * -#endif /* C++ or ANSI C. */ - -#if defined (_LIBC) -# include -#endif - -#if defined (HAVE_LIMITS_H) || defined (_LIBC) -# include -#endif - -#define LONG_MAX_32_BITS 2147483647 - -#ifndef LONG_MAX -#define LONG_MAX LONG_MAX_32_BITS -#endif - -#include - -#undef memchr - - -/* Search no more than N bytes of S for C. */ -__ptr_t -memchr (s, c, n) - const __ptr_t s; - int c; - size_t n; -{ - const unsigned char *char_ptr; - const unsigned long int *longword_ptr; - unsigned long int longword, magic_bits, charmask; - - c = (unsigned char) c; - - /* Handle the first few characters by reading one character at a time. - Do this until CHAR_PTR is aligned on a longword boundary. */ - for (char_ptr = (const unsigned char *) s; - n > 0 && ((unsigned long int) char_ptr - & (sizeof (longword) - 1)) != 0; - --n, ++char_ptr) - if (*char_ptr == c) - return (__ptr_t) char_ptr; - - /* All these elucidatory comments refer to 4-byte longwords, - but the theory applies equally well to 8-byte longwords. */ - - longword_ptr = (unsigned long int *) char_ptr; - - /* Bits 31, 24, 16, and 8 of this number are zero. Call these bits - the "holes." Note that there is a hole just to the left of - each byte, with an extra at the end: - - bits: 01111110 11111110 11111110 11111111 - bytes: AAAAAAAA BBBBBBBB CCCCCCCC DDDDDDDD - - The 1-bits make sure that carries propagate to the next 0-bit. - The 0-bits provide holes for carries to fall into. */ - - if (sizeof (longword) != 4 && sizeof (longword) != 8) - abort (); - -#if LONG_MAX <= LONG_MAX_32_BITS - magic_bits = 0x7efefeff; -#else - magic_bits = ((unsigned long int) 0x7efefefe << 32) | 0xfefefeff; -#endif - - /* Set up a longword, each of whose bytes is C. */ - charmask = c | (c << 8); - charmask |= charmask << 16; -#if LONG_MAX > LONG_MAX_32_BITS - charmask |= charmask << 32; -#endif - - /* Instead of the traditional loop which tests each character, - we will test a longword at a time. The tricky part is testing - if *any of the four* bytes in the longword in question are zero. */ - while (n >= sizeof (longword)) - { - /* We tentatively exit the loop if adding MAGIC_BITS to - LONGWORD fails to change any of the hole bits of LONGWORD. - - 1) Is this safe? Will it catch all the zero bytes? - Suppose there is a byte with all zeros. Any carry bits - propagating from its left will fall into the hole at its - least significant bit and stop. Since there will be no - carry from its most significant bit, the LSB of the - byte to the left will be unchanged, and the zero will be - detected. - - 2) Is this worthwhile? Will it ignore everything except - zero bytes? Suppose every byte of LONGWORD has a bit set - somewhere. There will be a carry into bit 8. If bit 8 - is set, this will carry into bit 16. If bit 8 is clear, - one of bits 9-15 must be set, so there will be a carry - into bit 16. Similarly, there will be a carry into bit - 24. If one of bits 24-30 is set, there will be a carry - into bit 31, so all of the hole bits will be changed. - - The one misfire occurs when bits 24-30 are clear and bit - 31 is set; in this case, the hole at bit 31 is not - changed. If we had access to the processor carry flag, - we could close this loophole by putting the fourth hole - at bit 32! - - So it ignores everything except 128's, when they're aligned - properly. - - 3) But wait! Aren't we looking for C, not zero? - Good point. So what we do is XOR LONGWORD with a longword, - each of whose bytes is C. This turns each byte that is C - into a zero. */ - - longword = *longword_ptr++ ^ charmask; - - /* Add MAGIC_BITS to LONGWORD. */ - if ((((longword + magic_bits) - - /* Set those bits that were unchanged by the addition. */ - ^ ~longword) - - /* Look at only the hole bits. If any of the hole bits - are unchanged, most likely one of the bytes was a - zero. */ - & ~magic_bits) != 0) - { - /* Which of the bytes was C? If none of them were, it was - a misfire; continue the search. */ - - const unsigned char *cp = (const unsigned char *) (longword_ptr - 1); - - if (cp[0] == c) - return (__ptr_t) cp; - if (cp[1] == c) - return (__ptr_t) &cp[1]; - if (cp[2] == c) - return (__ptr_t) &cp[2]; - if (cp[3] == c) - return (__ptr_t) &cp[3]; -#if LONG_MAX > 2147483647 - if (cp[4] == c) - return (__ptr_t) &cp[4]; - if (cp[5] == c) - return (__ptr_t) &cp[5]; - if (cp[6] == c) - return (__ptr_t) &cp[6]; - if (cp[7] == c) - return (__ptr_t) &cp[7]; -#endif - } - - n -= sizeof (longword); - } - - char_ptr = (const unsigned char *) longword_ptr; - - while (n-- > 0) - { - if (*char_ptr == c) - return (__ptr_t) char_ptr; - else - ++char_ptr; - } - - return 0; -} diff --git a/lib/memcmp.c b/lib/memcmp.c deleted file mode 100644 index 76cf52e..0000000 --- a/lib/memcmp.c +++ /dev/null @@ -1,396 +0,0 @@ -/* Copyright (C) 1991, 1993, 1995, 1997, 1998 Free Software Foundation, Inc. - Contributed by Torbjorn Granlund (tege@sics.se). - - NOTE: The canonical source of this file is maintained with the GNU C Library. - Bugs can be reported to bug-glibc@gnu.org. - - 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 the - Free Software Foundation; either version 2, or (at your option) any - later version. - - This program 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 - -#undef __ptr_t -#if defined __cplusplus || (defined __STDC__ && __STDC__) -# define __ptr_t void * -#else /* Not C++ or ANSI C. */ -# undef const -# define const -# define __ptr_t char * -#endif /* C++ or ANSI C. */ - -#ifndef __P -# if defined __GNUC__ || (defined __STDC__ && __STDC__) -# define __P(args) args -# else -# define __P(args) () -# endif /* GCC. */ -#endif /* Not __P. */ - -#if defined HAVE_STRING_H || defined _LIBC -# include -#endif - -#undef memcmp - -#ifdef _LIBC - -# include -# include - -# if __BYTE_ORDER == __BIG_ENDIAN -# define WORDS_BIGENDIAN -# endif - -#else /* Not in the GNU C library. */ - -# include - -/* Type to use for aligned memory operations. - This should normally be the biggest type supported by a single load - and store. Must be an unsigned type. */ -# define op_t unsigned long int -# define OPSIZ (sizeof(op_t)) - -/* Threshold value for when to enter the unrolled loops. */ -# define OP_T_THRES 16 - -/* Type to use for unaligned operations. */ -typedef unsigned char byte; - -# ifndef WORDS_BIGENDIAN -# define MERGE(w0, sh_1, w1, sh_2) (((w0) >> (sh_1)) | ((w1) << (sh_2))) -# else -# define MERGE(w0, sh_1, w1, sh_2) (((w0) << (sh_1)) | ((w1) >> (sh_2))) -# endif - -#endif /* In the GNU C library. */ - -#ifdef WORDS_BIGENDIAN -# define CMP_LT_OR_GT(a, b) ((a) > (b) ? 1 : -1) -#else -# define CMP_LT_OR_GT(a, b) memcmp_bytes ((a), (b)) -#endif - -/* BE VERY CAREFUL IF YOU CHANGE THIS CODE! */ - -/* The strategy of this memcmp is: - - 1. Compare bytes until one of the block pointers is aligned. - - 2. Compare using memcmp_common_alignment or - memcmp_not_common_alignment, regarding the alignment of the other - block after the initial byte operations. The maximum number of - full words (of type op_t) are compared in this way. - - 3. Compare the few remaining bytes. */ - -#ifndef WORDS_BIGENDIAN -/* memcmp_bytes -- Compare A and B bytewise in the byte order of the machine. - A and B are known to be different. - This is needed only on little-endian machines. */ - -static int memcmp_bytes __P((op_t, op_t)); - -# ifdef __GNUC__ -__inline -# endif -static int -memcmp_bytes (a, b) - op_t a, b; -{ - long int srcp1 = (long int) &a; - long int srcp2 = (long int) &b; - op_t a0, b0; - - do - { - a0 = ((byte *) srcp1)[0]; - b0 = ((byte *) srcp2)[0]; - srcp1 += 1; - srcp2 += 1; - } - while (a0 == b0); - return a0 - b0; -} -#endif - -static int memcmp_common_alignment __P((long, long, size_t)); - -/* memcmp_common_alignment -- Compare blocks at SRCP1 and SRCP2 with LEN `op_t' - objects (not LEN bytes!). Both SRCP1 and SRCP2 should be aligned for - memory operations on `op_t's. */ -#ifdef __GNUC__ -__inline -#endif -static int -memcmp_common_alignment (srcp1, srcp2, len) - long int srcp1; - long int srcp2; - size_t len; -{ - op_t a0, a1; - op_t b0, b1; - - switch (len % 4) - { - default: /* Avoid warning about uninitialized local variables. */ - case 2: - a0 = ((op_t *) srcp1)[0]; - b0 = ((op_t *) srcp2)[0]; - srcp1 -= 2 * OPSIZ; - srcp2 -= 2 * OPSIZ; - len += 2; - goto do1; - case 3: - a1 = ((op_t *) srcp1)[0]; - b1 = ((op_t *) srcp2)[0]; - srcp1 -= OPSIZ; - srcp2 -= OPSIZ; - len += 1; - goto do2; - case 0: - if (OP_T_THRES <= 3 * OPSIZ && len == 0) - return 0; - a0 = ((op_t *) srcp1)[0]; - b0 = ((op_t *) srcp2)[0]; - goto do3; - case 1: - a1 = ((op_t *) srcp1)[0]; - b1 = ((op_t *) srcp2)[0]; - srcp1 += OPSIZ; - srcp2 += OPSIZ; - len -= 1; - if (OP_T_THRES <= 3 * OPSIZ && len == 0) - goto do0; - /* Fall through. */ - } - - do - { - a0 = ((op_t *) srcp1)[0]; - b0 = ((op_t *) srcp2)[0]; - if (a1 != b1) - return CMP_LT_OR_GT (a1, b1); - - do3: - a1 = ((op_t *) srcp1)[1]; - b1 = ((op_t *) srcp2)[1]; - if (a0 != b0) - return CMP_LT_OR_GT (a0, b0); - - do2: - a0 = ((op_t *) srcp1)[2]; - b0 = ((op_t *) srcp2)[2]; - if (a1 != b1) - return CMP_LT_OR_GT (a1, b1); - - do1: - a1 = ((op_t *) srcp1)[3]; - b1 = ((op_t *) srcp2)[3]; - if (a0 != b0) - return CMP_LT_OR_GT (a0, b0); - - srcp1 += 4 * OPSIZ; - srcp2 += 4 * OPSIZ; - len -= 4; - } - while (len != 0); - - /* This is the right position for do0. Please don't move - it into the loop. */ - do0: - if (a1 != b1) - return CMP_LT_OR_GT (a1, b1); - return 0; -} - -static int memcmp_not_common_alignment __P((long, long, size_t)); - -/* memcmp_not_common_alignment -- Compare blocks at SRCP1 and SRCP2 with LEN - `op_t' objects (not LEN bytes!). SRCP2 should be aligned for memory - operations on `op_t', but SRCP1 *should be unaligned*. */ -#ifdef __GNUC__ -__inline -#endif -static int -memcmp_not_common_alignment (srcp1, srcp2, len) - long int srcp1; - long int srcp2; - size_t len; -{ - op_t a0, a1, a2, a3; - op_t b0, b1, b2, b3; - op_t x; - int shl, shr; - - /* Calculate how to shift a word read at the memory operation - aligned srcp1 to make it aligned for comparison. */ - - shl = 8 * (srcp1 % OPSIZ); - shr = 8 * OPSIZ - shl; - - /* Make SRCP1 aligned by rounding it down to the beginning of the `op_t' - it points in the middle of. */ - srcp1 &= -OPSIZ; - - switch (len % 4) - { - default: /* Avoid warning about uninitialized local variables. */ - case 2: - a1 = ((op_t *) srcp1)[0]; - a2 = ((op_t *) srcp1)[1]; - b2 = ((op_t *) srcp2)[0]; - srcp1 -= 1 * OPSIZ; - srcp2 -= 2 * OPSIZ; - len += 2; - goto do1; - case 3: - a0 = ((op_t *) srcp1)[0]; - a1 = ((op_t *) srcp1)[1]; - b1 = ((op_t *) srcp2)[0]; - srcp2 -= 1 * OPSIZ; - len += 1; - goto do2; - case 0: - if (OP_T_THRES <= 3 * OPSIZ && len == 0) - return 0; - a3 = ((op_t *) srcp1)[0]; - a0 = ((op_t *) srcp1)[1]; - b0 = ((op_t *) srcp2)[0]; - srcp1 += 1 * OPSIZ; - goto do3; - case 1: - a2 = ((op_t *) srcp1)[0]; - a3 = ((op_t *) srcp1)[1]; - b3 = ((op_t *) srcp2)[0]; - srcp1 += 2 * OPSIZ; - srcp2 += 1 * OPSIZ; - len -= 1; - if (OP_T_THRES <= 3 * OPSIZ && len == 0) - goto do0; - /* Fall through. */ - } - - do - { - a0 = ((op_t *) srcp1)[0]; - b0 = ((op_t *) srcp2)[0]; - x = MERGE(a2, shl, a3, shr); - if (x != b3) - return CMP_LT_OR_GT (x, b3); - - do3: - a1 = ((op_t *) srcp1)[1]; - b1 = ((op_t *) srcp2)[1]; - x = MERGE(a3, shl, a0, shr); - if (x != b0) - return CMP_LT_OR_GT (x, b0); - - do2: - a2 = ((op_t *) srcp1)[2]; - b2 = ((op_t *) srcp2)[2]; - x = MERGE(a0, shl, a1, shr); - if (x != b1) - return CMP_LT_OR_GT (x, b1); - - do1: - a3 = ((op_t *) srcp1)[3]; - b3 = ((op_t *) srcp2)[3]; - x = MERGE(a1, shl, a2, shr); - if (x != b2) - return CMP_LT_OR_GT (x, b2); - - srcp1 += 4 * OPSIZ; - srcp2 += 4 * OPSIZ; - len -= 4; - } - while (len != 0); - - /* This is the right position for do0. Please don't move - it into the loop. */ - do0: - x = MERGE(a2, shl, a3, shr); - if (x != b3) - return CMP_LT_OR_GT (x, b3); - return 0; -} - -int -memcmp (s1, s2, len) - const __ptr_t s1; - const __ptr_t s2; - size_t len; -{ - op_t a0; - op_t b0; - long int srcp1 = (long int) s1; - long int srcp2 = (long int) s2; - op_t res; - - if (len >= OP_T_THRES) - { - /* There are at least some bytes to compare. No need to test - for LEN == 0 in this alignment loop. */ - while (srcp2 % OPSIZ != 0) - { - a0 = ((byte *) srcp1)[0]; - b0 = ((byte *) srcp2)[0]; - srcp1 += 1; - srcp2 += 1; - res = a0 - b0; - if (res != 0) - return res; - len -= 1; - } - - /* SRCP2 is now aligned for memory operations on `op_t'. - SRCP1 alignment determines if we can do a simple, - aligned compare or need to shuffle bits. */ - - if (srcp1 % OPSIZ == 0) - res = memcmp_common_alignment (srcp1, srcp2, len / OPSIZ); - else - res = memcmp_not_common_alignment (srcp1, srcp2, len / OPSIZ); - if (res != 0) - return res; - - /* Number of bytes remaining in the interval [0..OPSIZ-1]. */ - srcp1 += len & -OPSIZ; - srcp2 += len & -OPSIZ; - len %= OPSIZ; - } - - /* There are just a few bytes to compare. Use byte memory operations. */ - while (len != 0) - { - a0 = ((byte *) srcp1)[0]; - b0 = ((byte *) srcp2)[0]; - srcp1 += 1; - srcp2 += 1; - res = a0 - b0; - if (res != 0) - return res; - len -= 1; - } - - return 0; -} - -#ifdef weak_alias -# undef bcmp -weak_alias (memcmp, bcmp) -#endif diff --git a/lib/memmove.c b/lib/memmove.c deleted file mode 100644 index a0d730e..0000000 --- a/lib/memmove.c +++ /dev/null @@ -1,76 +0,0 @@ -/* Copyright (C) 1998 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 the - Free Software Foundation; either version 2, or (at your option) any - later version. - - This program 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. */ - -/* Last ditch effort to support memmove: if user doesn't have - memmove or bcopy, we offer this sluggish implementation. */ - -#include "config.h" -#ifndef HAVE_MEMMOVE - -#include -#ifdef HAVE_MEMORY_H -# include -#endif - -#ifndef VOID -# define VOID void -#endif - -VOID * -memmove(dest, src, len) - VOID *dest; - const VOID *src; - size_t len; -{ -#ifdef HAVE_BCOPY - bcopy(src, dest, len); - -#else /*!HAVE_BCOPY*/ - char *dp = dest; - const char *sp = src; - -# ifdef HAVE_MEMCPY - /* A special-case for non-overlapping regions, on the assumption - that there is some hope that the sytem's memcpy() implementaion - is better than our dumb fall-back one. */ - if ((dp < sp && dp+len < sp) || (sp < dp && sp+len < dp)) - return memcpy(dest, src, len); -# endif - - /* I tried real hard to avoid getting to this point. - You *really* ought to upgrade your system's libraries; - the performance of this implementation sucks. */ - if (dp < sp) - { - while (len-- > 0) - *dp++ = *sp++; - } - else - { - if (dp == sp) - return dest; - dp += len; - sp += len; - while (len-- > 0) - *--dp = *--sp; - } -#endif /*!HAVE_BCOPY*/ - - return dest; -} - -#endif /*!HAVE_MEMMOVE*/ diff --git a/lib/mkstemp.c b/lib/mkstemp.c deleted file mode 100644 index 5b00205..0000000 --- a/lib/mkstemp.c +++ /dev/null @@ -1,70 +0,0 @@ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#ifdef HAVE_STRINGS_H -# include -#else -# include -#endif /* HAVE_STRINGS_H */ - -#ifdef HAVE_STDLIB_H -# include -#endif /* HAVE_STDLIB_H */ - -#ifdef HAVE_SYS_FILE_H -# include -#endif /* HAVE_SYS_FILE_H */ - -#ifdef HAVE_IO_H -# include -#endif /* HAVE_IO_H */ - -#ifdef HAVE_UNISTD_H -# include -#endif /* HAVE_UNISTD_H */ - -#ifdef HAVE_FCNTL_H -#include -#endif /* HAVE_FCNTL_H */ - -#include -#include - -/* Generate a unique temporary file name from template. The last six characters of - template must be XXXXXX and these are replaced with a string that makes the - filename unique. */ - -int -mkstemp (template) - char *template; -{ - int i, j, n, fd; - char *data = template + strlen(template) - 6; - - if (data < template) { - errno = EINVAL; - return -1; - } - - for (n = 0; n <= 5; n++) - if (data[n] != 'X') { - errno = EINVAL; - return -1; - } - - for (i = 0; i < INT_MAX; i++) { - j = i ^ 827714841; /* Base 36 DOSSUX :-) */ - for (n = 5; n >= 0; n--) { - data[n] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ" [j % 36]; - j /= 36; - } - - fd = open (template, O_CREAT|O_EXCL|O_RDWR, 0600); - if (fd != -1) - return fd; - } - - errno = EEXIST; - return -1; -} diff --git a/lib/obstack.c b/lib/obstack.c deleted file mode 100644 index b3e1c81..0000000 --- a/lib/obstack.c +++ /dev/null @@ -1,577 +0,0 @@ -/* obstack.c - subroutines used implicitly by object stack macros -*- C -*- - Copyright (C) 1988,89,90,91,92,93,94,96,97 Free Software Foundation, Inc. - - This file is part of the GNU C Library. Its master source is NOT part of - the C library, however. The master source lives in /gd/gnu/lib. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "obstack.h" - -/* NOTE BEFORE MODIFYING THIS FILE: This version number must be - incremented whenever callers compiled using an old obstack.h can no - longer properly call the functions in this obstack.c. */ -#define OBSTACK_INTERFACE_VERSION 1 - -/* Comment out all this code if we are using the GNU C Library, and are not - actually compiling the library itself, and the installed library - supports the same library interface we do. This code is part of the GNU - C Library, but also included in many other GNU distributions. Compiling - and linking in this code is a waste when using the GNU C library - (especially if it is a shared library). Rather than having every GNU - program understand `configure --with-gnu-libc' and omit the object - files, it is simpler to just do this in the source for each such file. */ - -#include /* Random thing to get __GNU_LIBRARY__. */ -#if !defined (_LIBC) && defined (__GNU_LIBRARY__) && __GNU_LIBRARY__ > 1 -#include -#if _GNU_OBSTACK_INTERFACE_VERSION == OBSTACK_INTERFACE_VERSION -#define ELIDE_CODE -#endif -#endif - - -#ifndef ELIDE_CODE - - -#if defined (__STDC__) && __STDC__ -#define POINTER void * -#else -#define POINTER char * -#endif - -/* Determine default alignment. */ -struct fooalign {char x; double d;}; -#define DEFAULT_ALIGNMENT \ - ((PTR_INT_TYPE) ((char *) &((struct fooalign *) 0)->d - (char *) 0)) -/* If malloc were really smart, it would round addresses to DEFAULT_ALIGNMENT. - But in fact it might be less smart and round addresses to as much as - DEFAULT_ROUNDING. So we prepare for it to do that. */ -union fooround {long x; double d;}; -#define DEFAULT_ROUNDING (sizeof (union fooround)) - -#ifdef original_glibc_code -/**//* When we copy a long block of data, this is the unit to do it with. */ -/**//* On some machines, copying successive ints does not work; */ -/**//* in such a case, redefine COPYING_UNIT to `long' (if that works) */ -/**//* or `char' as a last resort. */ -/**/#ifndef COPYING_UNIT -/**/#define COPYING_UNIT int -/**/#endif -#endif - -/* The functions allocating more room by calling `obstack_chunk_alloc' - jump to the handler pointed to by `obstack_alloc_failed_handler'. - This variable by default points to the internal function - `print_and_abort'. */ -#if defined (__STDC__) && __STDC__ -static void print_and_abort (void); -void (*obstack_alloc_failed_handler) (void) = print_and_abort; -#else -static void print_and_abort (); -void (*obstack_alloc_failed_handler) () = print_and_abort; -#endif - -/* Exit value used when `print_and_abort' is used. */ -#if defined __GNU_LIBRARY__ || defined HAVE_STDLIB_H -#include -#endif -#ifndef EXIT_FAILURE -#define EXIT_FAILURE 1 -#endif -int obstack_exit_failure = EXIT_FAILURE; - -/* The non-GNU-C macros copy the obstack into this global variable - to avoid multiple evaluation. */ - -struct obstack *_obstack; - -/* Define a macro that either calls functions with the traditional malloc/free - calling interface, or calls functions with the mmalloc/mfree interface - (that adds an extra first argument), based on the state of use_extra_arg. - For free, do not use ?:, since some compilers, like the MIPS compilers, - do not allow (expr) ? void : void. */ - -#if defined (__STDC__) && __STDC__ -#define CALL_CHUNKFUN(h, size) \ - (((h) -> use_extra_arg) \ - ? (*(h)->chunkfun) ((h)->extra_arg, (size)) \ - : (*(struct _obstack_chunk *(*) (long)) (h)->chunkfun) ((size))) - -#define CALL_FREEFUN(h, old_chunk) \ - do { \ - if ((h) -> use_extra_arg) \ - (*(h)->freefun) ((h)->extra_arg, (old_chunk)); \ - else \ - (*(void (*) (void *)) (h)->freefun) ((old_chunk)); \ - } while (0) -#else -#define CALL_CHUNKFUN(h, size) \ - (((h) -> use_extra_arg) \ - ? (*(h)->chunkfun) ((h)->extra_arg, (size)) \ - : (*(struct _obstack_chunk *(*) ()) (h)->chunkfun) ((size))) - -#define CALL_FREEFUN(h, old_chunk) \ - do { \ - if ((h) -> use_extra_arg) \ - (*(h)->freefun) ((h)->extra_arg, (old_chunk)); \ - else \ - (*(void (*) ()) (h)->freefun) ((old_chunk)); \ - } while (0) -#endif - - -/* Initialize an obstack H for use. Specify chunk size SIZE (0 means default). - Objects start on multiples of ALIGNMENT (0 means use default). - CHUNKFUN is the function to use to allocate chunks, - and FREEFUN the function to free them. - - Return nonzero if successful, zero if out of memory. - To recover from an out of memory error, - free up some memory, then call this again. */ - -int -_obstack_begin (h, size, alignment, chunkfun, freefun) - struct obstack *h; - int size; - int alignment; -#if defined (__STDC__) && __STDC__ - POINTER (*chunkfun) (long); - void (*freefun) (void *); -#else - POINTER (*chunkfun) (); - void (*freefun) (); -#endif -{ - register struct _obstack_chunk *chunk; /* points to new chunk */ - - if (alignment == 0) - alignment = DEFAULT_ALIGNMENT; - if (size == 0) - /* Default size is what GNU malloc can fit in a 4096-byte block. */ - { - /* 12 is sizeof (mhead) and 4 is EXTRA from GNU malloc. - Use the values for range checking, because if range checking is off, - the extra bytes won't be missed terribly, but if range checking is on - and we used a larger request, a whole extra 4096 bytes would be - allocated. - - These number are irrelevant to the new GNU malloc. I suspect it is - less sensitive to the size of the request. */ - int extra = ((((12 + DEFAULT_ROUNDING - 1) & ~(DEFAULT_ROUNDING - 1)) - + 4 + DEFAULT_ROUNDING - 1) - & ~(DEFAULT_ROUNDING - 1)); - size = 4096 - extra; - } - -#if defined (__STDC__) && __STDC__ - h->chunkfun = (struct _obstack_chunk * (*)(void *, long)) chunkfun; - h->freefun = (void (*) (void *, struct _obstack_chunk *)) freefun; -#else - h->chunkfun = (struct _obstack_chunk * (*)()) chunkfun; - h->freefun = freefun; -#endif - h->chunk_size = size; - h->alignment_mask = alignment - 1; - h->use_extra_arg = 0; - - chunk = h->chunk = CALL_CHUNKFUN (h, h -> chunk_size); - if (!chunk) - (*obstack_alloc_failed_handler) (); - h->next_free = h->object_base = chunk->contents; - h->chunk_limit = chunk->limit - = (char *) chunk + h->chunk_size; - chunk->prev = 0; - /* The initial chunk now contains no empty object. */ - h->maybe_empty_object = 0; - h->alloc_failed = 0; - return 1; -} - -int -_obstack_begin_1 (h, size, alignment, chunkfun, freefun, arg) - struct obstack *h; - int size; - int alignment; -#if defined (__STDC__) && __STDC__ - POINTER (*chunkfun) (POINTER, long); - void (*freefun) (POINTER, POINTER); -#else - POINTER (*chunkfun) (); - void (*freefun) (); -#endif - POINTER arg; -{ - register struct _obstack_chunk *chunk; /* points to new chunk */ - - if (alignment == 0) - alignment = DEFAULT_ALIGNMENT; - if (size == 0) - /* Default size is what GNU malloc can fit in a 4096-byte block. */ - { - /* 12 is sizeof (mhead) and 4 is EXTRA from GNU malloc. - Use the values for range checking, because if range checking is off, - the extra bytes won't be missed terribly, but if range checking is on - and we used a larger request, a whole extra 4096 bytes would be - allocated. - - These number are irrelevant to the new GNU malloc. I suspect it is - less sensitive to the size of the request. */ - int extra = ((((12 + DEFAULT_ROUNDING - 1) & ~(DEFAULT_ROUNDING - 1)) - + 4 + DEFAULT_ROUNDING - 1) - & ~(DEFAULT_ROUNDING - 1)); - size = 4096 - extra; - } - -#if defined(__STDC__) && __STDC__ - h->chunkfun = (struct _obstack_chunk * (*)(void *,long)) chunkfun; - h->freefun = (void (*) (void *, struct _obstack_chunk *)) freefun; -#else - h->chunkfun = (struct _obstack_chunk * (*)()) chunkfun; - h->freefun = freefun; -#endif - h->chunk_size = size; - h->alignment_mask = alignment - 1; - h->extra_arg = arg; - h->use_extra_arg = 1; - - chunk = h->chunk = CALL_CHUNKFUN (h, h -> chunk_size); - if (!chunk) - (*obstack_alloc_failed_handler) (); - h->next_free = h->object_base = chunk->contents; - h->chunk_limit = chunk->limit - = (char *) chunk + h->chunk_size; - chunk->prev = 0; - /* The initial chunk now contains no empty object. */ - h->maybe_empty_object = 0; - h->alloc_failed = 0; - return 1; -} - -/* Allocate a new current chunk for the obstack *H - on the assumption that LENGTH bytes need to be added - to the current object, or a new object of length LENGTH allocated. - Copies any partial object from the end of the old chunk - to the beginning of the new one. */ - -void -_obstack_newchunk (h, length) - struct obstack *h; - int length; -{ - register struct _obstack_chunk *old_chunk = h->chunk; - register struct _obstack_chunk *new_chunk; - register long new_size; - register int obj_size = h->next_free - h->object_base; - - /* Compute size for new chunk. */ - new_size = (obj_size + length) + (obj_size >> 3) + 100; - if (new_size < h->chunk_size) - new_size = h->chunk_size; - - /* Allocate and initialize the new chunk. */ - new_chunk = CALL_CHUNKFUN (h, new_size); - if (!new_chunk) - (*obstack_alloc_failed_handler) (); - h->chunk = new_chunk; - new_chunk->prev = old_chunk; - new_chunk->limit = h->chunk_limit = (char *) new_chunk + new_size; - - _obstack_memcpy(new_chunk->contents, h->object_base, obj_size); - - /* If the object just copied was the only data in OLD_CHUNK, */ - /* free that chunk and remove it from the chain. */ - /* But not if that chunk might contain an empty object. */ - if (h->object_base == old_chunk->contents && ! h->maybe_empty_object) - { - new_chunk->prev = old_chunk->prev; - CALL_FREEFUN (h, old_chunk); - } - - h->object_base = new_chunk->contents; - h->next_free = h->object_base + obj_size; - /* The new chunk certainly contains no empty object yet. */ - h->maybe_empty_object = 0; -} - -/* Return nonzero if object OBJ has been allocated from obstack H. - This is here for debugging. - If you use it in a program, you are probably losing. */ - -#if defined (__STDC__) && __STDC__ -/* Suppress -Wmissing-prototypes warning. We don't want to declare this in - obstack.h because it is just for debugging. */ -int _obstack_allocated_p (struct obstack *h, POINTER obj); -#endif - -int -_obstack_allocated_p (h, obj) - struct obstack *h; - POINTER obj; -{ - register struct _obstack_chunk *lp; /* below addr of any objects in this chunk */ - register struct _obstack_chunk *plp; /* point to previous chunk if any */ - - lp = (h)->chunk; - /* We use >= rather than > since the object cannot be exactly at - the beginning of the chunk but might be an empty object exactly - at the end of an adjacent chunk. */ - while (lp != 0 && ((POINTER) lp >= obj || (POINTER) (lp)->limit < obj)) - { - plp = lp->prev; - lp = plp; - } - return lp != 0; -} - -/* Free objects in obstack H, including OBJ and everything allocate - more recently than OBJ. If OBJ is zero, free everything in H. */ - -#undef obstack_free - -/* This function has two names with identical definitions. - This is the first one, called from non-ANSI code. */ - -void -_obstack_free (h, obj) - struct obstack *h; - POINTER obj; -{ - register struct _obstack_chunk *lp; /* below addr of any objects in this chunk */ - register struct _obstack_chunk *plp; /* point to previous chunk if any */ - - lp = h->chunk; - /* We use >= because there cannot be an object at the beginning of a chunk. - But there can be an empty object at that address - at the end of another chunk. */ - while (lp != 0 && ((POINTER) lp >= obj || (POINTER) (lp)->limit < obj)) - { - plp = lp->prev; - CALL_FREEFUN (h, lp); - lp = plp; - /* If we switch chunks, we can't tell whether the new current - chunk contains an empty object, so assume that it may. */ - h->maybe_empty_object = 1; - } - if (lp) - { - h->object_base = h->next_free = (char *) (obj); - h->chunk_limit = lp->limit; - h->chunk = lp; - } - else if (obj != 0) - /* obj is not in any of the chunks! */ - abort (); -} - -/* This function is used from ANSI code. */ - -void -obstack_free (h, obj) - struct obstack *h; - POINTER obj; -{ - register struct _obstack_chunk *lp; /* below addr of any objects in this chunk */ - register struct _obstack_chunk *plp; /* point to previous chunk if any */ - - lp = h->chunk; - /* We use >= because there cannot be an object at the beginning of a chunk. - But there can be an empty object at that address - at the end of another chunk. */ - while (lp != 0 && ((POINTER) lp >= obj || (POINTER) (lp)->limit < obj)) - { - plp = lp->prev; - CALL_FREEFUN (h, lp); - lp = plp; - /* If we switch chunks, we can't tell whether the new current - chunk contains an empty object, so assume that it may. */ - h->maybe_empty_object = 1; - } - if (lp) - { - h->object_base = h->next_free = (char *) (obj); - h->chunk_limit = lp->limit; - h->chunk = lp; - } - else if (obj != 0) - /* obj is not in any of the chunks! */ - abort (); -} - -int -_obstack_memory_used (h) - struct obstack *h; -{ - register struct _obstack_chunk* lp; - register int nbytes = 0; - - for (lp = h->chunk; lp != 0; lp = lp->prev) - { - nbytes += lp->limit - (char *) lp; - } - return nbytes; -} - -/* Define the error handler. */ -#ifndef _ -# ifdef HAVE_LIBINTL_H -# include -# ifndef _ -# define _(Str) gettext (Str) -# endif -# else -# define _(Str) (Str) -# endif -#endif - -static void -print_and_abort () -{ - fputs (_("memory exhausted\n"), stderr); - exit (obstack_exit_failure); -} - -#if 0 -/* These are now turned off because the applications do not use it - and it uses bcopy via obstack_grow, which causes trouble on sysV. */ - -/* Now define the functional versions of the obstack macros. - Define them to simply use the corresponding macros to do the job. */ - -#if defined (__STDC__) && __STDC__ -/* These function definitions do not work with non-ANSI preprocessors; - they won't pass through the macro names in parentheses. */ - -/* The function names appear in parentheses in order to prevent - the macro-definitions of the names from being expanded there. */ - -POINTER (obstack_base) (obstack) - struct obstack *obstack; -{ - return obstack_base (obstack); -} - -POINTER (obstack_next_free) (obstack) - struct obstack *obstack; -{ - return obstack_next_free (obstack); -} - -int (obstack_object_size) (obstack) - struct obstack *obstack; -{ - return obstack_object_size (obstack); -} - -int (obstack_room) (obstack) - struct obstack *obstack; -{ - return obstack_room (obstack); -} - -int (obstack_make_room) (obstack, length) - struct obstack *obstack; - int length; -{ - return obstack_make_room (obstack, length); -} - -void (obstack_grow) (obstack, pointer, length) - struct obstack *obstack; - POINTER pointer; - int length; -{ - obstack_grow (obstack, pointer, length); -} - -void (obstack_grow0) (obstack, pointer, length) - struct obstack *obstack; - POINTER pointer; - int length; -{ - obstack_grow0 (obstack, pointer, length); -} - -void (obstack_1grow) (obstack, character) - struct obstack *obstack; - int character; -{ - obstack_1grow (obstack, character); -} - -void (obstack_blank) (obstack, length) - struct obstack *obstack; - int length; -{ - obstack_blank (obstack, length); -} - -void (obstack_1grow_fast) (obstack, character) - struct obstack *obstack; - int character; -{ - obstack_1grow_fast (obstack, character); -} - -void (obstack_blank_fast) (obstack, length) - struct obstack *obstack; - int length; -{ - obstack_blank_fast (obstack, length); -} - -POINTER (obstack_finish) (obstack) - struct obstack *obstack; -{ - return obstack_finish (obstack); -} - -POINTER (obstack_alloc) (obstack, length) - struct obstack *obstack; - int length; -{ - return obstack_alloc (obstack, length); -} - -POINTER (obstack_copy) (obstack, pointer, length) - struct obstack *obstack; - POINTER pointer; - int length; -{ - return obstack_copy (obstack, pointer, length); -} - -POINTER (obstack_copy0) (obstack, pointer, length) - struct obstack *obstack; - POINTER pointer; - int length; -{ - return obstack_copy0 (obstack, pointer, length); -} - -#endif /* __STDC__ */ - -#endif /* 0 */ - -#endif /* !ELIDE_CODE */ diff --git a/lib/obstack.h b/lib/obstack.h deleted file mode 100644 index f77825c..0000000 --- a/lib/obstack.h +++ /dev/null @@ -1,609 +0,0 @@ -/* obstack.h - object stack macros - Copyright (C) 1988,89,90,91,92,93,94,96,97,98,99 Free Software Foundation, Inc. - This file is part of the GNU C Library. Its master source is NOT part of - the C library, however. The master source lives in /gd/gnu/lib. - - 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, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301 USA. */ - -/* Summary: - -All the apparent functions defined here are macros. The idea -is that you would use these pre-tested macros to solve a -very specific set of problems, and they would run fast. -Caution: no side-effects in arguments please!! They may be -evaluated MANY times!! - -These macros operate a stack of objects. Each object starts life -small, and may grow to maturity. (Consider building a word syllable -by syllable.) An object can move while it is growing. Once it has -been "finished" it never changes address again. So the "top of the -stack" is typically an immature growing object, while the rest of the -stack is of mature, fixed size and fixed address objects. - -These routines grab large chunks of memory, using a function you -supply, called `obstack_chunk_alloc'. On occasion, they free chunks, -by calling `obstack_chunk_free'. You must define them and declare -them before using any obstack macros. - -Each independent stack is represented by a `struct obstack'. -Each of the obstack macros expects a pointer to such a structure -as the first argument. - -One motivation for this package is the problem of growing char strings -in symbol tables. Unless you are "fascist pig with a read-only mind" ---Gosper's immortal quote from HAKMEM item 154, out of context--you -would not like to put any arbitrary upper limit on the length of your -symbols. - -In practice this often means you will build many short symbols and a -few long symbols. At the time you are reading a symbol you don't know -how long it is. One traditional method is to read a symbol into a -buffer, realloc()ating the buffer every time you try to read a symbol -that is longer than the buffer. This is beaut, but you still will -want to copy the symbol from the buffer to a more permanent -symbol-table entry say about half the time. - -With obstacks, you can work differently. Use one obstack for all symbol -names. As you read a symbol, grow the name in the obstack gradually. -When the name is complete, finalize it. Then, if the symbol exists already, -free the newly read name. - -The way we do this is to take a large chunk, allocating memory from -low addresses. When you want to build a symbol in the chunk you just -add chars above the current "high water mark" in the chunk. When you -have finished adding chars, because you got to the end of the symbol, -you know how long the chars are, and you can create a new object. -Mostly the chars will not burst over the highest address of the chunk, -because you would typically expect a chunk to be (say) 100 times as -long as an average object. - -In case that isn't clear, when we have enough chars to make up -the object, THEY ARE ALREADY CONTIGUOUS IN THE CHUNK (guaranteed) -so we just point to it where it lies. No moving of chars is -needed and this is the second win: potentially long strings need -never be explicitly shuffled. Once an object is formed, it does not -change its address during its lifetime. - -When the chars burst over a chunk boundary, we allocate a larger -chunk, and then copy the partly formed object from the end of the old -chunk to the beginning of the new larger chunk. We then carry on -accreting characters to the end of the object as we normally would. - -A special macro is provided to add a single char at a time to a -growing object. This allows the use of register variables, which -break the ordinary 'growth' macro. - -Summary: - We allocate large chunks. - We carve out one object at a time from the current chunk. - Once carved, an object never moves. - We are free to append data of any size to the currently - growing object. - Exactly one object is growing in an obstack at any one time. - You can run one obstack per control block. - You may have as many control blocks as you dare. - Because of the way we do it, you can `unwind' an obstack - back to a previous state. (You may remove objects much - as you would with a stack.) -*/ - - -/* Don't do the contents of this file more than once. */ - -#ifndef _OBSTACK_H -#define _OBSTACK_H 1 - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -/* We use subtraction of (char *) 0 instead of casting to int - because on word-addressable machines a simple cast to int - may ignore the byte-within-word field of the pointer. */ - -#ifndef __PTR_TO_INT -# define __PTR_TO_INT(P) ((P) - (char *) 0) -#endif - -#ifndef __INT_TO_PTR -# define __INT_TO_PTR(P) ((P) + (char *) 0) -#endif - -/* We need the type of the resulting object. If __PTRDIFF_TYPE__ is - defined, as with GNU C, use that; that way we don't pollute the - namespace with 's symbols. Otherwise, if is - available, include it and use ptrdiff_t. In traditional C, long is - the best that we can do. */ - -#ifdef __PTRDIFF_TYPE__ -# define PTR_INT_TYPE __PTRDIFF_TYPE__ -#else -# ifdef HAVE_STDDEF_H -# include -# define PTR_INT_TYPE ptrdiff_t -# else -# define PTR_INT_TYPE long -# endif -#endif - -#if defined _LIBC || defined HAVE_STRING_H -# include -# define _obstack_memcpy(To, From, N) memcpy ((To), (From), (N)) -#else -# ifdef memcpy -# define _obstack_memcpy(To, From, N) memcpy ((To), (From), (N)) -# else -# define _obstack_memcpy(To, From, N) bcopy ((From), (To), (N)) -# endif -#endif - -struct _obstack_chunk /* Lives at front of each chunk. */ -{ - char *limit; /* 1 past end of this chunk */ - struct _obstack_chunk *prev; /* address of prior chunk or NULL */ - char contents[4]; /* objects begin here */ -}; - -struct obstack /* control current object in current chunk */ -{ - long chunk_size; /* preferred size to allocate chunks in */ - struct _obstack_chunk *chunk; /* address of current struct obstack_chunk */ - char *object_base; /* address of object we are building */ - char *next_free; /* where to add next char to current object */ - char *chunk_limit; /* address of char after current chunk */ - PTR_INT_TYPE temp; /* Temporary for some macros. */ - int alignment_mask; /* Mask of alignment for each object. */ -#if defined __STDC__ && __STDC__ - /* These prototypes vary based on `use_extra_arg', and we use - casts to the prototypeless function type in all assignments, - but having prototypes here quiets -Wstrict-prototypes. */ - struct _obstack_chunk *(*chunkfun) (void *, long); - void (*freefun) (void *, struct _obstack_chunk *); - void *extra_arg; /* first arg for chunk alloc/dealloc funcs */ -#else - struct _obstack_chunk *(*chunkfun) (); /* User's fcn to allocate a chunk. */ - void (*freefun) (); /* User's function to free a chunk. */ - char *extra_arg; /* first arg for chunk alloc/dealloc funcs */ -#endif - unsigned use_extra_arg:1; /* chunk alloc/dealloc funcs take extra arg */ - unsigned maybe_empty_object:1;/* There is a possibility that the current - chunk contains a zero-length object. This - prevents freeing the chunk if we allocate - a bigger chunk to replace it. */ - unsigned alloc_failed:1; /* No longer used, as we now call the failed - handler on error, but retained for binary - compatibility. */ -}; - -/* Declare the external functions we use; they are in obstack.c. */ - -#if defined __STDC__ && __STDC__ -extern void _obstack_newchunk (struct obstack *, int); -extern void _obstack_free (struct obstack *, void *); -extern int _obstack_begin (struct obstack *, int, int, - void *(*) (long), void (*) (void *)); -extern int _obstack_begin_1 (struct obstack *, int, int, - void *(*) (void *, long), - void (*) (void *, void *), void *); -extern int _obstack_memory_used (struct obstack *); -#else -extern void _obstack_newchunk (); -extern void _obstack_free (); -extern int _obstack_begin (); -extern int _obstack_begin_1 (); -extern int _obstack_memory_used (); -#endif - -#if defined __STDC__ && __STDC__ - -/* Do the function-declarations after the structs - but before defining the macros. */ - -void obstack_init (struct obstack *obstack); - -void * obstack_alloc (struct obstack *obstack, int size); - -void * obstack_copy (struct obstack *obstack, const void *address, int size); -void * obstack_copy0 (struct obstack *obstack, const void *address, int size); - -void obstack_free (struct obstack *obstack, void *block); - -void obstack_blank (struct obstack *obstack, int size); - -void obstack_grow (struct obstack *obstack, const void *data, int size); -void obstack_grow0 (struct obstack *obstack, const void *data, int size); - -void obstack_1grow (struct obstack *obstack, int data_char); -void obstack_ptr_grow (struct obstack *obstack, const void *data); -void obstack_int_grow (struct obstack *obstack, int data); - -void * obstack_finish (struct obstack *obstack); - -int obstack_object_size (struct obstack *obstack); - -int obstack_room (struct obstack *obstack); -void obstack_make_room (struct obstack *obstack, int size); -void obstack_1grow_fast (struct obstack *obstack, int data_char); -void obstack_ptr_grow_fast (struct obstack *obstack, const void *data); -void obstack_int_grow_fast (struct obstack *obstack, int data); -void obstack_blank_fast (struct obstack *obstack, int size); - -void * obstack_base (struct obstack *obstack); -void * obstack_next_free (struct obstack *obstack); -int obstack_alignment_mask (struct obstack *obstack); -int obstack_chunk_size (struct obstack *obstack); -int obstack_memory_used (struct obstack *obstack); - -#endif /* __STDC__ */ - -/* Non-ANSI C cannot really support alternative functions for these macros, - so we do not declare them. */ - -/* Error handler called when `obstack_chunk_alloc' failed to allocate - more memory. This can be set to a user defined function which - should either abort gracefully or use longjump - but shouldn't - return. The default action is to print a message and abort. */ -#if defined __STDC__ && __STDC__ -extern void (*obstack_alloc_failed_handler) (void); -#else -extern void (*obstack_alloc_failed_handler) (); -#endif - -/* Exit value used when `print_and_abort' is used. */ -extern int obstack_exit_failure; - -/* Pointer to beginning of object being allocated or to be allocated next. - Note that this might not be the final address of the object - because a new chunk might be needed to hold the final size. */ - -#define obstack_base(h) ((h)->object_base) - -/* Size for allocating ordinary chunks. */ - -#define obstack_chunk_size(h) ((h)->chunk_size) - -/* Pointer to next byte not yet allocated in current chunk. */ - -#define obstack_next_free(h) ((h)->next_free) - -/* Mask specifying low bits that should be clear in address of an object. */ - -#define obstack_alignment_mask(h) ((h)->alignment_mask) - -/* To prevent prototype warnings provide complete argument list in - standard C version. */ -#if defined __STDC__ && __STDC__ - -# define obstack_init(h) \ - _obstack_begin ((h), 0, 0, \ - (void *(*) (long)) obstack_chunk_alloc, \ - (void (*) (void *)) obstack_chunk_free) - -# define obstack_begin(h, size) \ - _obstack_begin ((h), (size), 0, \ - (void *(*) (long)) obstack_chunk_alloc, \ - (void (*) (void *)) obstack_chunk_free) - -# define obstack_specify_allocation(h, size, alignment, chunkfun, freefun) \ - _obstack_begin ((h), (size), (alignment), \ - (void *(*) (long)) (chunkfun), \ - (void (*) (void *)) (freefun)) - -# define obstack_specify_allocation_with_arg(h, size, alignment, chunkfun, freefun, arg) \ - _obstack_begin_1 ((h), (size), (alignment), \ - (void *(*) (void *, long)) (chunkfun), \ - (void (*) (void *, void *)) (freefun), (arg)) - -# define obstack_chunkfun(h, newchunkfun) \ - ((h) -> chunkfun = (struct _obstack_chunk *(*)(void *, long)) (newchunkfun)) - -# define obstack_freefun(h, newfreefun) \ - ((h) -> freefun = (void (*)(void *, struct _obstack_chunk *)) (newfreefun)) - -#else - -# define obstack_init(h) \ - _obstack_begin ((h), 0, 0, \ - (void *(*) ()) obstack_chunk_alloc, \ - (void (*) ()) obstack_chunk_free) - -# define obstack_begin(h, size) \ - _obstack_begin ((h), (size), 0, \ - (void *(*) ()) obstack_chunk_alloc, \ - (void (*) ()) obstack_chunk_free) - -# define obstack_specify_allocation(h, size, alignment, chunkfun, freefun) \ - _obstack_begin ((h), (size), (alignment), \ - (void *(*) ()) (chunkfun), \ - (void (*) ()) (freefun)) - -# define obstack_specify_allocation_with_arg(h, size, alignment, chunkfun, freefun, arg) \ - _obstack_begin_1 ((h), (size), (alignment), \ - (void *(*) ()) (chunkfun), \ - (void (*) ()) (freefun), (arg)) - -# define obstack_chunkfun(h, newchunkfun) \ - ((h) -> chunkfun = (struct _obstack_chunk *(*)()) (newchunkfun)) - -# define obstack_freefun(h, newfreefun) \ - ((h) -> freefun = (void (*)()) (newfreefun)) - -#endif - -#define obstack_1grow_fast(h,achar) (*((h)->next_free)++ = achar) - -#define obstack_blank_fast(h,n) ((h)->next_free += (n)) - -#define obstack_memory_used(h) _obstack_memory_used (h) - -#if defined __GNUC__ && defined __STDC__ && __STDC__ -/* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and - does not implement __extension__. But that compiler doesn't define - __GNUC_MINOR__. */ -# if __GNUC__ < 2 || (__NeXT__ && !__GNUC_MINOR__) -# define __extension__ -# endif - -/* For GNU C, if not -traditional, - we can define these macros to compute all args only once - without using a global variable. - Also, we can avoid using the `temp' slot, to make faster code. */ - -# define obstack_object_size(OBSTACK) \ - __extension__ \ - ({ struct obstack *__o = (OBSTACK); \ - (unsigned) (__o->next_free - __o->object_base); }) - -# define obstack_room(OBSTACK) \ - __extension__ \ - ({ struct obstack *__o = (OBSTACK); \ - (unsigned) (__o->chunk_limit - __o->next_free); }) - -# define obstack_make_room(OBSTACK,length) \ -__extension__ \ -({ struct obstack *__o = (OBSTACK); \ - int __len = (length); \ - if (__o->chunk_limit - __o->next_free < __len) \ - _obstack_newchunk (__o, __len); \ - (void) 0; }) - -# define obstack_empty_p(OBSTACK) \ - __extension__ \ - ({ struct obstack *__o = (OBSTACK); \ - (__o->chunk->prev == 0 && __o->next_free - __o->chunk->contents == 0); }) - -# define obstack_grow(OBSTACK,where,length) \ -__extension__ \ -({ struct obstack *__o = (OBSTACK); \ - int __len = (length); \ - if (__o->next_free + __len > __o->chunk_limit) \ - _obstack_newchunk (__o, __len); \ - _obstack_memcpy (__o->next_free, (where), __len); \ - __o->next_free += __len; \ - (void) 0; }) - -# define obstack_grow0(OBSTACK,where,length) \ -__extension__ \ -({ struct obstack *__o = (OBSTACK); \ - int __len = (length); \ - if (__o->next_free + __len + 1 > __o->chunk_limit) \ - _obstack_newchunk (__o, __len + 1); \ - _obstack_memcpy (__o->next_free, (where), __len); \ - __o->next_free += __len; \ - *(__o->next_free)++ = 0; \ - (void) 0; }) - -# define obstack_1grow(OBSTACK,datum) \ -__extension__ \ -({ struct obstack *__o = (OBSTACK); \ - if (__o->next_free + 1 > __o->chunk_limit) \ - _obstack_newchunk (__o, 1); \ - *(__o->next_free)++ = (datum); \ - (void) 0; }) - -/* These assume that the obstack alignment is good enough for pointers - or ints, and that the data added so far to the current object - shares that much alignment. */ - -# define obstack_ptr_grow(OBSTACK,datum) \ -__extension__ \ -({ struct obstack *__o = (OBSTACK); \ - if (__o->next_free + sizeof (void *) > __o->chunk_limit) \ - _obstack_newchunk (__o, sizeof (void *)); \ - ((*((void **)__o->next_free) = (datum)), (__o->next_free += sizeof (void *))); \ - (void) 0; }) - -# define obstack_int_grow(OBSTACK,datum) \ -__extension__ \ -({ struct obstack *__o = (OBSTACK); \ - if (__o->next_free + sizeof (int) > __o->chunk_limit) \ - _obstack_newchunk (__o, sizeof (int)); \ - ((*((int *)__o->next_free) = (datum)), (__o->next_free += sizeof (int ))); \ - (void) 0; }) - -# define obstack_ptr_grow_fast(h,aptr) \ - (((*((void **) (h)->next_free) = (aptr)), ( (h)->next_free += sizeof (void *)))) - -# define obstack_int_grow_fast(h,aint) \ - (((*((int *) (h)->next_free) = (aint)), ( (h)->next_free += sizeof (int )))) - -# define obstack_blank(OBSTACK,length) \ -__extension__ \ -({ struct obstack *__o = (OBSTACK); \ - int __len = (length); \ - if (__o->chunk_limit - __o->next_free < __len) \ - _obstack_newchunk (__o, __len); \ - __o->next_free += __len; \ - (void) 0; }) - -# define obstack_alloc(OBSTACK,length) \ -__extension__ \ -({ struct obstack *__h = (OBSTACK); \ - obstack_blank (__h, (length)); \ - obstack_finish (__h); }) - -# define obstack_copy(OBSTACK,where,length) \ -__extension__ \ -({ struct obstack *__h = (OBSTACK); \ - obstack_grow (__h, (where), (length)); \ - obstack_finish (__h); }) - -# define obstack_copy0(OBSTACK,where,length) \ -__extension__ \ -({ struct obstack *__h = (OBSTACK); \ - obstack_grow0 (__h, (where), (length)); \ - obstack_finish (__h); }) - -/* The local variable is named __o1 to avoid a name conflict - when obstack_blank is called. */ -# define obstack_finish(OBSTACK) \ -__extension__ \ -({ struct obstack *__o1 = (OBSTACK); \ - void *value; \ - value = (void *) __o1->object_base; \ - if (__o1->next_free == value) \ - __o1->maybe_empty_object = 1; \ - __o1->next_free \ - = __INT_TO_PTR ((__PTR_TO_INT (__o1->next_free)+__o1->alignment_mask)\ - & ~ (__o1->alignment_mask)); \ - if (__o1->next_free - (char *)__o1->chunk \ - > __o1->chunk_limit - (char *)__o1->chunk) \ - __o1->next_free = __o1->chunk_limit; \ - __o1->object_base = __o1->next_free; \ - value; }) - -# define obstack_free(OBSTACK, OBJ) \ -__extension__ \ -({ struct obstack *__o = (OBSTACK); \ - void *__obj = (OBJ); \ - if (__obj > (void *)__o->chunk && __obj < (void *)__o->chunk_limit) \ - __o->next_free = __o->object_base = (char *)__obj; \ - else (obstack_free) (__o, __obj); }) - -#else /* not __GNUC__ or not __STDC__ */ - -# define obstack_object_size(h) \ - (unsigned) ((h)->next_free - (h)->object_base) - -# define obstack_room(h) \ - (unsigned) ((h)->chunk_limit - (h)->next_free) - -# define obstack_empty_p(h) \ - ((h)->chunk->prev == 0 && (h)->next_free - (h)->chunk->contents == 0) - -/* Note that the call to _obstack_newchunk is enclosed in (..., 0) - so that we can avoid having void expressions - in the arms of the conditional expression. - Casting the third operand to void was tried before, - but some compilers won't accept it. */ - -# define obstack_make_room(h,length) \ -( (h)->temp = (length), \ - (((h)->next_free + (h)->temp > (h)->chunk_limit) \ - ? (_obstack_newchunk ((h), (h)->temp), 0) : 0)) - -# define obstack_grow(h,where,length) \ -( (h)->temp = (length), \ - (((h)->next_free + (h)->temp > (h)->chunk_limit) \ - ? (_obstack_newchunk ((h), (h)->temp), 0) : 0), \ - _obstack_memcpy ((h)->next_free, (where), (h)->temp), \ - (h)->next_free += (h)->temp) - -# define obstack_grow0(h,where,length) \ -( (h)->temp = (length), \ - (((h)->next_free + (h)->temp + 1 > (h)->chunk_limit) \ - ? (_obstack_newchunk ((h), (h)->temp + 1), 0) : 0), \ - _obstack_memcpy ((h)->next_free, (where), (h)->temp), \ - (h)->next_free += (h)->temp, \ - *((h)->next_free)++ = 0) - -# define obstack_1grow(h,datum) \ -( (((h)->next_free + 1 > (h)->chunk_limit) \ - ? (_obstack_newchunk ((h), 1), 0) : 0), \ - (*((h)->next_free)++ = (datum))) - -# define obstack_ptr_grow(h,datum) \ -( (((h)->next_free + sizeof (char *) > (h)->chunk_limit) \ - ? (_obstack_newchunk ((h), sizeof (char *)), 0) : 0), \ - (*((const char **) (((h)->next_free+=sizeof(char *))-sizeof(char *))) = (datum))) - -# define obstack_int_grow(h,datum) \ -( (((h)->next_free + sizeof (int) > (h)->chunk_limit) \ - ? (_obstack_newchunk ((h), sizeof (int)), 0) : 0), \ - (*((int *) (((h)->next_free+=sizeof(int))-sizeof(int))) = (datum))) - -# define obstack_ptr_grow_fast(h,aptr) \ - (((*((const char **) (h)->next_free) = (aptr)), ( (h)->next_free += sizeof (const char *)))) - -# define obstack_int_grow_fast(h,aint) \ - (((*((int *) (h)->next_free) = (aint)), ( (h)->next_free += sizeof (int )))) - -# define obstack_blank(h,length) \ -( (h)->temp = (length), \ - (((h)->chunk_limit - (h)->next_free < (h)->temp) \ - ? (_obstack_newchunk ((h), (h)->temp), 0) : 0), \ - ((h)->next_free += (h)->temp)) - -# define obstack_alloc(h,length) \ - (obstack_blank ((h), (length)), obstack_finish ((h))) - -# define obstack_copy(h,where,length) \ - (obstack_grow ((h), (where), (length)), obstack_finish ((h))) - -# define obstack_copy0(h,where,length) \ - (obstack_grow0 ((h), (where), (length)), obstack_finish ((h))) - -# define obstack_finish(h) \ -( ((h)->next_free == (h)->object_base \ - ? (((h)->maybe_empty_object = 1), 0) \ - : 0), \ - (h)->temp = __PTR_TO_INT ((h)->object_base), \ - (h)->next_free \ - = __INT_TO_PTR ((__PTR_TO_INT ((h)->next_free)+(h)->alignment_mask) \ - & ~ ((h)->alignment_mask)), \ - (((h)->next_free - (char *) (h)->chunk \ - > (h)->chunk_limit - (char *) (h)->chunk) \ - ? ((h)->next_free = (h)->chunk_limit) : 0), \ - (h)->object_base = (h)->next_free, \ - __INT_TO_PTR ((h)->temp)) - -# if defined __STDC__ && __STDC__ -# define obstack_free(h,obj) \ -( (h)->temp = (char *) (obj) - (char *) (h)->chunk, \ - (((h)->temp > 0 && (h)->temp < (h)->chunk_limit - (char *) (h)->chunk)\ - ? (int) ((h)->next_free = (h)->object_base \ - = (h)->temp + (char *) (h)->chunk) \ - : (((obstack_free) ((h), (h)->temp + (char *) (h)->chunk), 0), 0))) -# else -# define obstack_free(h,obj) \ -( (h)->temp = (char *) (obj) - (char *) (h)->chunk, \ - (((h)->temp > 0 && (h)->temp < (h)->chunk_limit - (char *) (h)->chunk)\ - ? (int) ((h)->next_free = (h)->object_base \ - = (h)->temp + (char *) (h)->chunk) \ - : (_obstack_free ((h), (h)->temp + (char *) (h)->chunk), 0))) -# endif - -#endif /* not __GNUC__ or not __STDC__ */ - -#ifdef __cplusplus -} /* C++ */ -#endif - -#endif /* obstack.h */ diff --git a/lib/snprintf.c b/lib/snprintf.c deleted file mode 100644 index 7062f25..0000000 --- a/lib/snprintf.c +++ /dev/null @@ -1,337 +0,0 @@ -/* A simplified snprintf, without floating point support */ - -/* AIX requires this to be the first thing in the file. */ -#ifdef _AIX -#pragma alloca -#endif - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#ifndef __GNUC__ -# if HAVE_ALLOCA_H -# include -# else -# ifndef alloca /* predefined by HP cc +Olibcalls */ - char *alloca (); -# endif -# endif -#endif - -#ifndef BOOTSTRAP -#include -#endif -#ifdef HAVE_STDARG_H -#include -#else -#include -#endif -#ifdef HAVE_STDLIB_H -#include -#endif -#ifdef HAVE_STRING_H -#include -#endif -#include - -#include "basicdefs.h" - -#define MINUS_FLAG 1 -#define PLUS_FLAG 2 -#define SPACE_FLAG 4 -#define ALTERNATE_FLAG 8 -#define ZERO_FLAG 16 - -static int -compute_number_length (num, base, width, prec, flags, minusp) - unsigned long num; - unsigned base; - int width; - int prec; - int flags; - int minusp; -{ - int len = 0; - int i; - - /* length of the number itself */ - do - { - len++; - num /= base; - } - while (num); - - /* ...padded to prec characters */ - if (prec > len) len = prec; - - /* ...with alternate prefix */ - if (flags & ALTERNATE_FLAG && (base == 16 || base == 8)) - len += base / 8; - - /* ...with the sign before it */ - if (minusp || (flags & SPACE_FLAG) || (flags & PLUS_FLAG)) - len++; - - /* ...and padded with spaces or zeroes (zeroes go - before the sign, actually. This routine does - not consider that but vsprintf will). */ - - return (width > len) ? width : len; -} - -/* These can't be made into a function... */ - -#define PARSE_INT_FORMAT(res, args) \ -if (long_flag) \ - res = va_arg(args, long); \ -else \ - res = va_arg(args, int) - -#define PARSE_UINT_FORMAT(res, args) \ -if (long_flag) \ - res = va_arg(args, unsigned long); \ -else \ - res = va_arg(args, unsigned int) - -static int -compute_length (fmt, args) - const char *fmt; - va_list args; -{ - char c; - const char *format; - size_t sz; - - /* Go through the string and find the correct length. */ - sz = 0; - format = fmt; - while (c = *format++) - { - if (c == '%') - { - int flags = 0; - int width = 0; - int prec = -1; - int long_flag = 0; - - /* flags */ - while ((c = *format++)) - { - if (c == '-') - flags |= MINUS_FLAG; - else if (c == '+') - flags |= PLUS_FLAG; - else if (c == ' ') - flags |= SPACE_FLAG; - else if (c == '#') - flags |= ALTERNATE_FLAG; - else if (c == '0') - flags |= ZERO_FLAG; - else - break; - } - - if (flags & PLUS_FLAG) - flags &= ~SPACE_FLAG; - if (flags & MINUS_FLAG) - flags &= ~ZERO_FLAG; - - /* width */ - if (isdigit (c)) - do - { - width = width * 10 + c - '0'; - c = *format++; - } - while (isdigit (c)); - else if (c == '*') - { - width = va_arg (args, int); - c = *format++; - } - - /* precision */ - if (c == '.') - { - prec = 0; - c = *format++; - if (isdigit (c)) - do - { - prec = prec * 10 + c - '0'; - c = *format++; - } - while (isdigit (c)); - else if (c == '*') - { - prec = va_arg (args, int); - c = *format++; - } - } - - /* size */ - - if (c == 'h') - { - c = *format++; - if (c == 'h') - c = *format++; - } - else if (c == 'l') - { - long_flag = 1; - c = *format++; - } - - switch (c) - { - case 'c': - sz += width + 1; - break; - - case 's': - { - int len; - char *arg; - - arg = va_arg (args, char *); - len = strlen (arg); - - if (prec != -1 && len > prec) - len = prec; - - sz += (width > len) ? width : len; - break; - } - - case 'd': - case 'i': - { - long arg; - unsigned long num; - int minusp = 0; - - PARSE_INT_FORMAT (arg, args); - - if (arg < 0) - { - minusp = 1; - num = -arg; - } - else - num = arg; - - sz += compute_number_length(num, 10, width, - prec, flags, minusp); - break; - } - - case 'u': - { - unsigned long arg; - - PARSE_UINT_FORMAT (arg, args); - - sz += compute_number_length(arg, 10, width, - prec, flags, 0); - break; - } - - case 'o': - { - unsigned long arg; - - PARSE_UINT_FORMAT (arg, args); - - sz += compute_number_length(arg, 8, width, - prec, flags, 0); - break; - } - - case 'p': - flags |= ALTERNATE_FLAG; - /* fall through */ - - case 'x': - case 'X': - { - unsigned long arg; - - PARSE_UINT_FORMAT (arg, args); - - sz += compute_number_length(arg, 16, width, - prec, flags, 0); - break; - } - - case 'n': - break; - - case '%': - sz++; - break; - - default: - sz += 2; - break; - } - } - else - sz++; - } - - return sz; - } - -static int -my_vsnprintf (str, sz, fmt, args) - char *str; - size_t sz; - const char *fmt; - va_list args; -{ - char *buf; - size_t realsz = compute_length(fmt, args); - - /* Here, we have to count the null character at the end! */ - if (realsz + 1 < sz) - buf = alloca (realsz + 1); - else - buf = str; - - realsz = vsprintf(buf, fmt, args); - if (buf != str) - memcpy(str, buf, sz); - - return realsz; -} - -int -#ifdef HAVE_STDARG_H -snprintf (char *str, size_t sz, const char *format,...) -#else -snprintf (va_alist) - va_dcl -#endif -{ - va_list args; - int ret; -#ifdef HAVE_STDARG_H - va_start (args, format); -#else - char *str; - size_t sz; - char *format; - - va_start (args); - str = va_arg(args, char *); - sz = va_arg(args, size_t); - format = va_arg(args, char *); -#endif - - ret = my_vsnprintf (str, sz, format, args); - va_end (args); - return ret; -} diff --git a/lib/stdbool_.h b/lib/stdbool_.h deleted file mode 100644 index 978174e..0000000 --- a/lib/stdbool_.h +++ /dev/null @@ -1,47 +0,0 @@ -/* Copyright (C) 2001-2002 Free Software Foundation, Inc. - Written by Bruno Haible , 2001. - - 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 - the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program 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. */ - -#ifndef _STDBOOL_H -#define _STDBOOL_H - -/* ISO C 99 for platforms that lack it. */ - -/* 7.16. Boolean type and values */ - -/* BeOS already #defines false 0, true 1. We use the same - definitions below, but temporarily we have to #undef them. */ -#ifdef __BEOS__ -# undef false -# undef true -#endif - -/* For the sake of symbolic names in gdb, define _Bool as an enum type. */ -#ifndef __cplusplus -# if !@HAVE__BOOL@ -typedef enum { false = 0, true = 1 } _Bool; -# endif -#else -typedef bool _Bool; -#endif -#define bool _Bool - -/* The other macros must be usable in preprocessor directives. */ -#define false 0 -#define true 1 -#define __bool_true_false_are_defined 1 - -#endif /* _STDBOOL_H */ diff --git a/lib/strerror.c b/lib/strerror.c deleted file mode 100644 index a18f2ac..0000000 --- a/lib/strerror.c +++ /dev/null @@ -1,52 +0,0 @@ -/* strerror -- return a string corresponding to an error number. - This is a quickie version only intended as compatability glue - for systems which predate the ANSI C definition of the function; - the glibc version is recommended for more general use. - - Copyright (C) 1998 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 the - Free Software Foundation; either version 2, or (at your option) any - later version. - - This program 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, 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ - -#include "config.h" - -#ifndef HAVE_STRERROR - -# ifndef BOOTSTRAP -# include -# endif -# ifdef HAVE_STRING_H -# include -# endif -# include -# undef strerror - -extern int sys_nerr; -extern char *sys_errlist[]; - -char * -strerror(e) - int e; -{ - static char unknown_string[] = - "Unknown error code #xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; - - if (0<=e && e, 1997. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ - -#if HAVE_CONFIG_H -# include -#endif - -#include -#include - -/* states: S_N: normal, S_I: comparing integral part, S_F: comparing - fractional parts, S_Z: idem but with leading Zeroes only */ -#define S_N 0x0 -#define S_I 0x4 -#define S_F 0x8 -#define S_Z 0xC - -/* result_type: CMP: return diff; LEN: compare using len_diff/diff */ -#define CMP 2 -#define LEN 3 - - -/* ISDIGIT differs from isdigit, as follows: - - Its arg may be any int or unsigned int; it need not be an unsigned char. - - It's guaranteed to evaluate its argument exactly once. - - It's typically faster. - POSIX says that only '0' through '9' are digits. Prefer ISDIGIT to - ISDIGIT_LOCALE unless it's important to use the locale's definition - of `digit' even when the host does not conform to POSIX. */ -#define ISDIGIT(c) ((unsigned) (c) - '0' <= 9) - -#undef __strverscmp -#undef strverscmp - -#ifndef weak_alias -# define __strverscmp strverscmp -#endif - -/* Compare S1 and S2 as strings holding indices/version numbers, - returning less than, equal to or greater than zero if S1 is less than, - equal to or greater than S2 (for more info, see the texinfo doc). -*/ - -int -__strverscmp (const char *s1, const char *s2) -{ - const unsigned char *p1 = (const unsigned char *) s1; - const unsigned char *p2 = (const unsigned char *) s2; - unsigned char c1, c2; - int state; - int diff; - - /* Symbol(s) 0 [1-9] others (padding) - Transition (10) 0 (01) d (00) x (11) - */ - static const unsigned int next_state[] = - { - /* state x d 0 - */ - /* S_N */ S_N, S_I, S_Z, S_N, - /* S_I */ S_N, S_I, S_I, S_I, - /* S_F */ S_N, S_F, S_F, S_F, - /* S_Z */ S_N, S_F, S_Z, S_Z - }; - - static const int result_type[] = - { - /* state x/x x/d x/0 x/- d/x d/d d/0 d/- - 0/x 0/d 0/0 0/- -/x -/d -/0 -/- */ - - /* S_N */ CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP, - CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP, - /* S_I */ CMP, -1, -1, CMP, 1, LEN, LEN, CMP, - 1, LEN, LEN, CMP, CMP, CMP, CMP, CMP, - /* S_F */ CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP, - CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP, - /* S_Z */ CMP, 1, 1, CMP, -1, CMP, CMP, CMP, - -1, CMP, CMP, CMP - }; - - if (p1 == p2) - return 0; - - c1 = *p1++; - c2 = *p2++; - /* Hint: '0' is a digit too. */ - state = S_N | ((c1 == '0') + (ISDIGIT (c1) != 0)); - - while ((diff = c1 - c2) == 0 && c1 != '\0') - { - state = next_state[state]; - c1 = *p1++; - c2 = *p2++; - state |= (c1 == '0') + (ISDIGIT (c1) != 0); - } - - state = result_type[state << 2 | ((c2 == '0') + (ISDIGIT (c2) != 0))]; - - switch (state) - { - case CMP: - return diff; - - case LEN: - while (ISDIGIT (*p1++)) - if (!ISDIGIT (*p2++)) - return 1; - - return ISDIGIT (*p2) ? -1 : diff; - - default: - return state; - } -} -#ifdef weak_alias -weak_alias (__strverscmp, strverscmp) -#endif diff --git a/lib/strverscmp.h b/lib/strverscmp.h deleted file mode 100644 index bb1ea1b..0000000 --- a/lib/strverscmp.h +++ /dev/null @@ -1,20 +0,0 @@ -/* strverscmp.h -- compare strings holding indices/version numbers */ - -#ifndef STRVERSCMP_H_ -# define STRVERSCMP_H_ - -# if HAVE_CONFIG_H -# include -# endif - -# ifndef PARAMS -# if defined PROTOTYPES || (defined __STDC__ && __STDC__) -# define PARAMS(Args) Args -# else -# define PARAMS(Args) () -# endif -# endif - -int strverscmp PARAMS ((const char*, const char*)); - -#endif /* not STRVERSCMP_H_ */ diff --git a/po/LINGUAS b/po/LINGUAS deleted file mode 100644 index cb92b48..0000000 --- a/po/LINGUAS +++ /dev/null @@ -1 +0,0 @@ -af ca cs da de el eo es et fi fr ga gl he hr hu id it ja ko nl pl pt_BR ro ru sk sl sr sv tr zh_CN diff --git a/po/POTFILES.in b/po/POTFILES.in index 76dbe12..b19250a 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -6,4 +6,4 @@ sed/compile.c sed/execute.c sed/regexp.c sed/sed.c -lib/utils.c +sed/utils.c diff --git a/po/af.po b/po/af.po index 703c67d..7e2b742 100644 --- a/po/af.po +++ b/po/af.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.9\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:37+0200\n" +"Report-Msgid-Bugs-To: bonzini@gnu.org\n" +"POT-Creation-Date: 2006-09-26 00:06+0200\n" "PO-Revision-Date: 2004-01-11 21:06+0000\n" "Last-Translator: Ysbeer \n" "Language-Team: Afrikaans \n" @@ -349,58 +349,58 @@ msgstr "%s: -e uitdrukking #%lu, karakter %lu: %s\n" msgid "can't find label for jump to `%s'" msgstr "Kan nie etiket vir sprong na `%s' kry nie" -#: sed/execute.c:650 +#: sed/execute.c:706 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: Kan nie %s lees nie: %s\n" -#: sed/execute.c:673 +#: sed/execute.c:729 #, fuzzy, c-format msgid "couldn't edit %s: is a terminal" msgstr "Kon nie die lêer %s oopmaak nie: %s" -#: sed/execute.c:677 +#: sed/execute.c:734 #, c-format msgid "couldn't edit %s: not a regular file" msgstr "" -#: sed/execute.c:684 lib/utils.c:196 +#: sed/execute.c:741 sed/utils.c:229 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "Kon nie tydelike lêer %s oopmaak nie: %s" -#: sed/execute.c:1206 sed/execute.c:1387 +#: sed/execute.c:1264 sed/execute.c:1444 msgid "error in subprocess" msgstr "fout in subproses" -#: sed/execute.c:1208 +#: sed/execute.c:1266 msgid "option `e' not supported" msgstr "opsie `e' word nie ondersteun nie" -#: sed/execute.c:1389 +#: sed/execute.c:1446 msgid "`e' command not supported" msgstr "`e' instruksie word nie ondersteun nie" -#: sed/execute.c:1714 +#: sed/execute.c:1786 msgid "no input files" msgstr "" -#: sed/regexp.c:39 +#: sed/regexp.c:40 #, fuzzy msgid "no previous regular expression" msgstr "Geen vorige regex nie" -#: sed/regexp.c:40 +#: sed/regexp.c:41 #, fuzzy msgid "cannot specify modifiers on empty regexp" msgstr "Kan nie veranderaars vir leë regex spesifiseer nie" -#: sed/regexp.c:115 +#: sed/regexp.c:121 #, fuzzy, c-format msgid "invalid reference \\%d on `s' command's RHS" msgstr "Ongeldige regterhandsverwysing \\%d vir `s' instruksie" -#: sed/sed.c:93 +#: sed/sed.c:98 msgid "" " -R, --regexp-perl\n" " use Perl 5's regular expressions syntax in the script.\n" @@ -408,28 +408,28 @@ msgstr "" " -R, --regexp-perl\n" " gebruik Perl 5 se regexsintaks in die skrip.\n" -#: sed/sed.c:98 +#: sed/sed.c:103 #, c-format msgid "" "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" "\n" msgstr "" -#: sed/sed.c:102 +#: sed/sed.c:107 #, c-format msgid "" " -n, --quiet, --silent\n" " suppress automatic printing of pattern space\n" msgstr "" -#: sed/sed.c:104 +#: sed/sed.c:109 #, c-format msgid "" " -e script, --expression=script\n" " add the script to the commands to be executed\n" msgstr "" -#: sed/sed.c:106 +#: sed/sed.c:111 #, c-format msgid "" " -f script-file, --file=script-file\n" @@ -437,28 +437,36 @@ msgid "" "executed\n" msgstr "" -#: sed/sed.c:108 +#: sed/sed.c:113 #, c-format msgid "" " -i[SUFFIX], --in-place[=SUFFIX]\n" " edit files in place (makes backup if extension supplied)\n" msgstr "" -#: sed/sed.c:110 +#: sed/sed.c:116 +#, c-format +msgid "" +" -b, --binary\n" +" open files in binary mode (CR+LFs are not processed " +"specially)\n" +msgstr "" + +#: sed/sed.c:119 #, c-format msgid "" " -l N, --line-length=N\n" " specify the desired line-wrap length for the `l' command\n" msgstr "" -#: sed/sed.c:112 +#: sed/sed.c:121 #, c-format msgid "" " --posix\n" " disable all GNU extensions.\n" msgstr "" -#: sed/sed.c:114 +#: sed/sed.c:123 #, fuzzy, c-format msgid "" " -r, --regexp-extended\n" @@ -467,7 +475,7 @@ msgstr "" " -R, --regexp-perl\n" " gebruik Perl 5 se regexsintaks in die skrip.\n" -#: sed/sed.c:117 +#: sed/sed.c:126 #, c-format msgid "" " -s, --separate\n" @@ -476,7 +484,7 @@ msgid "" " long stream.\n" msgstr "" -#: sed/sed.c:120 +#: sed/sed.c:129 #, c-format msgid "" " -u, --unbuffered\n" @@ -485,17 +493,17 @@ msgid "" " the output buffers more often\n" msgstr "" -#: sed/sed.c:123 +#: sed/sed.c:132 #, c-format msgid " --help display this help and exit\n" msgstr "" -#: sed/sed.c:124 +#: sed/sed.c:133 #, c-format msgid " --version output version information and exit\n" msgstr "" -#: sed/sed.c:125 +#: sed/sed.c:134 #, c-format msgid "" "\n" @@ -506,7 +514,7 @@ msgid "" "\n" msgstr "" -#: sed/sed.c:131 +#: sed/sed.c:140 #, c-format msgid "" "E-mail bug reports to: %s .\n" @@ -515,12 +523,12 @@ msgstr "" "Rapporteer foute per e-pos aan: %s .\n" "Sluit asb. die woord ``%s'' êrens in die onderwerplyn in.\n" -#: sed/sed.c:268 +#: sed/sed.c:285 #, c-format msgid "super-sed version %s\n" msgstr "super-sed weergawe %s\n" -#: sed/sed.c:269 +#: sed/sed.c:286 #, fuzzy, c-format msgid "" "based on GNU sed version %s\n" @@ -529,12 +537,12 @@ msgstr "" "gebaseer op GNU sed weergawe 3.02.80\n" "\n" -#: sed/sed.c:271 +#: sed/sed.c:288 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed weergawe %s\n" -#: sed/sed.c:273 +#: sed/sed.c:290 #, c-format msgid "" "%s\n" @@ -549,74 +557,34 @@ msgstr "" "DOEL,\n" "binne regsperke nie.\n" -#: lib/utils.c:98 lib/utils.c:336 +#: sed/utils.c:98 sed/utils.c:363 #, fuzzy, c-format msgid "cannot remove %s: %s" msgstr "%s: Kan nie %s lees nie: %s\n" -#: lib/utils.c:143 +#: sed/utils.c:168 #, fuzzy, c-format msgid "couldn't open file %s: %s" msgstr "Kon nie die lêer %s oopmaak nie: %s" -#: lib/utils.c:220 +#: sed/utils.c:192 +#, fuzzy, c-format +msgid "couldn't attach to %s: %s" +msgstr "kon nie %d item na %s skryf nie: %s" + +#: sed/utils.c:247 #, c-format msgid "couldn't write %d item to %s: %s" msgid_plural "couldn't write %d items to %s: %s" msgstr[0] "kon nie %d item na %s skryf nie: %s" msgstr[1] "kon nie %d items na %s skryf nie: %s" -#: lib/utils.c:235 lib/utils.c:251 +#: sed/utils.c:262 sed/utils.c:278 #, c-format msgid "read error on %s: %s" msgstr "leesfout op %s: %s" -#: lib/utils.c:341 +#: sed/utils.c:368 #, fuzzy, c-format msgid "cannot rename %s: %s" msgstr "%s: Kan nie %s lees nie: %s\n" - -#~ msgid "Success" -#~ msgstr "Sukses" - -#~ msgid "No match" -#~ msgstr "Geen paring" - -#~ msgid "Invalid regular expression" -#~ msgstr "Ongeldige regex" - -#~ msgid "Invalid collation character" -#~ msgstr "Ongeldige kollasiekarakter" - -#~ msgid "Trailing backslash" -#~ msgstr "Sleep terugstreep" - -#~ msgid "Invalid back reference" -#~ msgstr "Ongeldige terugverwysing" - -#~ msgid "Unmatched [ or [^" -#~ msgstr "Ongepaarde [ of [^" - -#~ msgid "Unmatched ( or \\(" -#~ msgstr "Ongepaarde ( or \\(" - -#~ msgid "Unmatched \\{" -#~ msgstr "Ongepaarde \\{" - -#~ msgid "Invalid range end" -#~ msgstr "Ongeldige bereikseinde" - -#~ msgid "Memory exhausted" -#~ msgstr "Geheue uitgeput" - -#~ msgid "Invalid preceding regular expression" -#~ msgstr "Ongeldige vorige regex" - -#~ msgid "Premature end of regular expression" -#~ msgstr "Premature einde vir regex" - -#~ msgid "Unmatched ) or \\)" -#~ msgstr "Ongepaarde ) of \\)" - -#~ msgid "No previous regular expression" -#~ msgstr "Geen vorige regex nie" diff --git a/po/ca.po b/po/ca.po index 61671a3..5edd4fd 100644 --- a/po/ca.po +++ b/po/ca.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.1.1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:37+0200\n" +"Report-Msgid-Bugs-To: bonzini@gnu.org\n" +"POT-Creation-Date: 2006-09-26 00:06+0200\n" "PO-Revision-Date: 2004-07-10 05:51+0200\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" @@ -333,56 +333,56 @@ msgstr "%s: -e expressi msgid "can't find label for jump to `%s'" msgstr "no es troba l'etiqueta per al salt a «%s»" -#: sed/execute.c:650 +#: sed/execute.c:706 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: no es pot llegir %s: %s\n" -#: sed/execute.c:673 +#: sed/execute.c:729 #, c-format msgid "couldn't edit %s: is a terminal" msgstr "no s'ha pogut editar %s: és un terminal" -#: sed/execute.c:677 +#: sed/execute.c:734 #, c-format msgid "couldn't edit %s: not a regular file" msgstr "no s'ha pogut editar %s: no és un fitxer regular" -#: sed/execute.c:684 lib/utils.c:196 +#: sed/execute.c:741 sed/utils.c:229 #, c-format msgid "couldn't open temporary file %s: %s" msgstr "no s'ha pogut obrir el fitxer temporal %s: %s" -#: sed/execute.c:1206 sed/execute.c:1387 +#: sed/execute.c:1264 sed/execute.c:1444 msgid "error in subprocess" msgstr "s'ha produït un error en el subprocés" -#: sed/execute.c:1208 +#: sed/execute.c:1266 msgid "option `e' not supported" msgstr "l'opció «e» no està suportada" -#: sed/execute.c:1389 +#: sed/execute.c:1446 msgid "`e' command not supported" msgstr "l'ordre «e» no està suportada" -#: sed/execute.c:1714 +#: sed/execute.c:1786 msgid "no input files" msgstr "" -#: sed/regexp.c:39 +#: sed/regexp.c:40 msgid "no previous regular expression" msgstr "no hi ha una expressió regular prèvia" -#: sed/regexp.c:40 +#: sed/regexp.c:41 msgid "cannot specify modifiers on empty regexp" msgstr "no es poden especificar modificadors en expregs buides" -#: sed/regexp.c:115 +#: sed/regexp.c:121 #, c-format msgid "invalid reference \\%d on `s' command's RHS" msgstr "referència \\%d no vàlida en el costat dret de l'ordre «s»" -#: sed/sed.c:93 +#: sed/sed.c:98 msgid "" " -R, --regexp-perl\n" " use Perl 5's regular expressions syntax in the script.\n" @@ -391,7 +391,7 @@ msgstr "" " usa la sintaxi d'expressions regulars de Perl 5 en aquesta\n" " sequència.\n" -#: sed/sed.c:98 +#: sed/sed.c:103 #, c-format msgid "" "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" @@ -401,7 +401,7 @@ msgstr "" " [fitxer-entrada]...\n" "\n" -#: sed/sed.c:102 +#: sed/sed.c:107 #, c-format msgid "" " -n, --quiet, --silent\n" @@ -410,7 +410,7 @@ msgstr "" " -n, --quiet, --silent\n" " suprimeix la impressió automàtica de l'espai de patrons\n" -#: sed/sed.c:104 +#: sed/sed.c:109 #, c-format msgid "" " -e script, --expression=script\n" @@ -419,7 +419,7 @@ msgstr "" " -e script, --expression=script\n" " afegeix el script a les ordres a executar\n" -#: sed/sed.c:106 +#: sed/sed.c:111 #, c-format msgid "" " -f script-file, --file=script-file\n" @@ -430,7 +430,7 @@ msgstr "" " afegeix els continguts de fitxer-script a les ordres a " "executar\n" -#: sed/sed.c:108 +#: sed/sed.c:113 #, c-format msgid "" " -i[SUFFIX], --in-place[=SUFFIX]\n" @@ -440,7 +440,18 @@ msgstr "" " edita els mateixos fitxers (fa còpia de seguretat si es\n" " proveeix una extensió)\n" -#: sed/sed.c:110 +#: sed/sed.c:116 +#, fuzzy, c-format +msgid "" +" -b, --binary\n" +" open files in binary mode (CR+LFs are not processed " +"specially)\n" +msgstr "" +" -i[SUFIX], --in-place[=SUFIX]\n" +" edita els mateixos fitxers (fa còpia de seguretat si es\n" +" proveeix una extensió)\n" + +#: sed/sed.c:119 #, c-format msgid "" " -l N, --line-length=N\n" @@ -450,7 +461,7 @@ msgstr "" " especifica la longitud desitjada per a l'ajust de final de\n" " línia per a l'ordre «l»\n" -#: sed/sed.c:112 +#: sed/sed.c:121 #, c-format msgid "" " --posix\n" @@ -459,7 +470,7 @@ msgstr "" " --posix\n" " inhabilita totes les extensions GNU.\n" -#: sed/sed.c:114 +#: sed/sed.c:123 #, c-format msgid "" " -r, --regexp-extended\n" @@ -468,7 +479,7 @@ msgstr "" " -r, --regexp-extended\n" " usa expressions regulars exteses en el script.\n" -#: sed/sed.c:117 +#: sed/sed.c:126 #, c-format msgid "" " -s, --separate\n" @@ -480,7 +491,7 @@ msgstr "" " considera els fitxers com independents, en compte d'un\n" " llarg flux continu.\n" -#: sed/sed.c:120 +#: sed/sed.c:129 #, c-format msgid "" " -u, --unbuffered\n" @@ -493,17 +504,17 @@ msgstr "" "d'entrada\n" " i buida els búfers d'eixida més sovint\n" -#: sed/sed.c:123 +#: sed/sed.c:132 #, c-format msgid " --help display this help and exit\n" msgstr " --help mostra aquest missatge d'ajuda i surt\n" -#: sed/sed.c:124 +#: sed/sed.c:133 #, c-format msgid " --version output version information and exit\n" msgstr " --version mostra la informació de la versió i surt\n" -#: sed/sed.c:125 +#: sed/sed.c:134 #, c-format msgid "" "\n" @@ -522,7 +533,7 @@ msgstr "" "es llegeix l'entrada estàndard.\n" "\n" -#: sed/sed.c:131 +#: sed/sed.c:140 #, c-format msgid "" "E-mail bug reports to: %s .\n" @@ -532,12 +543,12 @@ msgstr "" "Assegureu-vos d'incloure la paraula «%s» en alguna part del camp " "«Assumpte:».\n" -#: sed/sed.c:268 +#: sed/sed.c:285 #, c-format msgid "super-sed version %s\n" msgstr "super-sed versió %s\n" -#: sed/sed.c:269 +#: sed/sed.c:286 #, c-format msgid "" "based on GNU sed version %s\n" @@ -546,12 +557,12 @@ msgstr "" "basat en GNU sed versió %s\n" "\n" -#: sed/sed.c:271 +#: sed/sed.c:288 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed versió %s\n" -#: sed/sed.c:273 +#: sed/sed.c:290 #, c-format msgid "" "%s\n" @@ -564,74 +575,34 @@ msgstr "" "de còpia. No hi ha CAP garantia; ni tan sols de COMERCIABILITAT o\n" "ADEQUACIÓ A UN PROPÒSIT PARTICULAR, fins on ho permeta la llei.\n" -#: lib/utils.c:98 lib/utils.c:336 +#: sed/utils.c:98 sed/utils.c:363 #, c-format msgid "cannot remove %s: %s" msgstr "no es pot eliminar %s: %s" -#: lib/utils.c:143 +#: sed/utils.c:168 #, c-format msgid "couldn't open file %s: %s" msgstr "no s'ha pogut obrir el fitxer %s: %s" -#: lib/utils.c:220 +#: sed/utils.c:192 +#, fuzzy, c-format +msgid "couldn't attach to %s: %s" +msgstr "no s'ha pogut escriure %d element a %s: %s" + +#: sed/utils.c:247 #, c-format msgid "couldn't write %d item to %s: %s" msgid_plural "couldn't write %d items to %s: %s" msgstr[0] "no s'ha pogut escriure %d element a %s: %s" msgstr[1] "no s'han pogut escriure %d elements a %s: %s" -#: lib/utils.c:235 lib/utils.c:251 +#: sed/utils.c:262 sed/utils.c:278 #, c-format msgid "read error on %s: %s" msgstr "error de lectura en %s: %s" -#: lib/utils.c:341 +#: sed/utils.c:368 #, c-format msgid "cannot rename %s: %s" msgstr "no es pot reanomenar %s: %s" - -#~ msgid "Success" -#~ msgstr "Èxit" - -#~ msgid "No match" -#~ msgstr "Sense parella" - -#~ msgid "Invalid regular expression" -#~ msgstr "Expressió regular no vàlida" - -#~ msgid "Invalid collation character" -#~ msgstr "El caràcter de comparació no és vàlid" - -#~ msgid "Trailing backslash" -#~ msgstr "Barra invertida al final" - -#~ msgid "Invalid back reference" -#~ msgstr "La referència cap enrere no és vàlida" - -#~ msgid "Unmatched [ or [^" -#~ msgstr "[ o [^ no emparellat" - -#~ msgid "Unmatched ( or \\(" -#~ msgstr "«(» o \\( no emparellat" - -#~ msgid "Unmatched \\{" -#~ msgstr "\\{ no emparellat" - -#~ msgid "Invalid range end" -#~ msgstr "El rang final no és vàlid" - -#~ msgid "Memory exhausted" -#~ msgstr "Memòria exhaurida" - -#~ msgid "Invalid preceding regular expression" -#~ msgstr "L'expressió regular precedent no vàlida" - -#~ msgid "Premature end of regular expression" -#~ msgstr "Fi prematur de l'expressió regular" - -#~ msgid "Unmatched ) or \\)" -#~ msgstr ") o \\) no emparellat" - -#~ msgid "No previous regular expression" -#~ msgstr "No hi ha una expressió regular prèvia" diff --git a/po/cs.po b/po/cs.po index 65c3cb2..1759031 100644 --- a/po/cs.po +++ b/po/cs.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: sed 3.02.80\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:37+0200\n" +"Report-Msgid-Bugs-To: bonzini@gnu.org\n" +"POT-Creation-Date: 2006-09-26 00:06+0200\n" "PO-Revision-Date: 2001-08-05 19:52+02:00\n" "Last-Translator: Vladimir Michl \n" "Language-Team: Czech \n" @@ -342,83 +342,83 @@ msgstr "%s: -e v msgid "can't find label for jump to `%s'" msgstr "Návì¹tí pro skok na `%s' nelze najít" -#: sed/execute.c:650 +#: sed/execute.c:706 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: %s nelze èíst: %s\n" -#: sed/execute.c:673 +#: sed/execute.c:729 #, fuzzy, c-format msgid "couldn't edit %s: is a terminal" msgstr "Soubor %s nelze otevøít" -#: sed/execute.c:677 +#: sed/execute.c:734 #, c-format msgid "couldn't edit %s: not a regular file" msgstr "" -#: sed/execute.c:684 lib/utils.c:196 +#: sed/execute.c:741 sed/utils.c:229 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "Soubor %s nelze otevøít" -#: sed/execute.c:1206 sed/execute.c:1387 +#: sed/execute.c:1264 sed/execute.c:1444 msgid "error in subprocess" msgstr "" -#: sed/execute.c:1208 +#: sed/execute.c:1266 msgid "option `e' not supported" msgstr "" -#: sed/execute.c:1389 +#: sed/execute.c:1446 msgid "`e' command not supported" msgstr "" -#: sed/execute.c:1714 +#: sed/execute.c:1786 msgid "no input files" msgstr "" -#: sed/regexp.c:39 +#: sed/regexp.c:40 msgid "no previous regular expression" msgstr "" -#: sed/regexp.c:40 +#: sed/regexp.c:41 msgid "cannot specify modifiers on empty regexp" msgstr "" -#: sed/regexp.c:115 +#: sed/regexp.c:121 #, c-format msgid "invalid reference \\%d on `s' command's RHS" msgstr "" -#: sed/sed.c:93 +#: sed/sed.c:98 msgid "" " -R, --regexp-perl\n" " use Perl 5's regular expressions syntax in the script.\n" msgstr "" -#: sed/sed.c:98 +#: sed/sed.c:103 #, c-format msgid "" "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" "\n" msgstr "" -#: sed/sed.c:102 +#: sed/sed.c:107 #, c-format msgid "" " -n, --quiet, --silent\n" " suppress automatic printing of pattern space\n" msgstr "" -#: sed/sed.c:104 +#: sed/sed.c:109 #, c-format msgid "" " -e script, --expression=script\n" " add the script to the commands to be executed\n" msgstr "" -#: sed/sed.c:106 +#: sed/sed.c:111 #, c-format msgid "" " -f script-file, --file=script-file\n" @@ -426,35 +426,43 @@ msgid "" "executed\n" msgstr "" -#: sed/sed.c:108 +#: sed/sed.c:113 #, c-format msgid "" " -i[SUFFIX], --in-place[=SUFFIX]\n" " edit files in place (makes backup if extension supplied)\n" msgstr "" -#: sed/sed.c:110 +#: sed/sed.c:116 +#, c-format +msgid "" +" -b, --binary\n" +" open files in binary mode (CR+LFs are not processed " +"specially)\n" +msgstr "" + +#: sed/sed.c:119 #, c-format msgid "" " -l N, --line-length=N\n" " specify the desired line-wrap length for the `l' command\n" msgstr "" -#: sed/sed.c:112 +#: sed/sed.c:121 #, c-format msgid "" " --posix\n" " disable all GNU extensions.\n" msgstr "" -#: sed/sed.c:114 +#: sed/sed.c:123 #, c-format msgid "" " -r, --regexp-extended\n" " use extended regular expressions in the script.\n" msgstr "" -#: sed/sed.c:117 +#: sed/sed.c:126 #, c-format msgid "" " -s, --separate\n" @@ -463,7 +471,7 @@ msgid "" " long stream.\n" msgstr "" -#: sed/sed.c:120 +#: sed/sed.c:129 #, c-format msgid "" " -u, --unbuffered\n" @@ -472,17 +480,17 @@ msgid "" " the output buffers more often\n" msgstr "" -#: sed/sed.c:123 +#: sed/sed.c:132 #, c-format msgid " --help display this help and exit\n" msgstr "" -#: sed/sed.c:124 +#: sed/sed.c:133 #, c-format msgid " --version output version information and exit\n" msgstr "" -#: sed/sed.c:125 +#: sed/sed.c:134 #, c-format msgid "" "\n" @@ -493,7 +501,7 @@ msgid "" "\n" msgstr "" -#: sed/sed.c:131 +#: sed/sed.c:140 #, c-format msgid "" "E-mail bug reports to: %s .\n" @@ -503,24 +511,24 @@ msgstr "" "Kamkoliv do polo¾ky ``Subject:'' vlo¾te ``%s''.\n" "Pøipomínky k pøekladu zasílejte na adresu (èesky).\n" -#: sed/sed.c:268 +#: sed/sed.c:285 #, c-format msgid "super-sed version %s\n" msgstr "" -#: sed/sed.c:269 +#: sed/sed.c:286 #, c-format msgid "" "based on GNU sed version %s\n" "\n" msgstr "" -#: sed/sed.c:271 +#: sed/sed.c:288 #, c-format msgid "GNU sed version %s\n" msgstr "" -#: sed/sed.c:273 +#: sed/sed.c:290 #, c-format msgid "" "%s\n" @@ -534,45 +542,34 @@ msgstr "" "ZÁRUKY,\n" "a to i bez záruky PRODEJNOSTI nebo VHODNOSTI PRO NÌJAKÝ KONKRÉTNÍ ÚÈEL.\n" -#: lib/utils.c:98 lib/utils.c:336 +#: sed/utils.c:98 sed/utils.c:363 #, fuzzy, c-format msgid "cannot remove %s: %s" msgstr "%s: %s nelze èíst: %s\n" -#: lib/utils.c:143 +#: sed/utils.c:168 #, fuzzy, c-format msgid "couldn't open file %s: %s" msgstr "Soubor %s nelze otevøít" -#: lib/utils.c:220 +#: sed/utils.c:192 +#, fuzzy, c-format +msgid "couldn't attach to %s: %s" +msgstr "%d polo¾ek nelze do %s zapsat: %s" + +#: sed/utils.c:247 #, fuzzy, c-format msgid "couldn't write %d item to %s: %s" msgid_plural "couldn't write %d items to %s: %s" msgstr[0] "%d polo¾ek nelze do %s zapsat: %s" msgstr[1] "%d polo¾ek nelze do %s zapsat: %s" -#: lib/utils.c:235 lib/utils.c:251 +#: sed/utils.c:262 sed/utils.c:278 #, c-format msgid "read error on %s: %s" msgstr "chyba pøi ètení z %s: %s" -#: lib/utils.c:341 +#: sed/utils.c:368 #, fuzzy, c-format msgid "cannot rename %s: %s" msgstr "%s: %s nelze èíst: %s\n" - -#, fuzzy -#~ msgid "Unmatched [ or [^" -#~ msgstr "Neodpovídající `{'" - -#, fuzzy -#~ msgid "Unmatched ( or \\(" -#~ msgstr "Neodpovídající `{'" - -#, fuzzy -#~ msgid "Unmatched \\{" -#~ msgstr "Neodpovídající `{'" - -#, fuzzy -#~ msgid "Unmatched ) or \\)" -#~ msgstr "Neodpovídající `{'" diff --git a/po/da.po b/po/da.po index 811676d..6ede6dc 100644 --- a/po/da.po +++ b/po/da.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.8\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:37+0200\n" +"Report-Msgid-Bugs-To: bonzini@gnu.org\n" +"POT-Creation-Date: 2006-09-26 00:06+0200\n" "PO-Revision-Date: 2003-10-25 08:00+0200\n" "Last-Translator: Byrial Ole Jensen \n" "Language-Team: Danish \n" @@ -348,58 +348,58 @@ msgstr "%s: -e udtryk nr. %lu, tegn %lu: %s\n" msgid "can't find label for jump to `%s'" msgstr "Kan ikke finde etiket for hop til '%s'" -#: sed/execute.c:650 +#: sed/execute.c:706 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: kan ikke læse %s: %s\n" -#: sed/execute.c:673 +#: sed/execute.c:729 #, fuzzy, c-format msgid "couldn't edit %s: is a terminal" msgstr "kunne ikke åbne filen %s: %s" -#: sed/execute.c:677 +#: sed/execute.c:734 #, c-format msgid "couldn't edit %s: not a regular file" msgstr "" -#: sed/execute.c:684 lib/utils.c:196 +#: sed/execute.c:741 sed/utils.c:229 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "kunne ikke åbne midlertidig fil %s: %s" -#: sed/execute.c:1206 sed/execute.c:1387 +#: sed/execute.c:1264 sed/execute.c:1444 msgid "error in subprocess" msgstr "fejl i underproces" -#: sed/execute.c:1208 +#: sed/execute.c:1266 msgid "option `e' not supported" msgstr "tilvalg 'e' er ikke understøttet" -#: sed/execute.c:1389 +#: sed/execute.c:1446 msgid "`e' command not supported" msgstr "'e'-kommando er ikke understøttet" -#: sed/execute.c:1714 +#: sed/execute.c:1786 msgid "no input files" msgstr "" -#: sed/regexp.c:39 +#: sed/regexp.c:40 #, fuzzy msgid "no previous regular expression" msgstr "Intet forudgående regulært udtryk" -#: sed/regexp.c:40 +#: sed/regexp.c:41 #, fuzzy msgid "cannot specify modifiers on empty regexp" msgstr "Der kan ikke angives ændrere til tomt regulært udtryk" -#: sed/regexp.c:115 +#: sed/regexp.c:121 #, fuzzy, c-format msgid "invalid reference \\%d on `s' command's RHS" msgstr "Ugyldig reference \\%d på 's'-kommandos højreside" -#: sed/sed.c:93 +#: sed/sed.c:98 msgid "" " -R, --regexp-perl\n" " use Perl 5's regular expressions syntax in the script.\n" @@ -407,28 +407,28 @@ msgstr "" " -R, --regexp-perl\n" " brug Perl 5's syntaks for regulære udtryk i skriptet\n" -#: sed/sed.c:98 +#: sed/sed.c:103 #, c-format msgid "" "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" "\n" msgstr "" -#: sed/sed.c:102 +#: sed/sed.c:107 #, c-format msgid "" " -n, --quiet, --silent\n" " suppress automatic printing of pattern space\n" msgstr "" -#: sed/sed.c:104 +#: sed/sed.c:109 #, c-format msgid "" " -e script, --expression=script\n" " add the script to the commands to be executed\n" msgstr "" -#: sed/sed.c:106 +#: sed/sed.c:111 #, c-format msgid "" " -f script-file, --file=script-file\n" @@ -436,28 +436,36 @@ msgid "" "executed\n" msgstr "" -#: sed/sed.c:108 +#: sed/sed.c:113 #, c-format msgid "" " -i[SUFFIX], --in-place[=SUFFIX]\n" " edit files in place (makes backup if extension supplied)\n" msgstr "" -#: sed/sed.c:110 +#: sed/sed.c:116 +#, c-format +msgid "" +" -b, --binary\n" +" open files in binary mode (CR+LFs are not processed " +"specially)\n" +msgstr "" + +#: sed/sed.c:119 #, c-format msgid "" " -l N, --line-length=N\n" " specify the desired line-wrap length for the `l' command\n" msgstr "" -#: sed/sed.c:112 +#: sed/sed.c:121 #, c-format msgid "" " --posix\n" " disable all GNU extensions.\n" msgstr "" -#: sed/sed.c:114 +#: sed/sed.c:123 #, fuzzy, c-format msgid "" " -r, --regexp-extended\n" @@ -466,7 +474,7 @@ msgstr "" " -R, --regexp-perl\n" " brug Perl 5's syntaks for regulære udtryk i skriptet\n" -#: sed/sed.c:117 +#: sed/sed.c:126 #, c-format msgid "" " -s, --separate\n" @@ -475,7 +483,7 @@ msgid "" " long stream.\n" msgstr "" -#: sed/sed.c:120 +#: sed/sed.c:129 #, c-format msgid "" " -u, --unbuffered\n" @@ -484,17 +492,17 @@ msgid "" " the output buffers more often\n" msgstr "" -#: sed/sed.c:123 +#: sed/sed.c:132 #, c-format msgid " --help display this help and exit\n" msgstr "" -#: sed/sed.c:124 +#: sed/sed.c:133 #, c-format msgid " --version output version information and exit\n" msgstr "" -#: sed/sed.c:125 +#: sed/sed.c:134 #, c-format msgid "" "\n" @@ -505,7 +513,7 @@ msgid "" "\n" msgstr "" -#: sed/sed.c:131 +#: sed/sed.c:140 #, c-format msgid "" "E-mail bug reports to: %s .\n" @@ -514,12 +522,12 @@ msgstr "" "Send fejlrapporter på engelsk pr. e-post til %s.\n" "Sørg venligst for at skrive ordet \"%s\" et sted i \"Subject:\"-feltet.\n" -#: sed/sed.c:268 +#: sed/sed.c:285 #, c-format msgid "super-sed version %s\n" msgstr "super-sed version %s\n" -#: sed/sed.c:269 +#: sed/sed.c:286 #, fuzzy, c-format msgid "" "based on GNU sed version %s\n" @@ -528,12 +536,12 @@ msgstr "" "baseret på GNU sed version 3.02.80\n" "\n" -#: sed/sed.c:271 +#: sed/sed.c:288 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed version %s\n" -#: sed/sed.c:273 +#: sed/sed.c:290 #, c-format msgid "" "%s\n" @@ -546,74 +554,34 @@ msgstr "" "Der er INGEN garanti; end ikke for SALGBARHED eller EGNETHED TIL NOGET\n" "BESTEMT FORMÅL, i det omfang som loven tillader.\n" -#: lib/utils.c:98 lib/utils.c:336 +#: sed/utils.c:98 sed/utils.c:363 #, fuzzy, c-format msgid "cannot remove %s: %s" msgstr "%s: kan ikke læse %s: %s\n" -#: lib/utils.c:143 +#: sed/utils.c:168 #, fuzzy, c-format msgid "couldn't open file %s: %s" msgstr "kunne ikke åbne filen %s: %s" -#: lib/utils.c:220 +#: sed/utils.c:192 +#, fuzzy, c-format +msgid "couldn't attach to %s: %s" +msgstr "kunne ikke skrive %d element til %s: %s" + +#: sed/utils.c:247 #, c-format msgid "couldn't write %d item to %s: %s" msgid_plural "couldn't write %d items to %s: %s" msgstr[0] "kunne ikke skrive %d element til %s: %s" msgstr[1] "kunne ikke skrive %d elementer til %s: %s" -#: lib/utils.c:235 lib/utils.c:251 +#: sed/utils.c:262 sed/utils.c:278 #, c-format msgid "read error on %s: %s" msgstr "læsefejl på %s: %s" -#: lib/utils.c:341 +#: sed/utils.c:368 #, fuzzy, c-format msgid "cannot rename %s: %s" msgstr "%s: kan ikke læse %s: %s\n" - -#~ msgid "Success" -#~ msgstr "Godt resultat" - -#~ msgid "No match" -#~ msgstr "Intet resultat" - -#~ msgid "Invalid regular expression" -#~ msgstr "Ugyldigt regulært udtryk" - -#~ msgid "Invalid collation character" -#~ msgstr "Ugyldigt sorteringstegn" - -#~ msgid "Trailing backslash" -#~ msgstr "Afsluttende omvendt skråstreg" - -#~ msgid "Invalid back reference" -#~ msgstr "Ugyldig reference bagud" - -#~ msgid "Unmatched [ or [^" -#~ msgstr "Uparret [ eller [^" - -#~ msgid "Unmatched ( or \\(" -#~ msgstr "Uparret ( eller \\(" - -#~ msgid "Unmatched \\{" -#~ msgstr "Uparret \\{" - -#~ msgid "Invalid range end" -#~ msgstr "Ugyldig slutning på område" - -#~ msgid "Memory exhausted" -#~ msgstr "Hukommelsen opbrugt" - -#~ msgid "Invalid preceding regular expression" -#~ msgstr "Ugyldigt forudgående regulært udtryk" - -#~ msgid "Premature end of regular expression" -#~ msgstr "Ufuldstændigt regulært udtryk" - -#~ msgid "Unmatched ) or \\)" -#~ msgstr "Uparret ) eller \\)" - -#~ msgid "No previous regular expression" -#~ msgstr "Intet forudgående regulært udtryk" diff --git a/po/de.po b/po/de.po index da4e72b..3906b24 100644 --- a/po/de.po +++ b/po/de.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.6\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:37+0200\n" +"Report-Msgid-Bugs-To: bonzini@gnu.org\n" +"POT-Creation-Date: 2006-09-26 00:06+0200\n" "PO-Revision-Date: 2003-03-21 22:03:41+0100\n" "Last-Translator: Walter Koch \n" "Language-Team: German \n" @@ -348,58 +348,58 @@ msgstr "%s: -e Ausdruck #%lu, Zeichen %lu: %s\n" msgid "can't find label for jump to `%s'" msgstr "Kann das Ziel für den Sprung nach `%s' nicht finden" -#: sed/execute.c:650 +#: sed/execute.c:706 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: kann %s nicht lesen: %s\n" -#: sed/execute.c:673 +#: sed/execute.c:729 #, fuzzy, c-format msgid "couldn't edit %s: is a terminal" msgstr "Datei %s kann nicht geöffnet werden: %s" -#: sed/execute.c:677 +#: sed/execute.c:734 #, c-format msgid "couldn't edit %s: not a regular file" msgstr "" -#: sed/execute.c:684 lib/utils.c:196 +#: sed/execute.c:741 sed/utils.c:229 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "Datei %s kann nicht geöffnet werden: %s" -#: sed/execute.c:1206 sed/execute.c:1387 +#: sed/execute.c:1264 sed/execute.c:1444 msgid "error in subprocess" msgstr "Fehler im Subprozess" -#: sed/execute.c:1208 +#: sed/execute.c:1266 msgid "option `e' not supported" msgstr "Option `e' wird nicht unterstützt" -#: sed/execute.c:1389 +#: sed/execute.c:1446 msgid "`e' command not supported" msgstr "`e'-Kommando wird nicht unterstützt" -#: sed/execute.c:1714 +#: sed/execute.c:1786 msgid "no input files" msgstr "" -#: sed/regexp.c:39 +#: sed/regexp.c:40 #, fuzzy msgid "no previous regular expression" msgstr "Kein vorheriger regulärer Ausdruck" -#: sed/regexp.c:40 +#: sed/regexp.c:41 #, fuzzy msgid "cannot specify modifiers on empty regexp" msgstr "Auf leere reguläre Ausdrücke können keine `modifier' angewandt werden" -#: sed/regexp.c:115 +#: sed/regexp.c:121 #, fuzzy, c-format msgid "invalid reference \\%d on `s' command's RHS" msgstr "Ungültiger Verweis \\%d in den Haltepuffer des `s'-Befehls" -#: sed/sed.c:93 +#: sed/sed.c:98 msgid "" " -R, --regexp-perl\n" " use Perl 5's regular expressions syntax in the script.\n" @@ -407,28 +407,28 @@ msgstr "" " -R, --regexp-perl\n" " Verwende die Perl 5 - Syntax für reg.Ausdrücke im Script.\n" -#: sed/sed.c:98 +#: sed/sed.c:103 #, c-format msgid "" "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" "\n" msgstr "" -#: sed/sed.c:102 +#: sed/sed.c:107 #, c-format msgid "" " -n, --quiet, --silent\n" " suppress automatic printing of pattern space\n" msgstr "" -#: sed/sed.c:104 +#: sed/sed.c:109 #, c-format msgid "" " -e script, --expression=script\n" " add the script to the commands to be executed\n" msgstr "" -#: sed/sed.c:106 +#: sed/sed.c:111 #, c-format msgid "" " -f script-file, --file=script-file\n" @@ -436,28 +436,36 @@ msgid "" "executed\n" msgstr "" -#: sed/sed.c:108 +#: sed/sed.c:113 #, c-format msgid "" " -i[SUFFIX], --in-place[=SUFFIX]\n" " edit files in place (makes backup if extension supplied)\n" msgstr "" -#: sed/sed.c:110 +#: sed/sed.c:116 +#, c-format +msgid "" +" -b, --binary\n" +" open files in binary mode (CR+LFs are not processed " +"specially)\n" +msgstr "" + +#: sed/sed.c:119 #, c-format msgid "" " -l N, --line-length=N\n" " specify the desired line-wrap length for the `l' command\n" msgstr "" -#: sed/sed.c:112 +#: sed/sed.c:121 #, c-format msgid "" " --posix\n" " disable all GNU extensions.\n" msgstr "" -#: sed/sed.c:114 +#: sed/sed.c:123 #, fuzzy, c-format msgid "" " -r, --regexp-extended\n" @@ -466,7 +474,7 @@ msgstr "" " -R, --regexp-perl\n" " Verwende die Perl 5 - Syntax für reg.Ausdrücke im Script.\n" -#: sed/sed.c:117 +#: sed/sed.c:126 #, c-format msgid "" " -s, --separate\n" @@ -475,7 +483,7 @@ msgid "" " long stream.\n" msgstr "" -#: sed/sed.c:120 +#: sed/sed.c:129 #, c-format msgid "" " -u, --unbuffered\n" @@ -484,17 +492,17 @@ msgid "" " the output buffers more often\n" msgstr "" -#: sed/sed.c:123 +#: sed/sed.c:132 #, c-format msgid " --help display this help and exit\n" msgstr "" -#: sed/sed.c:124 +#: sed/sed.c:133 #, c-format msgid " --version output version information and exit\n" msgstr "" -#: sed/sed.c:125 +#: sed/sed.c:134 #, c-format msgid "" "\n" @@ -505,7 +513,7 @@ msgid "" "\n" msgstr "" -#: sed/sed.c:131 +#: sed/sed.c:140 #, c-format msgid "" "E-mail bug reports to: %s .\n" @@ -514,12 +522,12 @@ msgstr "" "Fehlerberichte (in Englisch!) per E-Mail an: %s .\n" "Verwenden Sie dabei den Begriff ``%s'' irgendwo in der ``Betreff:''-Zeile.\n" -#: sed/sed.c:268 +#: sed/sed.c:285 #, c-format msgid "super-sed version %s\n" msgstr "Super-sed version %s\n" -#: sed/sed.c:269 +#: sed/sed.c:286 #, fuzzy, c-format msgid "" "based on GNU sed version %s\n" @@ -528,12 +536,12 @@ msgstr "" "basiert auf GNU sed Version 3.02.80\n" "\n" -#: sed/sed.c:271 +#: sed/sed.c:288 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed Version %s\n" -#: sed/sed.c:273 +#: sed/sed.c:290 #, c-format msgid "" "%s\n" @@ -551,74 +559,34 @@ msgstr "" "Es gibt KEINE GARANTIE; nicht einmal die implizite Garantie der\n" "MARKTFÄHIGKEIT oder der ERFÜLLUNG EINES BESTIMMTEN ZWECKES.\n" -#: lib/utils.c:98 lib/utils.c:336 +#: sed/utils.c:98 sed/utils.c:363 #, fuzzy, c-format msgid "cannot remove %s: %s" msgstr "%s: kann %s nicht lesen: %s\n" -#: lib/utils.c:143 +#: sed/utils.c:168 #, fuzzy, c-format msgid "couldn't open file %s: %s" msgstr "Datei %s kann nicht geöffnet werden: %s" -#: lib/utils.c:220 +#: sed/utils.c:192 +#, fuzzy, c-format +msgid "couldn't attach to %s: %s" +msgstr "Kann %d Feld nicht auf %s schreiben: %s" + +#: sed/utils.c:247 #, c-format msgid "couldn't write %d item to %s: %s" msgid_plural "couldn't write %d items to %s: %s" msgstr[0] "Kann %d Feld nicht auf %s schreiben: %s" msgstr[1] "Kann %d Felder nicht auf %s schreiben: %s" -#: lib/utils.c:235 lib/utils.c:251 +#: sed/utils.c:262 sed/utils.c:278 #, c-format msgid "read error on %s: %s" msgstr "Lesefehler in %s: %s" -#: lib/utils.c:341 +#: sed/utils.c:368 #, fuzzy, c-format msgid "cannot rename %s: %s" msgstr "%s: kann %s nicht lesen: %s\n" - -#~ msgid "Success" -#~ msgstr "Erfolgreich" - -#~ msgid "No match" -#~ msgstr "Keine Übereinstimmung" - -#~ msgid "Invalid regular expression" -#~ msgstr "Ungültiger regulärer Ausdruck" - -#~ msgid "Invalid collation character" -#~ msgstr "Ungültiger Vergleichszeichen" - -#~ msgid "Trailing backslash" -#~ msgstr "Abschliessender Backslash" - -#~ msgid "Invalid back reference" -#~ msgstr "Ungültiger Rückwärtsverweis" - -#~ msgid "Unmatched [ or [^" -#~ msgstr "Nicht paarweises [ bzw. [^" - -#~ msgid "Unmatched ( or \\(" -#~ msgstr "Nicht paarweises ( bzw. \\(" - -#~ msgid "Unmatched \\{" -#~ msgstr "Nicht paarweises \\{" - -#~ msgid "Invalid range end" -#~ msgstr "Ungültiges Bereichende" - -#~ msgid "Memory exhausted" -#~ msgstr "Speicher erschöpft" - -#~ msgid "Invalid preceding regular expression" -#~ msgstr "Vorheriger regulärer Ausdruck ist ungültig" - -#~ msgid "Premature end of regular expression" -#~ msgstr "Regulärer Ausdruck endet zu früh" - -#~ msgid "Unmatched ) or \\)" -#~ msgstr "Nicht paarweises ) bzw. \\)" - -#~ msgid "No previous regular expression" -#~ msgstr "Kein vorheriger regulärer Ausdruck" diff --git a/po/el.po b/po/el.po index 008aeb9..eee90bc 100644 --- a/po/el.po +++ b/po/el.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU sed 3.02.80\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:37+0200\n" +"Report-Msgid-Bugs-To: bonzini@gnu.org\n" +"POT-Creation-Date: 2006-09-26 00:06+0200\n" "PO-Revision-Date: 2002-03-08 12:57+0000\n" "Last-Translator: Simos Xenitellis \n" "Language-Team: Greek \n" @@ -347,85 +347,85 @@ msgstr "%s: -e msgid "can't find label for jump to `%s'" msgstr "Äåí Þôáí äõíáôÞ ç åýñåóç åôéêÝôôáò ãéá ìåôÜâáóç óôï `%s'" -#: sed/execute.c:650 +#: sed/execute.c:706 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: áäõíáìßá óôçí áíÜãíùóç %s: %s\n" -#: sed/execute.c:673 +#: sed/execute.c:729 #, fuzzy, c-format msgid "couldn't edit %s: is a terminal" msgstr "Äåí ìðüñåóá íá áíïßîù ôï áñ÷åßï %s" -#: sed/execute.c:677 +#: sed/execute.c:734 #, c-format msgid "couldn't edit %s: not a regular file" msgstr "" -#: sed/execute.c:684 lib/utils.c:196 +#: sed/execute.c:741 sed/utils.c:229 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "Äåí ìðüñåóá íá áíïßîù ôï áñ÷åßï %s" -#: sed/execute.c:1206 sed/execute.c:1387 +#: sed/execute.c:1264 sed/execute.c:1444 msgid "error in subprocess" msgstr "óöÜëìá óôç õðïäéáäéêáóßá" -#: sed/execute.c:1208 +#: sed/execute.c:1266 msgid "option `e' not supported" msgstr "äåí õðïóôçñßæåôáé ç åðéëïãÞ `e'" -#: sed/execute.c:1389 +#: sed/execute.c:1446 msgid "`e' command not supported" msgstr "äåí õðïóôçñßæåôáé ç åíôïëÞ `e'" -#: sed/execute.c:1714 +#: sed/execute.c:1786 msgid "no input files" msgstr "" -#: sed/regexp.c:39 +#: sed/regexp.c:40 #, fuzzy msgid "no previous regular expression" msgstr "Äåí âñÝèçêå ðñïçãïýìåíç êáíïíéêÞ Ýêöñáóç" -#: sed/regexp.c:40 +#: sed/regexp.c:41 #, fuzzy msgid "cannot specify modifiers on empty regexp" msgstr "äåí åðéôñÝðåôáé ï ïñéóìüò äéáìïñöùôþí óå êåíÞ êáíïíéêÞ Ýêöñáóç" -#: sed/regexp.c:115 +#: sed/regexp.c:121 #, fuzzy, c-format msgid "invalid reference \\%d on `s' command's RHS" msgstr "Ìç Ýãêõñç áíáöïñÜ \\%d óôï äåîß ôìÞìá ôçò åíôïëÞò `s'" -#: sed/sed.c:93 +#: sed/sed.c:98 msgid "" " -R, --regexp-perl\n" " use Perl 5's regular expressions syntax in the script.\n" msgstr "" -#: sed/sed.c:98 +#: sed/sed.c:103 #, c-format msgid "" "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" "\n" msgstr "" -#: sed/sed.c:102 +#: sed/sed.c:107 #, c-format msgid "" " -n, --quiet, --silent\n" " suppress automatic printing of pattern space\n" msgstr "" -#: sed/sed.c:104 +#: sed/sed.c:109 #, c-format msgid "" " -e script, --expression=script\n" " add the script to the commands to be executed\n" msgstr "" -#: sed/sed.c:106 +#: sed/sed.c:111 #, c-format msgid "" " -f script-file, --file=script-file\n" @@ -433,35 +433,43 @@ msgid "" "executed\n" msgstr "" -#: sed/sed.c:108 +#: sed/sed.c:113 #, c-format msgid "" " -i[SUFFIX], --in-place[=SUFFIX]\n" " edit files in place (makes backup if extension supplied)\n" msgstr "" -#: sed/sed.c:110 +#: sed/sed.c:116 +#, c-format +msgid "" +" -b, --binary\n" +" open files in binary mode (CR+LFs are not processed " +"specially)\n" +msgstr "" + +#: sed/sed.c:119 #, c-format msgid "" " -l N, --line-length=N\n" " specify the desired line-wrap length for the `l' command\n" msgstr "" -#: sed/sed.c:112 +#: sed/sed.c:121 #, c-format msgid "" " --posix\n" " disable all GNU extensions.\n" msgstr "" -#: sed/sed.c:114 +#: sed/sed.c:123 #, c-format msgid "" " -r, --regexp-extended\n" " use extended regular expressions in the script.\n" msgstr "" -#: sed/sed.c:117 +#: sed/sed.c:126 #, c-format msgid "" " -s, --separate\n" @@ -470,7 +478,7 @@ msgid "" " long stream.\n" msgstr "" -#: sed/sed.c:120 +#: sed/sed.c:129 #, c-format msgid "" " -u, --unbuffered\n" @@ -479,17 +487,17 @@ msgid "" " the output buffers more often\n" msgstr "" -#: sed/sed.c:123 +#: sed/sed.c:132 #, c-format msgid " --help display this help and exit\n" msgstr "" -#: sed/sed.c:124 +#: sed/sed.c:133 #, c-format msgid " --version output version information and exit\n" msgstr "" -#: sed/sed.c:125 +#: sed/sed.c:134 #, c-format msgid "" "\n" @@ -500,7 +508,7 @@ msgid "" "\n" msgstr "" -#: sed/sed.c:131 +#: sed/sed.c:140 #, c-format msgid "" "E-mail bug reports to: %s .\n" @@ -509,24 +517,24 @@ msgstr "" "ÁíáöïñÝò óöáëìÜôùí ìÝóù çëåêôñïíéêïý ôá÷õäñïìåßïõ óôï: %s .\n" "ÐñïóÝîôå íá óõìðåñéëÜâåôå ôç ëÝîç ``%s'' êÜðïõ óôï ðåäßï ``Subject:''.\n" -#: sed/sed.c:268 +#: sed/sed.c:285 #, c-format msgid "super-sed version %s\n" msgstr "" -#: sed/sed.c:269 +#: sed/sed.c:286 #, c-format msgid "" "based on GNU sed version %s\n" "\n" msgstr "" -#: sed/sed.c:271 +#: sed/sed.c:288 #, c-format msgid "GNU sed version %s\n" msgstr "" -#: sed/sed.c:273 +#: sed/sed.c:290 #, c-format msgid "" "%s\n" @@ -541,64 +549,34 @@ msgstr "" "ËÅÉÔÏÕÑÃÉÊÏÔÇÔÁ Þ ÊÁÔÁËËÇËÏÔÇÔÁ ÃÉÁ ÅÍÁ ÓÕÃÊÅÊÑÉÌÅÍÏ ÓÊÏÐÏ, ìÝ÷ñé ôï óçìåßï\n" "ðïõ åðéôñÝðåé ï íüìïò.\n" -#: lib/utils.c:98 lib/utils.c:336 +#: sed/utils.c:98 sed/utils.c:363 #, fuzzy, c-format msgid "cannot remove %s: %s" msgstr "%s: áäõíáìßá óôçí áíÜãíùóç %s: %s\n" -#: lib/utils.c:143 +#: sed/utils.c:168 #, fuzzy, c-format msgid "couldn't open file %s: %s" msgstr "Äåí ìðüñåóá íá áíïßîù ôï áñ÷åßï %s" -#: lib/utils.c:220 +#: sed/utils.c:192 +#, fuzzy, c-format +msgid "couldn't attach to %s: %s" +msgstr "áäýíáôç ç åããñáöÞ %d óôïé÷åßùí óôï %s: %s" + +#: sed/utils.c:247 #, fuzzy, c-format msgid "couldn't write %d item to %s: %s" msgid_plural "couldn't write %d items to %s: %s" msgstr[0] "áäýíáôç ç åããñáöÞ %d óôïé÷åßùí óôï %s: %s" msgstr[1] "áäýíáôç ç åããñáöÞ %d óôïé÷åßùí óôï %s: %s" -#: lib/utils.c:235 lib/utils.c:251 +#: sed/utils.c:262 sed/utils.c:278 #, c-format msgid "read error on %s: %s" msgstr "óöÜëìá áíÜãíùóçò óôï %s: %s" -#: lib/utils.c:341 +#: sed/utils.c:368 #, fuzzy, c-format msgid "cannot rename %s: %s" msgstr "%s: áäõíáìßá óôçí áíÜãíùóç %s: %s\n" - -#, fuzzy -#~ msgid "Invalid regular expression" -#~ msgstr "Äåí âñÝèçêå ðñïçãïýìåíç êáíïíéêÞ Ýêöñáóç" - -#, fuzzy -#~ msgid "Invalid collation character" -#~ msgstr "ìç Ýãêõñï áêïëïõèßá äéáöõãÞò óå êëÜóç ÷áñáêôÞñùí" - -#, fuzzy -#~ msgid "Unmatched [ or [^" -#~ msgstr "Áôáßñéáóôï `{'" - -#, fuzzy -#~ msgid "Unmatched ( or \\(" -#~ msgstr "Áôáßñéáóôï `{'" - -#, fuzzy -#~ msgid "Unmatched \\{" -#~ msgstr "Áôáßñéáóôï `{'" - -#, fuzzy -#~ msgid "Invalid preceding regular expression" -#~ msgstr "Äåí âñÝèçêå ðñïçãïýìåíç êáíïíéêÞ Ýêöñáóç" - -#, fuzzy -#~ msgid "Premature end of regular expression" -#~ msgstr "Äåí âñÝèçêå ðñïçãïýìåíç êáíïíéêÞ Ýêöñáóç" - -#, fuzzy -#~ msgid "Unmatched ) or \\)" -#~ msgstr "Áôáßñéáóôï `{'" - -#~ msgid "No previous regular expression" -#~ msgstr "Äåí âñÝèçêå ðñïçãïýìåíç êáíïíéêÞ Ýêöñáóç" diff --git a/po/eo.po b/po/eo.po index 8c5aa16..a4fa03f 100644 --- a/po/eo.po +++ b/po/eo.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU sed 4.0.8\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:37+0200\n" +"Report-Msgid-Bugs-To: bonzini@gnu.org\n" +"POT-Creation-Date: 2006-09-26 00:06+0200\n" "PO-Revision-Date: 2003-10-26 20:57+0000\n" "Last-Translator: Edmund GRIMLEY EVANS \n" "Language-Team: Esperanto \n" @@ -348,58 +348,58 @@ msgstr "%s: -e esprimo #%lu, signo %lu: %s\n" msgid "can't find label for jump to `%s'" msgstr "Ne povas trovi etikedon por salto al '%s'" -#: sed/execute.c:650 +#: sed/execute.c:706 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: ne povas legi %s: %s\n" -#: sed/execute.c:673 +#: sed/execute.c:729 #, fuzzy, c-format msgid "couldn't edit %s: is a terminal" msgstr "Ne povis malfermi dosieron %s: %s" -#: sed/execute.c:677 +#: sed/execute.c:734 #, c-format msgid "couldn't edit %s: not a regular file" msgstr "" -#: sed/execute.c:684 lib/utils.c:196 +#: sed/execute.c:741 sed/utils.c:229 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "Ne povis malfermi dumtempan dosieron %s: %s" -#: sed/execute.c:1206 sed/execute.c:1387 +#: sed/execute.c:1264 sed/execute.c:1444 msgid "error in subprocess" msgstr "eraro en subprocezo" -#: sed/execute.c:1208 +#: sed/execute.c:1266 msgid "option `e' not supported" msgstr "opcio 'e' ne realigita" -#: sed/execute.c:1389 +#: sed/execute.c:1446 msgid "`e' command not supported" msgstr "komando 'e' ne realigita" -#: sed/execute.c:1714 +#: sed/execute.c:1786 msgid "no input files" msgstr "" -#: sed/regexp.c:39 +#: sed/regexp.c:40 #, fuzzy msgid "no previous regular expression" msgstr "Mankas antaÅ­a regula esprimo" -#: sed/regexp.c:40 +#: sed/regexp.c:41 #, fuzzy msgid "cannot specify modifiers on empty regexp" msgstr "Ne eblas specifi modifilojn ĉe malplena regula esprimo" -#: sed/regexp.c:115 +#: sed/regexp.c:121 #, fuzzy, c-format msgid "invalid reference \\%d on `s' command's RHS" msgstr "Nevalida referenco \\%d ĉe dekstra flanko de komando 's'" -#: sed/sed.c:93 +#: sed/sed.c:98 msgid "" " -R, --regexp-perl\n" " use Perl 5's regular expressions syntax in the script.\n" @@ -407,28 +407,28 @@ msgstr "" " -R, --regexp-perl\n" " uzi sintakso de Perl 5 por regulaj esprimoj en programo.\n" -#: sed/sed.c:98 +#: sed/sed.c:103 #, c-format msgid "" "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" "\n" msgstr "" -#: sed/sed.c:102 +#: sed/sed.c:107 #, c-format msgid "" " -n, --quiet, --silent\n" " suppress automatic printing of pattern space\n" msgstr "" -#: sed/sed.c:104 +#: sed/sed.c:109 #, c-format msgid "" " -e script, --expression=script\n" " add the script to the commands to be executed\n" msgstr "" -#: sed/sed.c:106 +#: sed/sed.c:111 #, c-format msgid "" " -f script-file, --file=script-file\n" @@ -436,28 +436,36 @@ msgid "" "executed\n" msgstr "" -#: sed/sed.c:108 +#: sed/sed.c:113 #, c-format msgid "" " -i[SUFFIX], --in-place[=SUFFIX]\n" " edit files in place (makes backup if extension supplied)\n" msgstr "" -#: sed/sed.c:110 +#: sed/sed.c:116 +#, c-format +msgid "" +" -b, --binary\n" +" open files in binary mode (CR+LFs are not processed " +"specially)\n" +msgstr "" + +#: sed/sed.c:119 #, c-format msgid "" " -l N, --line-length=N\n" " specify the desired line-wrap length for the `l' command\n" msgstr "" -#: sed/sed.c:112 +#: sed/sed.c:121 #, c-format msgid "" " --posix\n" " disable all GNU extensions.\n" msgstr "" -#: sed/sed.c:114 +#: sed/sed.c:123 #, fuzzy, c-format msgid "" " -r, --regexp-extended\n" @@ -466,7 +474,7 @@ msgstr "" " -R, --regexp-perl\n" " uzi sintakso de Perl 5 por regulaj esprimoj en programo.\n" -#: sed/sed.c:117 +#: sed/sed.c:126 #, c-format msgid "" " -s, --separate\n" @@ -475,7 +483,7 @@ msgid "" " long stream.\n" msgstr "" -#: sed/sed.c:120 +#: sed/sed.c:129 #, c-format msgid "" " -u, --unbuffered\n" @@ -484,17 +492,17 @@ msgid "" " the output buffers more often\n" msgstr "" -#: sed/sed.c:123 +#: sed/sed.c:132 #, c-format msgid " --help display this help and exit\n" msgstr "" -#: sed/sed.c:124 +#: sed/sed.c:133 #, c-format msgid " --version output version information and exit\n" msgstr "" -#: sed/sed.c:125 +#: sed/sed.c:134 #, c-format msgid "" "\n" @@ -505,7 +513,7 @@ msgid "" "\n" msgstr "" -#: sed/sed.c:131 +#: sed/sed.c:140 #, c-format msgid "" "E-mail bug reports to: %s .\n" @@ -514,12 +522,12 @@ msgstr "" "RetpoÅ�tu cimo-raportojn al: %s .\n" "Nepre menciu la vorton '%s' ie en la temlinio.\n" -#: sed/sed.c:268 +#: sed/sed.c:285 #, c-format msgid "super-sed version %s\n" msgstr "super-sed versio %s\n" -#: sed/sed.c:269 +#: sed/sed.c:286 #, fuzzy, c-format msgid "" "based on GNU sed version %s\n" @@ -528,12 +536,12 @@ msgstr "" "bazita sur \"GNU sed\" versio 3.02.80\n" "\n" -#: sed/sed.c:271 +#: sed/sed.c:288 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed versio %s\n" -#: sed/sed.c:273 +#: sed/sed.c:290 #, c-format msgid "" "%s\n" @@ -546,74 +554,34 @@ msgstr "" "NENIA GARANTIO; eĉ ne por KOMERCA KVALITO aÅ­ ADEKVATECO POR DIFINITA CELO,\n" "laÅ­ la grado permesita de juro.\n" -#: lib/utils.c:98 lib/utils.c:336 +#: sed/utils.c:98 sed/utils.c:363 #, fuzzy, c-format msgid "cannot remove %s: %s" msgstr "%s: ne povas legi %s: %s\n" -#: lib/utils.c:143 +#: sed/utils.c:168 #, fuzzy, c-format msgid "couldn't open file %s: %s" msgstr "Ne povis malfermi dosieron %s: %s" -#: lib/utils.c:220 +#: sed/utils.c:192 +#, fuzzy, c-format +msgid "couldn't attach to %s: %s" +msgstr "ne povis skribi %d eron al %s: %s" + +#: sed/utils.c:247 #, c-format msgid "couldn't write %d item to %s: %s" msgid_plural "couldn't write %d items to %s: %s" msgstr[0] "ne povis skribi %d eron al %s: %s" msgstr[1] "ne povis skribi %d erojn al %s: %s" -#: lib/utils.c:235 lib/utils.c:251 +#: sed/utils.c:262 sed/utils.c:278 #, c-format msgid "read error on %s: %s" msgstr "legeraro ĉe %s: %s" -#: lib/utils.c:341 +#: sed/utils.c:368 #, fuzzy, c-format msgid "cannot rename %s: %s" msgstr "%s: ne povas legi %s: %s\n" - -#~ msgid "Success" -#~ msgstr "Sukceso" - -#~ msgid "No match" -#~ msgstr "Maltrafo" - -#~ msgid "Invalid regular expression" -#~ msgstr "Nevalida regula esprimo" - -#~ msgid "Invalid collation character" -#~ msgstr "Nevalida kunfanda signo" - -#~ msgid "Trailing backslash" -#~ msgstr "Malsuprenstreko ĉe fino" - -#~ msgid "Invalid back reference" -#~ msgstr "Nevalida retroreferenco" - -#~ msgid "Unmatched [ or [^" -#~ msgstr "Neparigita [ aÅ­ [^" - -#~ msgid "Unmatched ( or \\(" -#~ msgstr "Neparigita ( aÅ­ \\(" - -#~ msgid "Unmatched \\{" -#~ msgstr "Neparigita \\{" - -#~ msgid "Invalid range end" -#~ msgstr "Nevalida fino de gamo" - -#~ msgid "Memory exhausted" -#~ msgstr "Mankas memoro" - -#~ msgid "Invalid preceding regular expression" -#~ msgstr "Nevalida antaÅ­a regula esprimo" - -#~ msgid "Premature end of regular expression" -#~ msgstr "Neatendita fino de regula esprimo" - -#~ msgid "Unmatched ) or \\)" -#~ msgstr "Neparigita ) aÅ­ \\)" - -#~ msgid "No previous regular expression" -#~ msgstr "Mankas antaÅ­a regula esprimo" diff --git a/po/es.po b/po/es.po index 27ae5db..b36f2df 100644 --- a/po/es.po +++ b/po/es.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.8\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:37+0200\n" +"Report-Msgid-Bugs-To: bonzini@gnu.org\n" +"POT-Creation-Date: 2006-09-26 00:06+0200\n" "PO-Revision-Date: 2003-10-24 12:38-0500\n" "Last-Translator: Cristian Othón Martínez Vera \n" "Language-Team: Spanish \n" @@ -348,58 +348,58 @@ msgstr "%s: -e expresi msgid "can't find label for jump to `%s'" msgstr "No se puede encontrar la etiqueta para saltar a `%s'" -#: sed/execute.c:650 +#: sed/execute.c:706 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: no se puede leer %s: %s\n" -#: sed/execute.c:673 +#: sed/execute.c:729 #, fuzzy, c-format msgid "couldn't edit %s: is a terminal" msgstr "No se puede abrir el fichero %s: %s" -#: sed/execute.c:677 +#: sed/execute.c:734 #, c-format msgid "couldn't edit %s: not a regular file" msgstr "" -#: sed/execute.c:684 lib/utils.c:196 +#: sed/execute.c:741 sed/utils.c:229 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "No se puede abrir el fichero temporal %s: %s" -#: sed/execute.c:1206 sed/execute.c:1387 +#: sed/execute.c:1264 sed/execute.c:1444 msgid "error in subprocess" msgstr "error en el subproceso" -#: sed/execute.c:1208 +#: sed/execute.c:1266 msgid "option `e' not supported" msgstr "no hay soporte para la opción `e'" -#: sed/execute.c:1389 +#: sed/execute.c:1446 msgid "`e' command not supported" msgstr "no hay soporte para el comando `e'" -#: sed/execute.c:1714 +#: sed/execute.c:1786 msgid "no input files" msgstr "" -#: sed/regexp.c:39 +#: sed/regexp.c:40 #, fuzzy msgid "no previous regular expression" msgstr "No hay una expresión regular previa" -#: sed/regexp.c:40 +#: sed/regexp.c:41 #, fuzzy msgid "cannot specify modifiers on empty regexp" msgstr "No se pueden especificar modificadores en expresiones regulares vacías" -#: sed/regexp.c:115 +#: sed/regexp.c:121 #, fuzzy, c-format msgid "invalid reference \\%d on `s' command's RHS" msgstr "Referencia \\%d inválida en el lado derecho del comando `s'" -#: sed/sed.c:93 +#: sed/sed.c:98 msgid "" " -R, --regexp-perl\n" " use Perl 5's regular expressions syntax in the script.\n" @@ -408,28 +408,28 @@ msgstr "" " utilizar la sintaxis de expresiones regulares de Perl 5\n" " en el guión.\n" -#: sed/sed.c:98 +#: sed/sed.c:103 #, c-format msgid "" "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" "\n" msgstr "" -#: sed/sed.c:102 +#: sed/sed.c:107 #, c-format msgid "" " -n, --quiet, --silent\n" " suppress automatic printing of pattern space\n" msgstr "" -#: sed/sed.c:104 +#: sed/sed.c:109 #, c-format msgid "" " -e script, --expression=script\n" " add the script to the commands to be executed\n" msgstr "" -#: sed/sed.c:106 +#: sed/sed.c:111 #, c-format msgid "" " -f script-file, --file=script-file\n" @@ -437,28 +437,36 @@ msgid "" "executed\n" msgstr "" -#: sed/sed.c:108 +#: sed/sed.c:113 #, c-format msgid "" " -i[SUFFIX], --in-place[=SUFFIX]\n" " edit files in place (makes backup if extension supplied)\n" msgstr "" -#: sed/sed.c:110 +#: sed/sed.c:116 +#, c-format +msgid "" +" -b, --binary\n" +" open files in binary mode (CR+LFs are not processed " +"specially)\n" +msgstr "" + +#: sed/sed.c:119 #, c-format msgid "" " -l N, --line-length=N\n" " specify the desired line-wrap length for the `l' command\n" msgstr "" -#: sed/sed.c:112 +#: sed/sed.c:121 #, c-format msgid "" " --posix\n" " disable all GNU extensions.\n" msgstr "" -#: sed/sed.c:114 +#: sed/sed.c:123 #, fuzzy, c-format msgid "" " -r, --regexp-extended\n" @@ -468,7 +476,7 @@ msgstr "" " utilizar la sintaxis de expresiones regulares de Perl 5\n" " en el guión.\n" -#: sed/sed.c:117 +#: sed/sed.c:126 #, c-format msgid "" " -s, --separate\n" @@ -477,7 +485,7 @@ msgid "" " long stream.\n" msgstr "" -#: sed/sed.c:120 +#: sed/sed.c:129 #, c-format msgid "" " -u, --unbuffered\n" @@ -486,17 +494,17 @@ msgid "" " the output buffers more often\n" msgstr "" -#: sed/sed.c:123 +#: sed/sed.c:132 #, c-format msgid " --help display this help and exit\n" msgstr "" -#: sed/sed.c:124 +#: sed/sed.c:133 #, c-format msgid " --version output version information and exit\n" msgstr "" -#: sed/sed.c:125 +#: sed/sed.c:134 #, c-format msgid "" "\n" @@ -507,7 +515,7 @@ msgid "" "\n" msgstr "" -#: sed/sed.c:131 +#: sed/sed.c:140 #, c-format msgid "" "E-mail bug reports to: %s .\n" @@ -517,12 +525,12 @@ msgstr "" "Asegúrese de incluir la palabra ``%s'' en algún lugar en el campo " "``Subject:''.\n" -#: sed/sed.c:268 +#: sed/sed.c:285 #, c-format msgid "super-sed version %s\n" msgstr "super-sed versión %s\n" -#: sed/sed.c:269 +#: sed/sed.c:286 #, fuzzy, c-format msgid "" "based on GNU sed version %s\n" @@ -531,12 +539,12 @@ msgstr "" "basado en GNU sed versión 3.02.80\n" "\n" -#: sed/sed.c:271 +#: sed/sed.c:288 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed versión %s\n" -#: sed/sed.c:273 +#: sed/sed.c:290 #, c-format msgid "" "%s\n" @@ -549,74 +557,34 @@ msgstr "" "No hay NINGUNA garantía; ni siquiera de COMERCIABILIDAD o IDONEIDAD PARA UN\n" "FIN DETERMINADO, en la extensión permitida por ley.\n" -#: lib/utils.c:98 lib/utils.c:336 +#: sed/utils.c:98 sed/utils.c:363 #, fuzzy, c-format msgid "cannot remove %s: %s" msgstr "%s: no se puede leer %s: %s\n" -#: lib/utils.c:143 +#: sed/utils.c:168 #, fuzzy, c-format msgid "couldn't open file %s: %s" msgstr "No se puede abrir el fichero %s: %s" -#: lib/utils.c:220 +#: sed/utils.c:192 +#, fuzzy, c-format +msgid "couldn't attach to %s: %s" +msgstr "no se puede escribir %d elemento a %s: %s" + +#: sed/utils.c:247 #, c-format msgid "couldn't write %d item to %s: %s" msgid_plural "couldn't write %d items to %s: %s" msgstr[0] "no se puede escribir %d elemento a %s: %s" msgstr[1] "no se pueden escribir %d elementos a %s: %s" -#: lib/utils.c:235 lib/utils.c:251 +#: sed/utils.c:262 sed/utils.c:278 #, c-format msgid "read error on %s: %s" msgstr "error al leer de %s: %s" -#: lib/utils.c:341 +#: sed/utils.c:368 #, fuzzy, c-format msgid "cannot rename %s: %s" msgstr "%s: no se puede leer %s: %s\n" - -#~ msgid "Success" -#~ msgstr "Éxito" - -#~ msgid "No match" -#~ msgstr "No hay coincidencia" - -#~ msgid "Invalid regular expression" -#~ msgstr "Expresion regular inválida" - -#~ msgid "Invalid collation character" -#~ msgstr "Carácter de ordenamiento inválido" - -#~ msgid "Trailing backslash" -#~ msgstr "Diagonal invertida al final" - -#~ msgid "Invalid back reference" -#~ msgstr "Referencia hacia atrás inválida" - -#~ msgid "Unmatched [ or [^" -#~ msgstr "[ ó [^ sin pareja" - -#~ msgid "Unmatched ( or \\(" -#~ msgstr "( ó \\( sin pareja" - -#~ msgid "Unmatched \\{" -#~ msgstr "\\{ sin pareja" - -#~ msgid "Invalid range end" -#~ msgstr "Final de rango inválido" - -#~ msgid "Memory exhausted" -#~ msgstr "Memoria agotada" - -#~ msgid "Invalid preceding regular expression" -#~ msgstr "Expresión regular precedente inválida" - -#~ msgid "Premature end of regular expression" -#~ msgstr "Final prematuro de la expresión regular" - -#~ msgid "Unmatched ) or \\)" -#~ msgstr ") ó \\) sin pareja" - -#~ msgid "No previous regular expression" -#~ msgstr "No hay una expresión regular previa" diff --git a/po/et.po b/po/et.po index 1c09bf4..68638aa 100644 --- a/po/et.po +++ b/po/et.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.1.1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:37+0200\n" +"Report-Msgid-Bugs-To: bonzini@gnu.org\n" +"POT-Creation-Date: 2006-09-26 00:06+0200\n" "PO-Revision-Date: 2004-07-09 16:33+0300\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" @@ -332,56 +332,56 @@ msgstr "%s: -e avaldis #%lu, s msgid "can't find label for jump to `%s'" msgstr "ei leia märgendit, et hüpata kohale `%s'" -#: sed/execute.c:650 +#: sed/execute.c:706 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: ei saa lugeda %s: %s\n" -#: sed/execute.c:673 +#: sed/execute.c:729 #, c-format msgid "couldn't edit %s: is a terminal" msgstr "%s ei saa toimetada: see on terminal" -#: sed/execute.c:677 +#: sed/execute.c:734 #, c-format msgid "couldn't edit %s: not a regular file" msgstr "%s ei saa toimetada: see ei ole tavaline fail" -#: sed/execute.c:684 lib/utils.c:196 +#: sed/execute.c:741 sed/utils.c:229 #, c-format msgid "couldn't open temporary file %s: %s" msgstr "ajutist faili %s ei saa avada: %s" -#: sed/execute.c:1206 sed/execute.c:1387 +#: sed/execute.c:1264 sed/execute.c:1444 msgid "error in subprocess" msgstr "viga alamprotsessis" -#: sed/execute.c:1208 +#: sed/execute.c:1266 msgid "option `e' not supported" msgstr "võtit `e' ei toetata" -#: sed/execute.c:1389 +#: sed/execute.c:1446 msgid "`e' command not supported" msgstr "käsku `e' ei toetata" -#: sed/execute.c:1714 +#: sed/execute.c:1786 msgid "no input files" msgstr "" -#: sed/regexp.c:39 +#: sed/regexp.c:40 msgid "no previous regular expression" msgstr "eelmist regulaaravaldist pole" -#: sed/regexp.c:40 +#: sed/regexp.c:41 msgid "cannot specify modifiers on empty regexp" msgstr "muudatusi tühjale regulaaravaldisele ei saa määrata" -#: sed/regexp.c:115 +#: sed/regexp.c:121 #, c-format msgid "invalid reference \\%d on `s' command's RHS" msgstr "vigane viide \\%d käsu `s' paremas pooles" -#: sed/sed.c:93 +#: sed/sed.c:98 msgid "" " -R, --regexp-perl\n" " use Perl 5's regular expressions syntax in the script.\n" @@ -389,7 +389,7 @@ msgstr "" " -R, --regexp-perl\n" " kasuta skriptis Perl 5 regulaaravaldiste süntaksit.\n" -#: sed/sed.c:98 +#: sed/sed.c:103 #, c-format msgid "" "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" @@ -399,7 +399,7 @@ msgstr "" "fail]...\n" "\n" -#: sed/sed.c:102 +#: sed/sed.c:107 #, c-format msgid "" " -n, --quiet, --silent\n" @@ -408,7 +408,7 @@ msgstr "" " -n, --quiet, --silent\n" " keela mustriruumi automaatne väljastamine\n" -#: sed/sed.c:104 +#: sed/sed.c:109 #, c-format msgid "" " -e script, --expression=script\n" @@ -417,7 +417,7 @@ msgstr "" " -e skript, --expression=skript\n" " lisa täidetavate käskluste skript\n" -#: sed/sed.c:106 +#: sed/sed.c:111 #, c-format msgid "" " -f script-file, --file=script-file\n" @@ -427,7 +427,7 @@ msgstr "" " -f skripti-fail, --file=skripti-fail\n" " lisa skripti-faili sisu täidetavate käskluste hulka\n" -#: sed/sed.c:108 +#: sed/sed.c:113 #, c-format msgid "" " -i[SUFFIX], --in-place[=SUFFIX]\n" @@ -436,7 +436,17 @@ msgstr "" " -i[SUFIKS], --in-place[=SUFIKS]\n" " toimeta faile (kui kasutati sifiksit, loob ka varukoopia)\n" -#: sed/sed.c:110 +#: sed/sed.c:116 +#, fuzzy, c-format +msgid "" +" -b, --binary\n" +" open files in binary mode (CR+LFs are not processed " +"specially)\n" +msgstr "" +" -i[SUFIKS], --in-place[=SUFIKS]\n" +" toimeta faile (kui kasutati sifiksit, loob ka varukoopia)\n" + +#: sed/sed.c:119 #, c-format msgid "" " -l N, --line-length=N\n" @@ -445,7 +455,7 @@ msgstr "" " -l N, --line-length=N\n" " määra `l' käsule soovitatav rea pikkus\n" -#: sed/sed.c:112 +#: sed/sed.c:121 #, c-format msgid "" " --posix\n" @@ -454,7 +464,7 @@ msgstr "" " --posix\n" " blokeeri kõik GNU laiendused.\n" -#: sed/sed.c:114 +#: sed/sed.c:123 #, c-format msgid "" " -r, --regexp-extended\n" @@ -463,7 +473,7 @@ msgstr "" " -r, --regexp-extended\n" " kasuta skriptis laiendatud regulaaravaldiste süntaksit.\n" -#: sed/sed.c:117 +#: sed/sed.c:126 #, c-format msgid "" " -s, --separate\n" @@ -474,7 +484,7 @@ msgstr "" " -s, --separate\n" " käsitle faile ükshaaval, mitte ühe jätkuva voona.\n" -#: sed/sed.c:120 +#: sed/sed.c:129 #, c-format msgid "" " -u, --unbuffered\n" @@ -486,17 +496,17 @@ msgstr "" " loe sisendfailist minimaalne kogus andmeid ja tühjenda\n" " väljundpuhvreid sagedamini\n" -#: sed/sed.c:123 +#: sed/sed.c:132 #, c-format msgid " --help display this help and exit\n" msgstr " --help väljast see abiinfo ja lõpeta töö\n" -#: sed/sed.c:124 +#: sed/sed.c:133 #, c-format msgid " --version output version information and exit\n" msgstr " --version väljasta versiooniinfo ja lõpeta töö\n" -#: sed/sed.c:125 +#: sed/sed.c:134 #, c-format msgid "" "\n" @@ -513,7 +523,7 @@ msgstr "" "sisendfailide nimed; kui sisendfaile ei antud, loetakse standardsisendit.\n" "\n" -#: sed/sed.c:131 +#: sed/sed.c:140 #, c-format msgid "" "E-mail bug reports to: %s .\n" @@ -522,12 +532,12 @@ msgstr "" "Postitage teated vigadest: %s .\n" "Lisage kindlasti sõna ``%s'' ``Subject:'' reale.\n" -#: sed/sed.c:268 +#: sed/sed.c:285 #, c-format msgid "super-sed version %s\n" msgstr "super-sed versioon %s\n" -#: sed/sed.c:269 +#: sed/sed.c:286 #, c-format msgid "" "based on GNU sed version %s\n" @@ -536,12 +546,12 @@ msgstr "" "põhineb GNU sed versioonil %s\n" "\n" -#: sed/sed.c:271 +#: sed/sed.c:288 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed versioon %s\n" -#: sed/sed.c:273 +#: sed/sed.c:290 #, c-format msgid "" "%s\n" @@ -554,74 +564,34 @@ msgstr "" "PUUDUB; ka müügiks või mingil eesmärgil kasutamiseks, vastavalt seadustega\n" "lubatud piiridele.\n" -#: lib/utils.c:98 lib/utils.c:336 +#: sed/utils.c:98 sed/utils.c:363 #, c-format msgid "cannot remove %s: %s" msgstr "%s ei saa eemaldada: %s" -#: lib/utils.c:143 +#: sed/utils.c:168 #, c-format msgid "couldn't open file %s: %s" msgstr "faili %s ei saa avada: %s" -#: lib/utils.c:220 +#: sed/utils.c:192 +#, fuzzy, c-format +msgid "couldn't attach to %s: %s" +msgstr "%d elemendi faili %s kirjutamine ebaõnnestus: %s" + +#: sed/utils.c:247 #, c-format msgid "couldn't write %d item to %s: %s" msgid_plural "couldn't write %d items to %s: %s" msgstr[0] "%d elemendi faili %s kirjutamine ebaõnnestus: %s" msgstr[1] "%d elemendi faili %s kirjutamine ebaõnnestus: %s" -#: lib/utils.c:235 lib/utils.c:251 +#: sed/utils.c:262 sed/utils.c:278 #, c-format msgid "read error on %s: %s" msgstr "lugemisviga %s: %s" -#: lib/utils.c:341 +#: sed/utils.c:368 #, c-format msgid "cannot rename %s: %s" msgstr "%s ei saa ümber nimetada: %s" - -#~ msgid "Success" -#~ msgstr "Edukas" - -#~ msgid "No match" -#~ msgstr "Ei leia" - -#~ msgid "Invalid regular expression" -#~ msgstr "Vigane regulaaravaldis" - -#~ msgid "Invalid collation character" -#~ msgstr "Vigane sortimise sümbol" - -#~ msgid "Trailing backslash" -#~ msgstr "Lõpetav langkriips" - -#~ msgid "Invalid back reference" -#~ msgstr "Vigane tagasi viide" - -#~ msgid "Unmatched [ or [^" -#~ msgstr "Puudub [ või [^" - -#~ msgid "Unmatched ( or \\(" -#~ msgstr "Puudub ( või \\(" - -#~ msgid "Unmatched \\{" -#~ msgstr "Puudub \\{" - -#~ msgid "Invalid range end" -#~ msgstr "Vigane vahemiku lõpp" - -#~ msgid "Memory exhausted" -#~ msgstr "Mälu on otsas" - -#~ msgid "Invalid preceding regular expression" -#~ msgstr "Vigane eelnev regulaaravaldis" - -#~ msgid "Premature end of regular expression" -#~ msgstr "Ootamatu regulaaravaldise lõpp" - -#~ msgid "Unmatched ) or \\)" -#~ msgstr "Puudub ) või \\)" - -#~ msgid "No previous regular expression" -#~ msgstr "Eelmist regulaaravaldist pole" diff --git a/po/fi.po b/po/fi.po index 4845861..653fddb 100644 --- a/po/fi.po +++ b/po/fi.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: sed-4.0.8\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:37+0200\n" +"Report-Msgid-Bugs-To: bonzini@gnu.org\n" +"POT-Creation-Date: 2006-09-26 00:06+0200\n" "PO-Revision-Date: 2003-12-07 09:35+0200\n" "Last-Translator: Sami J. Laine \n" "Language-Team: Finnish \n" @@ -348,58 +348,58 @@ msgstr "%s: -e lauseke #%lu, merkki %lu: %s\n" msgid "can't find label for jump to `%s'" msgstr "Nimikettä hypylle kohteeseen \"%s\" ei löydy" -#: sed/execute.c:650 +#: sed/execute.c:706 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: ei voida lukea syötettä %s: %s\n" -#: sed/execute.c:673 +#: sed/execute.c:729 #, fuzzy, c-format msgid "couldn't edit %s: is a terminal" msgstr "Tiedostoa %s ei voitu avata: %s" -#: sed/execute.c:677 +#: sed/execute.c:734 #, c-format msgid "couldn't edit %s: not a regular file" msgstr "" -#: sed/execute.c:684 lib/utils.c:196 +#: sed/execute.c:741 sed/utils.c:229 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "Väliaikaistiedostoa %s ei voitu avata: %s" -#: sed/execute.c:1206 sed/execute.c:1387 +#: sed/execute.c:1264 sed/execute.c:1444 msgid "error in subprocess" msgstr "virhe lapsiprosessissa" -#: sed/execute.c:1208 +#: sed/execute.c:1266 msgid "option `e' not supported" msgstr "valitsin `e' ei ole tuettu" -#: sed/execute.c:1389 +#: sed/execute.c:1446 msgid "`e' command not supported" msgstr "komento `e' ei ole tuettu" -#: sed/execute.c:1714 +#: sed/execute.c:1786 msgid "no input files" msgstr "" -#: sed/regexp.c:39 +#: sed/regexp.c:40 #, fuzzy msgid "no previous regular expression" msgstr "Ei aikaisempaa säännöllistä lausetta" -#: sed/regexp.c:40 +#: sed/regexp.c:41 #, fuzzy msgid "cannot specify modifiers on empty regexp" msgstr "Muuttajia ei voida määritellä tyhjään säännöliseen lausekkeeseen" -#: sed/regexp.c:115 +#: sed/regexp.c:121 #, fuzzy, c-format msgid "invalid reference \\%d on `s' command's RHS" msgstr "Virheellinen viittaus \\%d komennon `s' oikealla puolella" -#: sed/sed.c:93 +#: sed/sed.c:98 msgid "" " -R, --regexp-perl\n" " use Perl 5's regular expressions syntax in the script.\n" @@ -408,28 +408,28 @@ msgstr "" " käytä Perl 5:en mukaista säännöllisten lauseiden\n" " syntaksia skriptissä.\n" -#: sed/sed.c:98 +#: sed/sed.c:103 #, c-format msgid "" "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" "\n" msgstr "" -#: sed/sed.c:102 +#: sed/sed.c:107 #, c-format msgid "" " -n, --quiet, --silent\n" " suppress automatic printing of pattern space\n" msgstr "" -#: sed/sed.c:104 +#: sed/sed.c:109 #, c-format msgid "" " -e script, --expression=script\n" " add the script to the commands to be executed\n" msgstr "" -#: sed/sed.c:106 +#: sed/sed.c:111 #, c-format msgid "" " -f script-file, --file=script-file\n" @@ -437,28 +437,36 @@ msgid "" "executed\n" msgstr "" -#: sed/sed.c:108 +#: sed/sed.c:113 #, c-format msgid "" " -i[SUFFIX], --in-place[=SUFFIX]\n" " edit files in place (makes backup if extension supplied)\n" msgstr "" -#: sed/sed.c:110 +#: sed/sed.c:116 +#, c-format +msgid "" +" -b, --binary\n" +" open files in binary mode (CR+LFs are not processed " +"specially)\n" +msgstr "" + +#: sed/sed.c:119 #, c-format msgid "" " -l N, --line-length=N\n" " specify the desired line-wrap length for the `l' command\n" msgstr "" -#: sed/sed.c:112 +#: sed/sed.c:121 #, c-format msgid "" " --posix\n" " disable all GNU extensions.\n" msgstr "" -#: sed/sed.c:114 +#: sed/sed.c:123 #, fuzzy, c-format msgid "" " -r, --regexp-extended\n" @@ -468,7 +476,7 @@ msgstr "" " käytä Perl 5:en mukaista säännöllisten lauseiden\n" " syntaksia skriptissä.\n" -#: sed/sed.c:117 +#: sed/sed.c:126 #, c-format msgid "" " -s, --separate\n" @@ -477,7 +485,7 @@ msgid "" " long stream.\n" msgstr "" -#: sed/sed.c:120 +#: sed/sed.c:129 #, c-format msgid "" " -u, --unbuffered\n" @@ -486,17 +494,17 @@ msgid "" " the output buffers more often\n" msgstr "" -#: sed/sed.c:123 +#: sed/sed.c:132 #, c-format msgid " --help display this help and exit\n" msgstr "" -#: sed/sed.c:124 +#: sed/sed.c:133 #, c-format msgid " --version output version information and exit\n" msgstr "" -#: sed/sed.c:125 +#: sed/sed.c:134 #, c-format msgid "" "\n" @@ -507,7 +515,7 @@ msgid "" "\n" msgstr "" -#: sed/sed.c:131 +#: sed/sed.c:140 #, c-format msgid "" "E-mail bug reports to: %s .\n" @@ -516,12 +524,12 @@ msgstr "" "Lähetä virheraportit osoitteeseen %s .\n" "Sisällytä sana \"%s\" viestin aihekenttään (\"Subject\"-kenttään).\n" -#: sed/sed.c:268 +#: sed/sed.c:285 #, c-format msgid "super-sed version %s\n" msgstr "super-sed versio %s\n" -#: sed/sed.c:269 +#: sed/sed.c:286 #, fuzzy, c-format msgid "" "based on GNU sed version %s\n" @@ -530,12 +538,12 @@ msgstr "" "perustuu GNU sed versioon 3.02.80\n" "\n" -#: sed/sed.c:271 +#: sed/sed.c:288 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed versio %s\n" -#: sed/sed.c:273 +#: sed/sed.c:290 #, c-format msgid "" "%s\n" @@ -549,74 +557,34 @@ msgstr "" "kaupallisesti hyväksyttävästä laadusta tai soveltuvuudesta tiettyyn\n" "tarkoitukseen.\n" -#: lib/utils.c:98 lib/utils.c:336 +#: sed/utils.c:98 sed/utils.c:363 #, fuzzy, c-format msgid "cannot remove %s: %s" msgstr "%s: ei voida lukea syötettä %s: %s\n" -#: lib/utils.c:143 +#: sed/utils.c:168 #, fuzzy, c-format msgid "couldn't open file %s: %s" msgstr "Tiedostoa %s ei voitu avata: %s" -#: lib/utils.c:220 +#: sed/utils.c:192 +#, fuzzy, c-format +msgid "couldn't attach to %s: %s" +msgstr "%d kohdetta ei voitu kirjoittaa tulosteeseen %s: %s" + +#: sed/utils.c:247 #, c-format msgid "couldn't write %d item to %s: %s" msgid_plural "couldn't write %d items to %s: %s" msgstr[0] "%d kohdetta ei voitu kirjoittaa tulosteeseen %s: %s" msgstr[1] "%d kohdetta ei voitu kirjoittaa tulosteeseen %s: %s" -#: lib/utils.c:235 lib/utils.c:251 +#: sed/utils.c:262 sed/utils.c:278 #, c-format msgid "read error on %s: %s" msgstr "lukuvirhe syötteessä %s: %s" -#: lib/utils.c:341 +#: sed/utils.c:368 #, fuzzy, c-format msgid "cannot rename %s: %s" msgstr "%s: ei voida lukea syötettä %s: %s\n" - -#~ msgid "Success" -#~ msgstr "Onnistui" - -#~ msgid "No match" -#~ msgstr "Ei osumaa" - -#~ msgid "Invalid regular expression" -#~ msgstr "Virheellinen säännöllinen lauseke" - -#~ msgid "Invalid collation character" -#~ msgstr "Virheellinen vertailumerkki" - -#~ msgid "Trailing backslash" -#~ msgstr "Seuraava kenoviiva" - -#~ msgid "Invalid back reference" -#~ msgstr "Virheellinen takaisinviittaus" - -#~ msgid "Unmatched [ or [^" -#~ msgstr "Pariton \"[\" tai \"[^\"" - -#~ msgid "Unmatched ( or \\(" -#~ msgstr "Pariton \"(\" tai \"\\(\"" - -#~ msgid "Unmatched \\{" -#~ msgstr "Pariton \"\\{\"" - -#~ msgid "Invalid range end" -#~ msgstr "Virheellinen välin loppu" - -#~ msgid "Memory exhausted" -#~ msgstr "Muisti loppu" - -#~ msgid "Invalid preceding regular expression" -#~ msgstr "Virheellinen edeltävä säännöllinen lauseke" - -#~ msgid "Premature end of regular expression" -#~ msgstr "Ennenaikainen säännöllisen lausekkeen loppu" - -#~ msgid "Unmatched ) or \\)" -#~ msgstr "Pariton \")\" tai \"\\)\"" - -#~ msgid "No previous regular expression" -#~ msgstr "Ei aikaisempaa säännöllistä lausetta" diff --git a/po/fr.po b/po/fr.po index 67211ba..d11750b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.1.1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:37+0200\n" +"Report-Msgid-Bugs-To: bonzini@gnu.org\n" +"POT-Creation-Date: 2006-09-26 00:06+0200\n" "PO-Revision-Date: 2004-07-12 00:09+0200\n" "Last-Translator: Gaël Quéri \n" "Language-Team: French \n" @@ -336,58 +336,58 @@ msgstr "%s: -e expression n msgid "can't find label for jump to `%s'" msgstr "impossible de trouver l'étiquette pour sauter à `%s'" -#: sed/execute.c:650 +#: sed/execute.c:706 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: impossible de lire %s: %s\n" -#: sed/execute.c:673 +#: sed/execute.c:729 #, c-format msgid "couldn't edit %s: is a terminal" msgstr "impossible d'éditer %s: est un terminal" -#: sed/execute.c:677 +#: sed/execute.c:734 #, c-format 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:684 lib/utils.c:196 +#: sed/execute.c:741 sed/utils.c:229 #, c-format msgid "couldn't open temporary file %s: %s" msgstr "impossible d'ouvrir le fichier temporaire %s: %s" -#: sed/execute.c:1206 sed/execute.c:1387 +#: sed/execute.c:1264 sed/execute.c:1444 msgid "error in subprocess" msgstr "erreur dans le sous-processus" -#: sed/execute.c:1208 +#: sed/execute.c:1266 msgid "option `e' not supported" msgstr "l'option `e' n'est pas supportée" -#: sed/execute.c:1389 +#: sed/execute.c:1446 msgid "`e' command not supported" msgstr "la commande `e' n'est pas supportée" -#: sed/execute.c:1714 +#: sed/execute.c:1786 msgid "no input files" msgstr "" -#: sed/regexp.c:39 +#: sed/regexp.c:40 msgid "no previous regular expression" msgstr "pas d'expression régulière précédente" -#: sed/regexp.c:40 +#: sed/regexp.c:41 msgid "cannot specify modifiers on empty regexp" msgstr "" "impossible de spécifier des modifieurs sur une expression\n" "rationnelle vide" -#: sed/regexp.c:115 +#: sed/regexp.c:121 #, c-format msgid "invalid reference \\%d on `s' command's RHS" msgstr "référence \\%d invalide dans le côté droit de la commande `s'" -#: sed/sed.c:93 +#: sed/sed.c:98 msgid "" " -R, --regexp-perl\n" " use Perl 5's regular expressions syntax in the script.\n" @@ -396,7 +396,7 @@ msgstr "" " utiliser la syntaxe des expressions régulières\n" " de Perl 5 dans le script.\n" -#: sed/sed.c:98 +#: sed/sed.c:103 #, c-format msgid "" "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" @@ -406,7 +406,7 @@ msgstr "" "[fichier-d'entrée]...\n" "\n" -#: sed/sed.c:102 +#: sed/sed.c:107 #, c-format msgid "" " -n, --quiet, --silent\n" @@ -415,7 +415,7 @@ msgstr "" " -n, --quiet, --silent\n" " supprimer l'écriture automatique de l'espace des motifs\n" -#: sed/sed.c:104 +#: sed/sed.c:109 #, c-format msgid "" " -e script, --expression=script\n" @@ -424,7 +424,7 @@ msgstr "" " -e script, --expression=script\n" " ajouter le script aux commandes à être exécutées\n" -#: sed/sed.c:106 +#: sed/sed.c:111 #, c-format msgid "" " -f script-file, --file=script-file\n" @@ -435,7 +435,7 @@ msgstr "" " ajouter le contenu de fichier-script aux commandes\n" " à être exécutées\n" -#: sed/sed.c:108 +#: sed/sed.c:113 #, c-format msgid "" " -i[SUFFIX], --in-place[=SUFFIX]\n" @@ -445,7 +445,18 @@ msgstr "" " éditer les fichiers à leur place (fait une\n" " sauvegarde si l'extension est fournie)\n" -#: sed/sed.c:110 +#: sed/sed.c:116 +#, fuzzy, c-format +msgid "" +" -b, --binary\n" +" open files in binary mode (CR+LFs are not processed " +"specially)\n" +msgstr "" +" -i[SUFFIXE], --in-place[=SUFFIXE]\n" +" éditer les fichiers à leur place (fait une\n" +" sauvegarde si l'extension est fournie)\n" + +#: sed/sed.c:119 #, c-format msgid "" " -l N, --line-length=N\n" @@ -455,7 +466,7 @@ msgstr "" " spécifier la longueur de coupure de ligne désirée pour la\n" " commande `l'\n" -#: sed/sed.c:112 +#: sed/sed.c:121 #, c-format msgid "" " --posix\n" @@ -464,7 +475,7 @@ msgstr "" " --posix\n" " désactiver toutes les extensions GNU.\n" -#: sed/sed.c:114 +#: sed/sed.c:123 #, c-format msgid "" " -r, --regexp-extended\n" @@ -474,7 +485,7 @@ msgstr "" " utiliser la syntaxe des expressions régulières\n" " étendues dans le script.\n" -#: sed/sed.c:117 +#: sed/sed.c:126 #, c-format msgid "" " -s, --separate\n" @@ -486,7 +497,7 @@ msgstr "" " considérer les fichiers comme séparés plutôt que comme un\n" " simple flux long et continu.\n" -#: sed/sed.c:120 +#: sed/sed.c:129 #, c-format msgid "" " -u, --unbuffered\n" @@ -499,18 +510,18 @@ msgstr "" " fichiers d'entrée et libérer les tampons de sortie plus\n" " souvent\n" -#: sed/sed.c:123 +#: sed/sed.c:132 #, c-format msgid " --help display this help and exit\n" msgstr " --help afficher cette aide et sortir\n" -#: sed/sed.c:124 +#: sed/sed.c:133 #, c-format msgid " --version output version information and exit\n" msgstr "" " --version afficher les informations de version du logiciel et sortir\n" -#: sed/sed.c:125 +#: sed/sed.c:134 #, c-format msgid "" "\n" @@ -527,7 +538,7 @@ msgstr "" "d'entrée; si aucun fichier d'entrée n'est spécifiée, l'entrée standard\n" "est lue.\n" -#: sed/sed.c:131 +#: sed/sed.c:140 #, c-format msgid "" "E-mail bug reports to: %s .\n" @@ -537,12 +548,12 @@ msgstr "" "N'oubliez pas d'inclure le mot ``%s'' quelque-part dans la zone " "``Subject:''\n" -#: sed/sed.c:268 +#: sed/sed.c:285 #, c-format msgid "super-sed version %s\n" msgstr "super-sed version %s\n" -#: sed/sed.c:269 +#: sed/sed.c:286 #, c-format msgid "" "based on GNU sed version %s\n" @@ -551,12 +562,12 @@ msgstr "" "fondé sur GNU sed version %s\n" "\n" -#: sed/sed.c:271 +#: sed/sed.c:288 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed version %s\n" -#: sed/sed.c:273 +#: sed/sed.c:290 #, c-format msgid "" "%s\n" @@ -570,74 +581,34 @@ msgstr "" "AUCUNE garantie n'est donnée; y compris pour des RAISONS COMMERCIALES ou\n" "pour RÉPONDRE A UN BESOIN PARTICULIER, à l'étendue permise par la loi.\n" -#: lib/utils.c:98 lib/utils.c:336 +#: sed/utils.c:98 sed/utils.c:363 #, c-format msgid "cannot remove %s: %s" msgstr "impossible de supprimer %s: %s" -#: lib/utils.c:143 +#: sed/utils.c:168 #, c-format msgid "couldn't open file %s: %s" msgstr "impossible d'ouvrir le fichier %s: %s" -#: lib/utils.c:220 +#: sed/utils.c:192 +#, fuzzy, c-format +msgid "couldn't attach to %s: %s" +msgstr "impossible d'écrire %d item à %s: %s" + +#: sed/utils.c:247 #, c-format msgid "couldn't write %d item to %s: %s" msgid_plural "couldn't write %d items to %s: %s" msgstr[0] "impossible d'écrire %d item à %s: %s" msgstr[1] "impossible d'écrire %d items à %s: %s" -#: lib/utils.c:235 lib/utils.c:251 +#: sed/utils.c:262 sed/utils.c:278 #, c-format msgid "read error on %s: %s" msgstr "erreur de lecture sur %s: %s" -#: lib/utils.c:341 +#: sed/utils.c:368 #, c-format msgid "cannot rename %s: %s" msgstr "impossible de renommer %s: %s" - -#~ msgid "Success" -#~ msgstr "Succès" - -#~ msgid "No match" -#~ msgstr "Pas de concordance" - -#~ msgid "Invalid regular expression" -#~ msgstr "Expression régulière invalide" - -#~ msgid "Invalid collation character" -#~ msgstr "Caractère de collation invalide" - -#~ msgid "Trailing backslash" -#~ msgstr "Antislash de protection" - -#~ msgid "Invalid back reference" -#~ msgstr "Référence arrière invalide" - -#~ msgid "Unmatched [ or [^" -#~ msgstr "[ ou [^ non refermé" - -#~ msgid "Unmatched ( or \\(" -#~ msgstr "( ou \\( non refermé" - -#~ msgid "Unmatched \\{" -#~ msgstr "\\{ non refermé" - -#~ msgid "Invalid range end" -#~ msgstr "Fin d'intervalle invalide" - -#~ msgid "Memory exhausted" -#~ msgstr "Mémoire épuisée" - -#~ msgid "Invalid preceding regular expression" -#~ msgstr "L'expression régulière précédente est invalide" - -#~ msgid "Premature end of regular expression" -#~ msgstr "Fin prématurée d'une expression régulière" - -#~ msgid "Unmatched ) or \\)" -#~ msgstr ") ou \\) non refermé" - -#~ msgid "No previous regular expression" -#~ msgstr "Pas d'expression régulière précédente" diff --git a/po/ga.po b/po/ga.po index ad37a27..839f755 100644 --- a/po/ga.po +++ b/po/ga.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.1.1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:37+0200\n" +"Report-Msgid-Bugs-To: bonzini@gnu.org\n" +"POT-Creation-Date: 2006-09-26 00:06+0200\n" "PO-Revision-Date: 2004-07-07 11:04-0500\n" "Last-Translator: Kevin Patrick Scannell \n" "Language-Team: Irish \n" @@ -333,59 +333,59 @@ msgstr "%s: -e slonn #%lu, char %lu: %s\n" msgid "can't find label for jump to `%s'" msgstr "níl aon fháil ar an lipéad `%s' don léim" -#: sed/execute.c:650 +#: sed/execute.c:706 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: ní féidir %s a léamh: %s\n" # Irish is nice this way, no initial mutation on 'rud'! -- KPS # Include all three b/c I'm using template version of "Plural-Forms" -#: sed/execute.c:673 +#: sed/execute.c:729 #, c-format msgid "couldn't edit %s: is a terminal" msgstr "níorbh fhéidir %s a chur in eagar; is teirminéal é" -#: sed/execute.c:677 +#: sed/execute.c:734 #, c-format 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:684 lib/utils.c:196 +#: sed/execute.c:741 sed/utils.c:229 #, c-format msgid "couldn't open temporary file %s: %s" msgstr "níorbh fhéidir an comhad sealadach %s a oscailt: %s" -#: sed/execute.c:1206 sed/execute.c:1387 +#: sed/execute.c:1264 sed/execute.c:1444 msgid "error in subprocess" msgstr "earráid i bhfo-phróiseas" -#: sed/execute.c:1208 +#: sed/execute.c:1266 msgid "option `e' not supported" msgstr "níl an rogha `e' ar fáil" -#: sed/execute.c:1389 +#: sed/execute.c:1446 msgid "`e' command not supported" msgstr "níl an t-ordú `e' ar fáil" -#: sed/execute.c:1714 +#: sed/execute.c:1786 msgid "no input files" msgstr "" -#: sed/regexp.c:39 +#: sed/regexp.c:40 msgid "no previous regular expression" msgstr "níl aon slonn ionadaíochta roimh seo" # bunathraitheoir is in FARF - KPS -#: sed/regexp.c:40 +#: sed/regexp.c:41 msgid "cannot specify modifiers on empty regexp" msgstr "ní féidir bunathraitheoirí a shonrú le slonn bán" -#: sed/regexp.c:115 +#: sed/regexp.c:121 #, c-format msgid "invalid reference \\%d on `s' command's RHS" msgstr "tagairt neamhbhailí \\%d ar dheis ordú `s'" -#: sed/sed.c:93 +#: sed/sed.c:98 msgid "" " -R, --regexp-perl\n" " use Perl 5's regular expressions syntax in the script.\n" @@ -393,7 +393,7 @@ msgstr "" " -R, --regexp-perl\n" " bain úsáid as sloinn ionadaíochta atá ag Perl 5.\n" -#: sed/sed.c:98 +#: sed/sed.c:103 #, c-format msgid "" "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" @@ -402,7 +402,7 @@ msgstr "" "Úsáid: %s [ROGHA]... {script-mura-bhfuil-script-eile} [inchomhad]...\n" "\n" -#: sed/sed.c:102 +#: sed/sed.c:107 #, c-format msgid "" " -n, --quiet, --silent\n" @@ -411,7 +411,7 @@ msgstr "" " -n, --quiet, --silent\n" " stop priontáil uathoibríoch den spás patrúin\n" -#: sed/sed.c:104 +#: sed/sed.c:109 #, c-format msgid "" " -e script, --expression=script\n" @@ -420,7 +420,7 @@ msgstr "" " -e script, --expression=script\n" " cuir an script leis na horduithe le rith\n" -#: sed/sed.c:106 +#: sed/sed.c:111 #, c-format msgid "" " -f script-file, --file=script-file\n" @@ -430,7 +430,7 @@ msgstr "" " -f comhad-script, --file=comhad-script\n" " cuir na línte i `comhad-script' leis na horduithe le rith\n" -#: sed/sed.c:108 +#: sed/sed.c:113 #, c-format msgid "" " -i[SUFFIX], --in-place[=SUFFIX]\n" @@ -440,7 +440,18 @@ msgstr "" " cuir eagar ar comhaid san áit a bhfuil siad (agus déan\n" " cúltaca má tá IARMHÍR tugtha\n" -#: sed/sed.c:110 +#: sed/sed.c:116 +#, fuzzy, c-format +msgid "" +" -b, --binary\n" +" open files in binary mode (CR+LFs are not processed " +"specially)\n" +msgstr "" +" -i[IARMHÍR], --in-place[=IARMHÍR]\n" +" cuir eagar ar comhaid san áit a bhfuil siad (agus déan\n" +" cúltaca má tá IARMHÍR tugtha\n" + +#: sed/sed.c:119 #, c-format msgid "" " -l N, --line-length=N\n" @@ -449,7 +460,7 @@ msgstr "" " -l N, --line-length=N\n" " ceap an fad timfhillte le haghaidh an ordaithe `l'\n" -#: sed/sed.c:112 +#: sed/sed.c:121 #, c-format msgid "" " --posix\n" @@ -458,7 +469,7 @@ msgstr "" " --posix\n" " díchumasaigh gach feabhsúchán GNU.\n" -#: sed/sed.c:114 +#: sed/sed.c:123 #, c-format msgid "" " -r, --regexp-extended\n" @@ -467,7 +478,7 @@ msgstr "" " -r, --regexp-extended\n" " úsáid sloinn ionadaíochta feabhsaithe sa script.\n" -#: sed/sed.c:117 +#: sed/sed.c:126 #, c-format msgid "" " -s, --separate\n" @@ -478,7 +489,7 @@ msgstr "" " -s, --separate\n" " féach ar comhaid ina leith seachas mar sruth leanúnach.\n" -#: sed/sed.c:120 +#: sed/sed.c:129 #, c-format msgid "" " -u, --unbuffered\n" @@ -490,17 +501,17 @@ msgstr "" " lódáil cantaí beaga ó na comhaid ionchur agus sruthlaigh\n" " na maoláin aschur níos minice\n" -#: sed/sed.c:123 +#: sed/sed.c:132 #, c-format msgid " --help display this help and exit\n" msgstr " --help taispeáin an chabhair seo agus éirigh as\n" -#: sed/sed.c:124 +#: sed/sed.c:133 #, c-format msgid " --version output version information and exit\n" msgstr " --version taispeáin eolas faoin leagan agus éirigh as\n" -#: sed/sed.c:125 +#: sed/sed.c:134 #, c-format msgid "" "\n" @@ -517,7 +528,7 @@ msgstr "" "léigh ón ionchur caighdeánach.\n" "\n" -#: sed/sed.c:131 +#: sed/sed.c:140 #, c-format msgid "" "E-mail bug reports to: %s .\n" @@ -526,12 +537,12 @@ msgstr "" "Seol tuairiscí fabhtanna chuig: %s .\n" "Cuir an focal ``%s'' áit éigin sa líne ``Subject:'' le do thoil.\n" -#: sed/sed.c:268 +#: sed/sed.c:285 #, c-format msgid "super-sed version %s\n" msgstr "super-sed, leagan %s\n" -#: sed/sed.c:269 +#: sed/sed.c:286 #, c-format msgid "" "based on GNU sed version %s\n" @@ -540,12 +551,12 @@ msgstr "" "bunaithe ar GNU sed, leagan %s\n" "\n" -#: sed/sed.c:271 +#: sed/sed.c:288 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed, leagan %s\n" -#: sed/sed.c:273 +#: sed/sed.c:290 #, c-format msgid "" "%s\n" @@ -559,19 +570,26 @@ msgstr "" "d'INDÍOLTACHT nó FEILIÚNACHT DO FHEIDHM AR LEITH, an oiread atá ceadaithe\n" "de réir dlí.\n" -#: lib/utils.c:98 lib/utils.c:336 +#: sed/utils.c:98 sed/utils.c:363 #, c-format msgid "cannot remove %s: %s" msgstr "ní féidir %s a scriosadh: %s" -#: lib/utils.c:143 +#: sed/utils.c:168 #, c-format msgid "couldn't open file %s: %s" msgstr "níorbh fhéidir an comhad %s a oscailt: %s" # Irish is nice this way, no initial mutation on 'rud'! -- KPS # Include all three b/c I'm using template version of "Plural-Forms" -#: lib/utils.c:220 +#: sed/utils.c:192 +#, fuzzy, c-format +msgid "couldn't attach to %s: %s" +msgstr "níorbh fhéidir %d rud a scríobh i %s: %s" + +# Irish is nice this way, no initial mutation on 'rud'! -- KPS +# Include all three b/c I'm using template version of "Plural-Forms" +#: sed/utils.c:247 #, c-format msgid "couldn't write %d item to %s: %s" msgid_plural "couldn't write %d items to %s: %s" @@ -580,58 +598,12 @@ msgstr[1] "n msgstr[2] "níorbh fhéidir %d rud a scríobh i %s: %s" msgstr[3] "níorbh fhéidir %d rud a scríobh i %s: %s" -#: lib/utils.c:235 lib/utils.c:251 +#: sed/utils.c:262 sed/utils.c:278 #, c-format msgid "read error on %s: %s" msgstr "earráid ag léamh %s: %s" -#: lib/utils.c:341 +#: sed/utils.c:368 #, c-format msgid "cannot rename %s: %s" msgstr "ní féidir %s a athainmniú: %s" - -#~ msgid "Success" -#~ msgstr "Bua!" - -#~ msgid "No match" -#~ msgstr "Níl a leithéid ann" - -#~ msgid "Invalid regular expression" -#~ msgstr "Slonn ionadaíochta neamhbhailí" - -#~ msgid "Invalid collation character" -#~ msgstr "Carachtar cóimheasa neamhbhailí" - -#~ msgid "Trailing backslash" -#~ msgstr "Cúlslais ag deireadh" - -# coinage - KPS -#~ msgid "Invalid back reference" -#~ msgstr "Cúltagairt neamhbhailí" - -#~ msgid "Unmatched [ or [^" -#~ msgstr "[ nó [^ corr" - -#~ msgid "Unmatched ( or \\(" -#~ msgstr "( nó \\( corr" - -#~ msgid "Unmatched \\{" -#~ msgstr "\\{ corr" - -#~ msgid "Invalid range end" -#~ msgstr "Deireadh raoin neamhbhailí" - -#~ msgid "Memory exhausted" -#~ msgstr "Cuimhne ídithe" - -#~ msgid "Invalid preceding regular expression" -#~ msgstr "Is neamhbhailí an slonn ionadaíochta roimh seo" - -#~ msgid "Premature end of regular expression" -#~ msgstr "Deireadh le slonn ionadaíochta gan choinne" - -#~ msgid "Unmatched ) or \\)" -#~ msgstr ") nó \\) corr" - -#~ msgid "No previous regular expression" -#~ msgstr "Níl aon slonn ionadaíochta roimh seo" diff --git a/po/gl.po b/po/gl.po index 9cc0029..3b10ce6 100644 --- a/po/gl.po +++ b/po/gl.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:37+0200\n" +"Report-Msgid-Bugs-To: bonzini@gnu.org\n" +"POT-Creation-Date: 2006-09-26 00:06+0200\n" "PO-Revision-Date: 2002-10-25 15:57+0200\n" "Last-Translator: Jacobo Tarrío Barreiro \n" "Language-Team: Galician \n" @@ -348,58 +348,58 @@ msgstr "%s: -e expresi msgid "can't find label for jump to `%s'" msgstr "Non se puido atopa-la etiqueta para saltar a `%s'" -#: sed/execute.c:650 +#: sed/execute.c:706 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: non se puido ler %s: %s\n" -#: sed/execute.c:673 +#: sed/execute.c:729 #, fuzzy, c-format msgid "couldn't edit %s: is a terminal" msgstr "Non se puido abri-lo ficheiro %s: %s" -#: sed/execute.c:677 +#: sed/execute.c:734 #, c-format msgid "couldn't edit %s: not a regular file" msgstr "" -#: sed/execute.c:684 lib/utils.c:196 +#: sed/execute.c:741 sed/utils.c:229 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "Non se puido abri-lo ficheiro %s: %s" -#: sed/execute.c:1206 sed/execute.c:1387 +#: sed/execute.c:1264 sed/execute.c:1444 msgid "error in subprocess" msgstr "erro no subproceso" -#: sed/execute.c:1208 +#: sed/execute.c:1266 msgid "option `e' not supported" msgstr "a opción `e' non está soportada" -#: sed/execute.c:1389 +#: sed/execute.c:1446 msgid "`e' command not supported" msgstr "o comando `e' non está soportado" -#: sed/execute.c:1714 +#: sed/execute.c:1786 msgid "no input files" msgstr "" -#: sed/regexp.c:39 +#: sed/regexp.c:40 #, fuzzy msgid "no previous regular expression" msgstr "Non hai unha expresión regular anterior" -#: sed/regexp.c:40 +#: sed/regexp.c:41 #, fuzzy msgid "cannot specify modifiers on empty regexp" msgstr "Non se poden especificar modificadores nunha expresión regular baleira" -#: sed/regexp.c:115 +#: sed/regexp.c:121 #, fuzzy, c-format msgid "invalid reference \\%d on `s' command's RHS" msgstr "Referencia \\%d non válida no lado dereito do comando `s'" -#: sed/sed.c:93 +#: sed/sed.c:98 msgid "" " -R, --regexp-perl\n" " use Perl 5's regular expressions syntax in the script.\n" @@ -408,28 +408,28 @@ msgstr "" " usa-la sintaxe de expresións regulares de Perl 5 no " "script.\n" -#: sed/sed.c:98 +#: sed/sed.c:103 #, c-format msgid "" "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" "\n" msgstr "" -#: sed/sed.c:102 +#: sed/sed.c:107 #, c-format msgid "" " -n, --quiet, --silent\n" " suppress automatic printing of pattern space\n" msgstr "" -#: sed/sed.c:104 +#: sed/sed.c:109 #, c-format msgid "" " -e script, --expression=script\n" " add the script to the commands to be executed\n" msgstr "" -#: sed/sed.c:106 +#: sed/sed.c:111 #, c-format msgid "" " -f script-file, --file=script-file\n" @@ -437,28 +437,36 @@ msgid "" "executed\n" msgstr "" -#: sed/sed.c:108 +#: sed/sed.c:113 #, c-format msgid "" " -i[SUFFIX], --in-place[=SUFFIX]\n" " edit files in place (makes backup if extension supplied)\n" msgstr "" -#: sed/sed.c:110 +#: sed/sed.c:116 +#, c-format +msgid "" +" -b, --binary\n" +" open files in binary mode (CR+LFs are not processed " +"specially)\n" +msgstr "" + +#: sed/sed.c:119 #, c-format msgid "" " -l N, --line-length=N\n" " specify the desired line-wrap length for the `l' command\n" msgstr "" -#: sed/sed.c:112 +#: sed/sed.c:121 #, c-format msgid "" " --posix\n" " disable all GNU extensions.\n" msgstr "" -#: sed/sed.c:114 +#: sed/sed.c:123 #, fuzzy, c-format msgid "" " -r, --regexp-extended\n" @@ -468,7 +476,7 @@ msgstr "" " usa-la sintaxe de expresións regulares de Perl 5 no " "script.\n" -#: sed/sed.c:117 +#: sed/sed.c:126 #, c-format msgid "" " -s, --separate\n" @@ -477,7 +485,7 @@ msgid "" " long stream.\n" msgstr "" -#: sed/sed.c:120 +#: sed/sed.c:129 #, c-format msgid "" " -u, --unbuffered\n" @@ -486,17 +494,17 @@ msgid "" " the output buffers more often\n" msgstr "" -#: sed/sed.c:123 +#: sed/sed.c:132 #, c-format msgid " --help display this help and exit\n" msgstr "" -#: sed/sed.c:124 +#: sed/sed.c:133 #, c-format msgid " --version output version information and exit\n" msgstr "" -#: sed/sed.c:125 +#: sed/sed.c:134 #, c-format msgid "" "\n" @@ -507,7 +515,7 @@ msgid "" "\n" msgstr "" -#: sed/sed.c:131 +#: sed/sed.c:140 #, c-format msgid "" "E-mail bug reports to: %s .\n" @@ -517,24 +525,24 @@ msgstr "" "Informe dos erros na traducción a gpul-traduccion@ceu.fi.udc.es .\n" "Asegúrese de incluí-la palabra ``%s'' nalgunha parte do campo ``Subject:''.\n" -#: sed/sed.c:268 +#: sed/sed.c:285 #, c-format msgid "super-sed version %s\n" msgstr "super-sed versión %s\n" -#: sed/sed.c:269 +#: sed/sed.c:286 #, fuzzy, c-format msgid "" "based on GNU sed version %s\n" "\n" msgstr "baseado en GNU sed versión 3.02.80\n" -#: sed/sed.c:271 +#: sed/sed.c:288 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed versión %s\n" -#: sed/sed.c:273 +#: sed/sed.c:290 #, c-format msgid "" "%s\n" @@ -549,74 +557,34 @@ msgstr "" "DETERMINADO,\n" "ata o que permite a lei.\n" -#: lib/utils.c:98 lib/utils.c:336 +#: sed/utils.c:98 sed/utils.c:363 #, fuzzy, c-format msgid "cannot remove %s: %s" msgstr "%s: non se puido ler %s: %s\n" -#: lib/utils.c:143 +#: sed/utils.c:168 #, fuzzy, c-format msgid "couldn't open file %s: %s" msgstr "Non se puido abri-lo ficheiro %s: %s" -#: lib/utils.c:220 +#: sed/utils.c:192 +#, fuzzy, c-format +msgid "couldn't attach to %s: %s" +msgstr "non se puido escribir %d elemento en %s: %s" + +#: sed/utils.c:247 #, c-format msgid "couldn't write %d item to %s: %s" msgid_plural "couldn't write %d items to %s: %s" msgstr[0] "non se puido escribir %d elemento en %s: %s" msgstr[1] "non se puideron escribir %d elementos en %s: %s" -#: lib/utils.c:235 lib/utils.c:251 +#: sed/utils.c:262 sed/utils.c:278 #, c-format msgid "read error on %s: %s" msgstr "erro de lectura en %s: %s" -#: lib/utils.c:341 +#: sed/utils.c:368 #, fuzzy, c-format msgid "cannot rename %s: %s" msgstr "%s: non se puido ler %s: %s\n" - -#~ msgid "Success" -#~ msgstr "Éxito" - -#~ msgid "No match" -#~ msgstr "Non se atopou" - -#~ msgid "Invalid regular expression" -#~ msgstr "Expresión regular non válida" - -#~ msgid "Invalid collation character" -#~ msgstr "Carácter de ordeamento non válido" - -#~ msgid "Trailing backslash" -#~ msgstr "Barra invertida á fin de liña" - -#~ msgid "Invalid back reference" -#~ msgstr "Referencia cara a atrás non válida" - -#~ msgid "Unmatched [ or [^" -#~ msgstr "[ ou [^ sen parella" - -#~ msgid "Unmatched ( or \\(" -#~ msgstr "( ou \\( sen parella" - -#~ msgid "Unmatched \\{" -#~ msgstr "\\{ sen parella" - -#~ msgid "Invalid range end" -#~ msgstr "Fin de rango non válida" - -#~ msgid "Memory exhausted" -#~ msgstr "Memoria esgotada" - -#~ msgid "Invalid preceding regular expression" -#~ msgstr "Expresión regular anterior non válida" - -#~ msgid "Premature end of regular expression" -#~ msgstr "Fin prematura da expresión regular" - -#~ msgid "Unmatched ) or \\)" -#~ msgstr ") ou \\) sen parella" - -#~ msgid "No previous regular expression" -#~ msgstr "Non hai unha expresión regular anterior" diff --git a/po/he.po b/po/he.po index eb4e06a..cbbe644 100644 --- a/po/he.po +++ b/po/he.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: sed 3.02.80\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:37+0200\n" +"Report-Msgid-Bugs-To: bonzini@gnu.org\n" +"POT-Creation-Date: 2006-09-26 00:06+0200\n" "PO-Revision-Date: 2001-08-04 20:37+0300\n" "Last-Translator: Eli Zaretskii \n" "Language-Team: Hebrew \n" @@ -342,83 +342,83 @@ msgstr "%s msgid "can't find label for jump to `%s'" msgstr "äàöîð àì `%s' äöéô÷ úéååú" -#: sed/execute.c:650 +#: sed/execute.c:706 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s úéðëúá %s úàéø÷á (%s) äàéâù\n" -#: sed/execute.c:673 +#: sed/execute.c:729 #, fuzzy, c-format msgid "couldn't edit %s: is a terminal" msgstr "%s õáå÷ úçéúôá äì÷ú" -#: sed/execute.c:677 +#: sed/execute.c:734 #, c-format msgid "couldn't edit %s: not a regular file" msgstr "" -#: sed/execute.c:684 lib/utils.c:196 +#: sed/execute.c:741 sed/utils.c:229 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "%s õáå÷ úçéúôá äì÷ú" -#: sed/execute.c:1206 sed/execute.c:1387 +#: sed/execute.c:1264 sed/execute.c:1444 msgid "error in subprocess" msgstr "" -#: sed/execute.c:1208 +#: sed/execute.c:1266 msgid "option `e' not supported" msgstr "" -#: sed/execute.c:1389 +#: sed/execute.c:1446 msgid "`e' command not supported" msgstr "" -#: sed/execute.c:1714 +#: sed/execute.c:1786 msgid "no input files" msgstr "" -#: sed/regexp.c:39 +#: sed/regexp.c:40 msgid "no previous regular expression" msgstr "" -#: sed/regexp.c:40 +#: sed/regexp.c:41 msgid "cannot specify modifiers on empty regexp" msgstr "" -#: sed/regexp.c:115 +#: sed/regexp.c:121 #, c-format msgid "invalid reference \\%d on `s' command's RHS" msgstr "" -#: sed/sed.c:93 +#: sed/sed.c:98 msgid "" " -R, --regexp-perl\n" " use Perl 5's regular expressions syntax in the script.\n" msgstr "" -#: sed/sed.c:98 +#: sed/sed.c:103 #, c-format msgid "" "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" "\n" msgstr "" -#: sed/sed.c:102 +#: sed/sed.c:107 #, c-format msgid "" " -n, --quiet, --silent\n" " suppress automatic printing of pattern space\n" msgstr "" -#: sed/sed.c:104 +#: sed/sed.c:109 #, c-format msgid "" " -e script, --expression=script\n" " add the script to the commands to be executed\n" msgstr "" -#: sed/sed.c:106 +#: sed/sed.c:111 #, c-format msgid "" " -f script-file, --file=script-file\n" @@ -426,35 +426,43 @@ msgid "" "executed\n" msgstr "" -#: sed/sed.c:108 +#: sed/sed.c:113 #, c-format msgid "" " -i[SUFFIX], --in-place[=SUFFIX]\n" " edit files in place (makes backup if extension supplied)\n" msgstr "" -#: sed/sed.c:110 +#: sed/sed.c:116 +#, c-format +msgid "" +" -b, --binary\n" +" open files in binary mode (CR+LFs are not processed " +"specially)\n" +msgstr "" + +#: sed/sed.c:119 #, c-format msgid "" " -l N, --line-length=N\n" " specify the desired line-wrap length for the `l' command\n" msgstr "" -#: sed/sed.c:112 +#: sed/sed.c:121 #, c-format msgid "" " --posix\n" " disable all GNU extensions.\n" msgstr "" -#: sed/sed.c:114 +#: sed/sed.c:123 #, c-format msgid "" " -r, --regexp-extended\n" " use extended regular expressions in the script.\n" msgstr "" -#: sed/sed.c:117 +#: sed/sed.c:126 #, c-format msgid "" " -s, --separate\n" @@ -463,7 +471,7 @@ msgid "" " long stream.\n" msgstr "" -#: sed/sed.c:120 +#: sed/sed.c:129 #, c-format msgid "" " -u, --unbuffered\n" @@ -472,17 +480,17 @@ msgid "" " the output buffers more often\n" msgstr "" -#: sed/sed.c:123 +#: sed/sed.c:132 #, c-format msgid " --help display this help and exit\n" msgstr "" -#: sed/sed.c:124 +#: sed/sed.c:133 #, c-format msgid " --version output version information and exit\n" msgstr "" -#: sed/sed.c:125 +#: sed/sed.c:134 #, c-format msgid "" "\n" @@ -493,7 +501,7 @@ msgid "" "\n" msgstr "" -#: sed/sed.c:131 +#: sed/sed.c:140 #, c-format msgid "" "E-mail bug reports to: %s .\n" @@ -502,24 +510,24 @@ msgstr "" " .%s úáåúëì (bugs) äì÷ú éçååéã çåìùì àð\n" " .(``Subject'') ``ïåãðä'' úøåùá ``%s'' äìéî ìåìëì åãéô÷ä àðà\n" -#: sed/sed.c:268 +#: sed/sed.c:285 #, c-format msgid "super-sed version %s\n" msgstr "" -#: sed/sed.c:269 +#: sed/sed.c:286 #, c-format msgid "" "based on GNU sed version %s\n" "\n" msgstr "" -#: sed/sed.c:271 +#: sed/sed.c:288 #, c-format msgid "GNU sed version %s\n" msgstr "" -#: sed/sed.c:273 +#: sed/sed.c:290 #, c-format msgid "" "%s\n" @@ -532,45 +540,34 @@ msgstr "" " äãéîá úàæå ,àéäù úéìëú åæéàì äîàúä åà úåøéçñ íùì àì åìéôà ;úåéøçà áúëá\n" " .úàæ øùôàî ÷åçäù\n" -#: lib/utils.c:98 lib/utils.c:336 +#: sed/utils.c:98 sed/utils.c:363 #, fuzzy, c-format msgid "cannot remove %s: %s" msgstr "%s úéðëúá %s úàéø÷á (%s) äàéâù\n" -#: lib/utils.c:143 +#: sed/utils.c:168 #, fuzzy, c-format msgid "couldn't open file %s: %s" msgstr "%s õáå÷ úçéúôá äì÷ú" -#: lib/utils.c:220 +#: sed/utils.c:192 +#, fuzzy, c-format +msgid "couldn't attach to %s: %s" +msgstr "èìôäî íé÷ìç %d ìù %s-ì äáéúëá (%s) äì÷ú" + +#: sed/utils.c:247 #, fuzzy, c-format msgid "couldn't write %d item to %s: %s" msgid_plural "couldn't write %d items to %s: %s" msgstr[0] "èìôäî íé÷ìç %d ìù %s-ì äáéúëá (%s) äì÷ú" msgstr[1] "èìôäî íé÷ìç %d ìù %s-ì äáéúëá (%s) äì÷ú" -#: lib/utils.c:235 lib/utils.c:251 +#: sed/utils.c:262 sed/utils.c:278 #, c-format msgid "read error on %s: %s" msgstr "%s úàéø÷á (%s) äì÷ú" -#: lib/utils.c:341 +#: sed/utils.c:368 #, fuzzy, c-format msgid "cannot rename %s: %s" msgstr "%s úéðëúá %s úàéø÷á (%s) äàéâù\n" - -#, fuzzy -#~ msgid "Unmatched [ or [^" -#~ msgstr "âåæ-ïá åì ïéàù `{'" - -#, fuzzy -#~ msgid "Unmatched ( or \\(" -#~ msgstr "âåæ-ïá åì ïéàù `{'" - -#, fuzzy -#~ msgid "Unmatched \\{" -#~ msgstr "âåæ-ïá åì ïéàù `{'" - -#, fuzzy -#~ msgid "Unmatched ) or \\)" -#~ msgstr "âåæ-ïá åì ïéàù `{'" diff --git a/po/hr.po b/po/hr.po index adb1b54..ae98382 100644 --- a/po/hr.po +++ b/po/hr.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: sed 3.02a\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:37+0200\n" +"Report-Msgid-Bugs-To: bonzini@gnu.org\n" +"POT-Creation-Date: 2006-09-26 00:06+0200\n" "PO-Revision-Date: 2002-06-14 15:17-01\n" "Last-Translator: Denis Lackovic \n" "Language-Team: Croatian \n" @@ -345,84 +345,84 @@ msgstr "%s: -e izraz #%lu, znak %lu: %s\n" msgid "can't find label for jump to `%s'" msgstr "Ne mogu naći labelu na koju bi trebalo skoÄ�iti `%s'" -#: sed/execute.c:650 +#: sed/execute.c:706 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: ne mogu Ä�itati %s: %s\n" -#: sed/execute.c:673 +#: sed/execute.c:729 #, fuzzy, c-format msgid "couldn't edit %s: is a terminal" msgstr "Ne mogu otvoriti datoteku %s" -#: sed/execute.c:677 +#: sed/execute.c:734 #, c-format msgid "couldn't edit %s: not a regular file" msgstr "" -#: sed/execute.c:684 lib/utils.c:196 +#: sed/execute.c:741 sed/utils.c:229 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "Ne mogu otvoriti datoteku %s" -#: sed/execute.c:1206 sed/execute.c:1387 +#: sed/execute.c:1264 sed/execute.c:1444 msgid "error in subprocess" msgstr "" -#: sed/execute.c:1208 +#: sed/execute.c:1266 msgid "option `e' not supported" msgstr "" -#: sed/execute.c:1389 +#: sed/execute.c:1446 msgid "`e' command not supported" msgstr "" -#: sed/execute.c:1714 +#: sed/execute.c:1786 msgid "no input files" msgstr "" -#: sed/regexp.c:39 +#: sed/regexp.c:40 #, fuzzy msgid "no previous regular expression" msgstr "Nedostaje prethodni regularni izraz" -#: sed/regexp.c:40 +#: sed/regexp.c:41 msgid "cannot specify modifiers on empty regexp" msgstr "" -#: sed/regexp.c:115 +#: sed/regexp.c:121 #, c-format msgid "invalid reference \\%d on `s' command's RHS" msgstr "" -#: sed/sed.c:93 +#: sed/sed.c:98 msgid "" " -R, --regexp-perl\n" " use Perl 5's regular expressions syntax in the script.\n" msgstr "" -#: sed/sed.c:98 +#: sed/sed.c:103 #, c-format msgid "" "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" "\n" msgstr "" -#: sed/sed.c:102 +#: sed/sed.c:107 #, c-format msgid "" " -n, --quiet, --silent\n" " suppress automatic printing of pattern space\n" msgstr "" -#: sed/sed.c:104 +#: sed/sed.c:109 #, c-format msgid "" " -e script, --expression=script\n" " add the script to the commands to be executed\n" msgstr "" -#: sed/sed.c:106 +#: sed/sed.c:111 #, c-format msgid "" " -f script-file, --file=script-file\n" @@ -430,35 +430,43 @@ msgid "" "executed\n" msgstr "" -#: sed/sed.c:108 +#: sed/sed.c:113 #, c-format msgid "" " -i[SUFFIX], --in-place[=SUFFIX]\n" " edit files in place (makes backup if extension supplied)\n" msgstr "" -#: sed/sed.c:110 +#: sed/sed.c:116 +#, c-format +msgid "" +" -b, --binary\n" +" open files in binary mode (CR+LFs are not processed " +"specially)\n" +msgstr "" + +#: sed/sed.c:119 #, c-format msgid "" " -l N, --line-length=N\n" " specify the desired line-wrap length for the `l' command\n" msgstr "" -#: sed/sed.c:112 +#: sed/sed.c:121 #, c-format msgid "" " --posix\n" " disable all GNU extensions.\n" msgstr "" -#: sed/sed.c:114 +#: sed/sed.c:123 #, c-format msgid "" " -r, --regexp-extended\n" " use extended regular expressions in the script.\n" msgstr "" -#: sed/sed.c:117 +#: sed/sed.c:126 #, c-format msgid "" " -s, --separate\n" @@ -467,7 +475,7 @@ msgid "" " long stream.\n" msgstr "" -#: sed/sed.c:120 +#: sed/sed.c:129 #, c-format msgid "" " -u, --unbuffered\n" @@ -476,17 +484,17 @@ msgid "" " the output buffers more often\n" msgstr "" -#: sed/sed.c:123 +#: sed/sed.c:132 #, c-format msgid " --help display this help and exit\n" msgstr "" -#: sed/sed.c:124 +#: sed/sed.c:133 #, c-format msgid " --version output version information and exit\n" msgstr "" -#: sed/sed.c:125 +#: sed/sed.c:134 #, c-format msgid "" "\n" @@ -497,7 +505,7 @@ msgid "" "\n" msgstr "" -#: sed/sed.c:131 +#: sed/sed.c:140 #, c-format msgid "" "E-mail bug reports to: %s .\n" @@ -506,24 +514,24 @@ msgstr "" "E-mail bug prijave (na engleskom) poÅ¡aljite na: %s .\n" "UkljuÄ�ite rijeÄ� ``%s'' u polju ``Subject:''.\n" -#: sed/sed.c:268 +#: sed/sed.c:285 #, c-format msgid "super-sed version %s\n" msgstr "" -#: sed/sed.c:269 +#: sed/sed.c:286 #, c-format msgid "" "based on GNU sed version %s\n" "\n" msgstr "" -#: sed/sed.c:271 +#: sed/sed.c:288 #, c-format msgid "GNU sed version %s\n" msgstr "" -#: sed/sed.c:273 +#: sed/sed.c:290 #, c-format msgid "" "%s\n" @@ -537,60 +545,34 @@ msgstr "" " NEMA garancije;\n" "Ä�ak ni tvrdnje o ISPLATIVOSTI ili POGODNOSTI ZA NEKU SVRHU.\n" -#: lib/utils.c:98 lib/utils.c:336 +#: sed/utils.c:98 sed/utils.c:363 #, fuzzy, c-format msgid "cannot remove %s: %s" msgstr "%s: ne mogu Ä�itati %s: %s\n" -#: lib/utils.c:143 +#: sed/utils.c:168 #, fuzzy, c-format msgid "couldn't open file %s: %s" msgstr "Ne mogu otvoriti datoteku %s" -#: lib/utils.c:220 +#: sed/utils.c:192 +#, fuzzy, c-format +msgid "couldn't attach to %s: %s" +msgstr "Ne mogu upisati %d item%s u %s: %s" + +#: sed/utils.c:247 #, fuzzy, c-format msgid "couldn't write %d item to %s: %s" msgid_plural "couldn't write %d items to %s: %s" msgstr[0] "Ne mogu upisati %d item%s u %s: %s" msgstr[1] "Ne mogu upisati %d item%s u %s: %s" -#: lib/utils.c:235 lib/utils.c:251 +#: sed/utils.c:262 sed/utils.c:278 #, c-format msgid "read error on %s: %s" msgstr "GreÅ¡ka u Ä�itanju na %s: %s" -#: lib/utils.c:341 +#: sed/utils.c:368 #, fuzzy, c-format msgid "cannot rename %s: %s" msgstr "%s: ne mogu Ä�itati %s: %s\n" - -#, fuzzy -#~ msgid "Invalid regular expression" -#~ msgstr "Nedostaje prethodni regularni izraz" - -#, fuzzy -#~ msgid "Unmatched [ or [^" -#~ msgstr "Neuparena `{'" - -#, fuzzy -#~ msgid "Unmatched ( or \\(" -#~ msgstr "Neuparena `{'" - -#, fuzzy -#~ msgid "Unmatched \\{" -#~ msgstr "Neuparena `{'" - -#, fuzzy -#~ msgid "Invalid preceding regular expression" -#~ msgstr "Nedostaje prethodni regularni izraz" - -#, fuzzy -#~ msgid "Premature end of regular expression" -#~ msgstr "Nedostaje prethodni regularni izraz" - -#, fuzzy -#~ msgid "Unmatched ) or \\)" -#~ msgstr "Neuparena `{'" - -#~ msgid "No previous regular expression" -#~ msgstr "Nedostaje prethodni regularni izraz" diff --git a/po/hu.po b/po/hu.po index cd4d94a..2ac2c74 100644 --- a/po/hu.po +++ b/po/hu.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.8\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:37+0200\n" +"Report-Msgid-Bugs-To: bonzini@gnu.org\n" +"POT-Creation-Date: 2006-09-26 00:06+0200\n" "PO-Revision-Date: 2003-10-26 09:28+0100\n" "Last-Translator: Mihály Gyulai \n" "Language-Team: Hungarian \n" @@ -348,58 +348,58 @@ msgstr "%s: -e kifejez msgid "can't find label for jump to `%s'" msgstr "Az ugráshoz (`%s') nem találom a címkét" -#: sed/execute.c:650 +#: sed/execute.c:706 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: nem lehet olvasni %s: %s\n" -#: sed/execute.c:673 +#: sed/execute.c:729 #, fuzzy, c-format msgid "couldn't edit %s: is a terminal" msgstr "Nem lehet megnyitni a(z) %s fájlt: %s" -#: sed/execute.c:677 +#: sed/execute.c:734 #, c-format msgid "couldn't edit %s: not a regular file" msgstr "" -#: sed/execute.c:684 lib/utils.c:196 +#: sed/execute.c:741 sed/utils.c:229 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "Nem lehet megnyitni az átmeneti fájlt: %s: %s" -#: sed/execute.c:1206 sed/execute.c:1387 +#: sed/execute.c:1264 sed/execute.c:1444 msgid "error in subprocess" msgstr "hiba az alfolyamatban" -#: sed/execute.c:1208 +#: sed/execute.c:1266 msgid "option `e' not supported" msgstr "az `e' opció nincs támogatva" -#: sed/execute.c:1389 +#: sed/execute.c:1446 msgid "`e' command not supported" msgstr "az `e' parancs nincs támogatva" -#: sed/execute.c:1714 +#: sed/execute.c:1786 msgid "no input files" msgstr "" -#: sed/regexp.c:39 +#: sed/regexp.c:40 #, fuzzy msgid "no previous regular expression" msgstr "Nincsen elõzõ reguláris kifejezés" -#: sed/regexp.c:40 +#: sed/regexp.c:41 #, fuzzy msgid "cannot specify modifiers on empty regexp" msgstr "Nem lehet módosítót megadni üres reguláris kifejezéshez" -#: sed/regexp.c:115 +#: sed/regexp.c:121 #, fuzzy, c-format msgid "invalid reference \\%d on `s' command's RHS" msgstr "Hibás hivatkozás (\\%d) a(z) `s' parancs RHS-ére" -#: sed/sed.c:93 +#: sed/sed.c:98 msgid "" " -R, --regexp-perl\n" " use Perl 5's regular expressions syntax in the script.\n" @@ -407,28 +407,28 @@ msgstr "" " -R --regexp-perl\n" " Perl 5 reguláris kifejezés nyelvtanának használata.\n" -#: sed/sed.c:98 +#: sed/sed.c:103 #, c-format msgid "" "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" "\n" msgstr "" -#: sed/sed.c:102 +#: sed/sed.c:107 #, c-format msgid "" " -n, --quiet, --silent\n" " suppress automatic printing of pattern space\n" msgstr "" -#: sed/sed.c:104 +#: sed/sed.c:109 #, c-format msgid "" " -e script, --expression=script\n" " add the script to the commands to be executed\n" msgstr "" -#: sed/sed.c:106 +#: sed/sed.c:111 #, c-format msgid "" " -f script-file, --file=script-file\n" @@ -436,28 +436,36 @@ msgid "" "executed\n" msgstr "" -#: sed/sed.c:108 +#: sed/sed.c:113 #, c-format msgid "" " -i[SUFFIX], --in-place[=SUFFIX]\n" " edit files in place (makes backup if extension supplied)\n" msgstr "" -#: sed/sed.c:110 +#: sed/sed.c:116 +#, c-format +msgid "" +" -b, --binary\n" +" open files in binary mode (CR+LFs are not processed " +"specially)\n" +msgstr "" + +#: sed/sed.c:119 #, c-format msgid "" " -l N, --line-length=N\n" " specify the desired line-wrap length for the `l' command\n" msgstr "" -#: sed/sed.c:112 +#: sed/sed.c:121 #, c-format msgid "" " --posix\n" " disable all GNU extensions.\n" msgstr "" -#: sed/sed.c:114 +#: sed/sed.c:123 #, fuzzy, c-format msgid "" " -r, --regexp-extended\n" @@ -466,7 +474,7 @@ msgstr "" " -R --regexp-perl\n" " Perl 5 reguláris kifejezés nyelvtanának használata.\n" -#: sed/sed.c:117 +#: sed/sed.c:126 #, c-format msgid "" " -s, --separate\n" @@ -475,7 +483,7 @@ msgid "" " long stream.\n" msgstr "" -#: sed/sed.c:120 +#: sed/sed.c:129 #, c-format msgid "" " -u, --unbuffered\n" @@ -484,17 +492,17 @@ msgid "" " the output buffers more often\n" msgstr "" -#: sed/sed.c:123 +#: sed/sed.c:132 #, c-format msgid " --help display this help and exit\n" msgstr "" -#: sed/sed.c:124 +#: sed/sed.c:133 #, c-format msgid " --version output version information and exit\n" msgstr "" -#: sed/sed.c:125 +#: sed/sed.c:134 #, c-format msgid "" "\n" @@ -505,7 +513,7 @@ msgid "" "\n" msgstr "" -#: sed/sed.c:131 +#: sed/sed.c:140 #, c-format msgid "" "E-mail bug reports to: %s .\n" @@ -514,12 +522,12 @@ msgstr "" "A fordítási hibákat kérem a gyulai@fbi.hu címre küldeni. \n" "Angolul ide: %s . A levél Tárgy mezejében legyen ott a `%s' szó.\n" -#: sed/sed.c:268 +#: sed/sed.c:285 #, c-format msgid "super-sed version %s\n" msgstr "super-sed verzió %s\n" -#: sed/sed.c:269 +#: sed/sed.c:286 #, fuzzy, c-format msgid "" "based on GNU sed version %s\n" @@ -528,12 +536,12 @@ msgstr "" "A GNU 3.02.80-as sed verzión alapszik\n" "\n" -#: sed/sed.c:271 +#: sed/sed.c:288 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed verzió %s\n" -#: sed/sed.c:273 +#: sed/sed.c:290 #, c-format msgid "" "%s\n" @@ -547,74 +555,33 @@ msgstr "" "SEMMILYEN garanciát nem vállalunk, még azt sem állítjuk, hogy ez a program\n" "KERESKEDELMI CÉLOKRA ALKALMAS vagy HASZNÁLHATÓ EGY ADOTT FELADATRA.\n" -#: lib/utils.c:98 lib/utils.c:336 +#: sed/utils.c:98 sed/utils.c:363 #, fuzzy, c-format msgid "cannot remove %s: %s" msgstr "%s: nem lehet olvasni %s: %s\n" -#: lib/utils.c:143 +#: sed/utils.c:168 #, fuzzy, c-format msgid "couldn't open file %s: %s" msgstr "Nem lehet megnyitni a(z) %s fájlt: %s" -#: lib/utils.c:220 +#: sed/utils.c:192 +#, fuzzy, c-format +msgid "couldn't attach to %s: %s" +msgstr "nem tudom a(z) %d elemet ide írni %s: %s" + +#: sed/utils.c:247 #, c-format msgid "couldn't write %d item to %s: %s" msgid_plural "couldn't write %d items to %s: %s" msgstr[0] "nem tudom a(z) %d elemet ide írni %s: %s" -msgstr[1] "nem tudom a(z) %d elemeket ide írni %s: %s" -#: lib/utils.c:235 lib/utils.c:251 +#: sed/utils.c:262 sed/utils.c:278 #, c-format msgid "read error on %s: %s" msgstr "olvasási hiba %s: %s" -#: lib/utils.c:341 +#: sed/utils.c:368 #, fuzzy, c-format msgid "cannot rename %s: %s" msgstr "%s: nem lehet olvasni %s: %s\n" - -#~ msgid "Success" -#~ msgstr "Sikeres" - -#~ msgid "No match" -#~ msgstr "Nincs találat" - -#~ msgid "Invalid regular expression" -#~ msgstr "Hibás reguláris kifejezés" - -#~ msgid "Invalid collation character" -#~ msgstr "Érvénytelen összehasonlító karakter" - -#~ msgid "Trailing backslash" -#~ msgstr "Lezáró visszaperjel" - -#~ msgid "Invalid back reference" -#~ msgstr "Érvénytelen vissza-hivatkozás" - -#~ msgid "Unmatched [ or [^" -#~ msgstr "Nincs párban [ vagy [^" - -#~ msgid "Unmatched ( or \\(" -#~ msgstr "Nincs párban ( vagy \\(" - -#~ msgid "Unmatched \\{" -#~ msgstr "Nincs párban \\{" - -#~ msgid "Invalid range end" -#~ msgstr "Sorozat érvénytelen vége" - -#~ msgid "Memory exhausted" -#~ msgstr "Kevés a memória" - -#~ msgid "Invalid preceding regular expression" -#~ msgstr "Érvénytelen megelõzõ reguláris kifejezés" - -#~ msgid "Premature end of regular expression" -#~ msgstr "Reguláris kifejezés túl korai vége" - -#~ msgid "Unmatched ) or \\)" -#~ msgstr "Nincs párban ) vagy \\)" - -#~ msgid "No previous regular expression" -#~ msgstr "Nincsen elõzõ reguláris kifejezés" diff --git a/po/id.po b/po/id.po index 1f03313..f535ffe 100644 --- a/po/id.po +++ b/po/id.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.9\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:37+0200\n" +"Report-Msgid-Bugs-To: bonzini@gnu.org\n" +"POT-Creation-Date: 2006-09-26 00:06+0200\n" "PO-Revision-Date: 2004-04-27 14:56+0700\n" "Last-Translator: Tedi Heriyanto \n" "Language-Team: Indonesian \n" @@ -350,58 +350,58 @@ msgstr "%s: -e ekspresi #%lu, char %lu: %s\n" msgid "can't find label for jump to `%s'" msgstr "Tidak dapat menemukan label untuk melompat ke `%s'" -#: sed/execute.c:650 +#: sed/execute.c:706 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: tidak dapat membaca %s: %s\n" -#: sed/execute.c:673 +#: sed/execute.c:729 #, fuzzy, c-format msgid "couldn't edit %s: is a terminal" msgstr "Tidak dapat membuka file %s %s" -#: sed/execute.c:677 +#: sed/execute.c:734 #, c-format msgid "couldn't edit %s: not a regular file" msgstr "" -#: sed/execute.c:684 lib/utils.c:196 +#: sed/execute.c:741 sed/utils.c:229 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "Tidak dapat membuka file temporer %s %s" -#: sed/execute.c:1206 sed/execute.c:1387 +#: sed/execute.c:1264 sed/execute.c:1444 msgid "error in subprocess" msgstr "kesalahan dalam subproses" -#: sed/execute.c:1208 +#: sed/execute.c:1266 msgid "option `e' not supported" msgstr "option `e' tidak didukung" -#: sed/execute.c:1389 +#: sed/execute.c:1446 msgid "`e' command not supported" msgstr "perintah `e' tidak didukung" -#: sed/execute.c:1714 +#: sed/execute.c:1786 msgid "no input files" msgstr "" -#: sed/regexp.c:39 +#: sed/regexp.c:40 #, fuzzy msgid "no previous regular expression" msgstr "Tidak ada reguler ekspresi sebelumnya" -#: sed/regexp.c:40 +#: sed/regexp.c:41 #, fuzzy msgid "cannot specify modifiers on empty regexp" msgstr "Tidak dapat menspesifikasikan modified pada regexp kosong" -#: sed/regexp.c:115 +#: sed/regexp.c:121 #, fuzzy, c-format msgid "invalid reference \\%d on `s' command's RHS" msgstr "Referensi tidak valid \\%d pada perintah `s' RHS" -#: sed/sed.c:93 +#: sed/sed.c:98 msgid "" " -R, --regexp-perl\n" " use Perl 5's regular expressions syntax in the script.\n" @@ -409,28 +409,28 @@ msgstr "" " -R, --regexp-perl\n" " gunakan sintaks reguler ekspresi Perl 5 dalam skrip.\n" -#: sed/sed.c:98 +#: sed/sed.c:103 #, c-format msgid "" "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" "\n" msgstr "" -#: sed/sed.c:102 +#: sed/sed.c:107 #, c-format msgid "" " -n, --quiet, --silent\n" " suppress automatic printing of pattern space\n" msgstr "" -#: sed/sed.c:104 +#: sed/sed.c:109 #, c-format msgid "" " -e script, --expression=script\n" " add the script to the commands to be executed\n" msgstr "" -#: sed/sed.c:106 +#: sed/sed.c:111 #, c-format msgid "" " -f script-file, --file=script-file\n" @@ -438,28 +438,36 @@ msgid "" "executed\n" msgstr "" -#: sed/sed.c:108 +#: sed/sed.c:113 #, c-format msgid "" " -i[SUFFIX], --in-place[=SUFFIX]\n" " edit files in place (makes backup if extension supplied)\n" msgstr "" -#: sed/sed.c:110 +#: sed/sed.c:116 +#, c-format +msgid "" +" -b, --binary\n" +" open files in binary mode (CR+LFs are not processed " +"specially)\n" +msgstr "" + +#: sed/sed.c:119 #, c-format msgid "" " -l N, --line-length=N\n" " specify the desired line-wrap length for the `l' command\n" msgstr "" -#: sed/sed.c:112 +#: sed/sed.c:121 #, c-format msgid "" " --posix\n" " disable all GNU extensions.\n" msgstr "" -#: sed/sed.c:114 +#: sed/sed.c:123 #, fuzzy, c-format msgid "" " -r, --regexp-extended\n" @@ -468,7 +476,7 @@ msgstr "" " -R, --regexp-perl\n" " gunakan sintaks reguler ekspresi Perl 5 dalam skrip.\n" -#: sed/sed.c:117 +#: sed/sed.c:126 #, c-format msgid "" " -s, --separate\n" @@ -477,7 +485,7 @@ msgid "" " long stream.\n" msgstr "" -#: sed/sed.c:120 +#: sed/sed.c:129 #, c-format msgid "" " -u, --unbuffered\n" @@ -486,17 +494,17 @@ msgid "" " the output buffers more often\n" msgstr "" -#: sed/sed.c:123 +#: sed/sed.c:132 #, c-format msgid " --help display this help and exit\n" msgstr "" -#: sed/sed.c:124 +#: sed/sed.c:133 #, c-format msgid " --version output version information and exit\n" msgstr "" -#: sed/sed.c:125 +#: sed/sed.c:134 #, c-format msgid "" "\n" @@ -507,7 +515,7 @@ msgid "" "\n" msgstr "" -#: sed/sed.c:131 +#: sed/sed.c:140 #, c-format msgid "" "E-mail bug reports to: %s .\n" @@ -516,12 +524,12 @@ msgstr "" "Email laporan kesalahan ke: %s \n" "Pastikan untuk menyertakan kata \"%s\" di field \"Subject:\".\n" -#: sed/sed.c:268 +#: sed/sed.c:285 #, c-format msgid "super-sed version %s\n" msgstr "super-sed versi %s\n" -#: sed/sed.c:269 +#: sed/sed.c:286 #, fuzzy, c-format msgid "" "based on GNU sed version %s\n" @@ -530,12 +538,12 @@ msgstr "" "berdasarkan pada GNU sed versi 3.02.80\n" "\n" -#: sed/sed.c:271 +#: sed/sed.c:288 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed versi %s\n" -#: sed/sed.c:273 +#: sed/sed.c:290 #, c-format msgid "" "%s\n" @@ -548,74 +556,33 @@ msgstr "" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE,\n" "to the extent permitted by law.\n" -#: lib/utils.c:98 lib/utils.c:336 +#: sed/utils.c:98 sed/utils.c:363 #, fuzzy, c-format msgid "cannot remove %s: %s" msgstr "%s: tidak dapat membaca %s: %s\n" -#: lib/utils.c:143 +#: sed/utils.c:168 #, fuzzy, c-format msgid "couldn't open file %s: %s" msgstr "Tidak dapat membuka file %s %s" -#: lib/utils.c:220 +#: sed/utils.c:192 +#, fuzzy, c-format +msgid "couldn't attach to %s: %s" +msgstr "tidak dapat menulis %d item ke %s: %s" + +#: sed/utils.c:247 #, c-format msgid "couldn't write %d item to %s: %s" msgid_plural "couldn't write %d items to %s: %s" msgstr[0] "tidak dapat menulis %d item ke %s: %s" -msgstr[1] "tidak dapat menulis %d item ke %s: %s" -#: lib/utils.c:235 lib/utils.c:251 +#: sed/utils.c:262 sed/utils.c:278 #, c-format msgid "read error on %s: %s" msgstr "kesalahan pembacaan pada %s: %s" -#: lib/utils.c:341 +#: sed/utils.c:368 #, fuzzy, c-format msgid "cannot rename %s: %s" msgstr "%s: tidak dapat membaca %s: %s\n" - -#~ msgid "Success" -#~ msgstr "Sukses" - -#~ msgid "No match" -#~ msgstr "Tidak cocok" - -#~ msgid "Invalid regular expression" -#~ msgstr "Reguler ekspresi tidak valid" - -#~ msgid "Invalid collation character" -#~ msgstr "Karakter kolasi tidak valid" - -#~ msgid "Trailing backslash" -#~ msgstr "Trailing backslash" - -#~ msgid "Invalid back reference" -#~ msgstr "Referensi balik tidak valid" - -#~ msgid "Unmatched [ or [^" -#~ msgstr "[ atau [^ tidak sesuai" - -#~ msgid "Unmatched ( or \\(" -#~ msgstr "( atau \\( tidak sesuai" - -#~ msgid "Unmatched \\{" -#~ msgstr "\\{ tidak sesuai" - -#~ msgid "Invalid range end" -#~ msgstr "Akhir batas tidak valid" - -#~ msgid "Memory exhausted" -#~ msgstr "Memori habis" - -#~ msgid "Invalid preceding regular expression" -#~ msgstr "Reguler ekspresi sebelumnya tidak valid" - -#~ msgid "Premature end of regular expression" -#~ msgstr "Akhir reguler ekspresi prematur" - -#~ msgid "Unmatched ) or \\)" -#~ msgstr ") atau \\) tidak sesuai" - -#~ msgid "No previous regular expression" -#~ msgstr "Tidak ada reguler ekspresi sebelumnya" diff --git a/po/it.po b/po/it.po index b07cdc9..18dd01e 100644 --- a/po/it.po +++ b/po/it.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: ssed 3.46\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:37+0200\n" +"Report-Msgid-Bugs-To: bonzini@gnu.org\n" +"POT-Creation-Date: 2006-09-26 00:06+0200\n" "PO-Revision-Date: 2000-12-21 12:44+0100\n" "Last-Translator: Paolo Bonzini \n" "Language-Team: Italian \n" @@ -321,56 +321,56 @@ msgstr "%s: espressione -e #%lu, carattere %lu: %s\n" msgid "can't find label for jump to `%s'" msgstr "impossibile trovare un'etichetta per il salto a `%s'" -#: sed/execute.c:650 +#: sed/execute.c:706 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: impossibile leggere %s: %s\n" -#: sed/execute.c:673 +#: sed/execute.c:729 #, c-format msgid "couldn't edit %s: is a terminal" msgstr "impossibile modificare il file %s: è un terminale" -#: sed/execute.c:677 +#: sed/execute.c:734 #, c-format msgid "couldn't edit %s: not a regular file" msgstr "impossibile modificare il file %s: non è un file regolare" -#: sed/execute.c:684 lib/utils.c:196 +#: sed/execute.c:741 sed/utils.c:229 #, c-format msgid "couldn't open temporary file %s: %s" msgstr "impossibile aprire il file temporaneo %s: %s" -#: sed/execute.c:1206 sed/execute.c:1387 +#: sed/execute.c:1264 sed/execute.c:1444 msgid "error in subprocess" msgstr "errore in un sottoprocesso" -#: sed/execute.c:1208 +#: sed/execute.c:1266 msgid "option `e' not supported" msgstr "opzione `e' non supportata" -#: sed/execute.c:1389 +#: sed/execute.c:1446 msgid "`e' command not supported" msgstr "comando `e' non supportato" -#: sed/execute.c:1714 +#: sed/execute.c:1786 msgid "no input files" msgstr "nessun file in ingresso" -#: sed/regexp.c:39 +#: sed/regexp.c:40 msgid "no previous regular expression" msgstr "occorre un'espressione regolare precedente" -#: sed/regexp.c:40 +#: sed/regexp.c:41 msgid "cannot specify modifiers on empty regexp" msgstr "non è possibile specificare dei modificatori per l'espressione vuota" -#: sed/regexp.c:115 +#: sed/regexp.c:121 #, c-format msgid "invalid reference \\%d on `s' command's RHS" msgstr "riferimento non valido \\%d nel secondo membro del comando `s'" -#: sed/sed.c:93 +#: sed/sed.c:98 msgid "" " -R, --regexp-perl\n" " use Perl 5's regular expressions syntax in the script.\n" @@ -378,7 +378,7 @@ msgstr "" " -R, --regexp-perl\n" " usa la sintassi Perl 5 per le espressioni regolari\n" -#: sed/sed.c:98 +#: sed/sed.c:103 #, c-format msgid "" "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" @@ -388,7 +388,7 @@ msgstr "" "file]...\n" "\n" -#: sed/sed.c:102 +#: sed/sed.c:107 #, c-format msgid "" " -n, --quiet, --silent\n" @@ -397,7 +397,7 @@ msgstr "" " -n, --quiet, --silent\n" " sopprime la stampa automatica del pattern space\n" -#: sed/sed.c:104 +#: sed/sed.c:109 #, c-format msgid "" " -e script, --expression=script\n" @@ -406,7 +406,7 @@ msgstr "" " -e script, --expression=script\n" " aggiunge lo script ai comandi da eseguire\n" -#: sed/sed.c:106 +#: sed/sed.c:111 #, c-format msgid "" " -f script-file, --file=script-file\n" @@ -417,7 +417,7 @@ msgstr "" " aggiunge il contenuto di file-script ai comandi da " "eseguire\n" -#: sed/sed.c:108 +#: sed/sed.c:113 #, c-format msgid "" " -i[SUFFIX], --in-place[=SUFFIX]\n" @@ -427,7 +427,18 @@ msgstr "" " scrive il risultato sul file originale (facendo una copia\n" " se è fornita un'estensione)\n" -#: sed/sed.c:110 +#: sed/sed.c:116 +#, c-format +msgid "" +" -b, --binary\n" +" open files in binary mode (CR+LFs are not processed " +"specially)\n" +msgstr "" +" -b, --binary\n" +" apre i file in modo binario (lasciando le sequenze CR" +"+LF se è immutate)\n" + +#: sed/sed.c:119 #, c-format msgid "" " -l N, --line-length=N\n" @@ -437,7 +448,7 @@ msgstr "" " specifica la lunghezza delle linee generate dal comando " "`l'\n" -#: sed/sed.c:112 +#: sed/sed.c:121 #, c-format msgid "" " --posix\n" @@ -446,7 +457,7 @@ msgstr "" " --posix\n" " disabilita tutte le estensioni GNU.\n" -#: sed/sed.c:114 +#: sed/sed.c:123 #, c-format msgid "" " -r, --regexp-extended\n" @@ -455,7 +466,7 @@ msgstr "" " -r, --regexp-extended\n" " usa la sintassi di `egrep' per le espressioni regolari\n" -#: sed/sed.c:117 +#: sed/sed.c:126 #, c-format msgid "" " -s, --separate\n" @@ -467,7 +478,7 @@ msgstr "" " considera i file di input come separati invece che come un\n" " unico file lungo.\n" -#: sed/sed.c:120 +#: sed/sed.c:129 #, c-format msgid "" " -u, --unbuffered\n" @@ -478,17 +489,17 @@ msgstr "" " -u, --unbuffered\n" " carica e visualizza i dati una a pezzetti piu' piccoli\n" -#: sed/sed.c:123 +#: sed/sed.c:132 #, c-format msgid " --help display this help and exit\n" msgstr " --help mostra questo aiuto ed esce\n" -#: sed/sed.c:124 +#: sed/sed.c:133 #, c-format msgid " --version output version information and exit\n" msgstr " --version stampa le informazioni sulla versione ed esce\n" -#: sed/sed.c:125 +#: sed/sed.c:134 #, c-format msgid "" "\n" @@ -507,7 +518,7 @@ msgstr "" "sono specificati file di input sarà letto lo standard input.\n" "\n" -#: sed/sed.c:131 +#: sed/sed.c:140 #, c-format msgid "" "E-mail bug reports to: %s .\n" @@ -516,12 +527,12 @@ msgstr "" "Segnalare eventuali bug a: %s .\n" "Assicurarsi di includere la parola ``%s'' nell'oggetto del messaggio.\n" -#: sed/sed.c:268 +#: sed/sed.c:285 #, c-format msgid "super-sed version %s\n" msgstr "super-sed versione %s\n" -#: sed/sed.c:269 +#: sed/sed.c:286 #, c-format msgid "" "based on GNU sed version %s\n" @@ -530,12 +541,12 @@ msgstr "" "basato su GNU sed versione %s\n" "\n" -#: sed/sed.c:271 +#: sed/sed.c:288 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed versione %s\n" -#: sed/sed.c:273 +#: sed/sed.c:290 #, c-format msgid "" "%s\n" @@ -549,29 +560,34 @@ msgstr "" "NON c'è garanzia; neppure di COMMERCIABILITA' o IDONEITA' AD UN PARTICOLARE\n" "SCOPO, nei limiti permessi dalla legge.\n" -#: lib/utils.c:98 lib/utils.c:336 +#: sed/utils.c:98 sed/utils.c:363 #, c-format msgid "cannot remove %s: %s" msgstr "impossibile eliminare %s: %s" -#: lib/utils.c:143 +#: sed/utils.c:168 #, c-format msgid "couldn't open file %s: %s" msgstr "impossibile aprire il file %s: %s" -#: lib/utils.c:220 +#: sed/utils.c:192 +#, c-format +msgid "couldn't attach to %s: %s" +msgstr "impossibile accedere a %s: %s" + +#: sed/utils.c:247 #, c-format msgid "couldn't write %d item to %s: %s" msgid_plural "couldn't write %d items to %s: %s" msgstr[0] "impossibile scrivere %d elemento su %s: %s" msgstr[1] "impossibile scrivere %d elementi su %s: %s" -#: lib/utils.c:235 lib/utils.c:251 +#: sed/utils.c:262 sed/utils.c:278 #, c-format msgid "read error on %s: %s" msgstr "errore di lettura su %s: %s" -#: lib/utils.c:341 +#: sed/utils.c:368 #, c-format msgid "cannot rename %s: %s" msgstr "impossibile rinominare %s: %s" diff --git a/po/ja.po b/po/ja.po index efc085b..ac3763e 100644 --- a/po/ja.po +++ b/po/ja.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU sed 4.1.1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:37+0200\n" +"Report-Msgid-Bugs-To: bonzini@gnu.org\n" +"POT-Creation-Date: 2006-09-26 00:06+0200\n" "PO-Revision-Date: 2005-02-01 21:02+0900\n" "Last-Translator: IIDA Yosiaki \n" "Language-Team: Japanese \n" @@ -335,56 +335,56 @@ msgstr "%s: -e ɽ msgid "can't find label for jump to `%s'" msgstr "¡Ö%s¡×¤Ø¤Î¥¸¥ã¥ó¥×¤Î¥é¥Ù¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" -#: sed/execute.c:650 +#: sed/execute.c:706 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: %s¤òÆÉ¤ß¹þ¤á¤Þ¤»¤ó: %s\n" -#: sed/execute.c:673 +#: sed/execute.c:729 #, c-format msgid "couldn't edit %s: is a terminal" msgstr "%s¤Ï¡¢ÊÔ½¸¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: üËö¤Ç¤¹" -#: sed/execute.c:677 +#: sed/execute.c:734 #, c-format msgid "couldn't edit %s: not a regular file" msgstr "%s¤Ï¡¢ÊÔ½¸¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: Ä̾ï¥Õ¥¡¥¤¥ë¤Ç¤¢¤ê¤Þ¤»¤ó" -#: sed/execute.c:684 lib/utils.c:196 +#: sed/execute.c:741 sed/utils.c:229 #, c-format msgid "couldn't open temporary file %s: %s" msgstr "°ì»þ¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó¤Ç¤·¤¿: %s: %s" -#: sed/execute.c:1206 sed/execute.c:1387 +#: sed/execute.c:1264 sed/execute.c:1444 msgid "error in subprocess" msgstr "»Ò¥×¥í¥»¥¹¤Î¥¨¥é¡¼" -#: sed/execute.c:1208 +#: sed/execute.c:1266 msgid "option `e' not supported" msgstr "¡Öe¡×¥ª¥×¥·¥ç¥ó¤Ï¡¢¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: sed/execute.c:1389 +#: sed/execute.c:1446 msgid "`e' command not supported" msgstr "¡Öe¡×¥³¥Þ¥ó¥É¤Ï¡¢¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: sed/execute.c:1714 +#: sed/execute.c:1786 msgid "no input files" msgstr "" -#: sed/regexp.c:39 +#: sed/regexp.c:40 msgid "no previous regular expression" msgstr "ľÁ°¤ÎÀµµ¬É½¸½¤¬¡¢¤¢¤ê¤Þ¤»¤ó" -#: sed/regexp.c:40 +#: sed/regexp.c:41 msgid "cannot specify modifiers on empty regexp" msgstr "½¤¾þ»Ò¤Ï¡¢¶õ¤ÎÀµµ¬É½¸½¤Ë»ØÄê¤Ç¤­¤Þ¤»¤ó" -#: sed/regexp.c:115 +#: sed/regexp.c:121 #, c-format msgid "invalid reference \\%d on `s' command's RHS" msgstr "¡Ös¡×¥³¥Þ¥ó¥É¤Î±¦Â¦¤Ë̵¸ú¤Ê\\%d¤Î»²¾È" -#: sed/sed.c:93 +#: sed/sed.c:98 msgid "" " -R, --regexp-perl\n" " use Perl 5's regular expressions syntax in the script.\n" @@ -392,7 +392,7 @@ msgstr "" " -R, --regexp-perl\n" " ¥¹¥¯¥ê¥×¥È¤ÇPerl 5¤ÎÀµµ¬É½¸½¹½Ê¸¤ò»È¤¦¡£\n" -#: sed/sed.c:98 +#: sed/sed.c:103 #, c-format msgid "" "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" @@ -401,7 +401,7 @@ msgstr "" "»ÈÍÑË¡: %s [¥ª¥×¥·¥ç¥ó]... {¥¹¥¯¥ê¥×¥È(¾¤Ë¤Ê¤±¤ì¤Ð)} [ÆþÎÏ¥Õ¥¡¥¤¥ë]...\n" "\n" -#: sed/sed.c:102 +#: sed/sed.c:107 #, fuzzy, c-format msgid "" " -n, --quiet, --silent\n" @@ -410,7 +410,7 @@ msgstr "" "-n, --quiet, --silent\n" " ¥Ñ¥¿¡¼¥ó¡¦¥¹¥Ú¡¼¥¹¤Î¼«Æ°½ÐÎϤòÍÞÀ©\n" -#: sed/sed.c:104 +#: sed/sed.c:109 #, c-format msgid "" " -e script, --expression=script\n" @@ -419,7 +419,7 @@ msgstr "" " -e ¥¹¥¯¥ê¥×¥È, --expression=¥¹¥¯¥ê¥×¥È\n" " ¼Â¹Ô¤¹¤ë¥³¥Þ¥ó¥É¤È¤·¤Æ¥¹¥¯¥ê¥×¥È¤òÄɲÃ\n" -#: sed/sed.c:106 +#: sed/sed.c:111 #, c-format msgid "" " -f script-file, --file=script-file\n" @@ -429,7 +429,7 @@ msgstr "" " -f ¥¹¥¯¥ê¥×¥È¡¦¥Õ¥¡¥¤¥ë, --file=¥¹¥¯¥ê¥×¥È¡¦¥Õ¥¡¥¤¥ë\n" " ¼Â¹Ô¤¹¤ë¥³¥Þ¥ó¥É¤È¤·¤Æ¥¹¥¯¥ê¥×¥È¡¦¥Õ¥¡¥¤¥ë¤ÎÆâÍÆ¤òÄɲÃ\n" -#: sed/sed.c:108 +#: sed/sed.c:113 #, c-format msgid "" " -i[SUFFIX], --in-place[=SUFFIX]\n" @@ -439,7 +439,18 @@ msgstr "" " ¥Õ¥¡¥¤¥ë¤ò¤½¤Î¾ì¤ÇÊÔ½¸ (³ÈÄ¥»Ò¤¬¤¢¤ì¤Ð¡¢¥Ð¥Ã¥¯¥¢¥Ã¥×¤òºî" "À®)\n" -#: sed/sed.c:110 +#: sed/sed.c:116 +#, fuzzy, c-format +msgid "" +" -b, --binary\n" +" open files in binary mode (CR+LFs are not processed " +"specially)\n" +msgstr "" +" -i[ÀÜÈø¼­], --in-place[=ÀÜÈø¼­]\n" +" ¥Õ¥¡¥¤¥ë¤ò¤½¤Î¾ì¤ÇÊÔ½¸ (³ÈÄ¥»Ò¤¬¤¢¤ì¤Ð¡¢¥Ð¥Ã¥¯¥¢¥Ã¥×¤òºî" +"À®)\n" + +#: sed/sed.c:119 #, c-format msgid "" " -l N, --line-length=N\n" @@ -448,7 +459,7 @@ msgstr "" " -l N, --line-length=N\n" " ¡Öl¡×¥³¥Þ¥ó¥ÉÍѤιÔÀÞÊÖ¤·Ä¹¤ò»ØÄê\n" -#: sed/sed.c:112 +#: sed/sed.c:121 #, c-format msgid "" " --posix\n" @@ -457,7 +468,7 @@ msgstr "" " --posix\n" " GNU³ÈÄ¥¤òÁ´Éô¶Ø»ß¡£\n" -#: sed/sed.c:114 +#: sed/sed.c:123 #, c-format msgid "" " -r, --regexp-extended\n" @@ -466,7 +477,7 @@ msgstr "" " -r, --regexp-extended\n" " ¥¹¥¯¥ê¥×¥È¤Ç³ÈÄ¥Àµµ¬É½¸½¤ò»ÈÍÑ¡£\n" -#: sed/sed.c:117 +#: sed/sed.c:126 #, c-format msgid "" " -s, --separate\n" @@ -477,7 +488,7 @@ msgstr "" " -s, --separate\n" " ¥Õ¥¡¥¤¥ë¤ò°ìÏ¢¤ÎÆþÎϤˤ»¤º¡¢ÊÌ¡¹¤Ë½èÍý¡£\n" -#: sed/sed.c:120 +#: sed/sed.c:129 #, c-format msgid "" " -u, --unbuffered\n" @@ -489,17 +500,17 @@ msgstr "" " ÆþÎÏ¥Õ¥¡¥¤¥ë¤«¤é¶Ë¾®¤Î¥Ç¡¼¥¿¤ò¼è¤ê¹þ¤ß¡¢\n" " ¤Á¤ç¤¯¤Á¤ç¤¯½ÐÎϥХåե¡¡¼¤ËÁݽФ·\n" -#: sed/sed.c:123 +#: sed/sed.c:132 #, c-format msgid " --help display this help and exit\n" msgstr " --help ¤³¤ÎÀâÌÀ¤òɽ¼¨¤·¤Æ½ªÎ»\n" -#: sed/sed.c:124 +#: sed/sed.c:133 #, c-format msgid " --version output version information and exit\n" msgstr " --version ¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤òɽ¼¨¤·¤Æ½ªÎ»\n" -#: sed/sed.c:125 +#: sed/sed.c:134 #, c-format msgid "" "\n" @@ -515,7 +526,7 @@ msgstr "" "¥¤¥ë̾¤È¤Ê¤ê¤Þ¤¹¡£ÆþÎÏ¥Õ¥¡¥¤¥ë¤Î»ØÄ꤬¤Ê¤¤¤È¡¢É¸½àÆþÎϤòÆÉ¤ß¹þ¤ß¤Þ¤¹¡£\n" "\n" -#: sed/sed.c:131 +#: sed/sed.c:140 #, c-format msgid "" "E-mail bug reports to: %s .\n" @@ -524,12 +535,12 @@ msgstr "" "ÅŻҥ᡼¥ë¤Ë¤è¤ë¥Ð¥°Êó¹ð¤Î°¸Àè: %s\n" "Êó¹ð¤ÎºÝ¡¢¡ÈSubject:¡É¥Õ¥£¡¼¥ë¥É¤Î¤É¤³¤«¤Ë¡È%s¡É¤òÆþ¤ì¤Æ¤¯¤À¤µ¤¤¡£\n" -#: sed/sed.c:268 +#: sed/sed.c:285 #, c-format msgid "super-sed version %s\n" msgstr "super-sed %sÈÇ\n" -#: sed/sed.c:269 +#: sed/sed.c:286 #, c-format msgid "" "based on GNU sed version %s\n" @@ -538,14 +549,14 @@ msgstr "" "¸¶ºîGNU sed %sÈÇ\n" "\n" -#: sed/sed.c:271 +#: sed/sed.c:288 #, c-format msgid "GNU sed version %s\n" msgstr "" "GNU sed %sÈÇ\n" "\n" -#: sed/sed.c:273 +#: sed/sed.c:290 #, c-format msgid "" "%s\n" @@ -564,77 +575,33 @@ msgstr "" "¤¤¡£ÊݾڤϰìÀÚ¤¢¤ê¤Þ¤»¤ó¡£±ÄÍøÌÜŪ¤äË¡¤ÇÄê¤á¤é¤ì¤¿ÈÏ°Ï¤Ç¤ÎÆÃÄêÌÜŪ¤Î¤¿¤á\n" "¤ÎŬ¹çÀ­¤â¤¢¤ê¤Þ¤»¤ó¡£\n" -#: lib/utils.c:98 lib/utils.c:336 +#: sed/utils.c:98 sed/utils.c:363 #, c-format msgid "cannot remove %s: %s" msgstr "%s¤òºï½ü¤Ç¤­¤Þ¤»¤ó: %s" -#: lib/utils.c:143 +#: sed/utils.c:168 #, c-format msgid "couldn't open file %s: %s" msgstr "¥Õ¥¡¥¤¥ë%s¤ò³«¤±¤Þ¤»¤ó¤Ç¤·¤¿: %s" -#: lib/utils.c:220 +#: sed/utils.c:192 +#, fuzzy, c-format +msgid "couldn't attach to %s: %s" +msgstr "%d¸Ä¤Î¥¢¥¤¥Æ¥à¤ò%s¤Ø½ñ¤­¹þ¤á¤Þ¤»¤ó¤Ç¤·¤¿: %s" + +#: sed/utils.c:247 #, c-format msgid "couldn't write %d item to %s: %s" msgid_plural "couldn't write %d items to %s: %s" msgstr[0] "%d¸Ä¤Î¥¢¥¤¥Æ¥à¤ò%s¤Ø½ñ¤­¹þ¤á¤Þ¤»¤ó¤Ç¤·¤¿: %s" -msgstr[1] "%d¸Ä¤Î¥¢¥¤¥Æ¥à¤ò%s¤Ø½ñ¤­¹þ¤á¤Þ¤»¤ó¤Ç¤·¤¿: %s" -#: lib/utils.c:235 lib/utils.c:251 +#: sed/utils.c:262 sed/utils.c:278 #, c-format msgid "read error on %s: %s" msgstr "%s¤ÎÆÉ¹þ¤ß¥¨¥é¡¼: %s" -#: lib/utils.c:341 +#: sed/utils.c:368 #, c-format msgid "cannot rename %s: %s" msgstr "%s¤Î̾Á°¤òÊѹ¹¤Ç¤­¤Þ¤»¤ó: %s" - -#~ msgid "Success" -#~ msgstr "À®¸ù" - -#~ msgid "No match" -#~ msgstr "¾È¹ç¤·¤Þ¤»¤ó" - -#~ msgid "Invalid regular expression" -#~ msgstr "̵¸ú¤ÊÀµµ¬É½¸½" - -#~ msgid "Invalid collation character" -#~ msgstr "̵¸ú¤Ê¹»¹çʸ»ú" - -#~ msgid "Trailing backslash" -#~ msgstr "¸å³¤ÎµÕ¥¹¥é¥Ã¥·¥å" - -#~ msgid "Invalid back reference" -#~ msgstr "̵¸ú¤ÊµÕ»²¾È" - -#~ msgid "Unmatched [ or [^" -#~ msgstr "[¤ä[^¤¬Äà¹ç¤¤¤Þ¤»¤ó" - -#~ msgid "Unmatched ( or \\(" -#~ msgstr "(¤ä\\(¤¬Äà¹ç¤¤¤Þ¤»¤ó" - -#~ msgid "Unmatched \\{" -#~ msgstr "\\{¤¬Äà¹ç¤¤¤Þ¤»¤ó" - -#~ msgid "Invalid content of \\{\\}" -#~ msgstr "̵¸ú¤Ê\\{\\}¤ÎÆâÍÆ\"" - -#~ msgid "Invalid range end" -#~ msgstr "̵¸ú¤ÊÈϰϤνªÃ¼" - -#~ msgid "Memory exhausted" -#~ msgstr "¥á¥â¥ê¡¼¤¬Â­¤ê¤Þ¤»¤ó" - -#~ msgid "Invalid preceding regular expression" -#~ msgstr "̵¸ú¤ÊÀè¹ÔÀµµ¬É½¸½" - -#~ msgid "Premature end of regular expression" -#~ msgstr "Áá²á¤®¤ëÀµµ¬É½¸½½ªÃ¼" - -#~ msgid "Unmatched ) or \\)" -#~ msgstr "Äà¤ê¹ç¤ï¤Ê¤¤)¤ä\\)" - -#~ msgid "No previous regular expression" -#~ msgstr "ľÁ°¤ÎÀµµ¬É½¸½¤¬¡¢¤¢¤ê¤Þ¤»¤ó" diff --git a/po/ko.po b/po/ko.po index 7b50480..854e9c3 100644 --- a/po/ko.po +++ b/po/ko.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU sed 3.02.80\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:37+0200\n" +"Report-Msgid-Bugs-To: bonzini@gnu.org\n" +"POT-Creation-Date: 2006-09-26 00:06+0200\n" "PO-Revision-Date: 2001-10-12 17:26+0900\n" "Last-Translator: Jong-Hoon Ryu \n" "Language-Team: Korean \n" @@ -342,83 +342,83 @@ msgstr "%s: -e expression #%lu, char %lu: %s\n" msgid "can't find label for jump to `%s'" msgstr "`%s' (À¸)·Î Á¡ÇÁÇÒ ·¹À̺íÀ» ãÀ» ¼ö ¾ø½À´Ï´Ù" -#: sed/execute.c:650 +#: sed/execute.c:706 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: %s (À»)¸¦ ÀÐÀ» ¼ö ¾øÀ½: %s\n" -#: sed/execute.c:673 +#: sed/execute.c:729 #, fuzzy, c-format msgid "couldn't edit %s: is a terminal" msgstr "%s ÆÄÀÏÀ» ¿­ ¼ö ¾ø½À´Ï´Ù" -#: sed/execute.c:677 +#: sed/execute.c:734 #, c-format msgid "couldn't edit %s: not a regular file" msgstr "" -#: sed/execute.c:684 lib/utils.c:196 +#: sed/execute.c:741 sed/utils.c:229 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "%s ÆÄÀÏÀ» ¿­ ¼ö ¾ø½À´Ï´Ù" -#: sed/execute.c:1206 sed/execute.c:1387 +#: sed/execute.c:1264 sed/execute.c:1444 msgid "error in subprocess" msgstr "" -#: sed/execute.c:1208 +#: sed/execute.c:1266 msgid "option `e' not supported" msgstr "" -#: sed/execute.c:1389 +#: sed/execute.c:1446 msgid "`e' command not supported" msgstr "" -#: sed/execute.c:1714 +#: sed/execute.c:1786 msgid "no input files" msgstr "" -#: sed/regexp.c:39 +#: sed/regexp.c:40 msgid "no previous regular expression" msgstr "" -#: sed/regexp.c:40 +#: sed/regexp.c:41 msgid "cannot specify modifiers on empty regexp" msgstr "" -#: sed/regexp.c:115 +#: sed/regexp.c:121 #, c-format msgid "invalid reference \\%d on `s' command's RHS" msgstr "" -#: sed/sed.c:93 +#: sed/sed.c:98 msgid "" " -R, --regexp-perl\n" " use Perl 5's regular expressions syntax in the script.\n" msgstr "" -#: sed/sed.c:98 +#: sed/sed.c:103 #, c-format msgid "" "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" "\n" msgstr "" -#: sed/sed.c:102 +#: sed/sed.c:107 #, c-format msgid "" " -n, --quiet, --silent\n" " suppress automatic printing of pattern space\n" msgstr "" -#: sed/sed.c:104 +#: sed/sed.c:109 #, c-format msgid "" " -e script, --expression=script\n" " add the script to the commands to be executed\n" msgstr "" -#: sed/sed.c:106 +#: sed/sed.c:111 #, c-format msgid "" " -f script-file, --file=script-file\n" @@ -426,35 +426,43 @@ msgid "" "executed\n" msgstr "" -#: sed/sed.c:108 +#: sed/sed.c:113 #, c-format msgid "" " -i[SUFFIX], --in-place[=SUFFIX]\n" " edit files in place (makes backup if extension supplied)\n" msgstr "" -#: sed/sed.c:110 +#: sed/sed.c:116 +#, c-format +msgid "" +" -b, --binary\n" +" open files in binary mode (CR+LFs are not processed " +"specially)\n" +msgstr "" + +#: sed/sed.c:119 #, c-format msgid "" " -l N, --line-length=N\n" " specify the desired line-wrap length for the `l' command\n" msgstr "" -#: sed/sed.c:112 +#: sed/sed.c:121 #, c-format msgid "" " --posix\n" " disable all GNU extensions.\n" msgstr "" -#: sed/sed.c:114 +#: sed/sed.c:123 #, c-format msgid "" " -r, --regexp-extended\n" " use extended regular expressions in the script.\n" msgstr "" -#: sed/sed.c:117 +#: sed/sed.c:126 #, c-format msgid "" " -s, --separate\n" @@ -463,7 +471,7 @@ msgid "" " long stream.\n" msgstr "" -#: sed/sed.c:120 +#: sed/sed.c:129 #, c-format msgid "" " -u, --unbuffered\n" @@ -472,17 +480,17 @@ msgid "" " the output buffers more often\n" msgstr "" -#: sed/sed.c:123 +#: sed/sed.c:132 #, c-format msgid " --help display this help and exit\n" msgstr "" -#: sed/sed.c:124 +#: sed/sed.c:133 #, c-format msgid " --version output version information and exit\n" msgstr "" -#: sed/sed.c:125 +#: sed/sed.c:134 #, c-format msgid "" "\n" @@ -493,7 +501,7 @@ msgid "" "\n" msgstr "" -#: sed/sed.c:131 +#: sed/sed.c:140 #, c-format msgid "" "E-mail bug reports to: %s .\n" @@ -502,24 +510,24 @@ msgstr "" "¹ö±×¸¦ º¸°íÇÒ E-mail ÁÖ¼Ò: %s .\n" "``Subject:'' Ç׸ñ¿¡ ¹Ýµå½Ã ``%s'' ´Ü¾î¸¦ Æ÷ÇÔÇØ Áֽñ⠹ٶø´Ï´Ù.\n" -#: sed/sed.c:268 +#: sed/sed.c:285 #, c-format msgid "super-sed version %s\n" msgstr "" -#: sed/sed.c:269 +#: sed/sed.c:286 #, c-format msgid "" "based on GNU sed version %s\n" "\n" msgstr "" -#: sed/sed.c:271 +#: sed/sed.c:288 #, c-format msgid "GNU sed version %s\n" msgstr "" -#: sed/sed.c:273 +#: sed/sed.c:290 #, c-format msgid "" "%s\n" @@ -532,45 +540,34 @@ msgstr "" "Âü°íÇϽñ⠹ٶø´Ï´Ù. ÀÌ ÇÁ·Î±×·¥Àº ¹ý¿¡ ÀúÃ˵ÇÁö ¾Ê´Â ¹üÀ§¿¡¼­ »ó¾÷ÀûÀ̳ª\n" "Ư¼ö ¸ñÀûÀ¸·Î »ç¿ëµÉ °æ¿ì¸¦ Æ÷ÇÔÇÑ ¾î¶°ÇÑ °æ¿ì¿¡µµ º¸ÁõÇÏÁö ¾Ê½À´Ï´Ù.\n" -#: lib/utils.c:98 lib/utils.c:336 +#: sed/utils.c:98 sed/utils.c:363 #, fuzzy, c-format msgid "cannot remove %s: %s" msgstr "%s: %s (À»)¸¦ ÀÐÀ» ¼ö ¾øÀ½: %s\n" -#: lib/utils.c:143 +#: sed/utils.c:168 #, fuzzy, c-format msgid "couldn't open file %s: %s" msgstr "%s ÆÄÀÏÀ» ¿­ ¼ö ¾ø½À´Ï´Ù" -#: lib/utils.c:220 +#: sed/utils.c:192 +#, fuzzy, c-format +msgid "couldn't attach to %s: %s" +msgstr "%2$s ¿¡ %1$d Ç׸ñ(item)À» ±â·ÏÇÒ ¼ö ¾ø½À´Ï´Ù: %3$s" + +#: sed/utils.c:247 #, fuzzy, c-format msgid "couldn't write %d item to %s: %s" msgid_plural "couldn't write %d items to %s: %s" msgstr[0] "%2$s ¿¡ %1$d Ç׸ñ(item)À» ±â·ÏÇÒ ¼ö ¾ø½À´Ï´Ù: %3$s" msgstr[1] "%2$s ¿¡ %1$d Ç׸ñ(item)À» ±â·ÏÇÒ ¼ö ¾ø½À´Ï´Ù: %3$s" -#: lib/utils.c:235 lib/utils.c:251 +#: sed/utils.c:262 sed/utils.c:278 #, c-format msgid "read error on %s: %s" msgstr "%s ÀÇ ³»¿ë Àб⠿À·ù: %s" -#: lib/utils.c:341 +#: sed/utils.c:368 #, fuzzy, c-format msgid "cannot rename %s: %s" msgstr "%s: %s (À»)¸¦ ÀÐÀ» ¼ö ¾øÀ½: %s\n" - -#, fuzzy -#~ msgid "Unmatched [ or [^" -#~ msgstr "`{' °¡ ÀÏÄ¡ÇÏÁö ¾Ê½À´Ï´Ù" - -#, fuzzy -#~ msgid "Unmatched ( or \\(" -#~ msgstr "`{' °¡ ÀÏÄ¡ÇÏÁö ¾Ê½À´Ï´Ù" - -#, fuzzy -#~ msgid "Unmatched \\{" -#~ msgstr "`{' °¡ ÀÏÄ¡ÇÏÁö ¾Ê½À´Ï´Ù" - -#, fuzzy -#~ msgid "Unmatched ) or \\)" -#~ msgstr "`{' °¡ ÀÏÄ¡ÇÏÁö ¾Ê½À´Ï´Ù" diff --git a/po/nl.po b/po/nl.po index 565a10d..00c361e 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.9\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:37+0200\n" +"Report-Msgid-Bugs-To: bonzini@gnu.org\n" +"POT-Creation-Date: 2006-09-26 00:06+0200\n" "PO-Revision-Date: 2004-04-09 21:39+0200\n" "Last-Translator: Elros Cyriatan \n" "Language-Team: Dutch \n" @@ -341,58 +341,58 @@ msgstr "%s: -e uitdrukking #%lu, teken %lu: %s\n" msgid "can't find label for jump to `%s'" msgstr "Kan label voor sprong naar `%s' niet vinden" -#: sed/execute.c:650 +#: sed/execute.c:706 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: kan %s niet lezen: %s\n" -#: sed/execute.c:673 +#: sed/execute.c:729 #, fuzzy, c-format msgid "couldn't edit %s: is a terminal" msgstr "Kon bestand %s niet openen: %s" -#: sed/execute.c:677 +#: sed/execute.c:734 #, c-format msgid "couldn't edit %s: not a regular file" msgstr "" -#: sed/execute.c:684 lib/utils.c:196 +#: sed/execute.c:741 sed/utils.c:229 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "Kon tijdelijk bestand %s niet openen: %s" -#: sed/execute.c:1206 sed/execute.c:1387 +#: sed/execute.c:1264 sed/execute.c:1444 msgid "error in subprocess" msgstr "fout in deelproces" -#: sed/execute.c:1208 +#: sed/execute.c:1266 msgid "option `e' not supported" msgstr "optie `e' niet ondersteund" -#: sed/execute.c:1389 +#: sed/execute.c:1446 msgid "`e' command not supported" msgstr "`e'-opdracht niet ondersteund" -#: sed/execute.c:1714 +#: sed/execute.c:1786 msgid "no input files" msgstr "" -#: sed/regexp.c:39 +#: sed/regexp.c:40 #, fuzzy msgid "no previous regular expression" msgstr "Geen eerdere reguliere uitdrukking" -#: sed/regexp.c:40 +#: sed/regexp.c:41 #, fuzzy msgid "cannot specify modifiers on empty regexp" msgstr "Kan geen veranderaars opgeven op lege reguliere uitdrukking" -#: sed/regexp.c:115 +#: sed/regexp.c:121 #, fuzzy, c-format msgid "invalid reference \\%d on `s' command's RHS" msgstr "Ongeldige verwijzing \\%d op rechterhandzijde van `s'-opdracht" -#: sed/sed.c:93 +#: sed/sed.c:98 msgid "" " -R, --regexp-perl\n" " use Perl 5's regular expressions syntax in the script.\n" @@ -401,28 +401,28 @@ msgstr "" " de syntaxis van Perl 5 voor reguliere uitdrukkingen " "gebruiken in het script.\n" -#: sed/sed.c:98 +#: sed/sed.c:103 #, c-format msgid "" "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" "\n" msgstr "" -#: sed/sed.c:102 +#: sed/sed.c:107 #, c-format msgid "" " -n, --quiet, --silent\n" " suppress automatic printing of pattern space\n" msgstr "" -#: sed/sed.c:104 +#: sed/sed.c:109 #, c-format msgid "" " -e script, --expression=script\n" " add the script to the commands to be executed\n" msgstr "" -#: sed/sed.c:106 +#: sed/sed.c:111 #, c-format msgid "" " -f script-file, --file=script-file\n" @@ -430,28 +430,39 @@ msgid "" "executed\n" msgstr "" -#: sed/sed.c:108 +#: sed/sed.c:113 #, c-format msgid "" " -i[SUFFIX], --in-place[=SUFFIX]\n" " edit files in place (makes backup if extension supplied)\n" msgstr "" -#: sed/sed.c:110 +#: sed/sed.c:116 +#, fuzzy, c-format +msgid "" +" -b, --binary\n" +" open files in binary mode (CR+LFs are not processed " +"specially)\n" +msgstr "" +" -i[ACHTERVOEGSEL], --in-place[=ACHTERVOEGSEL]\n" +" bestanden ter plekke bewerken (maakt reservekopie als " +"extensie gegeven)\n" + +#: sed/sed.c:119 #, c-format msgid "" " -l N, --line-length=N\n" " specify the desired line-wrap length for the `l' command\n" msgstr "" -#: sed/sed.c:112 +#: sed/sed.c:121 #, c-format msgid "" " --posix\n" " disable all GNU extensions.\n" msgstr "" -#: sed/sed.c:114 +#: sed/sed.c:123 #, fuzzy, c-format msgid "" " -r, --regexp-extended\n" @@ -461,7 +472,7 @@ msgstr "" " de syntaxis van Perl 5 voor reguliere uitdrukkingen " "gebruiken in het script.\n" -#: sed/sed.c:117 +#: sed/sed.c:126 #, c-format msgid "" " -s, --separate\n" @@ -470,7 +481,7 @@ msgid "" " long stream.\n" msgstr "" -#: sed/sed.c:120 +#: sed/sed.c:129 #, c-format msgid "" " -u, --unbuffered\n" @@ -479,17 +490,17 @@ msgid "" " the output buffers more often\n" msgstr "" -#: sed/sed.c:123 +#: sed/sed.c:132 #, c-format msgid " --help display this help and exit\n" msgstr "" -#: sed/sed.c:124 +#: sed/sed.c:133 #, c-format msgid " --version output version information and exit\n" msgstr "" -#: sed/sed.c:125 +#: sed/sed.c:134 #, c-format msgid "" "\n" @@ -506,7 +517,7 @@ msgstr "" "invoerbestanden opgegeven zijn, wordt standaardinvoer gelezen.\n" "\n" -#: sed/sed.c:131 +#: sed/sed.c:140 #, c-format msgid "" "E-mail bug reports to: %s .\n" @@ -516,12 +527,12 @@ msgstr "" "Zorg ervoor dat het woord ``%s'' ergens in het ``Onderwerp:''-veld staat.\n" "Rapporteer fouten in de vertalingen bij .\n" -#: sed/sed.c:268 +#: sed/sed.c:285 #, c-format msgid "super-sed version %s\n" msgstr "super-sed versie %s\n" -#: sed/sed.c:269 +#: sed/sed.c:286 #, c-format msgid "" "based on GNU sed version %s\n" @@ -530,12 +541,12 @@ msgstr "" "gebaseerd op GNU sed versie %s\n" "\n" -#: sed/sed.c:271 +#: sed/sed.c:288 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed versie %s\n" -#: sed/sed.c:273 +#: sed/sed.c:290 #, c-format msgid "" "%s\n" @@ -548,74 +559,34 @@ msgstr "" "garantie; zelfs niet voor VERHANDELBAARHEID of GESCHIKTHEID VOOR\n" "EEN BEPAALD DOEL, tot het uiterste dat door de wet wordt toegestaan.\n" -#: lib/utils.c:98 lib/utils.c:336 +#: sed/utils.c:98 sed/utils.c:363 #, c-format msgid "cannot remove %s: %s" msgstr "kan %s niet verwijderen: %s" -#: lib/utils.c:143 +#: sed/utils.c:168 #, c-format msgid "couldn't open file %s: %s" msgstr "kon bestand %s niet openen: %s" -#: lib/utils.c:220 +#: sed/utils.c:192 +#, fuzzy, c-format +msgid "couldn't attach to %s: %s" +msgstr "kon niet %d item naar %s schrijven: %s" + +#: sed/utils.c:247 #, c-format msgid "couldn't write %d item to %s: %s" msgid_plural "couldn't write %d items to %s: %s" msgstr[0] "kon niet %d item naar %s schrijven: %s" msgstr[1] "kon niet %d items naar %s schrijven: %s" -#: lib/utils.c:235 lib/utils.c:251 +#: sed/utils.c:262 sed/utils.c:278 #, c-format msgid "read error on %s: %s" msgstr "leesfout op %s: %s" -#: lib/utils.c:341 +#: sed/utils.c:368 #, fuzzy, c-format msgid "cannot rename %s: %s" msgstr "%s: kan %s niet lezen: %s\n" - -#~ msgid "Success" -#~ msgstr "Succes" - -#~ msgid "No match" -#~ msgstr "Geen overeenkomst" - -#~ msgid "Invalid regular expression" -#~ msgstr "Ongeldige reguliere uitdrukking" - -#~ msgid "Invalid collation character" -#~ msgstr "Ongeldig sorteerteken" - -#~ msgid "Trailing backslash" -#~ msgstr "Backslash aan het einde" - -#~ msgid "Invalid back reference" -#~ msgstr "Ongeldige terugverwijzing" - -#~ msgid "Unmatched [ or [^" -#~ msgstr "Niet-overeenkomende [ of [^" - -#~ msgid "Unmatched ( or \\(" -#~ msgstr "Niet-overeenkomende ( of \\(" - -#~ msgid "Unmatched \\{" -#~ msgstr "Niet-overeenkomende \\{" - -#~ msgid "Invalid range end" -#~ msgstr "Ongeldig bereikeinde" - -#~ msgid "Memory exhausted" -#~ msgstr "Geheugen uitgeput" - -#~ msgid "Invalid preceding regular expression" -#~ msgstr "Ongeldige voorafgaande reguliere uitdrukking" - -#~ msgid "Premature end of regular expression" -#~ msgstr "Vroegtijdig einde van reguliere uitdrukking" - -#~ msgid "Unmatched ) or \\)" -#~ msgstr "Niet-overeenkomende ) of \\)" - -#~ msgid "No previous regular expression" -#~ msgstr "Geen eerdere reguliere uitdrukking" diff --git a/po/pl.po b/po/pl.po index 1034d2c..b9dced5 100644 --- a/po/pl.po +++ b/po/pl.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.1.1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:37+0200\n" +"Report-Msgid-Bugs-To: bonzini@gnu.org\n" +"POT-Creation-Date: 2006-09-26 00:06+0200\n" "PO-Revision-Date: 2004-07-08 19:58+0200\n" "Last-Translator: Wojciech Polak \n" "Language-Team: Polish \n" @@ -334,56 +334,56 @@ msgstr "%s: -e wyra msgid "can't find label for jump to `%s'" msgstr "nie mo¿na znale¼æ etykiety dla skoku do `%s'" -#: sed/execute.c:650 +#: sed/execute.c:706 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: nie mo¿na odczytaæ %s: %s\n" -#: sed/execute.c:673 +#: sed/execute.c:729 #, c-format msgid "couldn't edit %s: is a terminal" msgstr "nie mo¿na edytowaæ %s: plik jest terminalem" -#: sed/execute.c:677 +#: sed/execute.c:734 #, c-format msgid "couldn't edit %s: not a regular file" msgstr "nie mo¿na edytowaæ %s: to nie jest regularny plik" -#: sed/execute.c:684 lib/utils.c:196 +#: sed/execute.c:741 sed/utils.c:229 #, c-format msgid "couldn't open temporary file %s: %s" msgstr "nie mo¿na otworzyæ tymczasowego pliku %s: %s" -#: sed/execute.c:1206 sed/execute.c:1387 +#: sed/execute.c:1264 sed/execute.c:1444 msgid "error in subprocess" msgstr "b³±d w podprocesie" -#: sed/execute.c:1208 +#: sed/execute.c:1266 msgid "option `e' not supported" msgstr "opcja `e' nie jest wspierana" -#: sed/execute.c:1389 +#: sed/execute.c:1446 msgid "`e' command not supported" msgstr "polecenie `e' nie jest wspierane" -#: sed/execute.c:1714 +#: sed/execute.c:1786 msgid "no input files" msgstr "" -#: sed/regexp.c:39 +#: sed/regexp.c:40 msgid "no previous regular expression" msgstr "brak poprzedniego wyra¿enia regularnego" -#: sed/regexp.c:40 +#: sed/regexp.c:41 msgid "cannot specify modifiers on empty regexp" msgstr "nie mo¿na wyszczególniæ modyfikatorów w pustym wyra¿eniu regularnym" -#: sed/regexp.c:115 +#: sed/regexp.c:121 #, c-format msgid "invalid reference \\%d on `s' command's RHS" msgstr "nieprawid³owe odwo³anie \\%d po prawej stronie polecenia `s'" -#: sed/sed.c:93 +#: sed/sed.c:98 msgid "" " -R, --regexp-perl\n" " use Perl 5's regular expressions syntax in the script.\n" @@ -392,7 +392,7 @@ msgstr "" " u¿ywa w skrypcie wyra¿enia regularne zgodne ze sk³adni± " "Perl 5.\n" -#: sed/sed.c:98 +#: sed/sed.c:103 #, c-format msgid "" "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" @@ -402,7 +402,7 @@ msgstr "" "wej¶ciowy]...\n" "\n" -#: sed/sed.c:102 +#: sed/sed.c:107 #, c-format msgid "" " -n, --quiet, --silent\n" @@ -411,7 +411,7 @@ msgstr "" " -n, --quiet, --silent\n" " powstrzymuje automatyczne drukowanie przetwarzanych linii.\n" -#: sed/sed.c:104 +#: sed/sed.c:109 #, c-format msgid "" " -e script, --expression=script\n" @@ -420,7 +420,7 @@ msgstr "" " -e skrypt, --expression=skrypt\n" " dodaje skrypt do poleceñ, które maj± byæ wykonane.\n" -#: sed/sed.c:106 +#: sed/sed.c:111 #, c-format msgid "" " -f script-file, --file=script-file\n" @@ -431,7 +431,7 @@ msgstr "" " dodaje zawarto¶æ pliku skryptowego do poleceñ,\n" " które maj± byæ wykonane.\n" -#: sed/sed.c:108 +#: sed/sed.c:113 #, c-format msgid "" " -i[SUFFIX], --in-place[=SUFFIX]\n" @@ -441,7 +441,18 @@ msgstr "" " edytuje pliki \"w miejscu\" (tworzy kopie zapasowe\n" " je¿eli zosta³o podane rozszerzenie).\n" -#: sed/sed.c:110 +#: sed/sed.c:116 +#, fuzzy, c-format +msgid "" +" -b, --binary\n" +" open files in binary mode (CR+LFs are not processed " +"specially)\n" +msgstr "" +" -i[rozszerzenie], --in-place[=rozszerzenie]\n" +" edytuje pliki \"w miejscu\" (tworzy kopie zapasowe\n" +" je¿eli zosta³o podane rozszerzenie).\n" + +#: sed/sed.c:119 #, c-format msgid "" " -l N, --line-length=N\n" @@ -450,7 +461,7 @@ msgstr "" " -l N, --line-length=N\n" " ustala po¿±dan± d³ugo¶æ ³amanych linii dla polecenia `l'.\n" -#: sed/sed.c:112 +#: sed/sed.c:121 #, c-format msgid "" " --posix\n" @@ -459,7 +470,7 @@ msgstr "" " --posix\n" " wy³±cza wszystkie rozszerzenia GNU.\n" -#: sed/sed.c:114 +#: sed/sed.c:123 #, c-format msgid "" " -r, --regexp-extended\n" @@ -468,7 +479,7 @@ msgstr "" " -r, --regexp-extended\n" " u¿ywa w skrypcie rozszerzonych wyra¿eñ regularnych.\n" -#: sed/sed.c:117 +#: sed/sed.c:126 #, c-format msgid "" " -s, --separate\n" @@ -480,7 +491,7 @@ msgstr "" " traktuje pliki jako oddzielne, a nie jako pojedynczy,\n" " d³ugi i ci±g³y strumieñ.\n" -#: sed/sed.c:120 +#: sed/sed.c:129 #, c-format msgid "" " -u, --unbuffered\n" @@ -492,17 +503,17 @@ msgstr "" " ³aduje minimaln± ilo¶æ danych z plików wej¶ciowych\n" " i czê¶ciej oczyszcza bufor wyj¶ciowy.\n" -#: sed/sed.c:123 +#: sed/sed.c:132 #, c-format msgid " --help display this help and exit\n" msgstr " --help wy¶wietla tê oto pomoc i koñczy pracê.\n" -#: sed/sed.c:124 +#: sed/sed.c:133 #, c-format msgid " --version output version information and exit\n" msgstr " --version wy¶wietla numer wersji i koñczy pracê.\n" -#: sed/sed.c:125 +#: sed/sed.c:134 #, c-format msgid "" "\n" @@ -520,7 +531,7 @@ msgstr "" "¿adne pliki wej¶ciowe, to wtedy odczytane zostanie standardowe wej¶cie.\n" "\n" -#: sed/sed.c:131 +#: sed/sed.c:140 #, c-format msgid "" "E-mail bug reports to: %s .\n" @@ -529,12 +540,12 @@ msgstr "" "Ewentualne b³êdy prosimy zg³aszaæ na adres: %s\n" "W tym celu proszê dodaæ s³owo ``%s'' do tematu listu.\n" -#: sed/sed.c:268 +#: sed/sed.c:285 #, c-format msgid "super-sed version %s\n" msgstr "super-sed wersja %s\n" -#: sed/sed.c:269 +#: sed/sed.c:286 #, c-format msgid "" "based on GNU sed version %s\n" @@ -543,12 +554,12 @@ msgstr "" "na podstawie wersji GNU sed %s\n" "\n" -#: sed/sed.c:271 +#: sed/sed.c:288 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed wersja %s\n" -#: sed/sed.c:273 +#: sed/sed.c:290 #, c-format msgid "" "%s\n" @@ -562,17 +573,22 @@ msgstr "" "w ¼ród³ach. Autorzy nie daj± ¯ADNYCH gwarancji, w tym równie¿ gwarancji\n" "PRZYDATNO¦CI DO SPRZEDA¯Y LUB DO KONKRETNYCH CELÓW.\n" -#: lib/utils.c:98 lib/utils.c:336 +#: sed/utils.c:98 sed/utils.c:363 #, c-format msgid "cannot remove %s: %s" msgstr "nie mo¿na usun±æ %s: %s" -#: lib/utils.c:143 +#: sed/utils.c:168 #, c-format msgid "couldn't open file %s: %s" msgstr "nie mo¿na otworzyæ pliku %s: %s" -#: lib/utils.c:220 +#: sed/utils.c:192 +#, fuzzy, c-format +msgid "couldn't attach to %s: %s" +msgstr "nie mo¿na zapisaæ %d elementu do %s: %s" + +#: sed/utils.c:247 #, c-format msgid "couldn't write %d item to %s: %s" msgid_plural "couldn't write %d items to %s: %s" @@ -580,57 +596,12 @@ msgstr[0] "nie mo msgstr[1] "nie mo¿na zapisaæ %d elementów do %s: %s" msgstr[2] "nie mo¿na zapisaæ %d elementów do %s: %s" -#: lib/utils.c:235 lib/utils.c:251 +#: sed/utils.c:262 sed/utils.c:278 #, c-format msgid "read error on %s: %s" msgstr "b³±d odczytu w %s: %s" -#: lib/utils.c:341 +#: sed/utils.c:368 #, c-format msgid "cannot rename %s: %s" msgstr "nie mo¿na zmieniæ nazwy %s: %s" - -#~ msgid "Success" -#~ msgstr "Sukces" - -#~ msgid "No match" -#~ msgstr "Brak dopasowania" - -#~ msgid "Invalid regular expression" -#~ msgstr "Nieprawid³owe wyra¿enie regularne" - -#~ msgid "Invalid collation character" -#~ msgstr "Nieprawid³owy znak porównania" - -#~ msgid "Trailing backslash" -#~ msgstr "Koñcowy znak backslash" - -#~ msgid "Invalid back reference" -#~ msgstr "Nieprawid³owe odwo³anie wsteczne" - -#~ msgid "Unmatched [ or [^" -#~ msgstr "Niedopasowany znak [ lub [^" - -#~ msgid "Unmatched ( or \\(" -#~ msgstr "Niedopasowany znak ( lub \\(" - -#~ msgid "Unmatched \\{" -#~ msgstr "Niedopasowany znak \\{" - -#~ msgid "Invalid range end" -#~ msgstr "Nieprawid³owy koniec zakresu" - -#~ msgid "Memory exhausted" -#~ msgstr "Pamiêæ wyczerpana" - -#~ msgid "Invalid preceding regular expression" -#~ msgstr "Nieprawid³owe poprzedzaj±ce wyra¿enie regularne" - -#~ msgid "Premature end of regular expression" -#~ msgstr "Przedwczesny koniec wyra¿enia regularnego" - -#~ msgid "Unmatched ) or \\)" -#~ msgstr "Niedopasowany znak ) lub \\)" - -#~ msgid "No previous regular expression" -#~ msgstr "Brak poprzedniego wyra¿enia regularnego" diff --git a/po/pt_BR.po b/po/pt_BR.po index 955e63d..3e1790b 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:37+0200\n" +"Report-Msgid-Bugs-To: bonzini@gnu.org\n" +"POT-Creation-Date: 2006-09-26 00:06+0200\n" "PO-Revision-Date: 2002-11-08 17:44-0300\n" "Last-Translator: Aurélio Marinho Jargas \n" "Language-Team: Brazilian Portuguese \n" @@ -351,58 +351,58 @@ msgstr "%s: -e express msgid "can't find label for jump to `%s'" msgstr "Não foi possível encontrar a marcação `%s'" -#: sed/execute.c:650 +#: sed/execute.c:706 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: não foi possível ler %s: %s\n" -#: sed/execute.c:673 +#: sed/execute.c:729 #, fuzzy, c-format msgid "couldn't edit %s: is a terminal" msgstr "Não foi possível abrir o arquivo %s: %s" -#: sed/execute.c:677 +#: sed/execute.c:734 #, c-format msgid "couldn't edit %s: not a regular file" msgstr "" -#: sed/execute.c:684 lib/utils.c:196 +#: sed/execute.c:741 sed/utils.c:229 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "Não foi possível abrir o arquivo %s: %s" -#: sed/execute.c:1206 sed/execute.c:1387 +#: sed/execute.c:1264 sed/execute.c:1444 msgid "error in subprocess" msgstr "erro no subprocesso" -#: sed/execute.c:1208 +#: sed/execute.c:1266 msgid "option `e' not supported" msgstr "opção `e' não suportada" -#: sed/execute.c:1389 +#: sed/execute.c:1446 msgid "`e' command not supported" msgstr "comando `e' não suportado" -#: sed/execute.c:1714 +#: sed/execute.c:1786 msgid "no input files" msgstr "" -#: sed/regexp.c:39 +#: sed/regexp.c:40 #, fuzzy msgid "no previous regular expression" msgstr "Não há expressão regular anterior" -#: sed/regexp.c:40 +#: sed/regexp.c:41 #, fuzzy msgid "cannot specify modifiers on empty regexp" msgstr "Não é permitido especificar modificadores numa expressão regular vazia" -#: sed/regexp.c:115 +#: sed/regexp.c:121 #, fuzzy, c-format msgid "invalid reference \\%d on `s' command's RHS" msgstr "Referência inválida \\%d na segunda parte do comando `s'" -#: sed/sed.c:93 +#: sed/sed.c:98 msgid "" " -R, --regexp-perl\n" " use Perl 5's regular expressions syntax in the script.\n" @@ -410,28 +410,28 @@ msgstr "" " -R, --regexp-perl\n" " usar sintaxe de expressões regulares do Perl 5 no script.\n" -#: sed/sed.c:98 +#: sed/sed.c:103 #, c-format msgid "" "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" "\n" msgstr "" -#: sed/sed.c:102 +#: sed/sed.c:107 #, c-format msgid "" " -n, --quiet, --silent\n" " suppress automatic printing of pattern space\n" msgstr "" -#: sed/sed.c:104 +#: sed/sed.c:109 #, c-format msgid "" " -e script, --expression=script\n" " add the script to the commands to be executed\n" msgstr "" -#: sed/sed.c:106 +#: sed/sed.c:111 #, c-format msgid "" " -f script-file, --file=script-file\n" @@ -439,28 +439,36 @@ msgid "" "executed\n" msgstr "" -#: sed/sed.c:108 +#: sed/sed.c:113 #, c-format msgid "" " -i[SUFFIX], --in-place[=SUFFIX]\n" " edit files in place (makes backup if extension supplied)\n" msgstr "" -#: sed/sed.c:110 +#: sed/sed.c:116 +#, c-format +msgid "" +" -b, --binary\n" +" open files in binary mode (CR+LFs are not processed " +"specially)\n" +msgstr "" + +#: sed/sed.c:119 #, c-format msgid "" " -l N, --line-length=N\n" " specify the desired line-wrap length for the `l' command\n" msgstr "" -#: sed/sed.c:112 +#: sed/sed.c:121 #, c-format msgid "" " --posix\n" " disable all GNU extensions.\n" msgstr "" -#: sed/sed.c:114 +#: sed/sed.c:123 #, fuzzy, c-format msgid "" " -r, --regexp-extended\n" @@ -469,7 +477,7 @@ msgstr "" " -R, --regexp-perl\n" " usar sintaxe de expressões regulares do Perl 5 no script.\n" -#: sed/sed.c:117 +#: sed/sed.c:126 #, c-format msgid "" " -s, --separate\n" @@ -478,7 +486,7 @@ msgid "" " long stream.\n" msgstr "" -#: sed/sed.c:120 +#: sed/sed.c:129 #, c-format msgid "" " -u, --unbuffered\n" @@ -487,17 +495,17 @@ msgid "" " the output buffers more often\n" msgstr "" -#: sed/sed.c:123 +#: sed/sed.c:132 #, c-format msgid " --help display this help and exit\n" msgstr "" -#: sed/sed.c:124 +#: sed/sed.c:133 #, c-format msgid " --version output version information and exit\n" msgstr "" -#: sed/sed.c:125 +#: sed/sed.c:134 #, c-format msgid "" "\n" @@ -508,7 +516,7 @@ msgid "" "\n" msgstr "" -#: sed/sed.c:131 +#: sed/sed.c:140 #, c-format msgid "" "E-mail bug reports to: %s .\n" @@ -517,12 +525,12 @@ msgstr "" "Envie relatórios de erros (em inglês) para: %s .\n" "Inclua a palavra ``%s'' no campo ``Assunto:'' ou ``Subject:''.\n" -#: sed/sed.c:268 +#: sed/sed.c:285 #, c-format msgid "super-sed version %s\n" msgstr "super-sed versão %s\n" -#: sed/sed.c:269 +#: sed/sed.c:286 #, fuzzy, c-format msgid "" "based on GNU sed version %s\n" @@ -531,12 +539,12 @@ msgstr "" "baseado no GNU sed versão 3.02.80\n" "\n" -#: sed/sed.c:271 +#: sed/sed.c:288 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed versão %s\n" -#: sed/sed.c:273 +#: sed/sed.c:290 #, c-format msgid "" "%s\n" @@ -549,74 +557,34 @@ msgstr "" "de cópia. NÃO há garantias, nem mesmo para os aspectos mercantis ou de\n" "atendimento a finalidades específicas, tanto quanto a lei permita.\n" -#: lib/utils.c:98 lib/utils.c:336 +#: sed/utils.c:98 sed/utils.c:363 #, fuzzy, c-format msgid "cannot remove %s: %s" msgstr "%s: não foi possível ler %s: %s\n" -#: lib/utils.c:143 +#: sed/utils.c:168 #, fuzzy, c-format msgid "couldn't open file %s: %s" msgstr "Não foi possível abrir o arquivo %s: %s" -#: lib/utils.c:220 +#: sed/utils.c:192 +#, fuzzy, c-format +msgid "couldn't attach to %s: %s" +msgstr "não foi possível escrever %d item para %s: %s" + +#: sed/utils.c:247 #, c-format msgid "couldn't write %d item to %s: %s" msgid_plural "couldn't write %d items to %s: %s" msgstr[0] "não foi possível escrever %d item para %s: %s" msgstr[1] "não foi possível escrever %d items para %s: %s" -#: lib/utils.c:235 lib/utils.c:251 +#: sed/utils.c:262 sed/utils.c:278 #, c-format msgid "read error on %s: %s" msgstr "erro de leitura em %s: %s" -#: lib/utils.c:341 +#: sed/utils.c:368 #, fuzzy, c-format msgid "cannot rename %s: %s" msgstr "%s: não foi possível ler %s: %s\n" - -#~ msgid "Success" -#~ msgstr "Sucesso" - -#~ msgid "No match" -#~ msgstr "Nada encontrado" - -#~ msgid "Invalid regular expression" -#~ msgstr "Expressão regular inválida" - -#~ msgid "Invalid collation character" -#~ msgstr "Caractere de ordenação inválido" - -#~ msgid "Trailing backslash" -#~ msgstr "Escape \\ no final" - -#~ msgid "Invalid back reference" -#~ msgstr "Retrovisor \\n inválido" - -#~ msgid "Unmatched [ or [^" -#~ msgstr "[ ou [^ não terminado" - -#~ msgid "Unmatched ( or \\(" -#~ msgstr "( ou \\( não terminado" - -#~ msgid "Unmatched \\{" -#~ msgstr "\\{ não terminado" - -#~ msgid "Invalid range end" -#~ msgstr "Fim de intervalo (range) inválido" - -#~ msgid "Memory exhausted" -#~ msgstr "Falta de memória" - -#~ msgid "Invalid preceding regular expression" -#~ msgstr "Expressão regular anterior inválida" - -#~ msgid "Premature end of regular expression" -#~ msgstr "Fim prematuro da expressão regular" - -#~ msgid "Unmatched ) or \\)" -#~ msgstr ") or \\) inesperado" - -#~ msgid "No previous regular expression" -#~ msgstr "Não há expressão regular anterior" diff --git a/po/ro.po b/po/ro.po index b524b27..2f071bf 100644 --- a/po/ro.po +++ b/po/ro.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.8\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:37+0200\n" +"Report-Msgid-Bugs-To: bonzini@gnu.org\n" +"POT-Creation-Date: 2006-09-26 00:06+0200\n" "PO-Revision-Date: 2003-11-22 12:00-0500\n" "Last-Translator: Laurentiu Buzdugan \n" "Language-Team: Romanian \n" @@ -350,58 +350,58 @@ msgstr "%s: -e expresia #%lu, caracterul %lu: %s\n" msgid "can't find label for jump to `%s'" msgstr "Nu pot gãsi eticheta pentru saltul la `%s'" -#: sed/execute.c:650 +#: sed/execute.c:706 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: nu pot citi %s: %s\n" -#: sed/execute.c:673 +#: sed/execute.c:729 #, fuzzy, c-format msgid "couldn't edit %s: is a terminal" msgstr "Nu am putut deschide fiºierul %s: %s" -#: sed/execute.c:677 +#: sed/execute.c:734 #, c-format msgid "couldn't edit %s: not a regular file" msgstr "" -#: sed/execute.c:684 lib/utils.c:196 +#: sed/execute.c:741 sed/utils.c:229 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "Nu am putut deschide fiºierul temporar %s: %s" -#: sed/execute.c:1206 sed/execute.c:1387 +#: sed/execute.c:1264 sed/execute.c:1444 msgid "error in subprocess" msgstr "eroare în subproces" -#: sed/execute.c:1208 +#: sed/execute.c:1266 msgid "option `e' not supported" msgstr "opþiunea `e' nu e suportatã" -#: sed/execute.c:1389 +#: sed/execute.c:1446 msgid "`e' command not supported" msgstr "comanda `e' nu e suportatã" -#: sed/execute.c:1714 +#: sed/execute.c:1786 msgid "no input files" msgstr "" -#: sed/regexp.c:39 +#: sed/regexp.c:40 #, fuzzy msgid "no previous regular expression" msgstr "Nici o expresie regularã anterioarã" -#: sed/regexp.c:40 +#: sed/regexp.c:41 #, fuzzy msgid "cannot specify modifiers on empty regexp" msgstr "Nu se pot specifica modificatori pentru regexp vidã" -#: sed/regexp.c:115 +#: sed/regexp.c:121 #, fuzzy, c-format msgid "invalid reference \\%d on `s' command's RHS" msgstr "Referinþã invalidã \\%d pentru RHS-ul comanzii `s'" -#: sed/sed.c:93 +#: sed/sed.c:98 msgid "" " -R, --regexp-perl\n" " use Perl 5's regular expressions syntax in the script.\n" @@ -410,28 +410,28 @@ msgstr "" " foloseºte sintaxa expresiilor regulare din Perl 5 în " "script.\n" -#: sed/sed.c:98 +#: sed/sed.c:103 #, c-format msgid "" "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" "\n" msgstr "" -#: sed/sed.c:102 +#: sed/sed.c:107 #, c-format msgid "" " -n, --quiet, --silent\n" " suppress automatic printing of pattern space\n" msgstr "" -#: sed/sed.c:104 +#: sed/sed.c:109 #, c-format msgid "" " -e script, --expression=script\n" " add the script to the commands to be executed\n" msgstr "" -#: sed/sed.c:106 +#: sed/sed.c:111 #, c-format msgid "" " -f script-file, --file=script-file\n" @@ -439,28 +439,36 @@ msgid "" "executed\n" msgstr "" -#: sed/sed.c:108 +#: sed/sed.c:113 #, c-format msgid "" " -i[SUFFIX], --in-place[=SUFFIX]\n" " edit files in place (makes backup if extension supplied)\n" msgstr "" -#: sed/sed.c:110 +#: sed/sed.c:116 +#, c-format +msgid "" +" -b, --binary\n" +" open files in binary mode (CR+LFs are not processed " +"specially)\n" +msgstr "" + +#: sed/sed.c:119 #, c-format msgid "" " -l N, --line-length=N\n" " specify the desired line-wrap length for the `l' command\n" msgstr "" -#: sed/sed.c:112 +#: sed/sed.c:121 #, c-format msgid "" " --posix\n" " disable all GNU extensions.\n" msgstr "" -#: sed/sed.c:114 +#: sed/sed.c:123 #, fuzzy, c-format msgid "" " -r, --regexp-extended\n" @@ -470,7 +478,7 @@ msgstr "" " foloseºte sintaxa expresiilor regulare din Perl 5 în " "script.\n" -#: sed/sed.c:117 +#: sed/sed.c:126 #, c-format msgid "" " -s, --separate\n" @@ -479,7 +487,7 @@ msgid "" " long stream.\n" msgstr "" -#: sed/sed.c:120 +#: sed/sed.c:129 #, c-format msgid "" " -u, --unbuffered\n" @@ -488,17 +496,17 @@ msgid "" " the output buffers more often\n" msgstr "" -#: sed/sed.c:123 +#: sed/sed.c:132 #, c-format msgid " --help display this help and exit\n" msgstr "" -#: sed/sed.c:124 +#: sed/sed.c:133 #, c-format msgid " --version output version information and exit\n" msgstr "" -#: sed/sed.c:125 +#: sed/sed.c:134 #, c-format msgid "" "\n" @@ -509,7 +517,7 @@ msgid "" "\n" msgstr "" -#: sed/sed.c:131 +#: sed/sed.c:140 #, c-format msgid "" "E-mail bug reports to: %s .\n" @@ -518,12 +526,12 @@ msgstr "" "Raportaþi bug-uri prin e-mail la: %s .\n" "Fiþi siguri cã includeþi ``%s'' undeva în câmpul ``Subject:''.\n" -#: sed/sed.c:268 +#: sed/sed.c:285 #, c-format msgid "super-sed version %s\n" msgstr "versiunea super-sed %s\n" -#: sed/sed.c:269 +#: sed/sed.c:286 #, fuzzy, c-format msgid "" "based on GNU sed version %s\n" @@ -532,12 +540,12 @@ msgstr "" "bazat pe GNU sed versiunea 3.02.80\n" "\n" -#: sed/sed.c:271 +#: sed/sed.c:288 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed versiunea %s\n" -#: sed/sed.c:273 +#: sed/sed.c:290 #, c-format msgid "" "%s\n" @@ -551,74 +559,34 @@ msgstr "" "Nu existã NICI o garanþie; nici mãcar pentru VANDABILITATE sau POTRIVIRE \n" "PENTRU UN ANUME SCOP, conform legilor în vigoare.\n" -#: lib/utils.c:98 lib/utils.c:336 +#: sed/utils.c:98 sed/utils.c:363 #, fuzzy, c-format msgid "cannot remove %s: %s" msgstr "%s: nu pot citi %s: %s\n" -#: lib/utils.c:143 +#: sed/utils.c:168 #, fuzzy, c-format msgid "couldn't open file %s: %s" msgstr "Nu am putut deschide fiºierul %s: %s" -#: lib/utils.c:220 +#: sed/utils.c:192 +#, fuzzy, c-format +msgid "couldn't attach to %s: %s" +msgstr "Nu am putut scrie %d articol în %s: %s" + +#: sed/utils.c:247 #, c-format msgid "couldn't write %d item to %s: %s" msgid_plural "couldn't write %d items to %s: %s" msgstr[0] "Nu am putut scrie %d articol în %s: %s" msgstr[1] "Nu am putut scrie %d articole în %s: %s" -#: lib/utils.c:235 lib/utils.c:251 +#: sed/utils.c:262 sed/utils.c:278 #, c-format msgid "read error on %s: %s" msgstr "eroare citire pentru %s: %s" -#: lib/utils.c:341 +#: sed/utils.c:368 #, fuzzy, c-format msgid "cannot rename %s: %s" msgstr "%s: nu pot citi %s: %s\n" - -#~ msgid "Success" -#~ msgstr "Succes" - -#~ msgid "No match" -#~ msgstr "Nici o potrivire" - -#~ msgid "Invalid regular expression" -#~ msgstr "Expresie regularã incorectã" - -#~ msgid "Invalid collation character" -#~ msgstr "Colaþiune de caractere incorectã" - -#~ msgid "Trailing backslash" -#~ msgstr "Backslash în coadã" - -#~ msgid "Invalid back reference" -#~ msgstr "Referinþã înapoi incorectã" - -#~ msgid "Unmatched [ or [^" -#~ msgstr "[ sau [^ fãrã pereche" - -#~ msgid "Unmatched ( or \\(" -#~ msgstr "( sau \\( fãrã pereche" - -#~ msgid "Unmatched \\{" -#~ msgstr "\\{ fãrã pereche" - -#~ msgid "Invalid range end" -#~ msgstr "Sfârºit de interval incorect" - -#~ msgid "Memory exhausted" -#~ msgstr "Memorie epuizatã" - -#~ msgid "Invalid preceding regular expression" -#~ msgstr "Expresie regularã precedentã incorectã" - -#~ msgid "Premature end of regular expression" -#~ msgstr "Sfârºit prematur al expresiei regulare" - -#~ msgid "Unmatched ) or \\)" -#~ msgstr ") sau \\) fãrã pereche" - -#~ msgid "No previous regular expression" -#~ msgstr "Nici o expresie regularã anterioarã" diff --git a/po/ru.po b/po/ru.po index f473ad3..3631339 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: sed-4.1.1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:37+0200\n" +"Report-Msgid-Bugs-To: bonzini@gnu.org\n" +"POT-Creation-Date: 2006-09-26 00:06+0200\n" "PO-Revision-Date: 2004-07-07 17:54+0300\n" "Last-Translator: Pavel Maryanov \n" "Language-Team: Russian \n" @@ -334,56 +334,56 @@ msgstr "%s: -e msgid "can't find label for jump to `%s'" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÍÅÔËÕ ÄÌÑ ÐÅÒÅÈÏÄÁ Ë `%s'" -#: sed/execute.c:650 +#: sed/execute.c:706 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ %s: %s\n" -#: sed/execute.c:673 +#: sed/execute.c:729 #, c-format msgid "couldn't edit %s: is a terminal" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÒÅÄÁËÔÉÒÏ×ÁÔØ %s: ÜÔÏ ÔÅÒÍÉÎÁÌ" -#: sed/execute.c:677 +#: sed/execute.c:734 #, c-format msgid "couldn't edit %s: not a regular file" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÒÅÄÁËÔÉÒÏ×ÁÔØ %s: ÜÔÏ ÎÅ ÏÂÙÞÎÙÊ ÆÁÊÌ" -#: sed/execute.c:684 lib/utils.c:196 +#: sed/execute.c:741 sed/utils.c:229 #, c-format msgid "couldn't open temporary file %s: %s" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ %s: %s" -#: sed/execute.c:1206 sed/execute.c:1387 +#: sed/execute.c:1264 sed/execute.c:1444 msgid "error in subprocess" msgstr "ÏÛÉÂËÁ × ÐÏÄÐÒÏÃÅÓÓÅ" -#: sed/execute.c:1208 +#: sed/execute.c:1266 msgid "option `e' not supported" msgstr "ÏÐÃÉÑ `e' ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ" -#: sed/execute.c:1389 +#: sed/execute.c:1446 msgid "`e' command not supported" msgstr "ËÏÍÁÎÄÁ `e' ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ" -#: sed/execute.c:1714 +#: sed/execute.c:1786 msgid "no input files" msgstr "" -#: sed/regexp.c:39 +#: sed/regexp.c:40 msgid "no previous regular expression" msgstr "ÎÅÔ ÐÒÅÄÙÄÕÝÅÇÏ ÒÅÇÕÌÑÒÎÏÇÏ ×ÙÒÁÖÅÎÉÑ" -#: sed/regexp.c:40 +#: sed/regexp.c:41 msgid "cannot specify modifiers on empty regexp" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÕËÁÚÁÔØ ÍÏÄÉÆÉËÁÔÏÒÙ × ÐÕÓÔÏÍ ÒÅÇÕÌÑÒÎÏÍ ×ÙÒÁÖÅÎÉÉ" -#: sed/regexp.c:115 +#: sed/regexp.c:121 #, c-format msgid "invalid reference \\%d on `s' command's RHS" msgstr "ÎÅÄÏÐÕÓÔÉÍÁÑ ÓÓÙÌËÁ \\%d ÎÁ RHS ËÏÍÁÎÄÙ `s'" -#: sed/sed.c:93 +#: sed/sed.c:98 msgid "" " -R, --regexp-perl\n" " use Perl 5's regular expressions syntax in the script.\n" @@ -392,7 +392,7 @@ msgstr "" " ÉÓÐÏÌØÚÏ×ÁÎÉÅ × ÓËÒÉÐÔÅ ÓÉÎÔÁËÓÉÓÁ ÒÅÇÕÌÑÒÎÙÈ ×ÙÒÁÖÅÎÉÊ " "Perl 5.\n" -#: sed/sed.c:98 +#: sed/sed.c:103 #, c-format msgid "" "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" @@ -402,7 +402,7 @@ msgstr "" "[×ÈÏÄÎÏÊ-ÆÁÊÌ]...\n" "\n" -#: sed/sed.c:102 +#: sed/sed.c:107 #, c-format msgid "" " -n, --quiet, --silent\n" @@ -411,7 +411,7 @@ msgstr "" " -n, --quiet, --silent\n" " ÐÏÄÁ×ÌÅÎÉÅ Á×ÔÏÍÁÔÉÞÅÓËÏÇÏ ×Ù×ÏÄÁ ÐÒÏÍÅÖÕÔËÏ×\n" -#: sed/sed.c:104 +#: sed/sed.c:109 #, c-format msgid "" " -e script, --expression=script\n" @@ -420,7 +420,7 @@ msgstr "" " -e script, --expression=script\n" " ÄÏÂÁ×ÌÅÎÉÅ ÓËÒÉÐÔÁ × ÉÓÐÏÌÎÑÅÍÙÅ ËÏÍÁÎÄÙ\n" -#: sed/sed.c:106 +#: sed/sed.c:111 #, c-format msgid "" " -f script-file, --file=script-file\n" @@ -430,7 +430,7 @@ msgstr "" " -f script-file, --file=script-file\n" " ÄÏÂÁ×ÌÅÎÉÅ ÓÏÄÅÒÖÉÍÏÇÏ ÆÁÊÌÁ-ÓËÒÉÐÔÁ × ÉÓÐÏÌÎÑÅÍÙÅ ËÏÍÁÎÄÙ\n" -#: sed/sed.c:108 +#: sed/sed.c:113 #, c-format msgid "" " -i[SUFFIX], --in-place[=SUFFIX]\n" @@ -440,7 +440,18 @@ msgstr "" " ÒÅÄÁËÔÉÒÏ×ÁÎÉÅ ÆÁÊÌÏ× ÎÁ ÍÅÓÔÅ (ÓÏÚÄÁÅÔ ËÏÐÉÀ, ÅÓÌÉ ÕËÁÚÁÎÏ " "ÒÁÓÛÉÒÅÎÉÅ)\n" -#: sed/sed.c:110 +#: sed/sed.c:116 +#, fuzzy, c-format +msgid "" +" -b, --binary\n" +" open files in binary mode (CR+LFs are not processed " +"specially)\n" +msgstr "" +" -i[óõææéëó], --in-place[=óõææéëó]\n" +" ÒÅÄÁËÔÉÒÏ×ÁÎÉÅ ÆÁÊÌÏ× ÎÁ ÍÅÓÔÅ (ÓÏÚÄÁÅÔ ËÏÐÉÀ, ÅÓÌÉ ÕËÁÚÁÎÏ " +"ÒÁÓÛÉÒÅÎÉÅ)\n" + +#: sed/sed.c:119 #, c-format msgid "" " -l N, --line-length=N\n" @@ -449,7 +460,7 @@ msgstr "" " -l N, --line-length=N\n" " ÕËÁÚÁÎÉÅ ÖÅÌÁÅÍÏÊ ÄÌÉÎÙ ÐÅÒÅÎÏÓÉÍÏÊ ÓÔÒÏËÉ ÄÌÑ ËÏÍÁÎÄÙ `l'\n" -#: sed/sed.c:112 +#: sed/sed.c:121 #, c-format msgid "" " --posix\n" @@ -458,7 +469,7 @@ msgstr "" " --posix\n" " ÏÔËÌÀÞÅÎÉÅ ×ÓÅÈ ÒÁÓÛÉÒÅÎÉÊ GNU.\n" -#: sed/sed.c:114 +#: sed/sed.c:123 #, c-format msgid "" " -r, --regexp-extended\n" @@ -467,7 +478,7 @@ msgstr "" " -r, --regexp-extended\n" " ÉÓÐÏÌØÚÏ×ÁÎÉÅ × ÓËÒÉÐÔÅ ÒÁÓÛÉÒÅÎÎÙÈ ÒÅÇÕÌÑÒÎÙÈ ×ÙÒÁÖÅÎÉÊ.\n" -#: sed/sed.c:117 +#: sed/sed.c:126 #, c-format msgid "" " -s, --separate\n" @@ -479,7 +490,7 @@ msgstr "" " ÄÏÐÕÝÅÎÉÅ, ÞÔÏ ÆÁÊÌÙ ÒÁÚÄÅÌÅÎÙ, Á ÎÅ × ×ÉÄÅ ÏÄÎÏÇÏ\n" " ÄÌÉÎÎÏÇÏ ÎÅÐÒÅÒÙ×ÎÏÇÏ ÐÏÔÏËÁ.\n" -#: sed/sed.c:120 +#: sed/sed.c:129 #, c-format msgid "" " -u, --unbuffered\n" @@ -491,17 +502,17 @@ msgstr "" " ÚÁÇÒÕÚËÁ ÍÉÎÉÍÁÌØÎÏÇÏ ÏÂßÅÍÁ ÄÁÎÎÙÈ ÉÚ ×ÈÏÄÎÙÈ ÆÁÊÌÏ×\n" " É ÂÏÌÅÅ ÞÁÓÔÙÊ ÓÂÒÏÓ ÎÁ ÄÉÓË ×ÙÈÏÄÎÙÈ ÂÕÆÅÒÏ×\n" -#: sed/sed.c:123 +#: sed/sed.c:132 #, c-format msgid " --help display this help and exit\n" msgstr " --help ×Ù×ÏÄ ÜÔÏÊ ÓÐÒÁ×ËÉ É ×ÙÈÏÄ\n" -#: sed/sed.c:124 +#: sed/sed.c:133 #, c-format msgid " --version output version information and exit\n" msgstr " --version ×Ù×ÏÄ ÉÎÆÏÒÍÁÃÉÉ Ï ×ÅÒÓÉÉ É ×ÙÈÏÄ\n" -#: sed/sed.c:125 +#: sed/sed.c:134 #, c-format msgid "" "\n" @@ -518,7 +529,7 @@ msgstr "" "ÆÁÊÌÙ ÎÅ ÕËÁÚÁÎÙ, ÔÏÇÄÁ ÞÉÔÁÅÔÓÑ ÓÔÁÎÔÁÒÔÎÙÊ ××ÏÄ.\n" "\n" -#: sed/sed.c:131 +#: sed/sed.c:140 #, c-format msgid "" "E-mail bug reports to: %s .\n" @@ -527,12 +538,12 @@ msgstr "" "ïÔÞÅÔÙ Ï ÏÛÉÂËÁÈ ÏÔÐÒÁ×ÌÑÊÔÅ ÐÏ ÁÄÒÅÓÕ: %s .\n" "õÂÅÄÉÔÅÓØ, ÞÔÏ ×ËÌÀÞÉÌÉ ÇÄÅ-ÌÉÂÏ × ÐÏÌÅ ``ôÅÍÁ:'' ÓÌÏ×Ï ``%s''.\n" -#: sed/sed.c:268 +#: sed/sed.c:285 #, c-format msgid "super-sed version %s\n" msgstr "super-sed ×ÅÒÓÉÑ %s\n" -#: sed/sed.c:269 +#: sed/sed.c:286 #, c-format msgid "" "based on GNU sed version %s\n" @@ -541,12 +552,12 @@ msgstr "" "ÏÓÎÏ×ÁÎ ÎÁ GNU sed ×ÅÒÓÉÉ %s\n" "\n" -#: sed/sed.c:271 +#: sed/sed.c:288 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed ×ÅÒÓÉÑ %s\n" -#: sed/sed.c:273 +#: sed/sed.c:290 #, c-format msgid "" "%s\n" @@ -560,74 +571,34 @@ msgstr "" "ðòéçïäîïóôé äìñ ðòïäáöé ÉÌÉ ðòéíåîéíïóôé äìñ ëïîëòåôîïê ãåìé, × ÔÏÊ ÍÅÒÅ,\n" "× ËÏÔÏÒÏÊ ÜÔÏ ÍÏÖÅÔ ÂÙÔØ ÄÏÐÕÝÅÎÏ ÚÁËÏÎÏÄÁÔÅÌØÓÔ×ÏÍ.\n" -#: lib/utils.c:98 lib/utils.c:336 +#: sed/utils.c:98 sed/utils.c:363 #, c-format msgid "cannot remove %s: %s" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ %s: %s" -#: lib/utils.c:143 +#: sed/utils.c:168 #, c-format msgid "couldn't open file %s: %s" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ %s: %s" -#: lib/utils.c:220 +#: sed/utils.c:192 +#, fuzzy, c-format +msgid "couldn't attach to %s: %s" +msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ %d ÜÌÅÍÅÎÔ × %s: %s" + +#: sed/utils.c:247 #, c-format msgid "couldn't write %d item to %s: %s" msgid_plural "couldn't write %d items to %s: %s" msgstr[0] "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ %d ÜÌÅÍÅÎÔ × %s: %s" msgstr[1] "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ %d ÜÌÅÍÅÎÔÏ× × %s: %s" -#: lib/utils.c:235 lib/utils.c:251 +#: sed/utils.c:262 sed/utils.c:278 #, c-format msgid "read error on %s: %s" msgstr "ÏÛÉÂËÁ ÞÔÅÎÉÑ %s: %s" -#: lib/utils.c:341 +#: sed/utils.c:368 #, c-format msgid "cannot rename %s: %s" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÉÍÅÎÏ×ÁÔØ %s: %s" - -#~ msgid "Success" -#~ msgstr "õÓÐÅÛÎÏ" - -#~ msgid "No match" -#~ msgstr "îÅÔ ÓÏÏÔ×ÅÓÔ×ÉÑ" - -#~ msgid "Invalid regular expression" -#~ msgstr "îÅÄÏÐÕÓÔÉÍÏÅ ÒÅÇÕÌÑÒÎÏÅ ×ÙÒÁÖÅÎÉÅ" - -#~ msgid "Invalid collation character" -#~ msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ ÓÒÁ×ÎÅÎÉÑ" - -#~ msgid "Trailing backslash" -#~ msgstr "úÁ×ÅÒÛÁÀÝÁÑ ÏÂÒÁÔÎÁÑ ËÏÓÁÑ ÞÅÒÔÁ" - -#~ msgid "Invalid back reference" -#~ msgstr "îÅÄÏÐÕÓÔÉÍÁÑ ÏÂÒÁÔÎÁÑ ÓÓÙÌËÁ" - -#~ msgid "Unmatched [ or [^" -#~ msgstr "îÅÐÁÒÎÙÊ ÓÉÍ×ÏÌ [ ÉÌÉ [^" - -#~ msgid "Unmatched ( or \\(" -#~ msgstr "îÅÐÁÒÎÙÊ ÓÉÍ×ÏÌ ( or \\(" - -#~ msgid "Unmatched \\{" -#~ msgstr "îÅÐÁÒÎÙÊ ÓÉÍ×ÏÌ \\{" - -#~ msgid "Invalid range end" -#~ msgstr "îÅÄÏÐÕÓÔÉÍÏÅ ÏËÏÎÞÁÎÉÅ ÄÉÁÐÁÚÏÎÁ" - -#~ msgid "Memory exhausted" -#~ msgstr "ðÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ" - -#~ msgid "Invalid preceding regular expression" -#~ msgstr "îÅÄÏÐÕÓÔÉÍÏÅ ÐÒÅÄÛÅÓÔ×ÕÀÝÅÅ ÒÅÇÕÌÑÒÎÏÅ ×ÙÒÁÖÅÎÉÅ" - -#~ msgid "Premature end of regular expression" -#~ msgstr "ðÒÅÖÄÅ×ÒÅÍÅÎÎÏÅ ÏËÏÎÞÁÎÉÅ ÒÅÇÕÌÑÒÎÏÇÏ ×ÙÒÁÖÅÎÉÑ" - -#~ msgid "Unmatched ) or \\)" -#~ msgstr "îÅÐÁÒÎÙÊ ÓÉÍ×ÏÌ ) ÉÌÉ \\)" - -#~ msgid "No previous regular expression" -#~ msgstr "îÅÔ ÐÒÅÄÙÄÕÝÅÇÏ ÒÅÇÕÌÑÒÎÏÇÏ ×ÙÒÁÖÅÎÉÑ" diff --git a/po/sk.po b/po/sk.po index 9516f82..bde8ca2 100644 --- a/po/sk.po +++ b/po/sk.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU sed 4.0.8\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:37+0200\n" +"Report-Msgid-Bugs-To: bonzini@gnu.org\n" +"POT-Creation-Date: 2006-09-26 00:06+0200\n" "PO-Revision-Date: 2003-10-25 17:22+0200\n" "Last-Translator: Marcel Telka \n" "Language-Team: Slovak \n" @@ -349,58 +349,58 @@ msgstr "%s: -e výraz #%lu, znak %lu: %s\n" msgid "can't find label for jump to `%s'" msgstr "Návestie pre skok na `%s' nie je možné nájsÅ¥?" -#: sed/execute.c:650 +#: sed/execute.c:706 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: %s nie je možné Ä�ítaÅ¥: %s\n" -#: sed/execute.c:673 +#: sed/execute.c:729 #, fuzzy, c-format msgid "couldn't edit %s: is a terminal" msgstr "Nebolo možné otvoriÅ¥ súbor %s: %s" -#: sed/execute.c:677 +#: sed/execute.c:734 #, c-format msgid "couldn't edit %s: not a regular file" msgstr "" -#: sed/execute.c:684 lib/utils.c:196 +#: sed/execute.c:741 sed/utils.c:229 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "Nebolo možné otvoriÅ¥ doÄ�asný súbor %s: %s" -#: sed/execute.c:1206 sed/execute.c:1387 +#: sed/execute.c:1264 sed/execute.c:1444 msgid "error in subprocess" msgstr "chyba v podprocese" -#: sed/execute.c:1208 +#: sed/execute.c:1266 msgid "option `e' not supported" msgstr "voľba `e' nie je podporovaná" -#: sed/execute.c:1389 +#: sed/execute.c:1446 msgid "`e' command not supported" msgstr "príkaz `e' nie je podporovaný" -#: sed/execute.c:1714 +#: sed/execute.c:1786 msgid "no input files" msgstr "" -#: sed/regexp.c:39 +#: sed/regexp.c:40 #, fuzzy msgid "no previous regular expression" msgstr "Bez predchádzajúceho regulárneho výrazu" -#: sed/regexp.c:40 +#: sed/regexp.c:41 #, fuzzy msgid "cannot specify modifiers on empty regexp" msgstr "Nie je možné zadaÅ¥ modifikátory pre prázdny regulárny výraz" -#: sed/regexp.c:115 +#: sed/regexp.c:121 #, fuzzy, c-format msgid "invalid reference \\%d on `s' command's RHS" msgstr "Neplatný odkaz \\%d na `s' príkazu RHS" -#: sed/sed.c:93 +#: sed/sed.c:98 msgid "" " -R, --regexp-perl\n" " use Perl 5's regular expressions syntax in the script.\n" @@ -408,28 +408,28 @@ msgstr "" " -R, --regexp-perl\n" " použiÅ¥ syntax regulárnych výrazov z Perlu 5 v skripte.\n" -#: sed/sed.c:98 +#: sed/sed.c:103 #, c-format msgid "" "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" "\n" msgstr "" -#: sed/sed.c:102 +#: sed/sed.c:107 #, c-format msgid "" " -n, --quiet, --silent\n" " suppress automatic printing of pattern space\n" msgstr "" -#: sed/sed.c:104 +#: sed/sed.c:109 #, c-format msgid "" " -e script, --expression=script\n" " add the script to the commands to be executed\n" msgstr "" -#: sed/sed.c:106 +#: sed/sed.c:111 #, c-format msgid "" " -f script-file, --file=script-file\n" @@ -437,28 +437,36 @@ msgid "" "executed\n" msgstr "" -#: sed/sed.c:108 +#: sed/sed.c:113 #, c-format msgid "" " -i[SUFFIX], --in-place[=SUFFIX]\n" " edit files in place (makes backup if extension supplied)\n" msgstr "" -#: sed/sed.c:110 +#: sed/sed.c:116 +#, c-format +msgid "" +" -b, --binary\n" +" open files in binary mode (CR+LFs are not processed " +"specially)\n" +msgstr "" + +#: sed/sed.c:119 #, c-format msgid "" " -l N, --line-length=N\n" " specify the desired line-wrap length for the `l' command\n" msgstr "" -#: sed/sed.c:112 +#: sed/sed.c:121 #, c-format msgid "" " --posix\n" " disable all GNU extensions.\n" msgstr "" -#: sed/sed.c:114 +#: sed/sed.c:123 #, fuzzy, c-format msgid "" " -r, --regexp-extended\n" @@ -467,7 +475,7 @@ msgstr "" " -R, --regexp-perl\n" " použiÅ¥ syntax regulárnych výrazov z Perlu 5 v skripte.\n" -#: sed/sed.c:117 +#: sed/sed.c:126 #, c-format msgid "" " -s, --separate\n" @@ -476,7 +484,7 @@ msgid "" " long stream.\n" msgstr "" -#: sed/sed.c:120 +#: sed/sed.c:129 #, c-format msgid "" " -u, --unbuffered\n" @@ -485,17 +493,17 @@ msgid "" " the output buffers more often\n" msgstr "" -#: sed/sed.c:123 +#: sed/sed.c:132 #, c-format msgid " --help display this help and exit\n" msgstr "" -#: sed/sed.c:124 +#: sed/sed.c:133 #, c-format msgid " --version output version information and exit\n" msgstr "" -#: sed/sed.c:125 +#: sed/sed.c:134 #, c-format msgid "" "\n" @@ -506,7 +514,7 @@ msgid "" "\n" msgstr "" -#: sed/sed.c:131 +#: sed/sed.c:140 #, c-format msgid "" "E-mail bug reports to: %s .\n" @@ -517,12 +525,12 @@ msgstr "" "Komentáre k slovenskému prekladu zasielajte na adresu .\n" -#: sed/sed.c:268 +#: sed/sed.c:285 #, c-format msgid "super-sed version %s\n" msgstr "super-sed verzia %s\n" -#: sed/sed.c:269 +#: sed/sed.c:286 #, fuzzy, c-format msgid "" "based on GNU sed version %s\n" @@ -531,12 +539,12 @@ msgstr "" "založené na GNU sed verzia 3.02.80\n" "\n" -#: sed/sed.c:271 +#: sed/sed.c:288 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed verzia %s\n" -#: sed/sed.c:273 +#: sed/sed.c:290 #, c-format msgid "" "%s\n" @@ -550,17 +558,22 @@ msgstr "" "nájdete v zdrojových textoch. Toto programové vybavenie je BEZ záruky,\n" "a to aj bez záruky PREDAJNOSTI alebo VHODNOSTI PRE NEJAKÃ� KONKRÉTNY ÚČEL.\n" -#: lib/utils.c:98 lib/utils.c:336 +#: sed/utils.c:98 sed/utils.c:363 #, fuzzy, c-format msgid "cannot remove %s: %s" msgstr "%s: %s nie je možné Ä�ítaÅ¥: %s\n" -#: lib/utils.c:143 +#: sed/utils.c:168 #, fuzzy, c-format msgid "couldn't open file %s: %s" msgstr "Nebolo možné otvoriÅ¥ súbor %s: %s" -#: lib/utils.c:220 +#: sed/utils.c:192 +#, fuzzy, c-format +msgid "couldn't attach to %s: %s" +msgstr "nebolo možné zapísaÅ¥ %d položiek do %s: %s" + +#: sed/utils.c:247 #, c-format msgid "couldn't write %d item to %s: %s" msgid_plural "couldn't write %d items to %s: %s" @@ -568,57 +581,12 @@ msgstr[0] "nebolo možné zapísaÅ¥ %d položiek do %s: %s" msgstr[1] "nebolo možné zapísaÅ¥ %d položku do %s: %s" msgstr[2] "nebolo možné zapísaÅ¥ %d položky do %s: %s" -#: lib/utils.c:235 lib/utils.c:251 +#: sed/utils.c:262 sed/utils.c:278 #, c-format msgid "read error on %s: %s" msgstr "chyba pri Ä�ítaní z %s: %s" -#: lib/utils.c:341 +#: sed/utils.c:368 #, fuzzy, c-format msgid "cannot rename %s: %s" msgstr "%s: %s nie je možné Ä�ítaÅ¥: %s\n" - -#~ msgid "Success" -#~ msgstr "Úspech" - -#~ msgid "No match" -#~ msgstr "Nezodpovedá" - -#~ msgid "Invalid regular expression" -#~ msgstr "Neplatný regulárny výraz" - -#~ msgid "Invalid collation character" -#~ msgstr "Neplatný znak pre porovnávanie" - -#~ msgid "Trailing backslash" -#~ msgstr "UkonÄ�ovacie opaÄ�né lomítko" - -#~ msgid "Invalid back reference" -#~ msgstr "Neplatný spätný odkaz" - -#~ msgid "Unmatched [ or [^" -#~ msgstr "Nezodpovedajúca [ alebo [^" - -#~ msgid "Unmatched ( or \\(" -#~ msgstr "Nezodpovedajúca ( alebo \\(" - -#~ msgid "Unmatched \\{" -#~ msgstr "Nezodpovedajúca \\{" - -#~ msgid "Invalid range end" -#~ msgstr "Neplatný koniec rozsahu" - -#~ msgid "Memory exhausted" -#~ msgstr "VyÄ�erpaná pamäť" - -#~ msgid "Invalid preceding regular expression" -#~ msgstr "Neplatný predchádzajúci regulárny výraz" - -#~ msgid "Premature end of regular expression" -#~ msgstr "NeoÄ�akávaný koniec regulárneho výrazu" - -#~ msgid "Unmatched ) or \\)" -#~ msgstr "Nezodpovedajúca ) alebo \\)" - -#~ msgid "No previous regular expression" -#~ msgstr "Bez predchádzajúceho regulárneho výrazu" diff --git a/po/sl.po b/po/sl.po index 22b293a..8ab5ee1 100644 --- a/po/sl.po +++ b/po/sl.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.6\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:37+0200\n" +"Report-Msgid-Bugs-To: bonzini@gnu.org\n" +"POT-Creation-Date: 2006-09-26 00:06+0200\n" "PO-Revision-Date: 2003-04-02 17:20+0200\n" "Last-Translator: Primo¾ Peterlin \n" "Language-Team: Slovenian \n" @@ -349,58 +349,58 @@ msgstr "%s: -e izraz #%lu, znak %lu: %s\n" msgid "can't find label for jump to `%s'" msgstr "Oznake za skok na \"%s\" ni mo¾no najti" -#: sed/execute.c:650 +#: sed/execute.c:706 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: %s ni mo¾no prebrati: %s\n" -#: sed/execute.c:673 +#: sed/execute.c:729 #, fuzzy, c-format msgid "couldn't edit %s: is a terminal" msgstr "Datoteke %s ni mogoèe odpreti: %s" -#: sed/execute.c:677 +#: sed/execute.c:734 #, c-format msgid "couldn't edit %s: not a regular file" msgstr "" -#: sed/execute.c:684 lib/utils.c:196 +#: sed/execute.c:741 sed/utils.c:229 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "Datoteke %s ni mogoèe odpreti: %s" -#: sed/execute.c:1206 sed/execute.c:1387 +#: sed/execute.c:1264 sed/execute.c:1444 msgid "error in subprocess" msgstr "Napaka v podprocesu" -#: sed/execute.c:1208 +#: sed/execute.c:1266 msgid "option `e' not supported" msgstr "Izbira ,e` ni podprta" -#: sed/execute.c:1389 +#: sed/execute.c:1446 msgid "`e' command not supported" msgstr "Ukaz ,e` ni podprt" -#: sed/execute.c:1714 +#: sed/execute.c:1786 msgid "no input files" msgstr "" -#: sed/regexp.c:39 +#: sed/regexp.c:40 #, fuzzy msgid "no previous regular expression" msgstr "Prej¹nji regularni izraz manjka" -#: sed/regexp.c:40 +#: sed/regexp.c:41 #, fuzzy msgid "cannot specify modifiers on empty regexp" msgstr "Doloèanje modifikatorjev pri praznem regularnem izrazu ni mogoèe" -#: sed/regexp.c:115 +#: sed/regexp.c:121 #, fuzzy, c-format msgid "invalid reference \\%d on `s' command's RHS" msgstr "Neveljavni sklic \\%d na desni strani ukaza ,s`" -#: sed/sed.c:93 +#: sed/sed.c:98 msgid "" " -R, --regexp-perl\n" " use Perl 5's regular expressions syntax in the script.\n" @@ -408,28 +408,28 @@ msgstr "" " -R, --regexp-perl\n" " dovoli uporabo regularnih izrazov, ki jih podpira Perl 5\n" -#: sed/sed.c:98 +#: sed/sed.c:103 #, c-format msgid "" "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" "\n" msgstr "" -#: sed/sed.c:102 +#: sed/sed.c:107 #, c-format msgid "" " -n, --quiet, --silent\n" " suppress automatic printing of pattern space\n" msgstr "" -#: sed/sed.c:104 +#: sed/sed.c:109 #, c-format msgid "" " -e script, --expression=script\n" " add the script to the commands to be executed\n" msgstr "" -#: sed/sed.c:106 +#: sed/sed.c:111 #, c-format msgid "" " -f script-file, --file=script-file\n" @@ -437,28 +437,36 @@ msgid "" "executed\n" msgstr "" -#: sed/sed.c:108 +#: sed/sed.c:113 #, c-format msgid "" " -i[SUFFIX], --in-place[=SUFFIX]\n" " edit files in place (makes backup if extension supplied)\n" msgstr "" -#: sed/sed.c:110 +#: sed/sed.c:116 +#, c-format +msgid "" +" -b, --binary\n" +" open files in binary mode (CR+LFs are not processed " +"specially)\n" +msgstr "" + +#: sed/sed.c:119 #, c-format msgid "" " -l N, --line-length=N\n" " specify the desired line-wrap length for the `l' command\n" msgstr "" -#: sed/sed.c:112 +#: sed/sed.c:121 #, c-format msgid "" " --posix\n" " disable all GNU extensions.\n" msgstr "" -#: sed/sed.c:114 +#: sed/sed.c:123 #, fuzzy, c-format msgid "" " -r, --regexp-extended\n" @@ -467,7 +475,7 @@ msgstr "" " -R, --regexp-perl\n" " dovoli uporabo regularnih izrazov, ki jih podpira Perl 5\n" -#: sed/sed.c:117 +#: sed/sed.c:126 #, c-format msgid "" " -s, --separate\n" @@ -476,7 +484,7 @@ msgid "" " long stream.\n" msgstr "" -#: sed/sed.c:120 +#: sed/sed.c:129 #, c-format msgid "" " -u, --unbuffered\n" @@ -485,17 +493,17 @@ msgid "" " the output buffers more often\n" msgstr "" -#: sed/sed.c:123 +#: sed/sed.c:132 #, c-format msgid " --help display this help and exit\n" msgstr "" -#: sed/sed.c:124 +#: sed/sed.c:133 #, c-format msgid " --version output version information and exit\n" msgstr "" -#: sed/sed.c:125 +#: sed/sed.c:134 #, c-format msgid "" "\n" @@ -506,7 +514,7 @@ msgid "" "\n" msgstr "" -#: sed/sed.c:131 +#: sed/sed.c:140 #, c-format msgid "" "E-mail bug reports to: %s .\n" @@ -515,12 +523,12 @@ msgstr "" "Sporoèila o napakah po¹ljite na %s .\n" "Poskrbite, da bo nekje v polju ,,Subject`` nastopal izraz ,,%s``.\n" -#: sed/sed.c:268 +#: sed/sed.c:285 #, c-format msgid "super-sed version %s\n" msgstr "super-sed, razlièica %s\n" -#: sed/sed.c:269 +#: sed/sed.c:286 #, fuzzy, c-format msgid "" "based on GNU sed version %s\n" @@ -529,12 +537,12 @@ msgstr "" "na osnovi GNU sed, razlièica 3.02.80\n" "\n" -#: sed/sed.c:271 +#: sed/sed.c:288 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed, razlièica %s\n" -#: sed/sed.c:273 +#: sed/sed.c:290 #, c-format msgid "" "%s\n" @@ -548,17 +556,22 @@ msgstr "" "in raz¹irjate so navedeni v izvorni kodi. Za program ni NOBENEGA JAMSTVA,\n" "niti jamstev USTREZNOSTI ZA PRODAJO ali PRIMERNOSTI ZA UPORABO.\n" -#: lib/utils.c:98 lib/utils.c:336 +#: sed/utils.c:98 sed/utils.c:363 #, fuzzy, c-format msgid "cannot remove %s: %s" msgstr "%s: %s ni mo¾no prebrati: %s\n" -#: lib/utils.c:143 +#: sed/utils.c:168 #, fuzzy, c-format msgid "couldn't open file %s: %s" msgstr "Datoteke %s ni mogoèe odpreti: %s" -#: lib/utils.c:220 +#: sed/utils.c:192 +#, fuzzy, c-format +msgid "couldn't attach to %s: %s" +msgstr "ni mogoèe zapisati %d elementov na %s: %s" + +#: sed/utils.c:247 #, c-format msgid "couldn't write %d item to %s: %s" msgid_plural "couldn't write %d items to %s: %s" @@ -567,57 +580,12 @@ msgstr[1] "ni mogo msgstr[2] "ni mogoèe zapisati %d elementov na %s: %s" msgstr[3] "ni mogoèe zapisati %d elementov na %s: %s" -#: lib/utils.c:235 lib/utils.c:251 +#: sed/utils.c:262 sed/utils.c:278 #, c-format msgid "read error on %s: %s" msgstr "napaka pri branju z %s: %s" -#: lib/utils.c:341 +#: sed/utils.c:368 #, fuzzy, c-format msgid "cannot rename %s: %s" msgstr "%s: %s ni mo¾no prebrati: %s\n" - -#~ msgid "Success" -#~ msgstr "Uspe¹no" - -#~ msgid "No match" -#~ msgstr "Ni ujemanja" - -#~ msgid "Invalid regular expression" -#~ msgstr "Neveljavni regularni izraz" - -#~ msgid "Invalid collation character" -#~ msgstr "Znaka izven abecede" - -#~ msgid "Trailing backslash" -#~ msgstr "Zakljuèna obrnjena po¹evnica" - -#~ msgid "Invalid back reference" -#~ msgstr "Neveljavni povratni sklic" - -#~ msgid "Unmatched [ or [^" -#~ msgstr "Oklepaj [ ali [^ brez zaklepaja" - -#~ msgid "Unmatched ( or \\(" -#~ msgstr "Oklepaj ( ali \\( brez zaklepaja" - -#~ msgid "Unmatched \\{" -#~ msgstr "Oklepaj \\{ brez zaklepaja" - -#~ msgid "Invalid range end" -#~ msgstr "Neveljavna zgornja meja intervala" - -#~ msgid "Memory exhausted" -#~ msgstr "Zmanjkalo pomnilnika" - -#~ msgid "Invalid preceding regular expression" -#~ msgstr "Neveljaven prej¹nji regularni izraz" - -#~ msgid "Premature end of regular expression" -#~ msgstr "Predèasni zakljuèek regularnega izraza" - -#~ msgid "Unmatched ) or \\)" -#~ msgstr "Oklepaj ) ali \\) brez zaklepaja" - -#~ msgid "No previous regular expression" -#~ msgstr "Prej¹nji regularni izraz manjka" diff --git a/po/sr.po b/po/sr.po index 97662ac..0a246e0 100644 --- a/po/sr.po +++ b/po/sr.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.9\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:37+0200\n" +"Report-Msgid-Bugs-To: bonzini@gnu.org\n" +"POT-Creation-Date: 2006-09-26 00:06+0200\n" "PO-Revision-Date: 2004-01-13 22:51-0500\n" "Last-Translator: Aleksandar Jelenak \n" "Language-Team: Serbian \n" @@ -349,58 +349,58 @@ msgstr "%s: -e израз #%lu, знак %lu: %s\n" msgid "can't find label for jump to `%s'" msgstr "Ð�е могу да нађем ознаку за Ñ�кок на „%s“" -#: sed/execute.c:650 +#: sed/execute.c:706 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: не може читати %s: %s\n" -#: sed/execute.c:673 +#: sed/execute.c:729 #, fuzzy, c-format msgid "couldn't edit %s: is a terminal" msgstr "Ð�е може Ñ�е отворити датотека %s: %s" -#: sed/execute.c:677 +#: sed/execute.c:734 #, c-format msgid "couldn't edit %s: not a regular file" msgstr "" -#: sed/execute.c:684 lib/utils.c:196 +#: sed/execute.c:741 sed/utils.c:229 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "Ð�е могу отворити привремену датотеку %s: %s" -#: sed/execute.c:1206 sed/execute.c:1387 +#: sed/execute.c:1264 sed/execute.c:1444 msgid "error in subprocess" msgstr "грешка у потпроцеÑ�у" -#: sed/execute.c:1208 +#: sed/execute.c:1266 msgid "option `e' not supported" msgstr "опција „e“ није подржана" -#: sed/execute.c:1389 +#: sed/execute.c:1446 msgid "`e' command not supported" msgstr "наредба „e“ није подржана" -#: sed/execute.c:1714 +#: sed/execute.c:1786 msgid "no input files" msgstr "" -#: sed/regexp.c:39 +#: sed/regexp.c:40 #, fuzzy msgid "no previous regular expression" msgstr "Без претходног регуларног израза" -#: sed/regexp.c:40 +#: sed/regexp.c:41 #, fuzzy msgid "cannot specify modifiers on empty regexp" msgstr "Ð�е може Ñ�е навеÑ�ти измењивач празном рег. изразу" -#: sed/regexp.c:115 +#: sed/regexp.c:121 #, fuzzy, c-format msgid "invalid reference \\%d on `s' command's RHS" msgstr "Ð�еиÑ�правна референца \\%d на деÑ�ној Ñ�трани наредбе „s“" -#: sed/sed.c:93 +#: sed/sed.c:98 msgid "" " -R, --regexp-perl\n" " use Perl 5's regular expressions syntax in the script.\n" @@ -408,28 +408,28 @@ msgstr "" " -R, --regexp-perl\n" " кориÑ�ти у Ñ�пиÑ�у Ñ�интакÑ�у Перла 5 за регуларне изразе.\n" -#: sed/sed.c:98 +#: sed/sed.c:103 #, c-format msgid "" "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" "\n" msgstr "" -#: sed/sed.c:102 +#: sed/sed.c:107 #, c-format msgid "" " -n, --quiet, --silent\n" " suppress automatic printing of pattern space\n" msgstr "" -#: sed/sed.c:104 +#: sed/sed.c:109 #, c-format msgid "" " -e script, --expression=script\n" " add the script to the commands to be executed\n" msgstr "" -#: sed/sed.c:106 +#: sed/sed.c:111 #, c-format msgid "" " -f script-file, --file=script-file\n" @@ -437,28 +437,36 @@ msgid "" "executed\n" msgstr "" -#: sed/sed.c:108 +#: sed/sed.c:113 #, c-format msgid "" " -i[SUFFIX], --in-place[=SUFFIX]\n" " edit files in place (makes backup if extension supplied)\n" msgstr "" -#: sed/sed.c:110 +#: sed/sed.c:116 +#, c-format +msgid "" +" -b, --binary\n" +" open files in binary mode (CR+LFs are not processed " +"specially)\n" +msgstr "" + +#: sed/sed.c:119 #, c-format msgid "" " -l N, --line-length=N\n" " specify the desired line-wrap length for the `l' command\n" msgstr "" -#: sed/sed.c:112 +#: sed/sed.c:121 #, c-format msgid "" " --posix\n" " disable all GNU extensions.\n" msgstr "" -#: sed/sed.c:114 +#: sed/sed.c:123 #, fuzzy, c-format msgid "" " -r, --regexp-extended\n" @@ -467,7 +475,7 @@ msgstr "" " -R, --regexp-perl\n" " кориÑ�ти у Ñ�пиÑ�у Ñ�интакÑ�у Перла 5 за регуларне изразе.\n" -#: sed/sed.c:117 +#: sed/sed.c:126 #, c-format msgid "" " -s, --separate\n" @@ -476,7 +484,7 @@ msgid "" " long stream.\n" msgstr "" -#: sed/sed.c:120 +#: sed/sed.c:129 #, c-format msgid "" " -u, --unbuffered\n" @@ -485,17 +493,17 @@ msgid "" " the output buffers more often\n" msgstr "" -#: sed/sed.c:123 +#: sed/sed.c:132 #, c-format msgid " --help display this help and exit\n" msgstr "" -#: sed/sed.c:124 +#: sed/sed.c:133 #, c-format msgid " --version output version information and exit\n" msgstr "" -#: sed/sed.c:125 +#: sed/sed.c:134 #, c-format msgid "" "\n" @@ -506,7 +514,7 @@ msgid "" "\n" msgstr "" -#: sed/sed.c:131 +#: sed/sed.c:140 #, c-format msgid "" "E-mail bug reports to: %s .\n" @@ -515,12 +523,12 @@ msgstr "" "Епошта за пријаву грешака: %s .\n" "ПоÑ�тарајте Ñ�е да укључите реч „%s“ негде у „Subject:“ пољу.\n" -#: sed/sed.c:268 +#: sed/sed.c:285 #, c-format msgid "super-sed version %s\n" msgstr "super-sed верзија %s\n" -#: sed/sed.c:269 +#: sed/sed.c:286 #, fuzzy, c-format msgid "" "based on GNU sed version %s\n" @@ -529,12 +537,12 @@ msgstr "" "заÑ�новано на ГÐ�У sed верзија 3.02.80\n" "\n" -#: sed/sed.c:271 +#: sed/sed.c:288 #, c-format msgid "GNU sed version %s\n" msgstr "ГÐ�У sed верзија %s\n" -#: sed/sed.c:273 +#: sed/sed.c:290 #, c-format msgid "" "%s\n" @@ -547,17 +555,22 @@ msgstr "" "икакве\n" "гаранције; чак ни о ТРЖИШÐ�ОСТИ или ИСПУЊÐ�Ð’Ð�ЊУ ОДРЕЂЕÐ�Е ПОТРЕБЕ.\n" -#: lib/utils.c:98 lib/utils.c:336 +#: sed/utils.c:98 sed/utils.c:363 #, fuzzy, c-format msgid "cannot remove %s: %s" msgstr "%s: не може читати %s: %s\n" -#: lib/utils.c:143 +#: sed/utils.c:168 #, fuzzy, c-format msgid "couldn't open file %s: %s" msgstr "Ð�е може Ñ�е отворити датотека %s: %s" -#: lib/utils.c:220 +#: sed/utils.c:192 +#, fuzzy, c-format +msgid "couldn't attach to %s: %s" +msgstr "неуÑ�пешан запиÑ� %d Ñ�тавке на %s: %s" + +#: sed/utils.c:247 #, c-format msgid "couldn't write %d item to %s: %s" msgid_plural "couldn't write %d items to %s: %s" @@ -565,57 +578,12 @@ msgstr[0] "неуÑ�пешан запиÑ� %d Ñ�тавке на %s: %s" msgstr[1] "неуÑ�пешан запиÑ� %d Ñ�тавке на %s: %s" msgstr[2] "неуÑ�пешан запиÑ� %d Ñ�тавки на %s: %s" -#: lib/utils.c:235 lib/utils.c:251 +#: sed/utils.c:262 sed/utils.c:278 #, c-format msgid "read error on %s: %s" msgstr "грешка учитавања на %s: %s" -#: lib/utils.c:341 +#: sed/utils.c:368 #, fuzzy, c-format msgid "cannot rename %s: %s" msgstr "%s: не може читати %s: %s\n" - -#~ msgid "Success" -#~ msgstr "УÑ�пех" - -#~ msgid "No match" -#~ msgstr "Без поклапања" - -#~ msgid "Invalid regular expression" -#~ msgstr "Ð�еиÑ�правни регуларни израз" - -#~ msgid "Invalid collation character" -#~ msgstr "Ð�еиÑ�правни знак прикупљања" - -#~ msgid "Trailing backslash" -#~ msgstr "Пратећа обрнута коÑ�а црта" - -#~ msgid "Invalid back reference" -#~ msgstr "Ð�еиÑ�правна повратна референца" - -#~ msgid "Unmatched [ or [^" -#~ msgstr "Ð�еÑ�парено [ или ^[" - -#~ msgid "Unmatched ( or \\(" -#~ msgstr "Ð�еÑ�парено ( или \\(" - -#~ msgid "Unmatched \\{" -#~ msgstr "Ð�еÑ�парено \\{" - -#~ msgid "Invalid range end" -#~ msgstr "Ð�еиÑ�правни крај опÑ�ега" - -#~ msgid "Memory exhausted" -#~ msgstr "Меморија иÑ�црпљена" - -#~ msgid "Invalid preceding regular expression" -#~ msgstr "Ð�еиÑ�праван претходећи регуларни израз" - -#~ msgid "Premature end of regular expression" -#~ msgstr "Преран крај регуларног израза" - -#~ msgid "Unmatched ) or \\)" -#~ msgstr "Ð�еÑ�парено ) или \\)" - -#~ msgid "No previous regular expression" -#~ msgstr "Без претходног регуларног израза" diff --git a/po/ssed.pot b/po/ssed.pot index 31a2471..9a32503 100644 --- a/po/ssed.pot +++ b/po/ssed.pot @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:37+0200\n" +"Report-Msgid-Bugs-To: bonzini@gnu.org\n" +"POT-Creation-Date: 2006-09-26 00:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -327,83 +327,83 @@ msgstr "" msgid "can't find label for jump to `%s'" msgstr "" -#: sed/execute.c:650 +#: sed/execute.c:706 #, c-format msgid "%s: can't read %s: %s\n" msgstr "" -#: sed/execute.c:673 +#: sed/execute.c:729 #, c-format msgid "couldn't edit %s: is a terminal" msgstr "" -#: sed/execute.c:677 +#: sed/execute.c:734 #, c-format msgid "couldn't edit %s: not a regular file" msgstr "" -#: sed/execute.c:684 lib/utils.c:196 +#: sed/execute.c:741 sed/utils.c:229 #, c-format msgid "couldn't open temporary file %s: %s" msgstr "" -#: sed/execute.c:1206 sed/execute.c:1387 +#: sed/execute.c:1264 sed/execute.c:1444 msgid "error in subprocess" msgstr "" -#: sed/execute.c:1208 +#: sed/execute.c:1266 msgid "option `e' not supported" msgstr "" -#: sed/execute.c:1389 +#: sed/execute.c:1446 msgid "`e' command not supported" msgstr "" -#: sed/execute.c:1714 +#: sed/execute.c:1786 msgid "no input files" msgstr "" -#: sed/regexp.c:39 +#: sed/regexp.c:40 msgid "no previous regular expression" msgstr "" -#: sed/regexp.c:40 +#: sed/regexp.c:41 msgid "cannot specify modifiers on empty regexp" msgstr "" -#: sed/regexp.c:115 +#: sed/regexp.c:121 #, c-format msgid "invalid reference \\%d on `s' command's RHS" msgstr "" -#: sed/sed.c:93 +#: sed/sed.c:98 msgid "" " -R, --regexp-perl\n" " use Perl 5's regular expressions syntax in the script.\n" msgstr "" -#: sed/sed.c:98 +#: sed/sed.c:103 #, c-format msgid "" "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" "\n" msgstr "" -#: sed/sed.c:102 +#: sed/sed.c:107 #, c-format msgid "" " -n, --quiet, --silent\n" " suppress automatic printing of pattern space\n" msgstr "" -#: sed/sed.c:104 +#: sed/sed.c:109 #, c-format msgid "" " -e script, --expression=script\n" " add the script to the commands to be executed\n" msgstr "" -#: sed/sed.c:106 +#: sed/sed.c:111 #, c-format msgid "" " -f script-file, --file=script-file\n" @@ -411,35 +411,43 @@ msgid "" "executed\n" msgstr "" -#: sed/sed.c:108 +#: sed/sed.c:113 #, c-format msgid "" " -i[SUFFIX], --in-place[=SUFFIX]\n" " edit files in place (makes backup if extension supplied)\n" msgstr "" -#: sed/sed.c:110 +#: sed/sed.c:116 +#, c-format +msgid "" +" -b, --binary\n" +" open files in binary mode (CR+LFs are not processed " +"specially)\n" +msgstr "" + +#: sed/sed.c:119 #, c-format msgid "" " -l N, --line-length=N\n" " specify the desired line-wrap length for the `l' command\n" msgstr "" -#: sed/sed.c:112 +#: sed/sed.c:121 #, c-format msgid "" " --posix\n" " disable all GNU extensions.\n" msgstr "" -#: sed/sed.c:114 +#: sed/sed.c:123 #, c-format msgid "" " -r, --regexp-extended\n" " use extended regular expressions in the script.\n" msgstr "" -#: sed/sed.c:117 +#: sed/sed.c:126 #, c-format msgid "" " -s, --separate\n" @@ -448,7 +456,7 @@ msgid "" " long stream.\n" msgstr "" -#: sed/sed.c:120 +#: sed/sed.c:129 #, c-format msgid "" " -u, --unbuffered\n" @@ -457,17 +465,17 @@ msgid "" " the output buffers more often\n" msgstr "" -#: sed/sed.c:123 +#: sed/sed.c:132 #, c-format msgid " --help display this help and exit\n" msgstr "" -#: sed/sed.c:124 +#: sed/sed.c:133 #, c-format msgid " --version output version information and exit\n" msgstr "" -#: sed/sed.c:125 +#: sed/sed.c:134 #, c-format msgid "" "\n" @@ -478,31 +486,31 @@ msgid "" "\n" msgstr "" -#: sed/sed.c:131 +#: sed/sed.c:140 #, c-format msgid "" "E-mail bug reports to: %s .\n" "Be sure to include the word ``%s'' somewhere in the ``Subject:'' field.\n" msgstr "" -#: sed/sed.c:268 +#: sed/sed.c:285 #, c-format msgid "super-sed version %s\n" msgstr "" -#: sed/sed.c:269 +#: sed/sed.c:286 #, c-format msgid "" "based on GNU sed version %s\n" "\n" msgstr "" -#: sed/sed.c:271 +#: sed/sed.c:288 #, c-format msgid "GNU sed version %s\n" msgstr "" -#: sed/sed.c:273 +#: sed/sed.c:290 #, c-format msgid "" "%s\n" @@ -511,29 +519,34 @@ msgid "" "to the extent permitted by law.\n" msgstr "" -#: lib/utils.c:98 lib/utils.c:336 +#: sed/utils.c:98 sed/utils.c:363 #, c-format msgid "cannot remove %s: %s" msgstr "" -#: lib/utils.c:143 +#: sed/utils.c:168 #, c-format msgid "couldn't open file %s: %s" msgstr "" -#: lib/utils.c:220 +#: sed/utils.c:192 +#, c-format +msgid "couldn't attach to %s: %s" +msgstr "" + +#: sed/utils.c:247 #, c-format msgid "couldn't write %d item to %s: %s" msgid_plural "couldn't write %d items to %s: %s" msgstr[0] "" msgstr[1] "" -#: lib/utils.c:235 lib/utils.c:251 +#: sed/utils.c:262 sed/utils.c:278 #, c-format msgid "read error on %s: %s" msgstr "" -#: lib/utils.c:341 +#: sed/utils.c:368 #, c-format msgid "cannot rename %s: %s" msgstr "" diff --git a/po/sv.po b/po/sv.po index 8fd1162..56a4cda 100644 --- a/po/sv.po +++ b/po/sv.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.1.1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:37+0200\n" +"Report-Msgid-Bugs-To: bonzini@gnu.org\n" +"POT-Creation-Date: 2006-09-26 00:06+0200\n" "PO-Revision-Date: 2004-07-11 11:45+0200\n" "Last-Translator: Christian Rose \n" "Language-Team: Swedish \n" @@ -332,47 +332,47 @@ msgstr "%s: -e uttryck #%lu, tecken %lu: %s\n" msgid "can't find label for jump to `%s'" msgstr "kan inte hitta etiketten för hopp till \"%s\"" -#: sed/execute.c:650 +#: sed/execute.c:706 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: kan inte läsa %s: %s\n" -#: sed/execute.c:673 +#: sed/execute.c:729 #, c-format msgid "couldn't edit %s: is a terminal" msgstr "kunde inte redigera %s: är en terminal" -#: sed/execute.c:677 +#: sed/execute.c:734 #, c-format msgid "couldn't edit %s: not a regular file" msgstr "kunde inte redigera %s: inte en vanlig fil" -#: sed/execute.c:684 lib/utils.c:196 +#: sed/execute.c:741 sed/utils.c:229 #, c-format msgid "couldn't open temporary file %s: %s" msgstr "kunde inte öppna temporära filen %s: %s" -#: sed/execute.c:1206 sed/execute.c:1387 +#: sed/execute.c:1264 sed/execute.c:1444 msgid "error in subprocess" msgstr "fel i underprocess" -#: sed/execute.c:1208 +#: sed/execute.c:1266 msgid "option `e' not supported" msgstr "flaggan \"e\" stöds inte" -#: sed/execute.c:1389 +#: sed/execute.c:1446 msgid "`e' command not supported" msgstr "kommandot \"e\" stöds inte" -#: sed/execute.c:1714 +#: sed/execute.c:1786 msgid "no input files" msgstr "" -#: sed/regexp.c:39 +#: sed/regexp.c:40 msgid "no previous regular expression" msgstr "inget tidigare reguljärt uttryck" -#: sed/regexp.c:40 +#: sed/regexp.c:41 msgid "cannot specify modifiers on empty regexp" msgstr "kan inte ange modifierare på tomt reguljärt uttryck" @@ -380,12 +380,12 @@ msgstr "kan inte ange modifierare p # Jag antar RHS står för "right hand side". Man kan då säga # "... kommandots högersida" # -#: sed/regexp.c:115 +#: sed/regexp.c:121 #, c-format msgid "invalid reference \\%d on `s' command's RHS" msgstr "ogiltig referens \\%d på \"s\"-kommandots högersida" -#: sed/sed.c:93 +#: sed/sed.c:98 msgid "" " -R, --regexp-perl\n" " use Perl 5's regular expressions syntax in the script.\n" @@ -393,7 +393,7 @@ msgstr "" " -R, --regexp-perl\n" " använd Perl 5:s syntax för reguljära uttryck i skriptet.\n" -#: sed/sed.c:98 +#: sed/sed.c:103 #, c-format msgid "" "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" @@ -402,7 +402,7 @@ msgstr "" "Användning: %s [FLAGGA]... {skript-endast-om-inga-andra} [indatafil]...\n" "\n" -#: sed/sed.c:102 +#: sed/sed.c:107 #, c-format msgid "" " -n, --quiet, --silent\n" @@ -411,7 +411,7 @@ msgstr "" " -n, --quiet, --silent\n" " förhindrar automatisk utskrift av mönsterutrymme\n" -#: sed/sed.c:104 +#: sed/sed.c:109 #, c-format msgid "" " -e script, --expression=script\n" @@ -420,7 +420,7 @@ msgstr "" " -e skript, --expression=skript\n" " lägg till skript till de kommandon som ska utföras\n" -#: sed/sed.c:106 +#: sed/sed.c:111 #, c-format msgid "" " -f script-file, --file=script-file\n" @@ -431,7 +431,7 @@ msgstr "" " lägg till innehållet i skriptfil till de kommandon som ska\n" " utföras\n" -#: sed/sed.c:108 +#: sed/sed.c:113 #, c-format msgid "" " -i[SUFFIX], --in-place[=SUFFIX]\n" @@ -441,7 +441,18 @@ msgstr "" " redigera filer på plats (skapar säkerhetskopia om ändelse\n" " tillhandahålls)\n" -#: sed/sed.c:110 +#: sed/sed.c:116 +#, fuzzy, c-format +msgid "" +" -b, --binary\n" +" open files in binary mode (CR+LFs are not processed " +"specially)\n" +msgstr "" +" -i[ÄNDELSE], --in-place[=ÄNDELSE]\n" +" redigera filer på plats (skapar säkerhetskopia om ändelse\n" +" tillhandahålls)\n" + +#: sed/sed.c:119 #, c-format msgid "" " -l N, --line-length=N\n" @@ -450,7 +461,7 @@ msgstr "" " -l N, --line-length=N\n" " ange önskad radbrytningslängd för \"l\"-kommandot\n" -#: sed/sed.c:112 +#: sed/sed.c:121 #, c-format msgid "" " --posix\n" @@ -459,7 +470,7 @@ msgstr "" " --posix\n" " inaktivera alla GNU-utökningar.\n" -#: sed/sed.c:114 +#: sed/sed.c:123 #, c-format msgid "" " -r, --regexp-extended\n" @@ -468,7 +479,7 @@ msgstr "" " -r, --regexp-extended\n" " använd utökade reguljära uttryck i skriptet.\n" -#: sed/sed.c:117 +#: sed/sed.c:126 #, c-format msgid "" " -s, --separate\n" @@ -480,7 +491,7 @@ msgstr "" " betrakta filer som separata istället för som en\n" " kontinuerlig lång dataström.\n" -#: sed/sed.c:120 +#: sed/sed.c:129 #, c-format msgid "" " -u, --unbuffered\n" @@ -492,17 +503,17 @@ msgstr "" " läs in minimala mängder data från indatafilerna och töm\n" " utdatabufferterna oftare\n" -#: sed/sed.c:123 +#: sed/sed.c:132 #, c-format msgid " --help display this help and exit\n" msgstr " --help visa denna hjälptext och avsluta\n" -#: sed/sed.c:124 +#: sed/sed.c:133 #, c-format msgid " --version output version information and exit\n" msgstr " --version visa versionsinformation och avsluta\n" -#: sed/sed.c:125 +#: sed/sed.c:134 #, c-format msgid "" "\n" @@ -519,7 +530,7 @@ msgstr "" "läses standard in.\n" "\n" -#: sed/sed.c:131 +#: sed/sed.c:140 #, c-format msgid "" "E-mail bug reports to: %s .\n" @@ -529,12 +540,12 @@ msgstr "" "Ange ordet \"%s\" på något ställe i \"Ärende:\"-fältet.\n" "Skicka anmärkningar på översättningen till .\n" -#: sed/sed.c:268 +#: sed/sed.c:285 #, c-format msgid "super-sed version %s\n" msgstr "super-sed version %s\n" -#: sed/sed.c:269 +#: sed/sed.c:286 #, c-format msgid "" "based on GNU sed version %s\n" @@ -543,12 +554,12 @@ msgstr "" "baserad på GNU sed version %s\n" "\n" -#: sed/sed.c:271 +#: sed/sed.c:288 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed version %s\n" -#: sed/sed.c:273 +#: sed/sed.c:290 #, c-format msgid "" "%s\n" @@ -564,74 +575,34 @@ msgstr "" "Det finns INGEN garanti; inte ens för SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT\n" "SPECIELLT ÄNDAMÅL, i den omfattning som medges av gällande lag.\n" -#: lib/utils.c:98 lib/utils.c:336 +#: sed/utils.c:98 sed/utils.c:363 #, c-format msgid "cannot remove %s: %s" msgstr "kan inte ta bort %s: %s" -#: lib/utils.c:143 +#: sed/utils.c:168 #, c-format msgid "couldn't open file %s: %s" msgstr "kunde inte öppna filen %s: %s" -#: lib/utils.c:220 +#: sed/utils.c:192 +#, fuzzy, c-format +msgid "couldn't attach to %s: %s" +msgstr "kunde inte skriva %d objekt till %s: %s" + +#: sed/utils.c:247 #, c-format msgid "couldn't write %d item to %s: %s" msgid_plural "couldn't write %d items to %s: %s" msgstr[0] "kunde inte skriva %d objekt till %s: %s" msgstr[1] "kunde inte skriva %d objekt till %s: %s" -#: lib/utils.c:235 lib/utils.c:251 +#: sed/utils.c:262 sed/utils.c:278 #, c-format msgid "read error on %s: %s" msgstr "läsfel vid %s: %s" -#: lib/utils.c:341 +#: sed/utils.c:368 #, c-format msgid "cannot rename %s: %s" msgstr "kan inte byta namn på %s: %s" - -#~ msgid "Success" -#~ msgstr "Lyckades" - -#~ msgid "No match" -#~ msgstr "Ingen träff" - -#~ msgid "Invalid regular expression" -#~ msgstr "Ogiltigt reguljärt uttryck" - -#~ msgid "Invalid collation character" -#~ msgstr "Ogiltigt sorteringstecken" - -#~ msgid "Trailing backslash" -#~ msgstr "Eftersläpande omvänt snedstreck" - -#~ msgid "Invalid back reference" -#~ msgstr "Ogiltig bakåtreferens" - -#~ msgid "Unmatched [ or [^" -#~ msgstr "Obalanserad [ eller [^" - -#~ msgid "Unmatched ( or \\(" -#~ msgstr "Obalanserad ( eller \\(" - -#~ msgid "Unmatched \\{" -#~ msgstr "Obalanserad \\{" - -#~ msgid "Invalid range end" -#~ msgstr "Ogiltigt intervallslut" - -#~ msgid "Memory exhausted" -#~ msgstr "Minnet slut" - -#~ msgid "Invalid preceding regular expression" -#~ msgstr "Ogiltigt föregående reguljärt uttryck" - -#~ msgid "Premature end of regular expression" -#~ msgstr "För tidigt slut på reguljärt uttryck" - -#~ msgid "Unmatched ) or \\)" -#~ msgstr "Obalanserad ) eller \\)" - -#~ msgid "No previous regular expression" -#~ msgstr "Inget tidigare reguljärt uttryck" diff --git a/po/tr.po b/po/tr.po index 534c0bf..687c93a 100644 --- a/po/tr.po +++ b/po/tr.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: sed 4.0.9\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:37+0200\n" +"Report-Msgid-Bugs-To: bonzini@gnu.org\n" +"POT-Creation-Date: 2006-09-26 00:06+0200\n" "PO-Revision-Date: 2004-05-19 18:06+0300\n" "Last-Translator: Deniz Akkus Kanca \n" "Language-Team: Turkish \n" @@ -350,58 +350,58 @@ msgstr "%s: -e ifade #%lu, harf %lu: %s\n" msgid "can't find label for jump to `%s'" msgstr "`%s'e atlamak için etiket bulunamıyor" -#: sed/execute.c:650 +#: sed/execute.c:706 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s: %s okunamıyor: %s\n" -#: sed/execute.c:673 +#: sed/execute.c:729 #, fuzzy, c-format msgid "couldn't edit %s: is a terminal" msgstr "%d sayıda öğe %s'e yazılamadı: %s" -#: sed/execute.c:677 +#: sed/execute.c:734 #, c-format msgid "couldn't edit %s: not a regular file" msgstr "" -#: sed/execute.c:684 lib/utils.c:196 +#: sed/execute.c:741 sed/utils.c:229 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "Geçici dosya %s açılamadı: %s" -#: sed/execute.c:1206 sed/execute.c:1387 +#: sed/execute.c:1264 sed/execute.c:1444 msgid "error in subprocess" msgstr "altsüreçte hata" -#: sed/execute.c:1208 +#: sed/execute.c:1266 msgid "option `e' not supported" msgstr " e' seçeneÄŸi desteklenmiyor" -#: sed/execute.c:1389 +#: sed/execute.c:1446 msgid "`e' command not supported" msgstr "`e' komutu desteklenmiyor" -#: sed/execute.c:1714 +#: sed/execute.c:1786 msgid "no input files" msgstr "" -#: sed/regexp.c:39 +#: sed/regexp.c:40 #, fuzzy msgid "no previous regular expression" msgstr "Daha önce düzenli ifade yok" -#: sed/regexp.c:40 +#: sed/regexp.c:41 #, fuzzy msgid "cannot specify modifiers on empty regexp" msgstr "BoÅŸ düzenli ifadeye deÄŸiÅŸtirici atanamaz" -#: sed/regexp.c:115 +#: sed/regexp.c:121 #, fuzzy, c-format msgid "invalid reference \\%d on `s' command's RHS" msgstr "`s' komutunun RHS'sinde geçersiz \\%d referansı" -#: sed/sed.c:93 +#: sed/sed.c:98 msgid "" " -R, --regexp-perl\n" " use Perl 5's regular expressions syntax in the script.\n" @@ -409,28 +409,28 @@ msgstr "" " -R, --regexp-perl\n" " betikte Perl 5'in düzenli ifade sözdizimini kullanır.\n" -#: sed/sed.c:98 +#: sed/sed.c:103 #, c-format msgid "" "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" "\n" msgstr "" -#: sed/sed.c:102 +#: sed/sed.c:107 #, c-format msgid "" " -n, --quiet, --silent\n" " suppress automatic printing of pattern space\n" msgstr "" -#: sed/sed.c:104 +#: sed/sed.c:109 #, c-format msgid "" " -e script, --expression=script\n" " add the script to the commands to be executed\n" msgstr "" -#: sed/sed.c:106 +#: sed/sed.c:111 #, c-format msgid "" " -f script-file, --file=script-file\n" @@ -438,28 +438,36 @@ msgid "" "executed\n" msgstr "" -#: sed/sed.c:108 +#: sed/sed.c:113 #, c-format msgid "" " -i[SUFFIX], --in-place[=SUFFIX]\n" " edit files in place (makes backup if extension supplied)\n" msgstr "" -#: sed/sed.c:110 +#: sed/sed.c:116 +#, c-format +msgid "" +" -b, --binary\n" +" open files in binary mode (CR+LFs are not processed " +"specially)\n" +msgstr "" + +#: sed/sed.c:119 #, c-format msgid "" " -l N, --line-length=N\n" " specify the desired line-wrap length for the `l' command\n" msgstr "" -#: sed/sed.c:112 +#: sed/sed.c:121 #, c-format msgid "" " --posix\n" " disable all GNU extensions.\n" msgstr "" -#: sed/sed.c:114 +#: sed/sed.c:123 #, fuzzy, c-format msgid "" " -r, --regexp-extended\n" @@ -468,7 +476,7 @@ msgstr "" " -R, --regexp-perl\n" " betikte Perl 5'in düzenli ifade sözdizimini kullanır.\n" -#: sed/sed.c:117 +#: sed/sed.c:126 #, c-format msgid "" " -s, --separate\n" @@ -477,7 +485,7 @@ msgid "" " long stream.\n" msgstr "" -#: sed/sed.c:120 +#: sed/sed.c:129 #, c-format msgid "" " -u, --unbuffered\n" @@ -486,17 +494,17 @@ msgid "" " the output buffers more often\n" msgstr "" -#: sed/sed.c:123 +#: sed/sed.c:132 #, c-format msgid " --help display this help and exit\n" msgstr "" -#: sed/sed.c:124 +#: sed/sed.c:133 #, c-format msgid " --version output version information and exit\n" msgstr "" -#: sed/sed.c:125 +#: sed/sed.c:134 #, c-format msgid "" "\n" @@ -507,7 +515,7 @@ msgid "" "\n" msgstr "" -#: sed/sed.c:131 +#: sed/sed.c:140 #, c-format msgid "" "E-mail bug reports to: %s .\n" @@ -517,12 +525,12 @@ msgstr "" " adresine bildirin. \n" "``%s'' sözcüğünün Konu baÅŸlığında yer almasına dikkat edin. \n" -#: sed/sed.c:268 +#: sed/sed.c:285 #, c-format msgid "super-sed version %s\n" msgstr "super-sed sürüm %s\n" -#: sed/sed.c:269 +#: sed/sed.c:286 #, fuzzy, c-format msgid "" "based on GNU sed version %s\n" @@ -531,12 +539,12 @@ msgstr "" "GNU sed sürümü 3.02.80 temel alınmıştır\n" "\n" -#: sed/sed.c:271 +#: sed/sed.c:288 #, c-format msgid "GNU sed version %s\n" msgstr "GNU sed sürümü %s\n" -#: sed/sed.c:273 +#: sed/sed.c:290 #, c-format msgid "" "%s\n" @@ -549,81 +557,33 @@ msgstr "" "Hiçbir garantisi yoktur; hatta SATILABİLİRLİĞİ veya HERHANGİ BİR AMACA\n" "UYGUNLUÄžU için bile garanti verilmez.\n" -#: lib/utils.c:98 lib/utils.c:336 +#: sed/utils.c:98 sed/utils.c:363 #, fuzzy, c-format msgid "cannot remove %s: %s" msgstr "%s: %s okunamıyor: %s\n" -#: lib/utils.c:143 +#: sed/utils.c:168 #, fuzzy, c-format msgid "couldn't open file %s: %s" msgstr "%s dosyası açılamadı: %s" -#: lib/utils.c:220 +#: sed/utils.c:192 +#, fuzzy, c-format +msgid "couldn't attach to %s: %s" +msgstr "%d sayıda öğe %s'e yazılamadı: %s" + +#: sed/utils.c:247 #, c-format msgid "couldn't write %d item to %s: %s" msgid_plural "couldn't write %d items to %s: %s" msgstr[0] "%d sayıda öğe %s'e yazılamadı: %s" -msgstr[1] "%d sayıda öğe %s'e yazılamadı: %s" -#: lib/utils.c:235 lib/utils.c:251 +#: sed/utils.c:262 sed/utils.c:278 #, c-format msgid "read error on %s: %s" msgstr "%s'de okuma hatası: %s" -#: lib/utils.c:341 +#: sed/utils.c:368 #, fuzzy, c-format msgid "cannot rename %s: %s" msgstr "%s: %s okunamıyor: %s\n" - -#~ msgid "Success" -#~ msgstr "BaÅŸarılı" - -#~ msgid "No match" -#~ msgstr "EÅŸleÅŸme bulunamadı" - -# -#~ msgid "Invalid regular expression" -#~ msgstr "Hatalı düzenli ifade" - -#~ msgid "Invalid collation character" -#~ msgstr "Hatalı birleÅŸtirme karakteri" - -#~ msgid "Trailing backslash" -#~ msgstr "Sonda fazla gerikesme var" - -#~ msgid "Invalid back reference" -#~ msgstr "Hatalı geri referans" - -# -#~ msgid "Unmatched [ or [^" -#~ msgstr "EÅŸleÅŸmeyen [ veya [^" - -# -#~ msgid "Unmatched ( or \\(" -#~ msgstr "EÅŸleÅŸmeyen ( veya \\(" - -# -#~ msgid "Unmatched \\{" -#~ msgstr "EÅŸleÅŸmeyen \\{" - -#~ msgid "Invalid range end" -#~ msgstr "Geçersiz kapsam sonu" - -#~ msgid "Memory exhausted" -#~ msgstr "Bellek tükendi" - -# -#~ msgid "Invalid preceding regular expression" -#~ msgstr "Bir önceki düzenli ifade hatalı" - -# -#~ msgid "Premature end of regular expression" -#~ msgstr "Düzenli ifade erken sonlandı" - -# -#~ msgid "Unmatched ) or \\)" -#~ msgstr "EÅŸleÅŸmeyen ) or \\)" - -#~ msgid "No previous regular expression" -#~ msgstr "Daha önce düzenli ifade yok" diff --git a/po/zh_CN.po b/po/zh_CN.po index 3e02ad6..49f9fef 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: sed 3.02.80\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:37+0200\n" +"Report-Msgid-Bugs-To: bonzini@gnu.org\n" +"POT-Creation-Date: 2006-09-26 00:06+0200\n" "PO-Revision-Date: 2002-08-18 11:11+0800\n" "Last-Translator: Wang Li \n" "Language-Team: Chinese (simplified) \n" @@ -342,83 +342,83 @@ msgstr "%s msgid "can't find label for jump to `%s'" msgstr "ÎÞ·¨ÎªÄ¿µÄΪ¡°%s¡±µÄÌø×ªÕÒµ½±êÇ©" -#: sed/execute.c:650 +#: sed/execute.c:706 #, c-format msgid "%s: can't read %s: %s\n" msgstr "%s£ºÎÞ·¨¶ÁÈ¡ %s£º%s\n" -#: sed/execute.c:673 +#: sed/execute.c:729 #, fuzzy, c-format msgid "couldn't edit %s: is a terminal" msgstr "ÎÞ·¨´ò¿ªÎļþ %s" -#: sed/execute.c:677 +#: sed/execute.c:734 #, c-format msgid "couldn't edit %s: not a regular file" msgstr "" -#: sed/execute.c:684 lib/utils.c:196 +#: sed/execute.c:741 sed/utils.c:229 #, fuzzy, c-format msgid "couldn't open temporary file %s: %s" msgstr "ÎÞ·¨´ò¿ªÎļþ %s" -#: sed/execute.c:1206 sed/execute.c:1387 +#: sed/execute.c:1264 sed/execute.c:1444 msgid "error in subprocess" msgstr "" -#: sed/execute.c:1208 +#: sed/execute.c:1266 msgid "option `e' not supported" msgstr "" -#: sed/execute.c:1389 +#: sed/execute.c:1446 msgid "`e' command not supported" msgstr "" -#: sed/execute.c:1714 +#: sed/execute.c:1786 msgid "no input files" msgstr "" -#: sed/regexp.c:39 +#: sed/regexp.c:40 msgid "no previous regular expression" msgstr "" -#: sed/regexp.c:40 +#: sed/regexp.c:41 msgid "cannot specify modifiers on empty regexp" msgstr "" -#: sed/regexp.c:115 +#: sed/regexp.c:121 #, c-format msgid "invalid reference \\%d on `s' command's RHS" msgstr "" -#: sed/sed.c:93 +#: sed/sed.c:98 msgid "" " -R, --regexp-perl\n" " use Perl 5's regular expressions syntax in the script.\n" msgstr "" -#: sed/sed.c:98 +#: sed/sed.c:103 #, c-format msgid "" "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" "\n" msgstr "" -#: sed/sed.c:102 +#: sed/sed.c:107 #, c-format msgid "" " -n, --quiet, --silent\n" " suppress automatic printing of pattern space\n" msgstr "" -#: sed/sed.c:104 +#: sed/sed.c:109 #, c-format msgid "" " -e script, --expression=script\n" " add the script to the commands to be executed\n" msgstr "" -#: sed/sed.c:106 +#: sed/sed.c:111 #, c-format msgid "" " -f script-file, --file=script-file\n" @@ -426,35 +426,43 @@ msgid "" "executed\n" msgstr "" -#: sed/sed.c:108 +#: sed/sed.c:113 #, c-format msgid "" " -i[SUFFIX], --in-place[=SUFFIX]\n" " edit files in place (makes backup if extension supplied)\n" msgstr "" -#: sed/sed.c:110 +#: sed/sed.c:116 +#, c-format +msgid "" +" -b, --binary\n" +" open files in binary mode (CR+LFs are not processed " +"specially)\n" +msgstr "" + +#: sed/sed.c:119 #, c-format msgid "" " -l N, --line-length=N\n" " specify the desired line-wrap length for the `l' command\n" msgstr "" -#: sed/sed.c:112 +#: sed/sed.c:121 #, c-format msgid "" " --posix\n" " disable all GNU extensions.\n" msgstr "" -#: sed/sed.c:114 +#: sed/sed.c:123 #, c-format msgid "" " -r, --regexp-extended\n" " use extended regular expressions in the script.\n" msgstr "" -#: sed/sed.c:117 +#: sed/sed.c:126 #, c-format msgid "" " -s, --separate\n" @@ -463,7 +471,7 @@ msgid "" " long stream.\n" msgstr "" -#: sed/sed.c:120 +#: sed/sed.c:129 #, c-format msgid "" " -u, --unbuffered\n" @@ -472,17 +480,17 @@ msgid "" " the output buffers more often\n" msgstr "" -#: sed/sed.c:123 +#: sed/sed.c:132 #, c-format msgid " --help display this help and exit\n" msgstr "" -#: sed/sed.c:124 +#: sed/sed.c:133 #, c-format msgid " --version output version information and exit\n" msgstr "" -#: sed/sed.c:125 +#: sed/sed.c:134 #, c-format msgid "" "\n" @@ -493,7 +501,7 @@ msgid "" "\n" msgstr "" -#: sed/sed.c:131 +#: sed/sed.c:140 #, c-format msgid "" "E-mail bug reports to: %s .\n" @@ -502,24 +510,24 @@ msgstr "" "½«´íÎ󱨸æÍ¨¹ýµç×ÓÓʼþ·¢Ë͵½£º%s .\n" "ÇëÎñ±Ø½«µ¥´Ê¡°%s¡±·ÅÔÚ¡°Subject:¡±ÓòµÄij´¦¡£\n" -#: sed/sed.c:268 +#: sed/sed.c:285 #, c-format msgid "super-sed version %s\n" msgstr "" -#: sed/sed.c:269 +#: sed/sed.c:286 #, c-format msgid "" "based on GNU sed version %s\n" "\n" msgstr "" -#: sed/sed.c:271 +#: sed/sed.c:288 #, c-format msgid "GNU sed version %s\n" msgstr "" -#: sed/sed.c:273 +#: sed/sed.c:290 #, c-format msgid "" "%s\n" @@ -528,45 +536,34 @@ msgid "" "to the extent permitted by law.\n" msgstr "" -#: lib/utils.c:98 lib/utils.c:336 +#: sed/utils.c:98 sed/utils.c:363 #, fuzzy, c-format msgid "cannot remove %s: %s" msgstr "%s£ºÎÞ·¨¶ÁÈ¡ %s£º%s\n" -#: lib/utils.c:143 +#: sed/utils.c:168 #, fuzzy, c-format msgid "couldn't open file %s: %s" msgstr "ÎÞ·¨´ò¿ªÎļþ %s" -#: lib/utils.c:220 +#: sed/utils.c:192 +#, fuzzy, c-format +msgid "couldn't attach to %s: %s" +msgstr "ÎÞ·¨½« %d ¸öÏîĿдÈë %s£º%s" + +#: sed/utils.c:247 #, fuzzy, c-format msgid "couldn't write %d item to %s: %s" msgid_plural "couldn't write %d items to %s: %s" msgstr[0] "ÎÞ·¨½« %d ¸öÏîĿдÈë %s£º%s" msgstr[1] "ÎÞ·¨½« %d ¸öÏîĿдÈë %s£º%s" -#: lib/utils.c:235 lib/utils.c:251 +#: sed/utils.c:262 sed/utils.c:278 #, c-format msgid "read error on %s: %s" msgstr "¶ÁÈ¡ %s ³ö´í£º%s" -#: lib/utils.c:341 +#: sed/utils.c:368 #, fuzzy, c-format msgid "cannot rename %s: %s" msgstr "%s£ºÎÞ·¨¶ÁÈ¡ %s£º%s\n" - -#, fuzzy -#~ msgid "Unmatched [ or [^" -#~ msgstr "δƥÅäµÄ¡°{¡±" - -#, fuzzy -#~ msgid "Unmatched ( or \\(" -#~ msgstr "δƥÅäµÄ¡°{¡±" - -#, fuzzy -#~ msgid "Unmatched \\{" -#~ msgstr "δƥÅäµÄ¡°{¡±" - -#, fuzzy -#~ msgid "Unmatched ) or \\)" -#~ msgstr "δƥÅäµÄ¡°{¡±" diff --git a/sed/Makefile.am b/sed/Makefile.am index 251bed1..4102e90 100644 --- a/sed/Makefile.am +++ b/sed/Makefile.am @@ -3,7 +3,7 @@ bin_PROGRAMS = sed localedir = $(datadir)/locale -sed_SOURCES = sed.c compile.c execute.c regexp.c fmt.c mbcs.c +sed_SOURCES = sed.c compile.c execute.c regexp.c fmt.c mbcs.c utils.c noinst_HEADERS = sed.h AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir)/intl -I$(top_srcdir)/pcre \ diff --git a/sed/compile.c b/sed/compile.c index e35608a..a7f0307 100644 --- a/sed/compile.c +++ b/sed/compile.c @@ -374,11 +374,11 @@ read_filename() return b; } -static struct output *get_openfile P_((struct output **file_ptrs, char *mode, bool fail)); +static struct output *get_openfile P_((struct output **file_ptrs, const char *mode, bool fail)); static struct output * get_openfile(file_ptrs, mode, fail) struct output **file_ptrs; - char *mode; + const char *mode; bool fail; { struct buffer *b; @@ -1234,7 +1234,7 @@ compile_program(vector) break; case 'R': - cur_cmd->x.fp = get_openfile(&file_read, "r", false)->fp; + cur_cmd->x.fp = get_openfile(&file_read, read_mode, false)->fp; break; case 'W': diff --git a/sed/execute.c b/sed/execute.c index 8ee5088..0ca2ca5 100644 --- a/sed/execute.c +++ b/sed/execute.c @@ -70,6 +70,7 @@ extern int errno; #endif #include +#include "stat-macros.h" /* Sed operates a line at a time. */ @@ -84,6 +85,12 @@ struct line { #endif }; +#ifdef HAVE_MBRTOWC +#define SIZEOF_LINE (sizeof (struct line) - sizeof (mbstate_t)) +#else +#define SIZEOF_LINE (sizeof (struct line)) +#endif + /* A queue of text to write out at the end of a cycle (filled by the "a", "r" and "R" commands.) */ struct append_queue { @@ -367,11 +374,13 @@ str_append_modified(to, string, length, type) #endif } -/* initialize a "struct line" buffer */ -static void line_init P_((struct line *, size_t initial_size)); +/* Initialize a "struct line" buffer. Copy multibyte state from `state' + if not null. */ +static void line_init P_((struct line *, struct line *, size_t initial_size)); static void -line_init(buf, initial_size) +line_init(buf, state, initial_size) struct line *buf; + struct line *state; size_t initial_size; { buf->text = MALLOC(initial_size, char); @@ -381,18 +390,43 @@ line_init(buf, initial_size) buf->chomped = true; #ifdef HAVE_MBRTOWC - memset (&buf->mbstate, 0, sizeof (buf->mbstate)); + if (state) + memcpy (&buf->mbstate, &state->mbstate, sizeof (buf->mbstate)); + else + memset (&buf->mbstate, 0, sizeof (buf->mbstate)); #endif +} +/* Reset a "struct line" buffer to length zero. Copy multibyte state from + `state' if not null. */ +static void line_reset P_((struct line *, struct line *)); +static void +line_reset(buf, state) + struct line *buf, *state; +{ + if (buf->alloc == 0) + line_init(buf, state, INITIAL_BUFFER_SIZE); + else + { + buf->length = 0; +#ifdef HAVE_MBRTOWC + if (state) + memcpy (&buf->mbstate, &state->mbstate, sizeof (buf->mbstate)); + else + memset (&buf->mbstate, 0, sizeof (buf->mbstate)); +#endif + } } /* Copy the contents of the line `from' into the line `to'. - This destroys the old contents of `to'. */ -static void line_copy P_((struct line *from, struct line *to)); + This destroys the old contents of `to'. + Copy the multibyte state if `state' is true. */ +static void line_copy P_((struct line *from, struct line *to, bool state)); static void -line_copy(from, to) +line_copy(from, to, state) struct line *from; struct line *to; + bool state; { /* Remove the inactive portion in the destination buffer. */ to->alloc += to->active - to->text; @@ -416,38 +450,53 @@ line_copy(from, to) MEMCPY(to->active, from->active, from->length); #ifdef HAVE_MBRTOWC - MEMCPY(&to->mbstate, &from->mbstate, sizeof (from->mbstate)); + if (state) + MEMCPY(&to->mbstate, &from->mbstate, sizeof (from->mbstate)); #endif } -/* Append the contents of the line `from' to the line `to'. */ -static void line_append P_((struct line *from, struct line *to)); +/* Append the contents of the line `from' to the line `to'. + Copy the multibyte state if `state' is true. */ +static void line_append P_((struct line *from, struct line *to, bool state)); static void -line_append(from, to) +line_append(from, to, state) struct line *from; struct line *to; + bool state; { str_append(to, "\n", 1); str_append(to, from->active, from->length); to->chomped = from->chomped; #ifdef HAVE_MBRTOWC - MEMCPY (&to->mbstate, &from->mbstate, sizeof (from->mbstate)); + if (state) + MEMCPY (&to->mbstate, &from->mbstate, sizeof (from->mbstate)); #endif } -/* Exchange the contents of two "struct line" buffers. */ -static void line_exchange P_((struct line *, struct line *)); +/* Exchange two "struct line" buffers. + Copy the multibyte state if `state' is true. */ +static void line_exchange P_((struct line *a, struct line *b, bool state)); static void -line_exchange(a, b) +line_exchange(a, b, state) struct line *a; struct line *b; + bool state; { struct line t; - MEMCPY(&t, a, sizeof(struct line)); - MEMCPY( a, b, sizeof(struct line)); - MEMCPY( b, &t, sizeof(struct line)); + if (state) + { + MEMCPY(&t, a, sizeof (struct line)); + MEMCPY( a, b, sizeof (struct line)); + MEMCPY( b, &t, sizeof (struct line)); + } + else + { + MEMCPY(&t, a, SIZEOF_LINE); + MEMCPY( a, b, SIZEOF_LINE); + MEMCPY( b, &t, SIZEOF_LINE); + } } @@ -583,7 +632,7 @@ dump_append_queue() be treated as if it were an empty file, causing no error condition." IEEE Std 1003.2-1992 So, don't fail. */ - fp = ck_fopen(p->fname, "r", false); + fp = ck_fopen(p->fname, read_mode, false); if (fp) { while ((cnt = ck_fread(buf, 1, sizeof buf, fp)) > 0) @@ -643,9 +692,9 @@ open_next_file(name, input) if (name[0] == '-' && name[1] == '\0' && !in_place_extension) { clearerr(stdin); /* clear any stale EOF indication */ - input->fp = stdin; + input->fp = ck_fdopen (fileno (stdin), "stdin", read_mode, false); } - else if ( ! (input->fp = ck_fopen(name, "r", false)) ) + else if ( ! (input->fp = ck_fopen(name, read_mode, false)) ) { const char *ptr = strerror(errno); fprintf(stderr, _("%s: can't read %s: %s\n"), myname, name, ptr); @@ -658,7 +707,7 @@ open_next_file(name, input) if (in_place_extension) { - int output_fd; + int input_fd, output_fd; char *tmpdir = ck_strdup(name), *p; struct stat st; @@ -673,7 +722,8 @@ open_next_file(name, input) if (isatty (fileno (input->fp))) panic(_("couldn't edit %s: is a terminal"), input->in_file_name); - fstat (fileno (input->fp), &st); + input_fd = fileno (input->fp); + fstat (input_fd, &st); if (!S_ISREG (st.st_mode)) panic(_("couldn't edit %s: not a regular file"), input->in_file_name); @@ -685,13 +735,13 @@ open_next_file(name, input) panic(_("couldn't open temporary file %s: %s"), input->out_file_name, strerror(errno)); output_fd = fileno (output_file.fp); -#ifdef HAVE_FCHMOD - fchmod (output_fd, st.st_mode); -#endif #ifdef HAVE_FCHOWN if (fchown (output_fd, st.st_uid, st.st_gid) == -1) fchown (output_fd, -1, st.st_gid); #endif + copy_acl (input->in_file_name, input_fd, + input->out_file_name, output_fd, + st.st_mode); } else output_file.fp = stdout; @@ -1073,9 +1123,7 @@ do_subst(sub) static struct re_registers regs; - if (s_accum.alloc == 0) - line_init(&s_accum, INITIAL_BUFFER_SIZE); - s_accum.length = 0; + line_reset(&s_accum, &line); /* The first part of the loop optimizes s/xxx// when xxx is at the start, and s/xxx$// */ @@ -1167,8 +1215,8 @@ do_subst(sub) /* Exchange line and s_accum. This can be much cheaper than copying s_accum.active into line.text (for huge lines). */ - line_exchange(&line, &s_accum); - + line_exchange(&line, &s_accum, false); + /* Finish up. */ if (count < sub->numb) return; @@ -1181,7 +1229,7 @@ do_subst(sub) { #ifdef HAVE_POPEN FILE *pipe; - s_accum.length = 0; + line_reset(&s_accum, NULL); str_append (&line, "", 1); pipe = popen(line.active, "r"); @@ -1198,7 +1246,10 @@ do_subst(sub) pclose (pipe); - line_exchange(&line, &s_accum); + /* Exchange line and s_accum. This can be much cheaper than copying + s_accum.active into line.text (for huge lines). See comment above + for 'g' as to while the third argument is incorrect anyway. */ + line_exchange(&line, &s_accum, true); if (line.length && line.active[line.length - 1] == '\n') line.length--; @@ -1338,9 +1389,7 @@ execute_program(vec, input) #ifdef HAVE_POPEN FILE *pipe; int cmd_length = cur_cmd->x.cmd_txt.text_length; - if (s_accum.alloc == 0) - line_init(&s_accum, INITIAL_BUFFER_SIZE); - s_accum.length = 0; + line_reset(&s_accum, NULL); if (!cmd_length) { @@ -1377,8 +1426,9 @@ execute_program(vec, input) /* Exchange line and s_accum. This can be much cheaper than copying s_accum.active into line.text - (for huge lines). */ - line_exchange(&line, &s_accum); + (for huge lines). See comment above for 'g' as + to while the third argument is incorrect anyway. */ + line_exchange(&line, &s_accum, true); } else flush_output(output_file.fp); @@ -1393,19 +1443,33 @@ execute_program(vec, input) } case 'g': - line_copy(&hold, &line); + /* We do not have a really good choice for the third parameter. + The problem is that hold space and the input file might as + well have different states; copying it from hold space means + that subsequent input might be read incorrectly, while + keeping it as in pattern space means that commands operating + on the moved buffer might consider a wrong character set. + We keep it true because it's what sed <= 4.1.5 did. */ + line_copy(&hold, &line, true); break; case 'G': - line_append(&hold, &line); + /* We do not have a really good choice for the third parameter. + The problem is that hold space and pattern space might as + well have different states. So, true is as wrong as false. + We keep it true because it's what sed <= 4.1.5 did, but + we could consider having line_ap. */ + line_append(&hold, &line, true); break; case 'h': - line_copy(&line, &hold); + /* Here, it is ok to have true. */ + line_copy(&line, &hold, true); break; case 'H': - line_append(&line, &hold); + /* See comment above for 'G' regarding the third parameter. */ + line_append(&line, &hold, true); break; case 'i': @@ -1536,7 +1600,8 @@ execute_program(vec, input) break; case 'x': - line_exchange(&line, &hold); + /* See comment above for 'g' regarding the third parameter. */ + line_exchange(&line, &hold, false); break; case 'y': @@ -1701,9 +1766,9 @@ process_files(the_program, argv) struct input input; int status; - line_init(&line, INITIAL_BUFFER_SIZE); - line_init(&hold, 0); - line_init(&buffer, 0); + line_init(&line, NULL, INITIAL_BUFFER_SIZE); + line_init(&hold, NULL, 0); + line_init(&buffer, NULL, 0); #ifdef EXPERIMENTAL_DASH_N_OPTIMIZATION branches = count_branches(the_program); diff --git a/sed/regexp.c b/sed/regexp.c index d4e7437..1297c5e 100644 --- a/sed/regexp.c +++ b/sed/regexp.c @@ -1,5 +1,6 @@ /* GNU SED, a batch stream editor. - Copyright (C) 1999, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2003, 2004, 2005, 2006 + 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 @@ -64,7 +65,12 @@ compile_regex_1 (new_regex, needed_sub) int syntax = ((extended_regexp_flags & REG_EXTENDED) ? RE_SYNTAX_POSIX_EXTENDED : RE_SYNTAX_POSIX_BASIC) - & ~RE_UNMATCHED_RIGHT_PAREN_ORD; + & ~RE_DOT_NOT_NULL; + + if (posixicity == POSIXLY_EXTENDED) + syntax &= ~RE_UNMATCHED_RIGHT_PAREN_ORD; + else + syntax |= RE_UNMATCHED_RIGHT_PAREN_ORD; syntax |= RE_NO_POSIX_BACKTRACKING; #ifdef RE_ICASE diff --git a/sed/sed.c b/sed/sed.c index 8d38566..178d2cf 100644 --- a/sed/sed.c +++ b/sed/sed.c @@ -59,6 +59,8 @@ # define ATOI(x) strtoul(x, NULL, 0) #endif +char *program_name; + int extended_regexp_flags = 0; /* If set, fflush(stdout) on every line output. */ @@ -73,6 +75,9 @@ bool separate_files = false; /* How do we edit files in-place? (we don't if NULL) */ char *in_place_extension = NULL; +/* The mode to use to read files, either "rt" or "rb". */ +char *read_mode = "rt"; + /* Do we need to be pedantically POSIX compliant? */ enum posixicity_types posixicity; @@ -107,6 +112,10 @@ Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n\ add the contents of script-file to the commands to be executed\n")); fprintf(out, _(" -i[SUFFIX], --in-place[=SUFFIX]\n\ edit files in place (makes backup if extension supplied)\n")); +#if defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__) || defined(MSDOS) || defined(__EMX__) + fprintf(out, _(" -b, --binary\n\ + open files in binary mode (CR+LFs are not processed specially)\n")); +#endif fprintf(out, _(" -l N, --line-length=N\n\ specify the desired line-wrap length for the `l' command\n")); fprintf(out, _(" --posix\n\ @@ -142,12 +151,13 @@ main(argc, argv) char **argv; { #ifdef REG_PERL -#define SHORTOPTS "snrRue:f:l:i::V:" +#define SHORTOPTS "bsnrRuEe:f:l:i::V:" #else -#define SHORTOPTS "snrue:f:l:i::V:" +#define SHORTOPTS "bsnruEe:f:l:i::V:" #endif static struct option longopts[] = { + {"binary", 0, NULL, 'b'}, {"regexp-extended", 0, NULL, 'r'}, #ifdef REG_PERL {"regexp-perl", 0, NULL, 'R'}, @@ -170,6 +180,7 @@ main(argc, argv) int return_code; const char *cols = getenv("COLS"); + program_name = argv[0]; initialize_main (&argc, &argv); #if HAVE_SETLOCALE /* Set locale according to user's wishes. */ @@ -241,6 +252,12 @@ main(argc, argv) posixicity = POSIXLY_BASIC; break; + case 'b': + read_mode = "rb"; + break; + + /* Undocumented, for compatibility with BSD sed. */ + case 'E': case 'r': if (extended_regexp_flags) usage(4); diff --git a/sed/sed.h b/sed/sed.h index a1b3bed..8ff27bc 100644 --- a/sed/sed.h +++ b/sed/sed.h @@ -25,6 +25,7 @@ #ifndef BOOTSTRAP #include +#include "unlocked-io.h" #endif #include "utils.h" @@ -228,6 +229,9 @@ extern countT lcmd_out_line_len; /* How do we edit files in-place? (we don't if NULL) */ extern char *in_place_extension; +/* The mode to use to read files, either "rt" or "rb". */ +extern char *read_mode; + /* Should we use EREs? */ extern bool use_extended_syntax_p; diff --git a/lib/utils.c b/sed/utils.c similarity index 94% rename from lib/utils.c rename to sed/utils.c index 647fd6d..b4f0164 100644 --- a/lib/utils.c +++ b/sed/utils.c @@ -126,25 +126,13 @@ utils_fp_name(fp) return ""; } -/* Panic on failing fopen */ -FILE * -ck_fopen(name, mode, fail) - const char *name; - const char *mode; - bool fail; -{ +static void +register_open_file (fp, name, temp) FILE *fp; + const char *name; + bool temp; +{ struct open_file *p; - - fp = fopen (name, mode); - if (!fp) - { - if (fail) - panic(_("couldn't open file %s: %s"), name, strerror(errno)); - - return NULL; - } - for (p=open_files; p; p=p->link) { if (fp == p->fp) @@ -162,6 +150,51 @@ ck_fopen(name, mode, fail) p->name = ck_strdup(name); p->fp = fp; p->temp = false; +} + +/* Panic on failing fopen */ +FILE * +ck_fopen(name, mode, fail) + const char *name; + const char *mode; + bool fail; +{ + FILE *fp; + + fp = fopen (name, mode); + if (!fp) + { + if (fail) + panic(_("couldn't open file %s: %s"), name, strerror(errno)); + + return NULL; + } + + register_open_file (fp, name, false); + return fp; +} + +/* Panic on failing fdopen */ +FILE * +ck_fdopen(fd, name, mode, fail) + int fd; + const char *name; + const char *mode; + bool fail; +{ + FILE *fp; + struct open_file *p; + + fp = fdopen (fd, mode); + if (!fp) + { + if (fail) + panic(_("couldn't attach to %s: %s"), name, strerror(errno)); + + return NULL; + } + + register_open_file (fp, name, false); return fp; } @@ -197,13 +230,7 @@ ck_mkstemp (p_filename, tmpdir, base) *p_filename = template; fp = fdopen (fd, "w"); - - p = MALLOC(1, struct open_file); - p->name = ck_strdup (template); - p->fp = fp; - p->temp = true; - p->link = open_files; - open_files = p; + register_open_file (fp, template, true); return fp; } @@ -355,14 +382,6 @@ ck_malloc(size) return ret; } -/* Panic on failing malloc */ -VOID * -xmalloc(size) - size_t size; -{ - return ck_malloc(size); -} - /* Panic on failing realloc */ VOID * ck_realloc(ptr, size) diff --git a/lib/utils.h b/sed/utils.h similarity index 96% rename from lib/utils.h rename to sed/utils.h index ae09864..cef0f6d 100644 --- a/lib/utils.h +++ b/sed/utils.h @@ -23,6 +23,7 @@ void panic P_((const char *str, ...)); FILE *ck_fopen P_((const char *name, const char *mode, bool fail)); +FILE *ck_fdopen P_((int fd, const char *name, const char *mode, bool fail)); void ck_fwrite P_((const VOID *ptr, size_t size, size_t nmemb, FILE *stream)); size_t ck_fread P_((VOID *ptr, size_t size, size_t nmemb, FILE *stream)); void ck_fflush P_((FILE *stream)); diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am index 9013ee4..0c8e021 100644 --- a/testsuite/Makefile.am +++ b/testsuite/Makefile.am @@ -10,9 +10,9 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/pcre \ SEDTESTS = \ space appquit enable sep inclib 8bit newjis xabcx dollar noeol noeolw \ - modulo numsub numsub2 numsub3 numsub4 numsub5 0range bkslashes \ - head madding mac-mf empty xbxcx xbxcx3 recall recall2 xemacs \ - fasts uniq manis khadafy linecnt eval distrib 8to7 y-bracket \ + modulo numsub numsub2 numsub3 numsub4 numsub5 0range bkslashes \ + head madding mac-mf empty xbxcx xbxcx3 recall recall2 xemacs \ + fasts uniq manis khadafy linecnt eval distrib 8to7 y-bracket \ y-newline allsub cv-vars classes middle bsd stdin flipcase \ insens subwrite writeout readin \ help version file quiet \