From 1a44d77d50f4fb37c0410eed04b82303624ea2ec Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Wed, 17 Aug 2011 12:11:54 -0700 Subject: [PATCH] Import upstream version 1.26 --- ChangeLog | 158 +- INSTALL | 9 +- Makefile.in | 221 +- NEWS | 25 +- aclocal.m4 | 5 +- build-aux/arg-nonnull.h | 4 +- build-aux/c++defs.h | 4 +- build-aux/config.guess | 207 +- build-aux/config.rpath | 104 +- build-aux/config.sub | 62 +- build-aux/gitlog-to-changelog | 2 +- build-aux/install-sh | 23 +- build-aux/texinfo.tex | 452 ++- build-aux/warn-on-use.h | 4 +- config.h.in | 209 +- configure | 5766 ++++++++++++++++++++++----------- configure.ac | 2 +- doc/Makefile.in | 221 +- doc/parse-datetime.texi | 3 +- doc/stamp-vti | 8 +- doc/tar.info | 790 ++--- doc/tar.info-1 | 85 +- doc/tar.info-2 | 24 +- doc/tar.texi | 77 +- doc/version.texi | 8 +- gnu/Makefile.am | 162 +- gnu/Makefile.in | 442 ++- gnu/alloca.c | 16 +- gnu/alloca.in.h | 2 +- gnu/anytostr.c | 11 +- gnu/areadlink.c | 2 +- gnu/areadlink.h | 2 +- gnu/areadlinkat.c | 2 +- gnu/argmatch.c | 4 +- gnu/argmatch.h | 4 +- gnu/argp-ba.c | 2 +- gnu/argp-eexst.c | 2 +- gnu/argp-fmtstream.c | 2 +- gnu/argp-fmtstream.h | 16 +- gnu/argp-fs-xinl.c | 2 +- gnu/argp-help.c | 4 +- gnu/argp-namefrob.h | 28 +- gnu/argp-parse.c | 2 +- gnu/argp-pin.c | 2 +- gnu/argp-pv.c | 2 +- gnu/argp-pvh.c | 2 +- gnu/argp-version-etc.c | 2 +- gnu/argp-version-etc.h | 2 +- gnu/argp-xinl.c | 2 +- gnu/argp.h | 20 +- gnu/asnprintf.c | 2 +- gnu/asprintf.c | 2 +- gnu/at-func.c | 4 +- gnu/at-func2.c | 4 +- gnu/backupfile.c | 2 +- gnu/backupfile.h | 2 +- gnu/basename-lgpl.c | 2 +- gnu/basename.c | 2 +- gnu/bitrotate.h | 2 +- gnu/btowc.c | 2 +- gnu/c-ctype.c | 2 +- gnu/c-ctype.h | 2 +- gnu/canonicalize-lgpl.c | 2 +- gnu/chdir-long.c | 2 +- gnu/chdir-long.h | 2 +- gnu/chown.c | 2 +- gnu/cloexec.c | 2 +- gnu/cloexec.h | 2 +- gnu/close-hook.c | 4 +- gnu/close-hook.h | 4 +- gnu/close-stream.c | 2 +- gnu/close.c | 2 +- gnu/closeout.c | 2 +- gnu/closeout.h | 2 +- gnu/config.charset | 2 +- gnu/dirent--.h | 2 +- gnu/dirent-safer.h | 2 +- gnu/dirent.in.h | 2 +- gnu/dirfd.c | 2 +- gnu/dirname-lgpl.c | 2 +- gnu/dirname.c | 2 +- gnu/dirname.h | 32 +- gnu/dosname.h | 55 + gnu/dup-safer.c | 2 +- gnu/dup2.c | 6 +- gnu/errno.in.h | 2 +- gnu/error.c | 2 +- gnu/error.h | 18 +- gnu/exclude.c | 4 +- gnu/exclude.h | 4 +- gnu/exitfail.c | 3 +- gnu/exitfail.h | 2 +- gnu/fchdir.c | 2 +- gnu/fchmodat.c | 2 +- gnu/fchownat.c | 27 +- gnu/fclose.c | 2 +- gnu/fcntl.c | 16 +- gnu/fcntl.in.h | 22 +- gnu/fd-safer.c | 2 +- gnu/fdopendir.c | 126 +- gnu/fdutimensat.c | 2 +- gnu/fileblocks.c | 2 +- gnu/filenamecat-lgpl.c | 2 +- gnu/filenamecat.h | 2 +- gnu/float+.h | 2 +- gnu/float.in.h | 2 +- gnu/fnmatch.c | 3 +- gnu/fnmatch.in.h | 4 +- gnu/fnmatch_loop.c | 3 +- gnu/fpending.c | 2 +- gnu/fpending.h | 2 +- gnu/fseeko.c | 6 +- gnu/fstatat.c | 2 +- gnu/full-write.c | 2 +- gnu/full-write.h | 2 +- gnu/futimens.c | 2 +- gnu/getcwd.c | 2 +- gnu/getdelim.c | 4 +- gnu/getdtablesize.c | 2 +- gnu/getline.c | 2 +- gnu/getopt.c | 2 +- gnu/getopt.in.h | 5 +- gnu/getopt1.c | 4 +- gnu/getopt_int.h | 4 +- gnu/getpagesize.c | 2 +- gnu/gettext.h | 10 +- gnu/gettime.c | 2 +- gnu/gettimeofday.c | 8 +- gnu/hash.c | 2 +- gnu/hash.h | 23 +- gnu/human.c | 3 +- gnu/human.h | 3 +- gnu/imaxtostr.c | 1 - gnu/intprops.h | 21 +- gnu/inttostr.c | 1 - gnu/inttostr.h | 2 +- gnu/inttypes.in.h | 5 +- gnu/iswblank.c | 29 + gnu/langinfo.in.h | 5 +- gnu/lchown.c | 2 +- gnu/link.c | 2 +- gnu/linkat.c | 36 +- gnu/localcharset.c | 5 +- gnu/localcharset.h | 2 +- gnu/lseek.c | 2 +- gnu/lstat.c | 2 +- gnu/malloc.c | 2 +- gnu/malloca.c | 2 +- gnu/malloca.h | 2 +- gnu/mbchar.c | 2 +- gnu/mbchar.h | 2 +- gnu/mbrtowc.c | 24 +- gnu/mbscasecmp.c | 2 +- gnu/mbsinit.c | 18 +- gnu/mbsrtowcs-impl.h | 124 + gnu/mbsrtowcs-state.c | 2 +- gnu/mbsrtowcs.c | 108 +- gnu/mbtowc-impl.h | 46 + gnu/mbtowc.c | 28 + gnu/mbuiter.h | 2 +- gnu/memchr.c | 2 +- gnu/mempcpy.c | 2 +- gnu/memrchr.c | 2 +- gnu/mkdir.c | 2 +- gnu/mkdirat.c | 2 +- gnu/mkdtemp.c | 2 +- gnu/mkfifo.c | 2 +- gnu/mkfifoat.c | 2 +- gnu/mknod.c | 2 +- gnu/mknodat.c | 2 +- gnu/mktime.c | 200 +- gnu/modechange.c | 2 +- gnu/modechange.h | 2 +- gnu/nl_langinfo.c | 4 +- gnu/obstack.c | 4 +- gnu/obstack.h | 2 +- gnu/offtostr.c | 1 - gnu/open.c | 2 +- gnu/openat-die.c | 12 +- gnu/openat-priv.h | 24 +- gnu/openat-proc.c | 16 +- gnu/openat.c | 12 +- gnu/openat.h | 18 +- gnu/opendir-safer.c | 2 +- gnu/parse-datetime.c | 169 +- gnu/parse-datetime.h | 2 +- gnu/parse-datetime.y | 3 +- gnu/pathmax.h | 2 +- gnu/pipe-safer.c | 2 +- gnu/printf-args.c | 2 +- gnu/printf-args.h | 6 +- gnu/printf-parse.c | 48 +- gnu/printf-parse.h | 16 +- gnu/priv-set.c | 2 +- gnu/priv-set.h | 2 +- gnu/progname.c | 2 +- gnu/progname.h | 2 +- gnu/quote.c | 4 +- gnu/quote.h | 3 +- gnu/quotearg.c | 3 +- gnu/quotearg.h | 4 +- gnu/rawmemchr.c | 2 +- gnu/readlink.c | 2 +- gnu/readlinkat.c | 2 +- gnu/realloc.c | 2 +- gnu/ref-add.sin | 2 +- gnu/ref-del.sin | 2 +- gnu/regcomp.c | 3 +- gnu/regex.c | 3 +- gnu/regex.h | 5 +- gnu/regex_internal.c | 3 +- gnu/regex_internal.h | 9 +- gnu/regexec.c | 5 +- gnu/rename.c | 2 +- gnu/renameat.c | 2 +- gnu/rmdir.c | 4 +- gnu/rpmatch.c | 2 +- gnu/safe-read.c | 2 +- gnu/safe-read.h | 2 +- gnu/safe-write.c | 2 +- gnu/safe-write.h | 2 +- gnu/same-inode.h | 2 +- gnu/save-cwd.c | 19 +- gnu/save-cwd.h | 2 +- gnu/savedir.c | 2 +- gnu/savedir.h | 2 +- gnu/setenv.c | 2 +- gnu/size_max.h | 2 +- gnu/sleep.c | 9 +- gnu/snprintf.c | 2 +- gnu/stat-time.h | 2 +- gnu/stat.c | 3 +- gnu/stdarg.in.h | 2 +- gnu/stdbool.in.h | 2 +- gnu/stddef.in.h | 2 +- gnu/stdint.in.h | 83 +- gnu/stdio-impl.h | 13 +- gnu/stdio.in.h | 117 +- gnu/stdlib.in.h | 75 +- gnu/stpcpy.c | 2 +- gnu/strcasecmp.c | 2 +- gnu/strchrnul.c | 2 +- gnu/strdup.c | 4 +- gnu/streq.h | 4 +- gnu/strerror.c | 2 +- gnu/string.in.h | 54 +- gnu/strings.in.h | 2 +- gnu/stripslash.c | 2 +- gnu/strncasecmp.c | 2 +- gnu/strndup.c | 4 +- gnu/strnlen.c | 2 +- gnu/strnlen1.c | 2 +- gnu/strnlen1.h | 2 +- gnu/strtoimax.c | 4 +- gnu/strtol.c | 8 +- gnu/strtoll.c | 4 +- gnu/strtoul.c | 2 +- gnu/strtoull.c | 3 +- gnu/symlink.c | 2 +- gnu/symlinkat.c | 2 +- gnu/sys_stat.in.h | 8 +- gnu/sys_time.in.h | 7 +- gnu/sysexits.in.h | 2 +- gnu/tempname.c | 2 +- gnu/tempname.h | 2 +- gnu/time.in.h | 20 +- gnu/time_r.c | 2 +- gnu/timespec.h | 2 +- gnu/uinttostr.c | 1 - gnu/umaxtostr.c | 1 - gnu/unistd--.h | 2 +- gnu/unistd-safer.h | 2 +- gnu/unistd.in.h | 76 +- gnu/unitypes.in.h | 4 +- gnu/uniwidth.in.h | 4 +- gnu/uniwidth/cjk.h | 4 +- gnu/uniwidth/width.c | 67 +- gnu/unlink.c | 4 +- gnu/unlinkat.c | 3 +- gnu/unlinkdir.c | 2 +- gnu/unlinkdir.h | 2 +- gnu/unlocked-io.h | 2 +- gnu/unsetenv.c | 2 +- gnu/utimens.c | 53 +- gnu/utimensat.c | 2 +- gnu/vasnprintf.c | 26 +- gnu/vasnprintf.h | 16 +- gnu/vasprintf.c | 2 +- gnu/verify.h | 2 +- gnu/version-etc-fsf.c | 2 +- gnu/version-etc.c | 4 +- gnu/version-etc.h | 10 +- gnu/vsnprintf.c | 2 +- gnu/wchar.in.h | 501 ++- gnu/wcrtomb.c | 2 +- gnu/wctype.in.h | 289 +- gnu/wcwidth.c | 2 +- gnu/write.c | 2 +- gnu/xalloc-die.c | 4 +- gnu/xalloc.h | 62 +- gnu/xasprintf.c | 2 +- gnu/xgetcwd.c | 2 +- gnu/xgetcwd.h | 2 +- gnu/xmalloc.c | 6 +- gnu/xsize.h | 2 +- gnu/xstrndup.c | 2 +- gnu/xstrndup.h | 2 +- gnu/xstrtol-error.c | 2 +- gnu/xstrtol.c | 2 +- gnu/xstrtol.h | 16 +- gnu/xvasprintf.c | 2 +- gnu/xvasprintf.h | 16 +- lib/Makefile.am | 2 +- lib/Makefile.in | 227 +- lib/paxexit-status.c | 3 + lib/paxlib.h | 4 - lib/paxnames.c | 19 +- m4/00gnulib.m4 | 2 +- m4/alloca.m4 | 8 +- m4/argmatch.m4 | 2 +- m4/argp.m4 | 2 +- m4/backupfile.m4 | 5 +- m4/bison.m4 | 2 +- m4/btowc.m4 | 20 +- m4/canonicalize.m4 | 25 +- m4/chdir-long.m4 | 2 +- m4/chown.m4 | 12 +- m4/clock_time.m4 | 2 +- m4/cloexec.m4 | 2 +- m4/close-stream.m4 | 2 +- m4/close.m4 | 2 +- m4/closeout.m4 | 2 +- m4/codeset.m4 | 2 +- m4/configmake.m4 | 50 + m4/d-ino.m4 | 21 +- m4/dirent-safer.m4 | 2 +- m4/dirent_h.m4 | 2 +- m4/dirfd.m4 | 8 +- m4/dirname.m4 | 5 +- m4/double-slash-root.m4 | 2 +- m4/dup2.m4 | 30 +- m4/eealloc.m4 | 2 +- m4/environ.m4 | 2 +- m4/errno_h.m4 | 6 +- m4/error.m4 | 2 +- m4/exclude.m4 | 2 +- m4/extensions.m4 | 2 +- m4/fchdir.m4 | 10 +- m4/fclose.m4 | 2 +- m4/fcntl-o.m4 | 65 +- m4/fcntl.m4 | 11 +- m4/fcntl_h.m4 | 6 +- m4/fdopendir.m4 | 14 +- m4/fileblocks.m4 | 2 +- m4/filenamecat.m4 | 2 +- m4/float_h.m4 | 6 +- m4/fnmatch.m4 | 85 +- m4/fpending.m4 | 2 +- m4/fseeko.m4 | 29 +- m4/futimens.m4 | 2 +- m4/getcwd-abort-bug.m4 | 2 +- m4/getcwd-path-max.m4 | 20 +- m4/getcwd.m4 | 13 +- m4/getdelim.m4 | 10 +- m4/getdtablesize.m4 | 2 +- m4/getline.m4 | 10 +- m4/getopt.m4 | 79 +- m4/getpagesize.m4 | 2 +- m4/gettext.m4 | 2 +- m4/gettime.m4 | 2 +- m4/gettimeofday.m4 | 2 +- m4/glibc21.m4 | 14 +- m4/gnulib-common.m4 | 37 +- m4/gnulib-comp.m4 | 31 +- m4/hash.m4 | 2 +- m4/human.m4 | 3 +- m4/iconv.m4 | 28 +- m4/include_next.m4 | 99 +- m4/inline.m4 | 2 +- m4/intlmacosx.m4 | 2 +- m4/intmax_t.m4 | 2 +- m4/inttostr.m4 | 2 +- m4/inttypes-pri.m4 | 2 +- m4/inttypes.m4 | 2 +- m4/inttypes_h.m4 | 2 +- m4/iswblank.m4 | 31 + m4/langinfo_h.m4 | 2 +- m4/lchown.m4 | 2 +- m4/lib-ld.m4 | 2 +- m4/lib-link.m4 | 6 +- m4/lib-prefix.m4 | 2 +- m4/libunistring-base.m4 | 2 +- m4/link-follow.m4 | 62 +- m4/link.m4 | 13 +- m4/linkat.m4 | 16 +- m4/localcharset.m4 | 2 +- m4/locale-fr.m4 | 146 +- m4/locale-ja.m4 | 85 +- m4/locale-zh.m4 | 65 +- m4/longlong.m4 | 83 +- m4/lseek.m4 | 2 +- m4/lstat.m4 | 2 +- m4/malloc.m4 | 2 +- m4/malloca.m4 | 2 +- m4/mbchar.m4 | 2 +- m4/mbiter.m4 | 7 +- m4/mbrtowc.m4 | 225 +- m4/mbsinit.m4 | 12 +- m4/mbsrtowcs.m4 | 44 +- m4/mbstate_t.m4 | 13 +- m4/mbtowc.m4 | 23 + m4/memchr.m4 | 13 +- m4/mempcpy.m4 | 2 +- m4/memrchr.m4 | 2 +- m4/mkdir.m4 | 2 +- m4/mkdtemp.m4 | 2 +- m4/mkfifo.m4 | 13 +- m4/mkfifoat.m4 | 2 +- m4/mknod.m4 | 6 +- m4/mktime.m4 | 40 +- m4/mmap-anon.m4 | 8 +- m4/mode_t.m4 | 2 +- m4/modechange.m4 | 2 +- m4/multiarch.m4 | 9 +- m4/nl_langinfo.m4 | 33 +- m4/nls.m4 | 2 +- m4/open.m4 | 14 +- m4/openat.m4 | 46 +- m4/parse-datetime.m4 | 10 +- m4/pathmax.m4 | 2 +- m4/po.m4 | 2 +- m4/printf.m4 | 211 +- m4/priv-set.m4 | 2 +- m4/progtest.m4 | 2 +- m4/quote.m4 | 2 +- m4/quotearg.m4 | 2 +- m4/rawmemchr.m4 | 2 +- m4/readlink.m4 | 2 +- m4/readlinkat.m4 | 2 +- m4/realloc.m4 | 2 +- m4/regex.m4 | 106 +- m4/rename.m4 | 100 +- m4/renameat.m4 | 2 +- m4/rmdir.m4 | 16 +- m4/rpmatch.m4 | 2 +- m4/safe-read.m4 | 2 +- m4/safe-write.m4 | 2 +- m4/save-cwd.m4 | 2 +- m4/savedir.m4 | 2 +- m4/setenv.m4 | 49 +- m4/size_max.m4 | 2 +- m4/sleep.m4 | 11 +- m4/snprintf.m4 | 9 +- m4/ssize_t.m4 | 2 +- m4/stat-time.m4 | 2 +- m4/stat.m4 | 15 +- m4/stdarg.m4 | 6 +- m4/stdbool.m4 | 16 +- m4/stddef_h.m4 | 6 +- m4/stdint.m4 | 25 +- m4/stdint_h.m4 | 2 +- m4/stdio_h.m4 | 29 +- m4/stdlib_h.m4 | 28 +- m4/stpcpy.m4 | 2 +- m4/strcase.m4 | 2 +- m4/strchrnul.m4 | 2 +- m4/strdup.m4 | 2 +- m4/strerror.m4 | 2 +- m4/string_h.m4 | 13 +- m4/strings_h.m4 | 2 +- m4/strndup.m4 | 2 +- m4/strnlen.m4 | 2 +- m4/strtoimax.m4 | 9 +- m4/strtol.m4 | 2 +- m4/strtoll.m4 | 3 +- m4/strtoul.m4 | 2 +- m4/strtoull.m4 | 3 +- m4/strtoumax.m4 | 9 +- m4/symlink.m4 | 17 +- m4/symlinkat.m4 | 2 +- m4/sys_stat_h.m4 | 2 +- m4/sys_time_h.m4 | 2 +- m4/sysexits.m4 | 2 +- m4/tempname.m4 | 2 +- m4/time_h.m4 | 8 +- m4/time_r.m4 | 10 +- m4/timespec.m4 | 2 +- m4/tm_gmtoff.m4 | 2 +- m4/unistd-safer.m4 | 2 +- m4/unistd_h.m4 | 19 +- m4/unlink.m4 | 29 +- m4/unlinkdir.m4 | 2 +- m4/unlocked-io.m4 | 2 +- m4/utimbuf.m4 | 2 +- m4/utimens.m4 | 5 +- m4/utimensat.m4 | 47 +- m4/utimes.m4 | 116 +- m4/vasnprintf.m4 | 5 +- m4/vasprintf.m4 | 2 +- m4/version-etc.m4 | 2 +- m4/vsnprintf.m4 | 9 +- m4/warn-on-use.m4 | 2 +- m4/wchar_h.m4 | 116 +- m4/wchar_t.m4 | 2 +- m4/wcrtomb.m4 | 23 +- m4/wctype_h.m4 | 141 +- m4/wcwidth.m4 | 15 +- m4/wint_t.m4 | 2 +- m4/write.m4 | 2 +- m4/xalloc.m4 | 3 +- m4/xgetcwd.m4 | 2 +- m4/xsize.m4 | 2 +- m4/xstrndup.m4 | 2 +- m4/xstrtol.m4 | 2 +- m4/xvasprintf.m4 | 2 +- po/POTFILES.in | 1 - po/bg.gmo | Bin 61781 -> 61781 bytes po/bg.po | 220 +- po/ca.gmo | Bin 59646 -> 59616 bytes po/ca.po | 233 +- po/cs.gmo | Bin 60055 -> 60020 bytes po/cs.po | 226 +- po/da.gmo | Bin 55982 -> 55961 bytes po/da.po | 228 +- po/de.gmo | Bin 59785 -> 59761 bytes po/de.po | 226 +- po/el.gmo | Bin 14878 -> 14878 bytes po/el.po | 220 +- po/es.gmo | Bin 25164 -> 25164 bytes po/es.po | 223 +- po/et.gmo | Bin 54699 -> 54679 bytes po/et.po | 227 +- po/eu.gmo | Bin 34901 -> 34901 bytes po/eu.po | 220 +- po/fi.gmo | Bin 34577 -> 34577 bytes po/fi.po | 220 +- po/fr.gmo | Bin 62196 -> 62183 bytes po/fr.po | 226 +- po/ga.gmo | Bin 55221 -> 55221 bytes po/ga.po | 220 +- po/gl.gmo | Bin 10990 -> 10990 bytes po/gl.po | 220 +- po/hr.gmo | Bin 10878 -> 10878 bytes po/hr.po | 221 +- po/hu.gmo | Bin 61925 -> 62426 bytes po/hu.po | 245 +- po/id.gmo | Bin 57602 -> 57500 bytes po/id.po | 219 +- po/it.gmo | Bin 58935 -> 58920 bytes po/it.po | 227 +- po/ja.gmo | Bin 54950 -> 54932 bytes po/ja.po | 229 +- po/ko.gmo | Bin 4121 -> 4121 bytes po/ko.po | 221 +- po/ky.gmo | Bin 62502 -> 62502 bytes po/ky.po | 220 +- po/ms.gmo | Bin 9953 -> 9953 bytes po/ms.po | 219 +- po/nb.gmo | Bin 4558 -> 4558 bytes po/nb.po | 219 +- po/nl.gmo | Bin 59125 -> 59113 bytes po/nl.po | 254 +- po/pl.gmo | Bin 59664 -> 59644 bytes po/pl.po | 229 +- po/pt.gmo | Bin 3744 -> 3744 bytes po/pt.po | 219 +- po/pt_BR.gmo | Bin 11024 -> 11024 bytes po/pt_BR.po | 220 +- po/ro.gmo | Bin 24113 -> 24113 bytes po/ro.po | 220 +- po/ru.gmo | Bin 76181 -> 76829 bytes po/ru.po | 243 +- po/sk.gmo | Bin 10626 -> 10626 bytes po/sk.po | 220 +- po/sl.gmo | Bin 42317 -> 58589 bytes po/sl.po | 764 +++-- po/sv.gmo | Bin 56844 -> 56824 bytes po/sv.po | 231 +- po/tar.pot | 215 +- po/tr.gmo | Bin 48205 -> 48205 bytes po/tr.po | 220 +- po/uk.gmo | Bin 76457 -> 76151 bytes po/uk.po | 236 +- po/vi.gmo | Bin 63276 -> 63161 bytes po/vi.po | 219 +- po/zh_CN.gmo | Bin 53149 -> 53122 bytes po/zh_CN.po | 226 +- po/zh_TW.gmo | Bin 48656 -> 48656 bytes po/zh_TW.po | 220 +- rmt/Makefile.in | 221 +- scripts/Makefile.in | 221 +- scripts/backup.in | 12 +- scripts/restore.in | 5 +- src/Makefile.in | 221 +- src/common.h | 4 +- src/compare.c | 16 +- src/create.c | 5 +- src/extract.c | 12 + src/incremen.c | 17 +- src/list.c | 12 +- src/misc.c | 18 +- src/names.c | 26 - src/sparse.c | 9 +- src/transform.c | 6 + tests/Makefile.am | 3 + tests/Makefile.in | 224 +- tests/backup01.at | 3 +- tests/listed04.at | 47 + tests/package.m4 | 4 +- tests/remfiles01.at | 1 + tests/sigpipe.at | 2 + tests/sparse04.at | 47 + tests/testsuite | 1410 +++++--- tests/testsuite.at | 14 +- tests/truncate.at | 7 +- tests/verify.at | 37 + 616 files changed, 16818 insertions(+), 10702 deletions(-) create mode 100644 gnu/dosname.h create mode 100644 gnu/iswblank.c create mode 100644 gnu/mbsrtowcs-impl.h create mode 100644 gnu/mbtowc-impl.h create mode 100644 gnu/mbtowc.c create mode 100644 lib/paxexit-status.c create mode 100644 m4/configmake.m4 create mode 100644 m4/iswblank.m4 create mode 100644 m4/mbtowc.m4 create mode 100644 tests/listed04.at create mode 100644 tests/sparse04.at create mode 100644 tests/verify.at diff --git a/ChangeLog b/ChangeLog index f4945ea8..bb3a1013 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,156 @@ +2011-03-12 Sergey Poznyakoff + + Version 1.26 + * NEWS, configure.ac: Update. + * po/POTFILES.in: Remove paxexit.c (see bb971a1e). + +2011-03-08 Paul Eggert + + --atime-preserve=replace: fix correctness and performance bugs + reported by Eric Blake in + . + * src/compare.c (diff_file): Do not restore atime of size-zero + files. + * src/create.c (dump_file0): Likewise. Also, do not restore atime + when fd is zero, because that indicates a file we haven't opened. + +2011-02-23 Paul Eggert + + * doc/tar.texi: Adjust example commands and output for accuracy. + The original problem was reported by Michael Witten in + . + +2011-02-16 Paul Eggert + + tar: if (p) free (p); -> free (p); + There is no longer (since SunOS 4) any need to guard against + free (NULL), so replace each "if (p) free (p);" with "free (p);". + From Jim Meyering in + . + * src/incremen.c (scan_directory, read_directory_file): As above. + (try_purge_directory): Likewise. + * src/list.c (read_header): Likewise. + * src/misc.c (assign_string): Likewise. + +2010-12-14 Sergey Poznyakoff + + Correctly store long sparse file names in PAX archives. + * src/sparse.c (pax_dump_header_1): Make sure the created header + name is + shorter than NAME_FIELD_SIZE bytes. + * tests/sparse04.at: New testcase. + * tests/Makefile.am (TESTSUITE_AT): Add sparse04.at. + * tests/testsuite.at: Include sparse04.at. + * NEWS: Update. + +2010-12-07 Paul Eggert + + tests: make the truncate test smaller and less buggy (tiny change) + Reported by Solar Designer in + . + * tests/truncate.at: Use a smaller test case, and make its + race condition less likely. + +2010-11-27 Paul Eggert + + tests: skip SIGPIPE-dependent tests in environments ignoring + SIGPIPE + Problem reported by Sven Joachim in + . + * tests/remfiles01.at: Use AT_SIGPIPE_PREREQ. + * tests/sigpipe.at: Likewise. + * tests/testsuite.at (AT_SIGPIPE_PREREQ): New macro. + +2010-11-25 Paul Eggert + + tar: work around NetBSD and Tru64 symlink incompatibility + with POSIX + Problem reported by Bruno Haible in + . + * src/extract.c (maybe_recoverable): Also treat EFTYPE (if + defined) + and ENOTSUP like ELOOP. + +2010-11-24 Paul Eggert + + tar: adjust to paxutils change: paxexit.c -> paxexit-status.c + * lib/Makefile.am (libtar_a_SOURCES): paxexit.c renamed to + paxexit-status.c. + + tar: remove unused function dir_removed_diag + * src/common.h (dir_removed_diag): Remove unused decl. + * src/misc.c (dir_removed_diag): Remove unused function. + +2010-11-23 Paul Eggert + + tar: work around FreeBSD symlink incompatibility with POSIX + * src/extract.c (maybe_recoverable): Treat EMLINK like ELOOP, for + FreeBSD. Problem reported by Christian Weisgerber in + . + + * src/names.c: tar: fix bug with --one-file-system + --listed-incremental + Problem (and idea for fix) reported by Martin Weigel + . + * src/common.h (is_individual_file): Remove decl. + * src/create.c (dump_file0): Replace "is_individual_file (p)" + with "top_level". + * src/incremen.c (procdir): Replace "!is_individual_file + (name_buffer)" with "st->parent". Fix bug with --one-file-system + and --listed-incremental. + * src/names.c (individual_file_table, register_individual_file): + (is_individual_file): Remove. All uses removed. + + tests: new test listed04 for --one-file-system + --listed-incremental + * tests/Makefile.am (TESTSUITE_AT): Add listed04.at. + * tests/listed04.at: New file. + * tests/testsuite.at: Include it. + + scripts: fix option parsing + Problem reported by Dennis Wydra in + . + * scripts/backup.in: Accept "-l LEVEL". Be more systematic about + backslashes inside ``; it shouldn't matter for modern shells but + it might matter for older ones. + * scripts/restore.in: Likewise. + * scripts/backup.in: Adjust implementation of -t/--time to match + the new implementation of -l/--level. + +2010-11-15 Sergey Poznyakoff + + Issue a warning if the archive being compared contais transformed + file names. + * src/common.h (transform_program_p): New proto. + * src/transform.c (transform_program_p): New function. + * src/compare.c (verify_volume): Warn if the archive contains + transformed file names. + + Minor change. + * doc/tar.texi: Reword the description of decompress-program. + +2010-11-15 Paul Eggert + + tar: fix --verify option, which broke in 1.24 + * NEWS: Document this. + * src/compare.c (verify_volume): Decode the header before invoking + diff_archive, as diff_archive no longer does this as of the + 2010-06-28 commit. Also, don't try to invoke diff_archive on a + zero block. + * tests/Makefile.am (TESTSUITE_AT): Add verify.at. + * tests/testsuite.at: Include verify.at. + * tests/verify.at: New file. + +2010-11-08 Paul Eggert + + Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/tar + +2010-11-08 Jim Meyering + + tests: avoid spurious failure when VERSION_CONTROL envvar is set + * tests/backup01.at: Unset VERSION_CONTROL. Otherwise, + when set to e.g., 'always', it would cause this test to fail. + 2010-11-07 Sergey Poznyakoff Version 1.25 @@ -1180,9 +1333,8 @@ * tests/extrac05.at: Skip test if creating sparse file fails. - Fix eventual memory override and fd exhaustion in create.c - Both bugs reported by Kamil Dudka. - + Fix eventual memory override and fd exhaustion in create.c Both + bugs reported by Kamil Dudka. * src/create.c (check_exclusion_tags): Do not keep pointer to a location within tagname: it may change after xrealloc. Use byte offset instead. diff --git a/INSTALL b/INSTALL index 81fd332c..a1e89e18 100644 --- a/INSTALL +++ b/INSTALL @@ -1,8 +1,8 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, +Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -226,6 +226,11 @@ order to use an ANSI C compiler: and if that doesn't work, install pre-built binaries of GCC for HP-UX. + HP-UX `make' updates targets which have the same time stamps as +their prerequisites, which makes it generally unusable when shipped +generated files such as `configure' are involved. Use GNU `make' +instead. + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot parse its `' header file. The option `-nodtk' can be used as a workaround. If GNU CC is not installed, it is therefore recommended diff --git a/Makefile.in b/Makefile.in index dd4e1962..d66a7179 100644 --- a/Makefile.in +++ b/Makefile.in @@ -68,7 +68,6 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -95,16 +94,16 @@ subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/argmatch.m4 \ - $(top_srcdir)/m4/argp.m4 $(top_srcdir)/m4/asm-underscore.m4 \ - $(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/bison.m4 \ - $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/canonicalize.m4 \ + $(top_srcdir)/m4/argp.m4 $(top_srcdir)/m4/backupfile.m4 \ + $(top_srcdir)/m4/bison.m4 $(top_srcdir)/m4/btowc.m4 \ + $(top_srcdir)/m4/canonicalize.m4 \ $(top_srcdir)/m4/chdir-long.m4 $(top_srcdir)/m4/chown.m4 \ $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/cloexec.m4 \ $(top_srcdir)/m4/close-stream.m4 $(top_srcdir)/m4/close.m4 \ $(top_srcdir)/m4/closeout.m4 $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/d-ino.m4 $(top_srcdir)/m4/dirent-safer.m4 \ - $(top_srcdir)/m4/dirent_h.m4 $(top_srcdir)/m4/dirfd.m4 \ - $(top_srcdir)/m4/dirname.m4 $(top_srcdir)/m4/dos.m4 \ + $(top_srcdir)/m4/configmake.m4 $(top_srcdir)/m4/d-ino.m4 \ + $(top_srcdir)/m4/dirent-safer.m4 $(top_srcdir)/m4/dirent_h.m4 \ + $(top_srcdir)/m4/dirfd.m4 $(top_srcdir)/m4/dirname.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup2.m4 \ $(top_srcdir)/m4/eealloc.m4 $(top_srcdir)/m4/environ.m4 \ $(top_srcdir)/m4/errno_h.m4 $(top_srcdir)/m4/error.m4 \ @@ -129,9 +128,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax_t.m4 \ $(top_srcdir)/m4/inttostr.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ - $(top_srcdir)/m4/langinfo_h.m4 $(top_srcdir)/m4/lchown.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/iswblank.m4 $(top_srcdir)/m4/langinfo_h.m4 \ + $(top_srcdir)/m4/lchown.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ $(top_srcdir)/m4/libunistring-base.m4 \ $(top_srcdir)/m4/link-follow.m4 $(top_srcdir)/m4/link.m4 \ $(top_srcdir)/m4/linkat.m4 $(top_srcdir)/m4/localcharset.m4 \ @@ -142,61 +141,62 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \ $(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \ - $(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdir.m4 \ - $(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mkfifo.m4 \ - $(top_srcdir)/m4/mkfifoat.m4 $(top_srcdir)/m4/mknod.m4 \ - $(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/mmap-anon.m4 \ - $(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/modechange.m4 \ - $(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/nl_langinfo.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/open.m4 \ - $(top_srcdir)/m4/openat.m4 $(top_srcdir)/m4/parse-datetime.m4 \ - $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/paxutils.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf.m4 \ - $(top_srcdir)/m4/priv-set.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ - $(top_srcdir)/m4/rawmemchr.m4 $(top_srcdir)/m4/readlink.m4 \ - $(top_srcdir)/m4/readlinkat.m4 $(top_srcdir)/m4/realloc.m4 \ - $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/rename.m4 \ - $(top_srcdir)/m4/renameat.m4 $(top_srcdir)/m4/rmdir.m4 \ - $(top_srcdir)/m4/rmt.m4 $(top_srcdir)/m4/rpmatch.m4 \ - $(top_srcdir)/m4/rtapelib.m4 $(top_srcdir)/m4/safe-read.m4 \ - $(top_srcdir)/m4/safe-write.m4 $(top_srcdir)/m4/save-cwd.m4 \ - $(top_srcdir)/m4/savedir.m4 $(top_srcdir)/m4/setenv.m4 \ - $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/sleep.m4 \ - $(top_srcdir)/m4/snprintf.m4 $(top_srcdir)/m4/ssize_t.m4 \ - $(top_srcdir)/m4/stat-time.m4 $(top_srcdir)/m4/stat.m4 \ - $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \ - $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio_h.m4 \ - $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/stpcpy.m4 \ - $(top_srcdir)/m4/strcase.m4 $(top_srcdir)/m4/strchrnul.m4 \ - $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ - $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strings_h.m4 \ - $(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \ - $(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \ - $(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \ - $(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \ - $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/symlinkat.m4 \ - $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ - $(top_srcdir)/m4/sysexits.m4 $(top_srcdir)/m4/system.m4 \ - $(top_srcdir)/m4/tempname.m4 $(top_srcdir)/m4/time_h.m4 \ - $(top_srcdir)/m4/time_r.m4 $(top_srcdir)/m4/timespec.m4 \ - $(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/unistd-safer.m4 \ - $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ - $(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/unlocked-io.m4 \ - $(top_srcdir)/m4/utimbuf.m4 $(top_srcdir)/m4/utimens.m4 \ - $(top_srcdir)/m4/utimensat.m4 $(top_srcdir)/m4/utimes.m4 \ - $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \ - $(top_srcdir)/m4/version-etc.m4 $(top_srcdir)/m4/vsnprintf.m4 \ - $(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/wchar_h.m4 \ - $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wcrtomb.m4 \ - $(top_srcdir)/m4/wctype_h.m4 $(top_srcdir)/m4/wcwidth.m4 \ - $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/write.m4 \ - $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xgetcwd.m4 \ - $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/xstrndup.m4 \ - $(top_srcdir)/m4/xstrtol.m4 $(top_srcdir)/m4/xvasprintf.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \ + $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \ + $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkdtemp.m4 \ + $(top_srcdir)/m4/mkfifo.m4 $(top_srcdir)/m4/mkfifoat.m4 \ + $(top_srcdir)/m4/mknod.m4 $(top_srcdir)/m4/mktime.m4 \ + $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ + $(top_srcdir)/m4/modechange.m4 $(top_srcdir)/m4/multiarch.m4 \ + $(top_srcdir)/m4/nl_langinfo.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/open.m4 $(top_srcdir)/m4/openat.m4 \ + $(top_srcdir)/m4/parse-datetime.m4 $(top_srcdir)/m4/pathmax.m4 \ + $(top_srcdir)/m4/paxutils.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/printf.m4 $(top_srcdir)/m4/priv-set.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/quote.m4 \ + $(top_srcdir)/m4/quotearg.m4 $(top_srcdir)/m4/rawmemchr.m4 \ + $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/readlinkat.m4 \ + $(top_srcdir)/m4/realloc.m4 $(top_srcdir)/m4/regex.m4 \ + $(top_srcdir)/m4/rename.m4 $(top_srcdir)/m4/renameat.m4 \ + $(top_srcdir)/m4/rmdir.m4 $(top_srcdir)/m4/rmt.m4 \ + $(top_srcdir)/m4/rpmatch.m4 $(top_srcdir)/m4/rtapelib.m4 \ + $(top_srcdir)/m4/safe-read.m4 $(top_srcdir)/m4/safe-write.m4 \ + $(top_srcdir)/m4/save-cwd.m4 $(top_srcdir)/m4/savedir.m4 \ + $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/size_max.m4 \ + $(top_srcdir)/m4/sleep.m4 $(top_srcdir)/m4/snprintf.m4 \ + $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \ + $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdarg.m4 \ + $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stddef_h.m4 \ + $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdint_h.m4 \ + $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ + $(top_srcdir)/m4/stpcpy.m4 $(top_srcdir)/m4/strcase.m4 \ + $(top_srcdir)/m4/strchrnul.m4 $(top_srcdir)/m4/strdup.m4 \ + $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/string_h.m4 \ + $(top_srcdir)/m4/strings_h.m4 $(top_srcdir)/m4/strndup.m4 \ + $(top_srcdir)/m4/strnlen.m4 $(top_srcdir)/m4/strtoimax.m4 \ + $(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \ + $(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \ + $(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/symlink.m4 \ + $(top_srcdir)/m4/symlinkat.m4 $(top_srcdir)/m4/sys_stat_h.m4 \ + $(top_srcdir)/m4/sys_time_h.m4 $(top_srcdir)/m4/sysexits.m4 \ + $(top_srcdir)/m4/system.m4 $(top_srcdir)/m4/tempname.m4 \ + $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \ + $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \ + $(top_srcdir)/m4/unistd-safer.m4 $(top_srcdir)/m4/unistd_h.m4 \ + $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlinkdir.m4 \ + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/utimbuf.m4 \ + $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimensat.m4 \ + $(top_srcdir)/m4/utimes.m4 $(top_srcdir)/m4/vasnprintf.m4 \ + $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/version-etc.m4 \ + $(top_srcdir)/m4/vsnprintf.m4 $(top_srcdir)/m4/warn-on-use.m4 \ + $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ + $(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wctype_h.m4 \ + $(top_srcdir)/m4/wcwidth.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/write.m4 $(top_srcdir)/m4/xalloc.m4 \ + $(top_srcdir)/m4/xgetcwd.m4 $(top_srcdir)/m4/xsize.m4 \ + $(top_srcdir)/m4/xstrndup.m4 $(top_srcdir)/m4/xstrtol.m4 \ + $(top_srcdir)/m4/xvasprintf.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -265,13 +265,13 @@ DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 $(distdir).tar.xz \ GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print +pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALLOCA_H = @ALLOCA_H@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ -ASM_SYMBOL_PREFIX = @ASM_SYMBOL_PREFIX@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOM4TE = @AUTOM4TE@ @@ -372,6 +372,8 @@ GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ GNULIB_GRANTPT = @GNULIB_GRANTPT@ GNULIB_IMAXABS = @GNULIB_IMAXABS@ GNULIB_IMAXDIV = @GNULIB_IMAXDIV@ +GNULIB_ISWBLANK = @GNULIB_ISWBLANK@ +GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@ GNULIB_LCHMOD = @GNULIB_LCHMOD@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LINK = @GNULIB_LINK@ @@ -398,6 +400,7 @@ GNULIB_MBSSEP = @GNULIB_MBSSEP@ GNULIB_MBSSPN = @GNULIB_MBSSPN@ GNULIB_MBSSTR = @GNULIB_MBSSTR@ GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@ +GNULIB_MBTOWC = @GNULIB_MBTOWC@ GNULIB_MEMCHR = @GNULIB_MEMCHR@ GNULIB_MEMMEM = @GNULIB_MEMMEM@ GNULIB_MEMPCPY = @GNULIB_MEMPCPY@ @@ -420,6 +423,7 @@ GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ GNULIB_OPEN = @GNULIB_OPEN@ GNULIB_OPENAT = @GNULIB_OPENAT@ GNULIB_PERROR = @GNULIB_PERROR@ +GNULIB_PIPE = @GNULIB_PIPE@ GNULIB_PIPE2 = @GNULIB_PIPE2@ GNULIB_POPEN = @GNULIB_POPEN@ GNULIB_PREAD = @GNULIB_PREAD@ @@ -455,6 +459,7 @@ GNULIB_STRCASESTR = @GNULIB_STRCASESTR@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ +GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ GNULIB_STRNCAT = @GNULIB_STRNCAT@ GNULIB_STRNDUP = @GNULIB_STRNDUP@ GNULIB_STRNLEN = @GNULIB_STRNLEN@ @@ -476,6 +481,7 @@ GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@ GNULIB_TIMEGM = @GNULIB_TIMEGM@ GNULIB_TIME_R = @GNULIB_TIME_R@ GNULIB_TMPFILE = @GNULIB_TMPFILE@ +GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@ GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ @@ -493,11 +499,42 @@ GNULIB_VPRINTF = @GNULIB_VPRINTF@ GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@ GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@ GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@ +GNULIB_WCPCPY = @GNULIB_WCPCPY@ +GNULIB_WCPNCPY = @GNULIB_WCPNCPY@ GNULIB_WCRTOMB = @GNULIB_WCRTOMB@ +GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@ +GNULIB_WCSCAT = @GNULIB_WCSCAT@ +GNULIB_WCSCHR = @GNULIB_WCSCHR@ +GNULIB_WCSCMP = @GNULIB_WCSCMP@ +GNULIB_WCSCOLL = @GNULIB_WCSCOLL@ +GNULIB_WCSCPY = @GNULIB_WCSCPY@ +GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ +GNULIB_WCSDUP = @GNULIB_WCSDUP@ +GNULIB_WCSLEN = @GNULIB_WCSLEN@ +GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ +GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ +GNULIB_WCSNCMP = @GNULIB_WCSNCMP@ +GNULIB_WCSNCPY = @GNULIB_WCSNCPY@ +GNULIB_WCSNLEN = @GNULIB_WCSNLEN@ GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@ +GNULIB_WCSPBRK = @GNULIB_WCSPBRK@ +GNULIB_WCSRCHR = @GNULIB_WCSRCHR@ GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@ +GNULIB_WCSSPN = @GNULIB_WCSSPN@ +GNULIB_WCSSTR = @GNULIB_WCSSTR@ +GNULIB_WCSTOK = @GNULIB_WCSTOK@ +GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@ +GNULIB_WCSXFRM = @GNULIB_WCSXFRM@ GNULIB_WCTOB = @GNULIB_WCTOB@ +GNULIB_WCTOMB = @GNULIB_WCTOMB@ +GNULIB_WCTRANS = @GNULIB_WCTRANS@ +GNULIB_WCTYPE = @GNULIB_WCTYPE@ GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ +GNULIB_WMEMCHR = @GNULIB_WMEMCHR@ +GNULIB_WMEMCMP = @GNULIB_WMEMCMP@ +GNULIB_WMEMCPY = @GNULIB_WMEMCPY@ +GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@ +GNULIB_WMEMSET = @GNULIB_WMEMSET@ GNULIB_WRITE = @GNULIB_WRITE@ GNULIB__EXIT = @GNULIB__EXIT@ GREP = @GREP@ @@ -508,9 +545,13 @@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ +HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ HAVE_DECL_FDOPENDIR = @HAVE_DECL_FDOPENDIR@ HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@ +HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@ +HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ +HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ @@ -518,11 +559,14 @@ HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ +HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ +HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ +HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ HAVE_DECL_STRNCASECMP = @HAVE_DECL_STRNCASECMP@ HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@ HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@ @@ -530,6 +574,8 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ +HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ @@ -543,13 +589,13 @@ HAVE_FCHMODAT = @HAVE_FCHMODAT@ HAVE_FCHOWNAT = @HAVE_FCHOWNAT@ HAVE_FCNTL = @HAVE_FCNTL@ HAVE_FDOPENDIR = @HAVE_FDOPENDIR@ +HAVE_FEATURES_H = @HAVE_FEATURES_H@ HAVE_FSEEKO = @HAVE_FSEEKO@ HAVE_FSTATAT = @HAVE_FSTATAT@ HAVE_FSYNC = @HAVE_FSYNC@ HAVE_FTELLO = @HAVE_FTELLO@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ HAVE_FUTIMENS = @HAVE_FUTIMENS@ -HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@ HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ HAVE_GETGROUPS = @HAVE_GETGROUPS@ HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@ @@ -571,7 +617,6 @@ HAVE_LCHMOD = @HAVE_LCHMOD@ HAVE_LCHOWN = @HAVE_LCHOWN@ HAVE_LINK = @HAVE_LINK@ HAVE_LINKAT = @HAVE_LINKAT@ -HAVE_LOCALTIME_R = @HAVE_LOCALTIME_R@ HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MBRLEN = @HAVE_MBRLEN@ @@ -596,6 +641,7 @@ HAVE_NANOSLEEP = @HAVE_NANOSLEEP@ HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@ HAVE_OPENAT = @HAVE_OPENAT@ HAVE_OS_H = @HAVE_OS_H@ +HAVE_PIPE = @HAVE_PIPE@ HAVE_PIPE2 = @HAVE_PIPE2@ HAVE_PREAD = @HAVE_PREAD@ HAVE_PTSNAME = @HAVE_PTSNAME@ @@ -639,11 +685,9 @@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ -HAVE_TTYNAME_R = @HAVE_TTYNAME_R@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ -HAVE_UNSETENV = @HAVE_UNSETENV@ HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_USLEEP = @HAVE_USLEEP@ HAVE_UTIMENSAT = @HAVE_UTIMENSAT@ @@ -651,11 +695,41 @@ HAVE_VASPRINTF = @HAVE_VASPRINTF@ HAVE_VDPRINTF = @HAVE_VDPRINTF@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ HAVE_WCHAR_T = @HAVE_WCHAR_T@ +HAVE_WCPCPY = @HAVE_WCPCPY@ +HAVE_WCPNCPY = @HAVE_WCPNCPY@ HAVE_WCRTOMB = @HAVE_WCRTOMB@ +HAVE_WCSCASECMP = @HAVE_WCSCASECMP@ +HAVE_WCSCAT = @HAVE_WCSCAT@ +HAVE_WCSCHR = @HAVE_WCSCHR@ +HAVE_WCSCMP = @HAVE_WCSCMP@ +HAVE_WCSCOLL = @HAVE_WCSCOLL@ +HAVE_WCSCPY = @HAVE_WCSCPY@ +HAVE_WCSCSPN = @HAVE_WCSCSPN@ +HAVE_WCSDUP = @HAVE_WCSDUP@ +HAVE_WCSLEN = @HAVE_WCSLEN@ +HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ +HAVE_WCSNCAT = @HAVE_WCSNCAT@ +HAVE_WCSNCMP = @HAVE_WCSNCMP@ +HAVE_WCSNCPY = @HAVE_WCSNCPY@ +HAVE_WCSNLEN = @HAVE_WCSNLEN@ HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@ +HAVE_WCSPBRK = @HAVE_WCSPBRK@ +HAVE_WCSRCHR = @HAVE_WCSRCHR@ HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@ +HAVE_WCSSPN = @HAVE_WCSSPN@ +HAVE_WCSSTR = @HAVE_WCSSTR@ +HAVE_WCSTOK = @HAVE_WCSTOK@ +HAVE_WCSWIDTH = @HAVE_WCSWIDTH@ +HAVE_WCSXFRM = @HAVE_WCSXFRM@ +HAVE_WCTRANS_T = @HAVE_WCTRANS_T@ HAVE_WCTYPE_H = @HAVE_WCTYPE_H@ +HAVE_WCTYPE_T = @HAVE_WCTYPE_T@ HAVE_WINT_T = @HAVE_WINT_T@ +HAVE_WMEMCHR = @HAVE_WMEMCHR@ +HAVE_WMEMCMP = @HAVE_WMEMCMP@ +HAVE_WMEMCPY = @HAVE_WMEMCPY@ +HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ +HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE__BOOL = @HAVE__BOOL@ HAVE__EXIT = @HAVE__EXIT@ INCLUDE_NEXT = @INCLUDE_NEXT@ @@ -780,8 +854,10 @@ REPLACE_FTELLO = @REPLACE_FTELLO@ REPLACE_FUTIMENS = @REPLACE_FUTIMENS@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETDELIM = @REPLACE_GETDELIM@ +REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETLINE = @REPLACE_GETLINE@ +REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ @@ -799,6 +875,7 @@ REPLACE_MBSINIT = @REPLACE_MBSINIT@ REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@ REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@ REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@ +REPLACE_MBTOWC = @REPLACE_MBTOWC@ REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ REPLACE_MKDIR = @REPLACE_MKDIR@ @@ -836,6 +913,7 @@ REPLACE_STPNCPY = @REPLACE_STPNCPY@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ +REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ REPLACE_STRNCAT = @REPLACE_STRNCAT@ REPLACE_STRNDUP = @REPLACE_STRNDUP@ REPLACE_STRNLEN = @REPLACE_STRNLEN@ @@ -861,7 +939,9 @@ REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ +REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ +REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ SET_MAKE = @SET_MAKE@ @@ -928,6 +1008,7 @@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +lispdir = @lispdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ diff --git a/NEWS b/NEWS index 8244bad1..12c1dd63 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,27 @@ -GNU tar NEWS - User visible changes. 2010-11-07 +GNU tar NEWS - User visible changes. 2011-03-12 Please send GNU tar bug reports to + +version 1.26 - Sergey Poznyakoff, 2011-03-12 + +* Bugfixes + +** Fix the --verify option, which broke in version 1.24. + +** Fix storing long sparse file names in PAX archives. + +** Fix correctness of --atime-preserve=replace + +tar --atime-preserve=replace no longer tries to restore atime of +zero-sized files. + +** Work around POSIX incompatibilities on FreeBSD, NetBSD and Tru64 + +** Fix bug with --one-file-system --listed-incremental + +When invoked with these two options, tar 1.25 would add only the +top-level directory to the archive, but not its contents. + version 1.25 - Sergey Poznyakoff, 2010-11-07 @@ -27,7 +48,7 @@ are met, tar retries extraction using an alternative decompressor: 2. The compression program was not explicitly requested in the command line by the use of such options as -z, -j, etc. -For example, if `compress' is not available, tar will try `gzip'. +For example, if `compress' is not available, tar will try `gzip'. version 1.24 - Sergey Poznyakoff, 2010-10-24 diff --git a/aclocal.m4 b/aclocal.m4 index 93aa9ab8..af3a30d4 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1032,7 +1032,6 @@ m4_include([m4/00gnulib.m4]) m4_include([m4/alloca.m4]) m4_include([m4/argmatch.m4]) m4_include([m4/argp.m4]) -m4_include([m4/asm-underscore.m4]) m4_include([m4/backupfile.m4]) m4_include([m4/bison.m4]) m4_include([m4/btowc.m4]) @@ -1045,12 +1044,12 @@ m4_include([m4/close-stream.m4]) m4_include([m4/close.m4]) m4_include([m4/closeout.m4]) m4_include([m4/codeset.m4]) +m4_include([m4/configmake.m4]) m4_include([m4/d-ino.m4]) m4_include([m4/dirent-safer.m4]) m4_include([m4/dirent_h.m4]) m4_include([m4/dirfd.m4]) m4_include([m4/dirname.m4]) -m4_include([m4/dos.m4]) m4_include([m4/double-slash-root.m4]) m4_include([m4/dup2.m4]) m4_include([m4/eealloc.m4]) @@ -1097,6 +1096,7 @@ m4_include([m4/inttostr.m4]) m4_include([m4/inttypes-pri.m4]) m4_include([m4/inttypes.m4]) m4_include([m4/inttypes_h.m4]) +m4_include([m4/iswblank.m4]) m4_include([m4/langinfo_h.m4]) m4_include([m4/lchown.m4]) m4_include([m4/lib-ld.m4]) @@ -1121,6 +1121,7 @@ m4_include([m4/mbrtowc.m4]) m4_include([m4/mbsinit.m4]) m4_include([m4/mbsrtowcs.m4]) m4_include([m4/mbstate_t.m4]) +m4_include([m4/mbtowc.m4]) m4_include([m4/memchr.m4]) m4_include([m4/mempcpy.m4]) m4_include([m4/memrchr.m4]) diff --git a/build-aux/arg-nonnull.h b/build-aux/arg-nonnull.h index ffbb3970..1b24a0d0 100644 --- a/build-aux/arg-nonnull.h +++ b/build-aux/arg-nonnull.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A C macro for declaring that specific arguments must not be NULL. - Copyright (C) 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2009-2011 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 @@ -11,7 +11,7 @@ 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 - Lesser General Public License for more details. + General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . */ diff --git a/build-aux/c++defs.h b/build-aux/c++defs.h index c41e2428..eb53f1d7 100644 --- a/build-aux/c++defs.h +++ b/build-aux/c++defs.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* C++ compatible function declaration macros. - Copyright (C) 2010 Free Software Foundation, Inc. + Copyright (C) 2010-2011 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 @@ -11,7 +11,7 @@ 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 - Lesser General Public License for more details. + General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . */ diff --git a/build-aux/config.guess b/build-aux/config.guess index 4c8f032e..187cd54e 100755 --- a/build-aux/config.guess +++ b/build-aux/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011 Free Software Foundation, Inc. -timestamp='2010-09-24' +timestamp='2011-02-02' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -57,7 +57,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -92,7 +92,7 @@ if test $# != 0; then exit 1 fi -trap 'exit 1' HUP INT TERM +trap 'exit 1' 1 2 15 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a # compiler to aid in system detection is discouraged as it requires @@ -106,7 +106,7 @@ trap 'exit 1' HUP INT TERM set_cc_for_build=' trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" HUP INT PIPE TERM ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; : ${TMPDIR=/tmp} ; { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || @@ -181,7 +181,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in fi ;; *) - os=netbsd + os=netbsd ;; esac # The OS release @@ -224,7 +224,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on @@ -270,7 +270,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -296,7 +299,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in echo s390-ibm-zvmoe exit ;; *:OS400:*:*) - echo powerpc-ibm-os400 + echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} @@ -395,23 +398,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} exit ;; @@ -481,8 +484,8 @@ EOF echo m88k-motorola-sysv3 exit ;; AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ @@ -495,7 +498,7 @@ EOF else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; @@ -595,52 +598,52 @@ EOF 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac + esac ;; + esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c - #define _HPUX_SOURCE - #include - #include + #define _HPUX_SOURCE + #include + #include - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa @@ -731,22 +734,22 @@ EOF exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; @@ -770,14 +773,14 @@ EOF exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} @@ -805,14 +808,14 @@ EOF echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; @@ -867,7 +870,7 @@ EOF EV6) UNAME_MACHINE=alphaev6 ;; EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; - esac + esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} @@ -892,7 +895,7 @@ EOF echo crisv32-axis-linux-gnu exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo frv-unknown-linux-gnu exit ;; i*86:Linux:*:*) LIBC=gnu @@ -960,7 +963,7 @@ EOF echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -978,7 +981,7 @@ EOF echo x86_64-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -987,11 +990,11 @@ EOF echo i386-sequent-sysv4 exit ;; i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. + # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit ;; i*86:OS/2:*:*) @@ -1023,7 +1026,7 @@ EOF fi exit ;; i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; @@ -1051,13 +1054,13 @@ EOF exit ;; pc:*:*:*) # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configury will decide that # this is a cross-build. echo i586-pc-msdosdjgpp - exit ;; + exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 exit ;; @@ -1092,8 +1095,8 @@ EOF /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' test -r /etc/.relid \ @@ -1136,10 +1139,10 @@ EOF echo ns32k-sni-sysv fi exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm @@ -1165,11 +1168,11 @@ EOF exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv${UNAME_RELEASE} fi - exit ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos exit ;; @@ -1282,13 +1285,13 @@ EOF echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux${UNAME_RELEASE} exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; @@ -1328,11 +1331,11 @@ main () #include printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #endif diff --git a/build-aux/config.rpath b/build-aux/config.rpath index 17298f23..8bd7f5d7 100755 --- a/build-aux/config.rpath +++ b/build-aux/config.rpath @@ -2,7 +2,7 @@ # Output a system dependent set of variables, describing how to set the # run time search path of shared libraries in an executable. # -# Copyright 1996-2010 Free Software Foundation, Inc. +# Copyright 1996-2011 Free Software Foundation, Inc. # Taken from GNU libtool, 2001 # Originally by Gordon Matzigkeit , 1996 # @@ -57,13 +57,6 @@ else aix*) wl='-Wl,' ;; - darwin*) - case $cc_basename in - xlc*) - wl='-Wl,' - ;; - esac - ;; mingw* | cygwin* | pw32* | os2* | cegcc*) ;; hpux9* | hpux10* | hpux11*) @@ -72,9 +65,7 @@ else irix5* | irix6* | nonstopux*) wl='-Wl,' ;; - newsos6) - ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in ecc*) wl='-Wl,' @@ -85,17 +76,26 @@ else lf95*) wl='-Wl,' ;; - pgcc | pgf77 | pgf90) + nagfor*) + wl='-Wl,-Wl,,' + ;; + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) wl='-Wl,' ;; ccc*) wl='-Wl,' ;; + xl* | bgxl* | bgf* | mpixl*) + wl='-Wl,' + ;; como) wl='-lopt=' ;; *) case `$CC -V 2>&1 | sed 5q` in + *Sun\ F* | *Sun*Fortran*) + wl= + ;; *Sun\ C*) wl='-Wl,' ;; @@ -103,13 +103,24 @@ else ;; esac ;; + newsos6) + ;; + *nto* | *qnx*) + ;; osf3* | osf4* | osf5*) wl='-Wl,' ;; rdos*) ;; solaris*) - wl='-Wl,' + case $cc_basename in + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) + wl='-Qoption ld ' + ;; + *) + wl='-Wl,' + ;; + esac ;; sunos4*) wl='-Qoption ld ' @@ -171,15 +182,14 @@ if test "$with_gnu_ld" = yes; then fi ;; amigaos*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we cannot use - # them. - ld_shlibs=no + case "$host_cpu" in + powerpc) + ;; + m68k) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac ;; beos*) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then @@ -198,11 +208,13 @@ if test "$with_gnu_ld" = yes; then ld_shlibs=no fi ;; + haiku*) + ;; interix[3-9]*) hardcode_direct=no hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ;; - gnu* | linux* | k*bsd*-gnu) + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then : else @@ -325,10 +337,14 @@ else fi ;; amigaos*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - # see comment about different semantics on the GNU ld section - ld_shlibs=no + case "$host_cpu" in + powerpc) + ;; + m68k) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac ;; bsdi[45]*) ;; @@ -342,24 +358,15 @@ else ;; darwin* | rhapsody*) hardcode_direct=no - if test "$GCC" = yes ; then + if { case $cc_basename in ifort*) true;; *) test "$GCC" = yes;; esac; }; then : else - case $cc_basename in - xlc*) - ;; - *) - ld_shlibs=no - ;; - esac + ld_shlibs=no fi ;; dgux*) hardcode_libdir_flag_spec='-L$libdir' ;; - freebsd1*) - ld_shlibs=no - ;; freebsd2.2*) hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes @@ -420,6 +427,8 @@ else hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: ;; + *nto* | *qnx*) + ;; openbsd*) if test -f /usr/libexec/ld.so; then hardcode_direct=yes @@ -515,7 +524,12 @@ case "$host_os" in library_names_spec='$libname$shrext' ;; amigaos*) - library_names_spec='$libname.a' + case "$host_cpu" in + powerpc*) + library_names_spec='$libname$shrext' ;; + m68k) + library_names_spec='$libname.a' ;; + esac ;; beos*) library_names_spec='$libname$shrext' @@ -534,8 +548,6 @@ case "$host_os" in dgux*) library_names_spec='$libname$shrext' ;; - freebsd1*) - ;; freebsd* | dragonfly*) case "$host_os" in freebsd[123]*) @@ -547,6 +559,9 @@ case "$host_os" in gnu*) library_names_spec='$libname$shrext' ;; + haiku*) + library_names_spec='$libname$shrext' + ;; hpux9* | hpux10* | hpux11*) case $host_cpu in ia64*) @@ -582,7 +597,7 @@ case "$host_os" in ;; linux*oldld* | linux*aout* | linux*coff*) ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) library_names_spec='$libname$shrext' ;; knetbsd*-gnu) @@ -594,7 +609,7 @@ case "$host_os" in newsos6) library_names_spec='$libname$shrext' ;; - nto-qnx*) + *nto* | *qnx*) library_names_spec='$libname$shrext' ;; openbsd*) @@ -625,6 +640,9 @@ case "$host_os" in sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) library_names_spec='$libname$shrext' ;; + tpf*) + library_names_spec='$libname$shrext' + ;; uts4*) library_names_spec='$libname$shrext' ;; diff --git a/build-aux/config.sub b/build-aux/config.sub index 320e3038..0ef29b07 100755 --- a/build-aux/config.sub +++ b/build-aux/config.sub @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011 Free Software Foundation, Inc. -timestamp='2010-09-11' +timestamp='2011-02-24' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -76,7 +76,7 @@ version="\ GNU config.sub ($timestamp) Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -158,8 +158,8 @@ case $os in os= basic_machine=$1 ;; - -bluegene*) - os=-cnk + -bluegene*) + os=-cnk ;; -sim | -cisco | -oki | -wec | -winbond) os= @@ -175,10 +175,10 @@ case $os in os=-chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + -chorusrdb) + os=-chorusrdb basic_machine=$1 - ;; + ;; -hiux*) os=-hiuxwe2 ;; @@ -424,7 +424,7 @@ case $basic_machine in basic_machine=a29k-amd os=-udi ;; - abacus) + abacus) basic_machine=abacus-unknown ;; adobe68k) @@ -507,7 +507,7 @@ case $basic_machine in basic_machine=c90-cray os=-unicos ;; - cegcc) + cegcc) basic_machine=arm-unknown os=-cegcc ;; @@ -539,7 +539,7 @@ case $basic_machine in basic_machine=craynv-cray os=-unicosmp ;; - cr16) + cr16 | cr16-*) basic_machine=cr16-unknown os=-elf ;; @@ -755,7 +755,7 @@ case $basic_machine in basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze) basic_machine=microblaze-xilinx ;; mingw32) @@ -862,10 +862,10 @@ case $basic_machine in np1) basic_machine=np1-gould ;; - neo-tandem) + neo-tandem) basic_machine=neo-tandem ;; - nse-tandem) + nse-tandem) basic_machine=nse-tandem ;; nsr-tandem) @@ -1102,8 +1102,8 @@ case $basic_machine in basic_machine=t90-cray os=-unicos ;; - # This must be matched before tile*. - tilegx*) + # This must be matched before tile*. + tilegx*) basic_machine=tilegx-unknown os=-linux-gnu ;; @@ -1275,11 +1275,11 @@ esac if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases + # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux + -auroraux) + os=-auroraux ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` @@ -1364,7 +1364,7 @@ case $os in -opened*) os=-openedition ;; - -os400*) + -os400*) os=-os400 ;; -wince*) @@ -1413,7 +1413,7 @@ case $os in -sinix*) os=-sysv4 ;; - -tpf*) + -tpf*) os=-tpf ;; -triton*) @@ -1458,8 +1458,8 @@ case $os in -dicos*) os=-dicos ;; - -nacl*) - ;; + -nacl*) + ;; -none) ;; *) @@ -1482,10 +1482,10 @@ else # system, and we'll never get to this point. case $basic_machine in - score-*) + score-*) os=-elf ;; - spu-*) + spu-*) os=-elf ;; *-acorn) @@ -1497,8 +1497,8 @@ case $basic_machine in arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff + c4x-* | tic4x-*) + os=-coff ;; tic54x-*) os=-coff @@ -1534,7 +1534,7 @@ case $basic_machine in m68*-cisco) os=-aout ;; - mep-*) + mep-*) os=-elf ;; mips*-cisco) @@ -1561,7 +1561,7 @@ case $basic_machine in *-ibm) os=-aix ;; - *-knuth) + *-knuth) os=-mmixware ;; *-wec) diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog index 7660af51..45597041 100755 --- a/build-aux/gitlog-to-changelog +++ b/build-aux/gitlog-to-changelog @@ -9,7 +9,7 @@ my $VERSION = '2009-10-30 13:46'; # UTC # If you change this file with Emacs, please let the write hook # do its job. Otherwise, update this string manually. -# Copyright (C) 2008-2010 Free Software Foundation, Inc. +# Copyright (C) 2008-2011 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 diff --git a/build-aux/install-sh b/build-aux/install-sh index 3f83ce9b..a9244eb0 100755 --- a/build-aux/install-sh +++ b/build-aux/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2010-02-06.18; # UTC +scriptversion=2011-01-19.21; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -156,6 +156,10 @@ while test $# -ne 0; do -s) stripcmd=$stripprog;; -t) dst_arg=$2 + # Protect names problematic for `test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac shift;; -T) no_target_directory=true;; @@ -186,6 +190,10 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then fi shift # arg dst_arg=$arg + # Protect names problematic for `test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac done fi @@ -232,9 +240,9 @@ fi for src do - # Protect names starting with `-'. + # Protect names problematic for `test' and other utilities. case $src in - -*) src=./$src;; + -* | [=\(\)!]) src=./$src;; esac if test -n "$dir_arg"; then @@ -256,12 +264,7 @@ do echo "$0: no destination specified." >&2 exit 1 fi - dst=$dst_arg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst;; - esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. @@ -389,7 +392,7 @@ do case $dstdir in /*) prefix='/';; - -*) prefix='./';; + [-=\(\)!]*) prefix='./';; *) prefix='';; esac @@ -407,7 +410,7 @@ do for d do - test -z "$d" && continue + test X"$d" = X && continue prefix=$prefix$d if test -d "$prefix"; then diff --git a/build-aux/texinfo.tex b/build-aux/texinfo.tex index f472b653..7b943897 100644 --- a/build-aux/texinfo.tex +++ b/build-aux/texinfo.tex @@ -3,11 +3,11 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2010-09-06.17} +\def\texinfoversion{2011-02-24.09} % % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, -% 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +% 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. % % This texinfo.tex file is free software: you can redistribute it and/or % modify it under the terms of the GNU General Public License as @@ -118,8 +118,8 @@ \ifx\putwordChapter\undefined \gdef\putwordChapter{Chapter}\fi \ifx\putwordfile\undefined \gdef\putwordfile{file}\fi \ifx\putwordin\undefined \gdef\putwordin{in}\fi -\ifx\putwordIndexIsEmpty\undefined \gdef\putwordIndexIsEmpty{(Index is empty)}\fi -\ifx\putwordIndexNonexistent\undefined \gdef\putwordIndexNonexistent{(Index is nonexistent)}\fi +\ifx\putwordIndexIsEmpty\undefined \gdef\putwordIndexIsEmpty{(Index is empty)}\fi +\ifx\putwordIndexNonexistent\undefined \gdef\putwordIndexNonexistent{(Index is nonexistent)}\fi \ifx\putwordInfo\undefined \gdef\putwordInfo{Info}\fi \ifx\putwordInstanceVariableof\undefined \gdef\putwordInstanceVariableof{Instance Variable of}\fi \ifx\putwordMethodon\undefined \gdef\putwordMethodon{Method on}\fi @@ -158,15 +158,18 @@ \def\spaceisspace{\catcode`\ =\spacecat} % sometimes characters are active, so we need control sequences. +\chardef\ampChar = `\& \chardef\colonChar = `\: \chardef\commaChar = `\, \chardef\dashChar = `\- \chardef\dotChar = `\. \chardef\exclamChar= `\! +\chardef\hashChar = `\# \chardef\lquoteChar= `\` \chardef\questChar = `\? \chardef\rquoteChar= `\' \chardef\semiChar = `\; +\chardef\slashChar = `\/ \chardef\underChar = `\_ % Ignore a token. @@ -215,7 +218,7 @@ \tracingmacros2 \tracingrestores1 \showboxbreadth\maxdimen \showboxdepth\maxdimen - \ifx\eTeXversion\undefined\else % etex gives us more logging + \ifx\eTeXversion\thisisundefined\else % etex gives us more logging \tracingscantokens1 \tracingifs1 \tracinggroups1 @@ -545,7 +548,7 @@ } \def\inenvironment#1{% \ifx#1\empty - out of any environment% + outside of any environment% \else in environment \expandafter\string#1% \fi @@ -557,7 +560,7 @@ \parseargdef\end{% \if 1\csname iscond.#1\endcsname \else - % The general wording of \badenverr may not be ideal, but... --kasal, 06nov03 + % The general wording of \badenverr may not be ideal. \expandafter\checkenv\csname#1\endcsname \csname E#1\endcsname \endgroup @@ -608,7 +611,7 @@ \else\ifx\temp\offword \plainnonfrenchspacing \else \errhelp = \EMsimple - \errmessage{Unknown @frenchspacing option `\temp', must be on/off}% + \errmessage{Unknown @frenchspacing option `\temp', must be on|off}% \fi\fi } @@ -849,6 +852,7 @@ where each line of input produces a line of output.} \makevalueexpandable % we want to expand any @value in FILE. \turnoffactive % and allow special characters in the expansion \indexnofonts % Allow `@@' and other weird things in file names. + \wlog{texinfo.tex: doing @include of #1^^J}% \edef\temp{\noexpand\input #1 }% % % This trickery is to read FILE outside of a group, in case it makes @@ -1078,9 +1082,8 @@ where each line of input produces a line of output.} \newif\ifpdfmakepagedest % when pdftex is run in dvi mode, \pdfoutput is defined (so \pdfoutput=1 -% can be set). So we test for \relax and 0 as well as \undefined, -% borrowed from ifpdf.sty. -\ifx\pdfoutput\undefined +% can be set). So we test for \relax and 0 as well as being undefined. +\ifx\pdfoutput\thisisundefined \else \ifx\pdfoutput\relax \else @@ -1512,7 +1515,7 @@ output) for that.)} % if we are producing pdf, and we have \pdffontattr, then define cmaps. % (\pdffontattr was introduced many years ago, but people still run % older pdftex's; it's easy to conditionalize, so we do.) -\ifpdf \ifx\pdffontattr\undefined \else +\ifpdf \ifx\pdffontattr\thisisundefined \else \begingroup \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char. \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap @@ -1779,7 +1782,7 @@ end % Use cm as the default font prefix. % To specify the font prefix, you must define \fontprefix % before you read in texinfo.tex. -\ifx\fontprefix\undefined +\ifx\fontprefix\thisisundefined \def\fontprefix{cm} \fi % Support font families that don't use the same naming scheme as CM. @@ -2070,7 +2073,7 @@ end % \parseargdef\fonttextsize{% \def\textsizearg{#1}% - \wlog{doing @fonttextsize \textsizearg}% + %\wlog{doing @fonttextsize \textsizearg}% % % Set \globaldefs so that documents can use this inside @tex, since % makeinfo 4.8 does not support it, but we need it nonetheless. @@ -2252,12 +2255,14 @@ end % Markup style setup for left and right quotes. \defmarkupstylesetup\markupsetuplq{% - \expandafter\let\expandafter \temp \csname markupsetuplq\currentmarkupstyle\endcsname + \expandafter\let\expandafter \temp + \csname markupsetuplq\currentmarkupstyle\endcsname \ifx\temp\relax \markupsetuplqdefault \else \temp \fi } \defmarkupstylesetup\markupsetuprq{% - \expandafter\let\expandafter \temp \csname markupsetuprq\currentmarkupstyle\endcsname + \expandafter\let\expandafter \temp + \csname markupsetuprq\currentmarkupstyle\endcsname \ifx\temp\relax \markupsetuprqdefault \else \temp \fi } @@ -2291,12 +2296,11 @@ end \let\markupsetuplqkbd \markupsetnoligaturesquoteleft -% Allow an option to not replace quotes with a regular directed right -% quote/apostrophe (char 0x27), but instead use the undirected quote -% from cmtt (char 0x0d). The undirected quote is ugly, so don't make it -% the default, but it works for pasting with more pdf viewers (at least -% evince), the lilypond developers report. xpdf does work with the -% regular 0x27. +% Allow an option to not use regular directed right quote/apostrophe +% (char 0x27), but instead the undirected quote from cmtt (char 0x0d). +% The undirected quote is ugly, so don't make it the default, but it +% works for pasting with more pdf viewers (at least evince), the +% lilypond developers report. xpdf does work with the regular 0x27. % \def\codequoteright{% \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax @@ -2320,6 +2324,36 @@ end \else \char'22 \fi } +% Commands to set the quote options. +% +\parseargdef\codequoteundirected{% + \def\temp{#1}% + \ifx\temp\onword + \expandafter\let\csname SETtxicodequoteundirected\endcsname + = t% + \else\ifx\temp\offword + \expandafter\let\csname SETtxicodequoteundirected\endcsname + = \relax + \else + \errhelp = \EMsimple + \errmessage{Unknown @codequoteundirected value `\temp', must be on|off}% + \fi\fi +} +% +\parseargdef\codequotebacktick{% + \def\temp{#1}% + \ifx\temp\onword + \expandafter\let\csname SETtxicodequotebacktick\endcsname + = t% + \else\ifx\temp\offword + \expandafter\let\csname SETtxicodequotebacktick\endcsname + = \relax + \else + \errhelp = \EMsimple + \errmessage{Unknown @codequotebacktick value `\temp', must be on|off}% + \fi\fi +} + % [Knuth] pp. 380,381,391, disable Spanish ligatures ?` and !` of \tt font. \def\noligaturesquoteleft{\relax\lq} @@ -2487,6 +2521,8 @@ end } } +\def\codex #1{\tclose{#1}\endgroup} + \def\realdash{-} \def\codedash{-\discretionary{}{}{}} \def\codeunder{% @@ -2500,7 +2536,6 @@ end \discretionary{}{}{}}% {\_}% } -\def\codex #1{\tclose{#1}\endgroup} % An additional complication: the above will allow breaks after, e.g., % each of the four underscores in __typeof__. This is undesirable in @@ -2520,63 +2555,18 @@ end \allowcodebreaksfalse \else \errhelp = \EMsimple - \errmessage{Unknown @allowcodebreaks option `\txiarg'}% + \errmessage{Unknown @allowcodebreaks option `\txiarg', must be true|false}% \fi\fi } -% @kbd is like @code, except that if the argument is just one @key command, -% then @kbd has no effect. -\def\kbd#1{{\setupmarkupstyle{kbd}\def\look{#1}\expandafter\kbdfoo\look??\par}} - -% @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always), -% `example' (@kbd uses ttsl only inside of @example and friends), -% or `code' (@kbd uses normal tty font always). -\parseargdef\kbdinputstyle{% - \def\txiarg{#1}% - \ifx\txiarg\worddistinct - \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}% - \else\ifx\txiarg\wordexample - \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\tt}% - \else\ifx\txiarg\wordcode - \gdef\kbdexamplefont{\tt}\gdef\kbdfont{\tt}% - \else - \errhelp = \EMsimple - \errmessage{Unknown @kbdinputstyle option `\txiarg'}% - \fi\fi\fi -} -\def\worddistinct{distinct} -\def\wordexample{example} -\def\wordcode{code} - -% Default is `distinct'. -\kbdinputstyle distinct - -\def\xkey{\key} -\def\kbdfoo#1#2#3\par{\def\one{#1}\def\three{#3}\def\threex{??}% -\ifx\one\xkey\ifx\threex\three \key{#2}% -\else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi -\else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi} - -% For @indicateurl, @env, @command quotes seem unnecessary, so use \code. -\let\indicateurl=\code -\let\env=\code -\let\command=\code - -% @clicksequence{File @click{} Open ...} -\def\clicksequence#1{\begingroup #1\endgroup} - -% @clickstyle @arrow (by default) -\parseargdef\clickstyle{\def\click{#1}} -\def\click{\arrow} - % @uref (abbreviation for `urlref') takes an optional (comma-separated) % second argument specifying the text to display and an optional third % arg as text to display instead of (rather than in addition to) the url -% itself. First (mandatory) arg is the url. Perhaps eventually put in -% a hypertex \special here. -% -\def\uref#1{\douref #1,,,\finish} -\def\douref#1,#2,#3,#4\finish{\begingroup +% itself. First (mandatory) arg is the url. +% (This \urefnobreak definition isn't used now, leaving it for a while +% for comparison.) +\def\urefnobreak#1{\dourefnobreak #1,,,\finish} +\def\dourefnobreak#1,#2,#3,#4\finish{\begingroup \unsepspaces \pdfurl{#1}% \setbox0 = \hbox{\ignorespaces #3}% @@ -2597,6 +2587,103 @@ end \endlink \endgroup} +% This \urefbreak definition is the active one. +\def\urefbreak{\begingroup \urefcatcodes \dourefbreak} +\let\uref=\urefbreak +\def\dourefbreak#1{\urefbreakfinish #1,,,\finish} +\def\urefbreakfinish#1,#2,#3,#4\finish{% doesn't work in @example + \unsepspaces + \pdfurl{#1}% + \setbox0 = \hbox{\ignorespaces #3}% + \ifdim\wd0 > 0pt + \unhbox0 % third arg given, show only that + \else + \setbox0 = \hbox{\ignorespaces #2}% + \ifdim\wd0 > 0pt + \ifpdf + \unhbox0 % PDF: 2nd arg given, show only it + \else + \unhbox0\ (\urefcode{#1})% DVI: 2nd arg given, show both it and url + \fi + \else + \urefcode{#1}% only url given, so show it + \fi + \fi + \endlink +\endgroup} + +% Allow line breaks around only a few characters (only). +\def\urefcatcodes{% + \catcode\ampChar=\active \catcode\dotChar=\active + \catcode\hashChar=\active \catcode\questChar=\active + \catcode\slashChar=\active +} +{ + \urefcatcodes + % + \global\def\urefcode{\begingroup + \setupmarkupstyle{code}% + \urefcatcodes + \let&\urefcodeamp + \let.\urefcodedot + \let#\urefcodehash + \let?\urefcodequest + \let/\urefcodeslash + \codex + } + % + % By default, they are just regular characters. + \global\def&{\normalamp} + \global\def.{\normaldot} + \global\def#{\normalhash} + \global\def?{\normalquest} + \global\def/{\normalslash} +} + +% we put a little stretch before and after the breakable chars, to help +% line breaking of long url's. The unequal skips make look better in +% cmtt at least, especially for dots. +\def\urefprestretch{\urefprebreak \hskip0pt plus.13em } +\def\urefpoststretch{\urefpostbreak \hskip0pt plus.1em } +% +\def\urefcodeamp{\urefprestretch \&\urefpoststretch} +\def\urefcodedot{\urefprestretch .\urefpoststretch} +\def\urefcodehash{\urefprestretch \#\urefpoststretch} +\def\urefcodequest{\urefprestretch ?\urefpoststretch} +\def\urefcodeslash{\futurelet\next\urefcodeslashfinish} +{ + \catcode`\/=\active + \global\def\urefcodeslashfinish{% + \urefprestretch \slashChar + % Allow line break only after the final / in a sequence of + % slashes, to avoid line break between the slashes in http://. + \ifx\next/\else \urefpoststretch \fi + } +} + +% One more complication: by default we'll break after the special +% characters, but some people like to break before the special chars, so +% allow that. Also allow no breaking at all, for manual control. +% +\parseargdef\urefbreakstyle{% + \def\txiarg{#1}% + \ifx\txiarg\wordnone + \def\urefprebreak{\nobreak}\def\urefpostbreak{\nobreak} + \else\ifx\txiarg\wordbefore + \def\urefprebreak{\allowbreak}\def\urefpostbreak{\nobreak} + \else\ifx\txiarg\wordafter + \def\urefprebreak{\nobreak}\def\urefpostbreak{\allowbreak} + \else + \errhelp = \EMsimple + \errmessage{Unknown @urefbreakstyle setting `\txiarg'}% + \fi\fi\fi +} +\def\wordafter{after} +\def\wordbefore{before} +\def\wordnone{none} + +\urefbreakstyle after + % @url synonym for @uref, since that's how everyone uses it. % \let\url=\uref @@ -2618,6 +2705,51 @@ end \let\email=\uref \fi +% @kbd is like @code, except that if the argument is just one @key command, +% then @kbd has no effect. +\def\kbd#1{{\setupmarkupstyle{kbd}\def\look{#1}\expandafter\kbdfoo\look??\par}} + +% @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always), +% `example' (@kbd uses ttsl only inside of @example and friends), +% or `code' (@kbd uses normal tty font always). +\parseargdef\kbdinputstyle{% + \def\txiarg{#1}% + \ifx\txiarg\worddistinct + \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}% + \else\ifx\txiarg\wordexample + \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\tt}% + \else\ifx\txiarg\wordcode + \gdef\kbdexamplefont{\tt}\gdef\kbdfont{\tt}% + \else + \errhelp = \EMsimple + \errmessage{Unknown @kbdinputstyle setting `\txiarg'}% + \fi\fi\fi +} +\def\worddistinct{distinct} +\def\wordexample{example} +\def\wordcode{code} + +% Default is `distinct'. +\kbdinputstyle distinct + +\def\xkey{\key} +\def\kbdfoo#1#2#3\par{\def\one{#1}\def\three{#3}\def\threex{??}% +\ifx\one\xkey\ifx\threex\three \key{#2}% +\else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi +\else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi} + +% For @indicateurl, @env, @command quotes seem unnecessary, so use \code. +\let\indicateurl=\code +\let\env=\code +\let\command=\code + +% @clicksequence{File @click{} Open ...} +\def\clicksequence#1{\begingroup #1\endgroup} + +% @clickstyle @arrow (by default) +\parseargdef\clickstyle{\def\click{#1}} +\def\click{\arrow} + % Typeset a dimension, e.g., `in' or `pt'. The only reason for the % argument is to make the input look right: @dmn{pt} instead of @dmn{}pt. % @@ -3005,7 +3137,7 @@ end % Textures 1.7.7 (preloaded format=plain 93.10.14) (68K) 16 APR 2004 02:38 % so we'll define it if necessary. % -\ifx\Orb\undefined +\ifx\Orb\thisisundefined \def\Orb{\mathhexbox20D} \fi @@ -3033,8 +3165,9 @@ end \newif\ifsetshortcontentsaftertitlepage \let\setshortcontentsaftertitlepage = \setshortcontentsaftertitlepagetrue -\parseargdef\shorttitlepage{\begingroup\hbox{}\vskip 1.5in \chaprm \centerline{#1}% - \endgroup\page\hbox{}\page} +\parseargdef\shorttitlepage{% + \begingroup \hbox{}\vskip 1.5in \chaprm \centerline{#1}% + \endgroup\page\hbox{}\page} \envdef\titlepage{% % Open one extra group, as we want to close it in the middle of \Etitlepage. @@ -3279,7 +3412,7 @@ end % This produces Day Month Year style of output. % Only define if not already defined, in case a txi-??.tex file has set % up a different format (e.g., txi-cs.tex does this). -\ifx\today\undefined +\ifx\today\thisisundefined \def\today{% \number\day\space \ifcase\month @@ -5242,7 +5375,8 @@ end \global\let\subsubsection = \appendixsubsubsec } -\outer\parseargdef\unnumbered{\unnmhead0{#1}} % normally unnmhead0 calls unnumberedzzz +% normally unnmhead0 calls unnumberedzzz: +\outer\parseargdef\unnumbered{\unnmhead0{#1}} \def\unnumberedzzz#1{% \global\secno=0 \global\subsecno=0 \global\subsubsecno=0 \global\advance\unnumberedno by 1 @@ -5286,40 +5420,47 @@ end \let\top\unnumbered % Sections. +% \outer\parseargdef\numberedsec{\numhead1{#1}} % normally calls seczzz \def\seczzz#1{% \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1 \sectionheading{#1}{sec}{Ynumbered}{\the\chapno.\the\secno}% } -\outer\parseargdef\appendixsection{\apphead1{#1}} % normally calls appendixsectionzzz +% normally calls appendixsectionzzz: +\outer\parseargdef\appendixsection{\apphead1{#1}} \def\appendixsectionzzz#1{% \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1 \sectionheading{#1}{sec}{Yappendix}{\appendixletter.\the\secno}% } \let\appendixsec\appendixsection -\outer\parseargdef\unnumberedsec{\unnmhead1{#1}} % normally calls unnumberedseczzz +% normally calls unnumberedseczzz: +\outer\parseargdef\unnumberedsec{\unnmhead1{#1}} \def\unnumberedseczzz#1{% \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1 \sectionheading{#1}{sec}{Ynothing}{\the\unnumberedno.\the\secno}% } % Subsections. -\outer\parseargdef\numberedsubsec{\numhead2{#1}} % normally calls numberedsubseczzz +% +% normally calls numberedsubseczzz: +\outer\parseargdef\numberedsubsec{\numhead2{#1}} \def\numberedsubseczzz#1{% \global\subsubsecno=0 \global\advance\subsecno by 1 \sectionheading{#1}{subsec}{Ynumbered}{\the\chapno.\the\secno.\the\subsecno}% } -\outer\parseargdef\appendixsubsec{\apphead2{#1}} % normally calls appendixsubseczzz +% normally calls appendixsubseczzz: +\outer\parseargdef\appendixsubsec{\apphead2{#1}} \def\appendixsubseczzz#1{% \global\subsubsecno=0 \global\advance\subsecno by 1 \sectionheading{#1}{subsec}{Yappendix}% {\appendixletter.\the\secno.\the\subsecno}% } -\outer\parseargdef\unnumberedsubsec{\unnmhead2{#1}} %normally calls unnumberedsubseczzz +% normally calls unnumberedsubseczzz: +\outer\parseargdef\unnumberedsubsec{\unnmhead2{#1}} \def\unnumberedsubseczzz#1{% \global\subsubsecno=0 \global\advance\subsecno by 1 \sectionheading{#1}{subsec}{Ynothing}% @@ -5327,21 +5468,25 @@ end } % Subsubsections. -\outer\parseargdef\numberedsubsubsec{\numhead3{#1}} % normally numberedsubsubseczzz +% +% normally numberedsubsubseczzz: +\outer\parseargdef\numberedsubsubsec{\numhead3{#1}} \def\numberedsubsubseczzz#1{% \global\advance\subsubsecno by 1 \sectionheading{#1}{subsubsec}{Ynumbered}% {\the\chapno.\the\secno.\the\subsecno.\the\subsubsecno}% } -\outer\parseargdef\appendixsubsubsec{\apphead3{#1}} % normally appendixsubsubseczzz +% normally appendixsubsubseczzz: +\outer\parseargdef\appendixsubsubsec{\apphead3{#1}} \def\appendixsubsubseczzz#1{% \global\advance\subsubsecno by 1 \sectionheading{#1}{subsubsec}{Yappendix}% {\appendixletter.\the\secno.\the\subsecno.\the\subsubsecno}% } -\outer\parseargdef\unnumberedsubsubsec{\unnmhead3{#1}} %normally unnumberedsubsubseczzz +% normally unnumberedsubsubseczzz: +\outer\parseargdef\unnumberedsubsubsec{\unnmhead3{#1}} \def\unnumberedsubsubseczzz#1{% \global\advance\subsubsecno by 1 \sectionheading{#1}{subsubsec}{Ynothing}% @@ -5601,6 +5746,8 @@ end % \def\sectionheading#1#2#3#4{% {% + \checkenv{}% should not be in an environment. + % % Switch to the right set of fonts. \csname #2fonts\endcsname \rmisbold % @@ -6346,7 +6493,7 @@ end % \def\Equotation{% \par - \ifx\quotationauthor\undefined\else + \ifx\quotationauthor\thisisundefined\else % indent a bit. \leftline{\kern 2\leftskip \sl ---\quotationauthor}% \fi @@ -6505,6 +6652,7 @@ end \makevalueexpandable \setupverbatim \indexnofonts % Allow `@@' and other weird things in file names. + \wlog{texinfo.tex: doing @verbatiminclude of #1^^J}% \input #1 \afterenvbreak }% @@ -6880,7 +7028,7 @@ end % To do this right we need a feature of e-TeX, \scantokens, % which we arrange to emulate with a temporary file in ordinary TeX. -\ifx\eTeXversion\undefined +\ifx\eTeXversion\thisisundefined \newwrite\macscribble \def\scantokens#1{% \toks0={#1}% @@ -6891,25 +7039,28 @@ end } \fi -\def\scanmacro#1{% - \begingroup - \newlinechar`\^^M - \let\xeatspaces\eatspaces - % Undo catcode changes of \startcontents and \doprintindex - % When called from @insertcopying or (short)caption, we need active - % backslash to get it printed correctly. Previously, we had - % \catcode`\\=\other instead. We'll see whether a problem appears - % with macro expansion. --kasal, 19aug04 - \catcode`\@=0 \catcode`\\=\active \escapechar=`\@ - % ... and \example - \spaceisspace - % - % Append \endinput to make sure that TeX does not see the ending newline. - % I've verified that it is necessary both for e-TeX and for ordinary TeX - % --kasal, 29nov03 - \scantokens{#1\endinput}% - \endgroup -} +\def\scanmacro#1{\begingroup + \newlinechar`\^^M + \let\xeatspaces\eatspaces + % + % Undo catcode changes of \startcontents and \doprintindex + % When called from @insertcopying or (short)caption, we need active + % backslash to get it printed correctly. Previously, we had + % \catcode`\\=\other instead. We'll see whether a problem appears + % with macro expansion. --kasal, 19aug04 + \catcode`\@=0 \catcode`\\=\active \escapechar=`\@ + % + % ... and for \example: + \spaceisspace + % + % The \empty here causes a following catcode 5 newline to be eaten + % as part of reading whitespace after a control sequence. It does + % not eat a catcode 13 newline. There's no good way to handle the + % two cases. See the Macro Details node in the manual for the + % workaround we currently have to recommend for macros and + % line-oriented commands. + \scantokens{#1\empty}% +\endgroup} \def\scanexp#1{% \edef\temp{\noexpand\scanmacro{#1}}% @@ -7232,7 +7383,8 @@ end % @inforef is relatively simple. \def\inforef #1{\inforefzzz #1,,,,**} -\def\inforefzzz #1,#2,#3,#4**{\putwordSee{} \putwordInfo{} \putwordfile{} \file{\ignorespaces #3{}}, +\def\inforefzzz #1,#2,#3,#4**{% + \putwordSee{} \putwordInfo{} \putwordfile{} \file{\ignorespaces #3{}}, node \samp{\ignorespaces#1{}}} % @node's only job in TeX is to define \lastnode, which is used in @@ -7293,11 +7445,32 @@ end \toks0 = \expandafter{\lastsection}% \immediate \writexrdef{title}{\the\toks0 }% \immediate \writexrdef{snt}{\csname #2\endcsname}% \Ynumbered etc. - \safewhatsit{\writexrdef{pg}{\folio}}% will be written later, during \shipout + \safewhatsit{\writexrdef{pg}{\folio}}% will be written later, at \shipout }% \fi } +% @xrefautosectiontitle on|off says whether @section(ing) names are used +% automatically in xrefs, if the third arg is not explicitly specified. +% This was provided as a "secret" @set xref-automatic-section-title +% variable, now it's official. +% +\parseargdef\xrefautomaticsectiontitle{% + \def\temp{#1}% + \ifx\temp\onword + \expandafter\let\csname SETxref-automatic-section-title\endcsname + = \empty + \else\ifx\temp\offword + \expandafter\let\csname SETxref-automatic-section-title\endcsname + = \relax + \else + \errhelp = \EMsimple + \errmessage{Unknown @xrefautomaticsectiontitle value `\temp', + must be on|off}% + \fi\fi +} + + % @xref, @pxref, and @ref generate cross-references. For \xrefX, #1 is % the node name, #2 the name of the Info cross-reference, #3 the printed % node name, #4 the name of the Info file, #5 the name of the printed @@ -7314,7 +7487,7 @@ end \setbox0=\hbox{\printedrefname\unskip}% \ifdim \wd0 = 0pt % No printed node name was explicitly given. - \expandafter\ifx\csname SETxref-automatic-section-title\endcsname\relax + \expandafter\ifx\csname SETxref-automatic-section-title\endcsname \relax % Use the node name inside the square brackets. \def\printedrefname{\ignorespaces #1}% \else @@ -7784,7 +7957,7 @@ end it from ftp://tug.org/tex/epsf.tex.} % \def\image#1{% - \ifx\epsfbox\undefined + \ifx\epsfbox\thisiundefined \ifwarnednoepsf \else \errhelp = \noepsfhelp \errmessage{epsf.tex not found, images will be ignored}% @@ -8279,7 +8452,7 @@ directory should work if nowhere else does.} \gdef^^b9{$^1$} \gdef^^ba{\ordm} % - \gdef^^bb{\guilletright} + \gdef^^bb{\guillemetright} \gdef^^bc{$1\over4$} \gdef^^bd{$1\over2$} \gdef^^be{$3\over4$} @@ -8544,7 +8717,7 @@ directory should work if nowhere else does.} \gdef\DeclareUnicodeCharacter#1#2{% \countUTFz = "#1\relax - \wlog{\space\space defining Unicode char U+#1 (decimal \the\countUTFz)}% + %\wlog{\space\space defining Unicode char U+#1 (decimal \the\countUTFz)}% \begingroup \parseXMLCharref \def\UTFviiiTwoOctets##1##2{% @@ -9224,24 +9397,15 @@ directory should work if nowhere else does.} \catcode`\^^? = 14 % Define macros to output various characters with catcode for normal text. -\catcode`\"=\other -\catcode`\~=\other -\catcode`\^=\other -\catcode`\_=\other -\catcode`\|=\other -\catcode`\<=\other -\catcode`\>=\other -\catcode`\+=\other -\catcode`\$=\other -\def\normaldoublequote{"} -\def\normaltilde{~} -\def\normalcaret{^} -\def\normalunderscore{_} -\def\normalverticalbar{|} -\def\normalless{<} -\def\normalgreater{>} -\def\normalplus{+} -\def\normaldollar{$}%$ font-lock fix +\catcode`\"=\other \def\normaldoublequote{"} +\catcode`\$=\other \def\normaldollar{$}%$ font-lock fix +\catcode`\+=\other \def\normalplus{+} +\catcode`\<=\other \def\normalless{<} +\catcode`\>=\other \def\normalgreater{>} +\catcode`\^=\other \def\normalcaret{^} +\catcode`\_=\other \def\normalunderscore{_} +\catcode`\|=\other \def\normalverticalbar{|} +\catcode`\~=\other \def\normaltilde{~} % This macro is used to make a character print one way in \tt % (where it can probably be output as-is), and another way in other fonts, @@ -9334,16 +9498,16 @@ directory should work if nowhere else does.} % the literal character `\'. % @def@normalturnoffactive{% - @let\=@normalbackslash @let"=@normaldoublequote - @let~=@normaltilde + @let$=@normaldollar %$ font-lock fix + @let+=@normalplus + @let<=@normalless + @let>=@normalgreater + @let\=@normalbackslash @let^=@normalcaret @let_=@normalunderscore @let|=@normalverticalbar - @let<=@normalless - @let>=@normalgreater - @let+=@normalplus - @let$=@normaldollar %$ font-lock fix + @let~=@normaltilde @markupsetuplqdefault @markupsetuprqdefault @unsepspaces @@ -9375,10 +9539,16 @@ directory should work if nowhere else does.} % Say @foo, not \foo, in error messages. @escapechar = `@@ +% These (along with & and #) are made active for url-breaking, so need +% active definitions as the normal characters. +@def@normaldot{.} +@def@normalquest{?} +@def@normalslash{/} + % These look ok in all fonts, so just make them not special. -@catcode`@& = @other -@catcode`@# = @other -@catcode`@% = @other +@catcode`@& = @other @def@normalamp{&} +@catcode`@# = @other @def@normalhash{#} +@catcode`@% = @other @def@normalpercent{%} @c Finally, make ` and ' active, so that txicodequoteundirected and @c txicodequotebacktick work right in, e.g., @w{@code{`foo'}}. If we diff --git a/build-aux/warn-on-use.h b/build-aux/warn-on-use.h index 7b42432b..5dfc5905 100644 --- a/build-aux/warn-on-use.h +++ b/build-aux/warn-on-use.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A C macro for emitting warnings if a function is used. - Copyright (C) 2010 Free Software Foundation, Inc. + Copyright (C) 2010-2011 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 @@ -11,7 +11,7 @@ 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 - Lesser General Public License for more details. + General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . */ diff --git a/config.h.in b/config.h.in index a7d8c63a..d9dd5a88 100644 --- a/config.h.in +++ b/config.h.in @@ -1,9 +1,5 @@ /* config.h.in. Generated from configure.ac by autoheader. */ -/* Define if the compiler is building for multiple architectures of Apple - platforms at once. */ -#undef AA_APPLE_UNIVERSAL_BUILD - /* Define to the number of bits in type 'ptrdiff_t'. */ #undef BITSIZEOF_PTRDIFF_T @@ -88,6 +84,10 @@ language is requested. */ #undef ENABLE_NLS +/* Define to 1 if your platform has fchownat, but it does not reject an empty + file name. */ +#undef FCHOWNAT_EMPTY_FILENAME_BUG + /* Define to 1 if your platform has fchownat, but it cannot perform lchown tasks. */ #undef FCHOWNAT_NOFOLLOW_BUG @@ -95,23 +95,13 @@ /* Define this to 1 if F_DUPFD behavior does not match POSIX */ #undef FCNTL_DUPFD_BUGGY -/* Define on systems for which file names may have a so-called `drive letter' - prefix, define this to compute the length of that prefix, including the - colon. */ -#undef FILE_SYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX - -/* Define if the backslash character may also serve as a file name component - separator. */ -#undef FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR - -/* Define if a drive letter prefix denotes a relative path if it is not - followed by a file name component separator. */ -#undef FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE - /* Define to 1 if mkdir mistakenly creates a directory given with a trailing dot component. */ #undef FUNC_MKDIR_DOT_BUG +/* Define to 1 if nl_langinfo (YESEXPR) returns a non-empty string. */ +#undef FUNC_NL_LANGINFO_YESEXPR_WORKS + /* Define to 1 if realpath() can malloc memory, always gives an absolute path, and handles trailing slash correctly. */ #undef FUNC_REALPATH_WORKS @@ -169,6 +159,10 @@ argp.h */ #undef GNULIB_PROGRAM_INVOCATION_SHORT_NAME +/* Define to a C preprocessor expression that evaluates to 1 or 0, depending + whether the gnulib module snprintf shall be considered present. */ +#undef GNULIB_SNPRINTF + /* Define to 1 when the gnulib module btowc should be tested. */ #undef GNULIB_TEST_BTOWC @@ -233,6 +227,9 @@ /* Define to 1 when the gnulib module gettimeofday should be tested. */ #undef GNULIB_TEST_GETTIMEOFDAY +/* Define to 1 when the gnulib module iswblank should be tested. */ +#undef GNULIB_TEST_ISWBLANK + /* Define to 1 when the gnulib module lchown should be tested. */ #undef GNULIB_TEST_LCHOWN @@ -263,6 +260,9 @@ /* Define to 1 when the gnulib module mbsrtowcs should be tested. */ #undef GNULIB_TEST_MBSRTOWCS +/* Define to 1 when the gnulib module mbtowc should be tested. */ +#undef GNULIB_TEST_MBTOWC + /* Define to 1 when the gnulib module memchr should be tested. */ #undef GNULIB_TEST_MEMCHR @@ -447,6 +447,10 @@ */ #undef HAVE_DECL_DIRFD +/* Define to 1 if you have the declaration of `fchdir', and to 0 if you don't. + */ +#undef HAVE_DECL_FCHDIR + /* Define to 1 if you have the declaration of `fdopendir', and to 0 if you don't. */ #undef HAVE_DECL_FDOPENDIR @@ -479,6 +483,10 @@ you don't. */ #undef HAVE_DECL_FREAD_UNLOCKED +/* Define to 1 if you have the declaration of `fseeko', and to 0 if you don't. + */ +#undef HAVE_DECL_FSEEKO + /* Define to 1 if you have the declaration of `fwrite_unlocked', and to 0 if you don't. */ #undef HAVE_DECL_FWRITE_UNLOCKED @@ -511,10 +519,6 @@ don't. */ #undef HAVE_DECL_GETLINE -/* Define to 1 if you have the declaration of `getopt_clip', and to 0 if you - don't. */ -#undef HAVE_DECL_GETOPT_CLIP - /* Define to 1 if you have the declaration of `getpwuid', and to 0 if you don't. */ #undef HAVE_DECL_GETPWUID @@ -535,13 +539,13 @@ don't. */ #undef HAVE_DECL_ISWBLANK -/* Define to 1 if you have the declaration of `memrchr', and to 0 if you +/* Define to 1 if you have the declaration of `localtime_r', and to 0 if you don't. */ -#undef HAVE_DECL_MEMRCHR +#undef HAVE_DECL_LOCALTIME_R -/* Define to 1 if you have the declaration of `optreset', and to 0 if you +/* Define to 1 if you have the declaration of `memrchr', and to 0 if you don't. */ -#undef HAVE_DECL_OPTRESET +#undef HAVE_DECL_MEMRCHR /* Define to 1 if you have the declaration of `program_invocation_name', and to 0 if you don't. */ @@ -559,6 +563,10 @@ don't. */ #undef HAVE_DECL_PUTC_UNLOCKED +/* Define to 1 if you have the declaration of `setenv', and to 0 if you don't. + */ +#undef HAVE_DECL_SETENV + /* Define to 1 if you have the declaration of `sleep', and to 0 if you don't. */ #undef HAVE_DECL_SLEEP @@ -615,6 +623,10 @@ */ #undef HAVE_DECL_TZNAME +/* Define to 1 if you have the declaration of `unsetenv', and to 0 if you + don't. */ +#undef HAVE_DECL_UNSETENV + /* Define to 1 if you have the declaration of `vsnprintf', and to 0 if you don't. */ #undef HAVE_DECL_VSNPRINTF @@ -643,9 +655,6 @@ /* Define if you have the declaration of environ. */ #undef HAVE_ENVIRON_DECL -/* Define to 1 if you have the header file. */ -#undef HAVE_ERRNO_H - /* Define to 1 if you have the `fchdir' function. */ #undef HAVE_FCHDIR @@ -670,9 +679,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_FEATURES_H -/* Define to 1 if you have the header file. */ -#undef HAVE_FLOAT_H - /* Define to 1 if you have the `flockfile' function. */ #undef HAVE_FLOCKFILE @@ -910,9 +916,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_PWD_H -/* Define to 1 if you have the header file. */ -#undef HAVE_RANDOM_H - /* Define to 1 if you have the `rawmemchr' function. */ #undef HAVE_RAWMEMCHR @@ -1046,6 +1049,9 @@ /* Define to 1 if initstat_r is declared even after undefining macros. */ #undef HAVE_RAW_DECL_INITSTAT_R +/* Define to 1 if iswctype is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_ISWCTYPE + /* Define to 1 if lchmod is declared even after undefining macros. */ #undef HAVE_RAW_DECL_LCHMOD @@ -1124,6 +1130,9 @@ /* Define to 1 if openat is declared even after undefining macros. */ #undef HAVE_RAW_DECL_OPENAT +/* Define to 1 if pipe is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_PIPE + /* Define to 1 if pipe2 is declared even after undefining macros. */ #undef HAVE_RAW_DECL_PIPE2 @@ -1205,6 +1214,9 @@ /* Define to 1 if strdup is declared even after undefining macros. */ #undef HAVE_RAW_DECL_STRDUP +/* Define to 1 if strerror_r is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_STRERROR_R + /* Define to 1 if strncasecmp is declared even after undefining macros. */ #undef HAVE_RAW_DECL_STRNCASECMP @@ -1256,6 +1268,9 @@ /* Define to 1 if tmpfile is declared even after undefining macros. */ #undef HAVE_RAW_DECL_TMPFILE +/* Define to 1 if towctrans is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_TOWCTRANS + /* Define to 1 if ttyname_r is declared even after undefining macros. */ #undef HAVE_RAW_DECL_TTYNAME_R @@ -1283,21 +1298,111 @@ /* Define to 1 if vsnprintf is declared even after undefining macros. */ #undef HAVE_RAW_DECL_VSNPRINTF +/* Define to 1 if wcpcpy is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_WCPCPY + +/* Define to 1 if wcpncpy is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_WCPNCPY + /* Define to 1 if wcrtomb is declared even after undefining macros. */ #undef HAVE_RAW_DECL_WCRTOMB +/* Define to 1 if wcscasecmp is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_WCSCASECMP + +/* Define to 1 if wcscat is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_WCSCAT + +/* Define to 1 if wcschr is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_WCSCHR + +/* Define to 1 if wcscmp is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_WCSCMP + +/* Define to 1 if wcscoll is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_WCSCOLL + +/* Define to 1 if wcscpy is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_WCSCPY + +/* Define to 1 if wcscspn is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_WCSCSPN + +/* Define to 1 if wcsdup is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_WCSDUP + +/* Define to 1 if wcslen is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_WCSLEN + +/* Define to 1 if wcsncasecmp is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_WCSNCASECMP + +/* Define to 1 if wcsncat is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_WCSNCAT + +/* Define to 1 if wcsncmp is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_WCSNCMP + +/* Define to 1 if wcsncpy is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_WCSNCPY + +/* Define to 1 if wcsnlen is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_WCSNLEN + /* Define to 1 if wcsnrtombs is declared even after undefining macros. */ #undef HAVE_RAW_DECL_WCSNRTOMBS +/* Define to 1 if wcspbrk is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_WCSPBRK + +/* Define to 1 if wcsrchr is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_WCSRCHR + /* Define to 1 if wcsrtombs is declared even after undefining macros. */ #undef HAVE_RAW_DECL_WCSRTOMBS +/* Define to 1 if wcsspn is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_WCSSPN + +/* Define to 1 if wcsstr is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_WCSSTR + +/* Define to 1 if wcstok is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_WCSTOK + +/* Define to 1 if wcswidth is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_WCSWIDTH + +/* Define to 1 if wcsxfrm is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_WCSXFRM + /* Define to 1 if wctob is declared even after undefining macros. */ #undef HAVE_RAW_DECL_WCTOB +/* Define to 1 if wctrans is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_WCTRANS + +/* Define to 1 if wctype is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_WCTYPE + /* Define to 1 if wcwidth is declared even after undefining macros. */ #undef HAVE_RAW_DECL_WCWIDTH +/* Define to 1 if wmemchr is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_WMEMCHR + +/* Define to 1 if wmemcmp is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_WMEMCMP + +/* Define to 1 if wmemcpy is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_WMEMCPY + +/* Define to 1 if wmemmove is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_WMEMMOVE + +/* Define to 1 if wmemset is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_WMEMSET + /* Define to 1 if _Exit is declared even after undefining macros. */ #undef HAVE_RAW_DECL__EXIT @@ -1351,15 +1456,6 @@ buffer had been large enough. */ #undef HAVE_SNPRINTF_RETVAL_C99 -/* Define to 1 if you have the header file. */ -#undef HAVE_STDARG_H - -/* Define to 1 if stdbool.h conforms to C99. */ -#undef HAVE_STDBOOL_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDDEF_H - /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H @@ -1370,9 +1466,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STDIO_EXT_H -/* Define to 1 if you have the header file. */ -#undef HAVE_STDIO_H - /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H @@ -1424,9 +1517,6 @@ /* Define to 1 if you have the `strtoumax' function. */ #undef HAVE_STRTOUMAX -/* Define to 1 if the system has the type `struct random_data'. */ -#undef HAVE_STRUCT_RANDOM_DATA - /* Define to 1 if `st_atimensec' is member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_ATIMENSEC @@ -1543,9 +1633,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_WAIT_H -/* Define to 1 if you have the header file. */ -#undef HAVE_TIME_H - /* Define if struct tm has the tm_gmtoff member. */ #undef HAVE_TM_GMTOFF @@ -1650,17 +1737,12 @@ /* Define as const if the declaration of iconv() needs const. */ #undef ICONV_CONST -#if FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR -# define ISSLASH(C) ((C) == '/' || (C) == '\\') -#else -# define ISSLASH(C) ((C) == '/') -#endif - /* Define to 1 if linkat fails to recognize a trailing slash. */ #undef LINKAT_TRAILING_SLASH_BUG /* Define to 1 if `link(2)' dereferences symbolic links, 0 if it creates hard - links to symlinks, and -1 if unknown. */ + links to symlinks, -1 if it depends on the variable __xpg4, and -2 if + unknown. */ #undef LINK_FOLLOWS_SYMLINKS /* Define to 1 if lseek does not detect pipes. */ @@ -1693,8 +1775,11 @@ /* Define to a substitute value for mmap()'s MAP_ANONYMOUS flag. */ #undef MAP_ANONYMOUS +/* Define if the mbrtowc function has the NULL pwc argument bug. */ +#undef MBRTOWC_NULL_ARG1_BUG + /* Define if the mbrtowc function has the NULL string argument bug. */ -#undef MBRTOWC_NULL_ARG_BUG +#undef MBRTOWC_NULL_ARG2_BUG /* Define if the mbrtowc function does not return 0 for a NUL character. */ #undef MBRTOWC_NUL_RETVAL_BUG @@ -1857,10 +1942,6 @@ /* Define to 1 if unlink() on a parent directory may succeed */ #undef UNLINK_PARENT_BUG -/* Define to the prefix of C symbols at the assembler and linker level, either - an underscore or empty. */ -#undef USER_LABEL_PREFIX - /* Define to 1 if you want getc etc. to use unlocked I/O if available. Unlocked I/O can improve performance in unithreaded apps, but it is not safe for multithreaded apps. */ diff --git a/configure b/configure index 08758085..858b4e79 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for GNU tar 1.25. +# Generated by GNU Autoconf 2.63 for GNU tar 1.26. # # Report bugs to . # @@ -596,8 +596,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='GNU tar' PACKAGE_TARNAME='tar' -PACKAGE_VERSION='1.25' -PACKAGE_STRING='GNU tar 1.25' +PACKAGE_VERSION='1.26' +PACKAGE_STRING='GNU tar 1.26' PACKAGE_BUGREPORT='bug-tar@gnu.org' ac_unique_file="src/tar.c" @@ -681,17 +681,9 @@ LIB_SETSOCKOPT LIBGNU_LTLIBDEPS LIBGNU_LIBDEPS gltests_WITNESS -REPLACE_ISWCNTRL -HAVE_WCTYPE_H -NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H -NEXT_WCTYPE_H -REPLACE_ISWBLANK -HAVE_ISWBLANK -HAVE_ISWCNTRL -HAVE_WINT_T -HAVE_WCHAR_H NEXT_AS_FIRST_DIRECTIVE_WCHAR_H NEXT_WCHAR_H +HAVE_FEATURES_H LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_FALSE LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE LIBUNISTRING_UNIWIDTH_H @@ -716,12 +708,10 @@ NEXT_AS_FIRST_DIRECTIVE_STRING_H NEXT_STRING_H HAVE_DECL_STRNCASECMP HAVE_STRCASECMP -HAVE_RANDOM_H NEXT_AS_FIRST_DIRECTIVE_STDLIB_H NEXT_STDLIB_H NEXT_AS_FIRST_DIRECTIVE_STDIO_H NEXT_STDIO_H -ASM_SYMBOL_PREFIX NEXT_AS_FIRST_DIRECTIVE_STDDEF_H NEXT_STDDEF_H STDDEF_H @@ -737,7 +727,7 @@ REPLACE_LOCALTIME_R HAVE_TIMEGM HAVE_STRPTIME HAVE_NANOSLEEP -HAVE_LOCALTIME_R +HAVE_DECL_LOCALTIME_R GNULIB_TIME_R GNULIB_TIMEGM GNULIB_STRPTIME @@ -749,6 +739,7 @@ REPLACE_STRSIGNAL REPLACE_STRNLEN REPLACE_STRNDUP REPLACE_STRNCAT +REPLACE_STRERROR_R REPLACE_STRERROR REPLACE_STRCASESTR REPLACE_STRSTR @@ -758,6 +749,7 @@ REPLACE_MEMMEM REPLACE_MEMCHR HAVE_STRVERSCMP HAVE_DECL_STRSIGNAL +HAVE_DECL_STRERROR_R HAVE_DECL_STRTOK_R HAVE_STRCASESTR HAVE_STRSEP @@ -776,6 +768,7 @@ HAVE_MEMCHR HAVE_MBSLEN GNULIB_STRVERSCMP GNULIB_STRSIGNAL +GNULIB_STRERROR_R GNULIB_STRERROR GNULIB_MBSTOK_R GNULIB_MBSSEP @@ -823,6 +816,21 @@ NEXT_LANGINFO_H REPLACE_NL_LANGINFO HAVE_NL_LANGINFO GNULIB_NL_LANGINFO +REPLACE_ISWCNTRL +HAVE_WCTYPE_H +NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H +NEXT_WCTYPE_H +HAVE_WINT_T +HAVE_ISWCNTRL +REPLACE_ISWBLANK +HAVE_WCTRANS_T +HAVE_WCTYPE_T +HAVE_ISWBLANK +GNULIB_TOWCTRANS +GNULIB_WCTRANS +GNULIB_ISWCTYPE +GNULIB_WCTYPE +GNULIB_ISWBLANK UINT64_MAX_EQ_ULONG_MAX UINT32_MAX_LT_UINTMAX_MAX INT64_MAX_EQ_LONG_MAX @@ -861,6 +869,7 @@ NEXT_AS_FIRST_DIRECTIVE_STDINT_H NEXT_STDINT_H HAVE_SYS_TYPES_H HAVE_INTTYPES_H +HAVE_WCHAR_H HAVE_UNSIGNED_LONG_LONG_INT HAVE_LONG_LONG_INT HAVE__BOOL @@ -924,6 +933,8 @@ HAVE_DECL_SNPRINTF HAVE_DECL_OBSTACK_PRINTF HAVE_DECL_GETLINE HAVE_DECL_GETDELIM +HAVE_DECL_FTELLO +HAVE_DECL_FSEEKO HAVE_DECL_FPURGE GNULIB_VSPRINTF_POSIX GNULIB_VSNPRINTF @@ -1034,6 +1045,8 @@ GNULIB_ALPHASORT GNULIB_SCANDIR GNULIB_FDOPENDIR GNULIB_DIRFD +pkglibexecdir +lispdir LIB_CLOCK_GETTIME UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS UNISTD_H_HAVE_WINSOCK2_H @@ -1054,6 +1067,8 @@ REPLACE_LINK REPLACE_LCHOWN REPLACE_GETPAGESIZE REPLACE_GETGROUPS +REPLACE_GETLOGIN_R +REPLACE_GETDOMAINNAME REPLACE_GETCWD REPLACE_FCHOWNAT REPLACE_DUP2 @@ -1062,13 +1077,15 @@ REPLACE_CLOSE REPLACE_CHOWN HAVE_SYS_PARAM_H HAVE_OS_H +HAVE_DECL_TTYNAME_R HAVE_DECL_GETUSERSHELL HAVE_DECL_GETPAGESIZE HAVE_DECL_GETLOGIN_R +HAVE_DECL_GETDOMAINNAME +HAVE_DECL_FCHDIR HAVE_DECL_ENVIRON HAVE_USLEEP HAVE_UNLINKAT -HAVE_TTYNAME_R HAVE_SYMLINKAT HAVE_SYMLINK HAVE_SLEEP @@ -1077,6 +1094,7 @@ HAVE_READLINK HAVE_PWRITE HAVE_PREAD HAVE_PIPE2 +HAVE_PIPE HAVE_LINKAT HAVE_LINK HAVE_LCHOWN @@ -1085,7 +1103,6 @@ HAVE_GETLOGIN HAVE_GETHOSTNAME HAVE_GETGROUPS HAVE_GETDTABLESIZE -HAVE_GETDOMAINNAME HAVE_FTRUNCATE HAVE_FSYNC HAVE_FCHOWNAT @@ -1111,6 +1128,7 @@ GNULIB_READLINK GNULIB_PWRITE GNULIB_PREAD GNULIB_PIPE2 +GNULIB_PIPE GNULIB_LSEEK GNULIB_LINKAT GNULIB_LINK @@ -1135,6 +1153,7 @@ GNULIB_DUP3 GNULIB_DUP2 GNULIB_CLOSE GNULIB_CHOWN +REPLACE_WCTOMB REPLACE_UNSETENV REPLACE_STRTOD REPLACE_SETENV @@ -1142,20 +1161,23 @@ REPLACE_REALPATH REPLACE_REALLOC REPLACE_PUTENV REPLACE_MKSTEMP +REPLACE_MBTOWC REPLACE_MALLOC REPLACE_CANONICALIZE_FILE_NAME REPLACE_CALLOC -HAVE_UNSETENV +HAVE_DECL_UNSETENV HAVE_UNLOCKPT HAVE_SYS_LOADAVG_H HAVE_STRUCT_RANDOM_DATA HAVE_STRTOULL HAVE_STRTOLL HAVE_STRTOD +HAVE_DECL_SETENV HAVE_SETENV HAVE_RPMATCH HAVE_REALPATH HAVE_RANDOM_R +HAVE_RANDOM_H HAVE_PTSNAME HAVE_MKSTEMPS HAVE_MKSTEMP @@ -1168,6 +1190,7 @@ HAVE_DECL_GETLOADAVG HAVE_CANONICALIZE_FILE_NAME HAVE_ATOLL HAVE__EXIT +GNULIB_WCTOMB GNULIB_UNSETENV GNULIB_UNLOCKPT GNULIB_SYSTEM_POSIX @@ -1186,6 +1209,7 @@ GNULIB_MKSTEMP GNULIB_MKOSTEMPS GNULIB_MKOSTEMP GNULIB_MKDTEMP +GNULIB_MBTOWC GNULIB_MALLOC_POSIX GNULIB_GRANTPT GNULIB_GETSUBOPT @@ -1195,6 +1219,7 @@ GNULIB_CALLOC_POSIX GNULIB_ATOLL GNULIB__EXIT LOCALE_FR +REPLACE_WCSWIDTH REPLACE_WCWIDTH REPLACE_WCSNRTOMBS REPLACE_WCSRTOMBS @@ -1209,6 +1234,34 @@ REPLACE_BTOWC REPLACE_MBSTATE_T HAVE_DECL_WCWIDTH HAVE_DECL_WCTOB +HAVE_WCSWIDTH +HAVE_WCSTOK +HAVE_WCSSTR +HAVE_WCSPBRK +HAVE_WCSSPN +HAVE_WCSCSPN +HAVE_WCSRCHR +HAVE_WCSCHR +HAVE_WCSDUP +HAVE_WCSXFRM +HAVE_WCSCOLL +HAVE_WCSNCASECMP +HAVE_WCSCASECMP +HAVE_WCSNCMP +HAVE_WCSCMP +HAVE_WCSNCAT +HAVE_WCSCAT +HAVE_WCPNCPY +HAVE_WCSNCPY +HAVE_WCPCPY +HAVE_WCSCPY +HAVE_WCSNLEN +HAVE_WCSLEN +HAVE_WMEMSET +HAVE_WMEMMOVE +HAVE_WMEMCPY +HAVE_WMEMCMP +HAVE_WMEMCHR HAVE_WCSNRTOMBS HAVE_WCSRTOMBS HAVE_WCRTOMB @@ -1218,6 +1271,34 @@ HAVE_MBRLEN HAVE_MBRTOWC HAVE_MBSINIT HAVE_BTOWC +GNULIB_WCSWIDTH +GNULIB_WCSTOK +GNULIB_WCSSTR +GNULIB_WCSPBRK +GNULIB_WCSSPN +GNULIB_WCSCSPN +GNULIB_WCSRCHR +GNULIB_WCSCHR +GNULIB_WCSDUP +GNULIB_WCSXFRM +GNULIB_WCSCOLL +GNULIB_WCSNCASECMP +GNULIB_WCSCASECMP +GNULIB_WCSNCMP +GNULIB_WCSCMP +GNULIB_WCSNCAT +GNULIB_WCSCAT +GNULIB_WCPNCPY +GNULIB_WCSNCPY +GNULIB_WCPCPY +GNULIB_WCSCPY +GNULIB_WCSNLEN +GNULIB_WCSLEN +GNULIB_WMEMSET +GNULIB_WMEMMOVE +GNULIB_WMEMCPY +GNULIB_WMEMCMP +GNULIB_WMEMCHR GNULIB_WCWIDTH GNULIB_WCSNRTOMBS GNULIB_WCSRTOMBS @@ -1919,7 +2000,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GNU tar 1.25 to adapt to many kinds of systems. +\`configure' configures GNU tar 1.26 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1989,7 +2070,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNU tar 1.25:";; + short | recursive ) echo "Configuration of GNU tar 1.26:";; esac cat <<\_ACEOF @@ -2127,7 +2208,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNU tar configure 1.25 +GNU tar configure 1.26 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -2141,7 +2222,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GNU tar $as_me 1.25, which was +It was created by GNU tar $as_me 1.26, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2450,11 +2531,9 @@ ac_func_list="$ac_func_list fchown" ac_header_list="$ac_header_list dirent.h" ac_func_list="$ac_func_list fdopendir" ac_func_list="$ac_func_list dup2" -ac_header_list="$ac_header_list errno.h" -ac_func_list="$ac_func_list fchdir" ac_func_list="$ac_func_list fcntl" +ac_func_list="$ac_func_list fchdir" ac_func_list="$ac_func_list mempcpy" -ac_header_list="$ac_header_list float.h" ac_func_list="$ac_func_list isblank" ac_func_list="$ac_func_list iswctype" ac_func_list="$ac_func_list mbsrtowcs" @@ -2472,9 +2551,11 @@ gl_getopt_required=GNU ac_header_list="$ac_header_list getopt.h" ac_func_list="$ac_func_list gettimeofday" ac_func_list="$ac_func_list nanotime" -ac_header_list="$ac_header_list stdint.h" ac_header_list="$ac_header_list wchar.h" +ac_header_list="$ac_header_list stdint.h" ac_header_list="$ac_header_list inttypes.h" +ac_func_list="$ac_func_list iswcntrl" +ac_func_list="$ac_func_list iswblank" ac_header_list="$ac_header_list langinfo.h" ac_func_list="$ac_func_list lchmod" ac_func_list="$ac_func_list link" @@ -2498,10 +2579,6 @@ ac_func_list="$ac_func_list wcscoll" ac_func_list="$ac_func_list renameat" ac_func_list="$ac_func_list setenv" ac_func_list="$ac_func_list sleep" -ac_header_list="$ac_header_list stdarg.h" -ac_header_list="$ac_header_list stddef.h" -ac_header_list="$ac_header_list stdio.h" -ac_header_list="$ac_header_list stdlib.h" ac_func_list="$ac_func_list strdup" ac_header_list="$ac_header_list sys/socket.h" ac_header_list="$ac_header_list strings.h" @@ -2509,7 +2586,6 @@ ac_func_list="$ac_func_list strndup" ac_func_list="$ac_func_list symlinkat" ac_header_list="$ac_header_list sys/stat.h" ac_header_list="$ac_header_list sysexits.h" -ac_header_list="$ac_header_list time.h" ac_func_list="$ac_func_list localtime_r" ac_func_list="$ac_func_list pipe" ac_header_list="$ac_header_list utime.h" @@ -2519,8 +2595,6 @@ ac_func_list="$ac_func_list utimensat" ac_func_list="$ac_func_list lutimes" ac_func_list="$ac_func_list vasnprintf" ac_func_list="$ac_func_list wcrtomb" -ac_func_list="$ac_func_list iswcntrl" -ac_func_list="$ac_func_list iswblank" ac_func_list="$ac_func_list wcwidth" ac_header_list="$ac_header_list netdb.h" ac_header_list="$ac_header_list sys/wait.h" @@ -3119,7 +3193,7 @@ fi # Define the identity of the package. PACKAGE='tar' - VERSION='1.25' + VERSION='1.26' cat >>confdefs.h <<_ACEOF @@ -6113,6 +6187,7 @@ esac # Code from module dirfd: # Code from module dirname: # Code from module dirname-lgpl: + # Code from module dosname: # Code from module double-slash-root: # Code from module dup2: # Code from module environ: @@ -6158,6 +6233,7 @@ esac # Code from module intprops: # Code from module inttostr: # Code from module inttypes: + # Code from module iswblank: # Code from module langinfo: # Code from module lchown: # Code from module link: @@ -6174,6 +6250,7 @@ esac # Code from module mbscasecmp: # Code from module mbsinit: # Code from module mbsrtowcs: + # Code from module mbtowc: # Code from module mbuiter: # Code from module memchr: # Code from module mempcpy: @@ -6273,7 +6350,7 @@ esac # Code from module warn-on-use: # Code from module wchar: # Code from module wcrtomb: - # Code from module wctype: + # Code from module wctype-h: # Code from module wcwidth: # Code from module write: # Code from module xalloc: @@ -10632,9 +10709,14 @@ DIR *dp = opendir ("."); if (! dp) return 1; e = readdir (dp); - return ! (e - && stat (e->d_name, &st) == 0 - && e->d_ino == st.st_ino); + if (! e) + return 2; + if (stat (e->d_name, &st) != 0) + return 3; + if (e->d_ino != st.st_ino) + return 4; + return 0; + ; return 0; } @@ -10687,153 +10769,6 @@ _ACEOF fi - - { $as_echo "$as_me:$LINENO: checking whether system is Windows or MSDOS" >&5 -$as_echo_n "checking whether system is Windows or MSDOS... " >&6; } -if test "${ac_cv_win_or_dos+set}" = set; then - $as_echo_n "(cached) " >&6 -else - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - -#if !defined _WIN32 && !defined __WIN32__ && !defined __MSDOS__ && !defined __CYGWIN__ -neither MSDOS nor Windows -#endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_win_or_dos=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_win_or_dos=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_win_or_dos" >&5 -$as_echo "$ac_cv_win_or_dos" >&6; } - - if test x"$ac_cv_win_or_dos" = xyes; then - ac_fs_accepts_drive_letter_prefix=1 - ac_fs_backslash_is_file_name_separator=1 - { $as_echo "$as_me:$LINENO: checking whether drive letter can start relative path" >&5 -$as_echo_n "checking whether drive letter can start relative path... " >&6; } -if test "${ac_cv_drive_letter_can_be_relative+set}" = set; then - $as_echo_n "(cached) " >&6 -else - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - -#if defined __CYGWIN__ -drive letters are always absolute -#endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_drive_letter_can_be_relative=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_drive_letter_can_be_relative=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_drive_letter_can_be_relative" >&5 -$as_echo "$ac_cv_drive_letter_can_be_relative" >&6; } - if test x"$ac_cv_drive_letter_can_be_relative" = xyes; then - ac_fs_drive_letter_can_be_relative=1 - else - ac_fs_drive_letter_can_be_relative=0 - fi - else - ac_fs_accepts_drive_letter_prefix=0 - ac_fs_backslash_is_file_name_separator=0 - ac_fs_drive_letter_can_be_relative=0 - fi - - -cat >>confdefs.h <<_ACEOF -#define FILE_SYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX $ac_fs_accepts_drive_letter_prefix -_ACEOF - - - - - - -cat >>confdefs.h <<_ACEOF -#define FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR $ac_fs_backslash_is_file_name_separator -_ACEOF - - - -cat >>confdefs.h <<_ACEOF -#define FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE $ac_fs_drive_letter_can_be_relative -_ACEOF - - { $as_echo "$as_me:$LINENO: checking for long file names" >&5 $as_echo_n "checking for long file names... " >&6; } if test "${ac_cv_sys_long_file_names+set}" = set; then @@ -10890,6 +10825,34 @@ fi GNULIB_WCSRTOMBS=0; GNULIB_WCSNRTOMBS=0; GNULIB_WCWIDTH=0; + GNULIB_WMEMCHR=0; + GNULIB_WMEMCMP=0; + GNULIB_WMEMCPY=0; + GNULIB_WMEMMOVE=0; + GNULIB_WMEMSET=0; + GNULIB_WCSLEN=0; + GNULIB_WCSNLEN=0; + GNULIB_WCSCPY=0; + GNULIB_WCPCPY=0; + GNULIB_WCSNCPY=0; + GNULIB_WCPNCPY=0; + GNULIB_WCSCAT=0; + GNULIB_WCSNCAT=0; + GNULIB_WCSCMP=0; + GNULIB_WCSNCMP=0; + GNULIB_WCSCASECMP=0; + GNULIB_WCSNCASECMP=0; + GNULIB_WCSCOLL=0; + GNULIB_WCSXFRM=0; + GNULIB_WCSDUP=0; + GNULIB_WCSCHR=0; + GNULIB_WCSRCHR=0; + GNULIB_WCSCSPN=0; + GNULIB_WCSSPN=0; + GNULIB_WCSPBRK=0; + GNULIB_WCSSTR=0; + GNULIB_WCSTOK=0; + GNULIB_WCSWIDTH=0; HAVE_BTOWC=1; HAVE_MBSINIT=1; HAVE_MBRTOWC=1; @@ -10899,6 +10862,34 @@ fi HAVE_WCRTOMB=1; HAVE_WCSRTOMBS=1; HAVE_WCSNRTOMBS=1; + HAVE_WMEMCHR=1; + HAVE_WMEMCMP=1; + HAVE_WMEMCPY=1; + HAVE_WMEMMOVE=1; + HAVE_WMEMSET=1; + HAVE_WCSLEN=1; + HAVE_WCSNLEN=1; + HAVE_WCSCPY=1; + HAVE_WCPCPY=1; + HAVE_WCSNCPY=1; + HAVE_WCPNCPY=1; + HAVE_WCSCAT=1; + HAVE_WCSNCAT=1; + HAVE_WCSCMP=1; + HAVE_WCSNCMP=1; + HAVE_WCSCASECMP=1; + HAVE_WCSNCASECMP=1; + HAVE_WCSCOLL=1; + HAVE_WCSXFRM=1; + HAVE_WCSDUP=1; + HAVE_WCSCHR=1; + HAVE_WCSRCHR=1; + HAVE_WCSCSPN=1; + HAVE_WCSSPN=1; + HAVE_WCSPBRK=1; + HAVE_WCSSTR=1; + HAVE_WCSTOK=1; + HAVE_WCSWIDTH=1; HAVE_DECL_WCTOB=1; HAVE_DECL_WCWIDTH=1; REPLACE_MBSTATE_T=0; @@ -10913,6 +10904,7 @@ fi REPLACE_WCSRTOMBS=0; REPLACE_WCSNRTOMBS=0; REPLACE_WCWIDTH=0; + REPLACE_WCSWIDTH=0; { $as_echo "$as_me:$LINENO: checking whether uses 'inline' correctly" >&5 @@ -10929,6 +10921,13 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #define wcstod renamed_wcstod +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include #include extern int zero (void); int main () { return zero(); } @@ -10948,6 +10947,13 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #define wcstod renamed_wcstod +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include #include int zero (void) { return 0; } @@ -11086,7 +11092,17 @@ struct tm t; char buf[16]; int main () { /* Check whether the given locale name is recognized by the system. */ +#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ + /* On native Win32, setlocale(category, "") looks at the system settings, + not at the environment variables. Also, when an encoding suffix such + as ".65001" or ".54936" is speficied, it succeeds but sets the LC_CTYPE + category of the locale to "C". */ + if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL + || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0) + return 1; +#else if (setlocale (LC_ALL, "") == NULL) return 1; +#endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. @@ -11127,37 +11143,56 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -s conftest$ac_exeext; then - # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the - # configure script would override the LC_ALL setting. Likewise for - # LC_CTYPE, which is also set at the beginning of the configure script. - # Test for the usual locale name. - if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_fr=fr_FR - else - # Test for the locale name with explicit encoding suffix. - if (LC_ALL=fr_FR.ISO-8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_fr=fr_FR.ISO-8859-1 - else - # Test for the AIX, OSF/1, FreeBSD, NetBSD, OpenBSD locale name. - if (LC_ALL=fr_FR.ISO8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_fr=fr_FR.ISO8859-1 + case "$host_os" in + # Handle native Windows specially, because there setlocale() interprets + # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256", + # "fr" or "fra" as "French" or "French_France.1252", + # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252", + # "ja" as "Japanese" or "Japanese_Japan.932", + # and similar. + mingw*) + # Test for the native Win32 locale name. + if (LC_ALL=French_France.1252 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr=French_France.1252 + else + # None found. + gt_cv_locale_fr=none + fi + ;; + *) + # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because + # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # configure script would override the LC_ALL setting. Likewise for + # LC_CTYPE, which is also set at the beginning of the configure script. + # Test for the usual locale name. + if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr=fr_FR else - # Test for the HP-UX locale name. - if (LC_ALL=fr_FR.iso88591 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_fr=fr_FR.iso88591 + # Test for the locale name with explicit encoding suffix. + if (LC_ALL=fr_FR.ISO-8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr=fr_FR.ISO-8859-1 else - # Test for the Solaris 7 locale name. - if (LC_ALL=fr LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_fr=fr + # Test for the AIX, OSF/1, FreeBSD, NetBSD, OpenBSD locale name. + if (LC_ALL=fr_FR.ISO8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr=fr_FR.ISO8859-1 else - # None found. - gt_cv_locale_fr=none + # Test for the HP-UX locale name. + if (LC_ALL=fr_FR.iso88591 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr=fr_FR.iso88591 + else + # Test for the Solaris 7 locale name. + if (LC_ALL=fr LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr=fr + else + # None found. + gt_cv_locale_fr=none + fi + fi fi fi fi - fi - fi + ;; + esac fi rm -fr conftest* @@ -11247,10 +11282,23 @@ int main () { - char *name1 = realpath ("conftest.a", NULL); - char *name2 = realpath ("conftest.b/../conftest.a", NULL); - char *name3 = realpath ("conftest.a/", NULL); - return !(name1 && *name1 == '/' && !name2 && !name3); + int result = 0; + { + char *name = realpath ("conftest.a", NULL); + if (!(name && *name == '/')) + result |= 1; + } + { + char *name = realpath ("conftest.b/../conftest.a", NULL); + if (name != NULL) + result |= 2; + } + { + char *name = realpath ("conftest.a/", NULL); + if (name != NULL) + result |= 4; + } + return result; ; return 0; @@ -11335,6 +11383,7 @@ _ACEOF GNULIB_GETSUBOPT=0; GNULIB_GRANTPT=0; GNULIB_MALLOC_POSIX=0; + GNULIB_MBTOWC=0; GNULIB_MKDTEMP=0; GNULIB_MKOSTEMP=0; GNULIB_MKOSTEMPS=0; @@ -11353,6 +11402,7 @@ _ACEOF GNULIB_SYSTEM_POSIX=0; GNULIB_UNLOCKPT=0; GNULIB_UNSETENV=0; + GNULIB_WCTOMB=0; HAVE__EXIT=1; HAVE_ATOLL=1; HAVE_CANONICALIZE_FILE_NAME=1; @@ -11365,20 +11415,23 @@ _ACEOF HAVE_MKSTEMP=1; HAVE_MKSTEMPS=1; HAVE_PTSNAME=1; + HAVE_RANDOM_H=1; HAVE_RANDOM_R=1; HAVE_REALPATH=1; HAVE_RPMATCH=1; HAVE_SETENV=1; + HAVE_DECL_SETENV=1; HAVE_STRTOD=1; HAVE_STRTOLL=1; HAVE_STRTOULL=1; HAVE_STRUCT_RANDOM_DATA=1; HAVE_SYS_LOADAVG_H=0; HAVE_UNLOCKPT=1; - HAVE_UNSETENV=1; + HAVE_DECL_UNSETENV=1; REPLACE_CALLOC=0; REPLACE_CANONICALIZE_FILE_NAME=0; REPLACE_MALLOC=0; + REPLACE_MBTOWC=0; REPLACE_MKSTEMP=0; REPLACE_PUTENV=0; REPLACE_REALLOC=0; @@ -11386,6 +11439,7 @@ _ACEOF REPLACE_SETENV=0; REPLACE_STRTOD=0; REPLACE_UNSETENV=0; + REPLACE_WCTOMB=0; GNULIB_CHOWN=0; @@ -11412,6 +11466,7 @@ _ACEOF GNULIB_LINK=0; GNULIB_LINKAT=0; GNULIB_LSEEK=0; + GNULIB_PIPE=0; GNULIB_PIPE2=0; GNULIB_PREAD=0; GNULIB_PWRITE=0; @@ -11437,7 +11492,6 @@ _ACEOF HAVE_FCHOWNAT=1; HAVE_FSYNC=1; HAVE_FTRUNCATE=1; - HAVE_GETDOMAINNAME=1; HAVE_GETDTABLESIZE=1; HAVE_GETGROUPS=1; HAVE_GETHOSTNAME=1; @@ -11446,6 +11500,7 @@ _ACEOF HAVE_LCHOWN=1; HAVE_LINK=1; HAVE_LINKAT=1; + HAVE_PIPE=1; HAVE_PIPE2=1; HAVE_PREAD=1; HAVE_PWRITE=1; @@ -11454,13 +11509,15 @@ _ACEOF HAVE_SLEEP=1; HAVE_SYMLINK=1; HAVE_SYMLINKAT=1; - HAVE_TTYNAME_R=1; HAVE_UNLINKAT=1; HAVE_USLEEP=1; HAVE_DECL_ENVIRON=1; + HAVE_DECL_FCHDIR=1; + HAVE_DECL_GETDOMAINNAME=1; HAVE_DECL_GETLOGIN_R=1; HAVE_DECL_GETPAGESIZE=1; HAVE_DECL_GETUSERSHELL=1; + HAVE_DECL_TTYNAME_R=1; HAVE_OS_H=0; HAVE_SYS_PARAM_H=0; REPLACE_CHOWN=0; @@ -11469,6 +11526,8 @@ _ACEOF REPLACE_DUP2=0; REPLACE_FCHOWNAT=0; REPLACE_GETCWD=0; + REPLACE_GETDOMAINNAME=0; + REPLACE_GETLOGIN_R=0; REPLACE_GETGROUPS=0; REPLACE_GETPAGESIZE=0; REPLACE_LCHOWN=0; @@ -11752,6 +11811,7 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { + int result = 0; char const *dangling_symlink = "conftest.dangle"; unlink (dangling_symlink); @@ -11760,8 +11820,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* Exit successfully on a conforming system, i.e., where chown must fail with ENOENT. */ - exit ( ! (chown (dangling_symlink, getuid (), getgid ()) != 0 - && errno == ENOENT)); + if (chown (dangling_symlink, getuid (), getgid ()) == 0) + result |= 1; + if (errno != ENOENT) + result |= 2; + return result; } _ACEOF @@ -12298,6 +12361,7 @@ $as_echo "$gl_cv_pragma_columns" >&6; } + { $as_echo "$as_me:$LINENO: checking if environ is properly declared" >&5 $as_echo_n "checking if environ is properly declared... " >&6; } if test "${gt_cv_var_environ_declaration+set}" = set; then @@ -12366,8 +12430,6 @@ _ACEOF - - { $as_echo "$as_me:$LINENO: checking for complete errno.h" >&5 $as_echo_n "checking for complete errno.h... " >&6; } if test "${gl_cv_header_errno_h_complete+set}" = set; then @@ -12440,9 +12502,6 @@ $as_echo "$gl_cv_header_errno_h_complete" >&6; } - - - if test $gl_cv_have_include_next = yes; then gl_cv_next_errno_h='<'errno.h'>' else @@ -12452,8 +12511,7 @@ if test "${gl_cv_next_errno_h+set}" = set; then $as_echo_n "(cached) " >&6 else - if test $ac_cv_header_errno_h = yes; then - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -12462,20 +12520,18 @@ cat >>conftest.$ac_ext <<_ACEOF #include _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - gl_cv_next_errno_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n '\#/errno.h#{ - s#.*"\(.*/errno.h\)".*#\1# - s#^/[^/]#//&# - p - q - }'`'"' - else - gl_cv_next_errno_h='<'errno.h'>' - fi + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_errno_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n '\#/errno.h#{ + s#.*"\(.*/errno.h\)".*#\1# + s#^/[^/]#//&# + p + q + }'`'"' + fi { $as_echo "$as_me:$LINENO: result: $gl_cv_next_errno_h" >&5 @@ -12494,6 +12550,7 @@ $as_echo "$gl_cv_next_errno_h" >&6; } + ERRNO_H='errno.h' fi @@ -14098,6 +14155,75 @@ fi REPLACE_STAT=0; REPLACE_UTIMENSAT=0; +{ $as_echo "$as_me:$LINENO: checking whether fchdir is declared" >&5 +$as_echo_n "checking whether fchdir is declared... " >&6; } +if test "${ac_cv_have_decl_fchdir+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +#ifndef fchdir + (void) fchdir; +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_have_decl_fchdir=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_have_decl_fchdir=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_fchdir" >&5 +$as_echo "$ac_cv_have_decl_fchdir" >&6; } +if test "x$ac_cv_have_decl_fchdir" = x""yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_FCHDIR 1 +_ACEOF + + +else + cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_FCHDIR 0 +_ACEOF + + +fi + + @@ -14213,6 +14339,8 @@ _ACEOF GNULIB_VSNPRINTF=0; GNULIB_VSPRINTF_POSIX=0; HAVE_DECL_FPURGE=1; + HAVE_DECL_FSEEKO=1; + HAVE_DECL_FTELLO=1; HAVE_DECL_GETDELIM=1; HAVE_DECL_GETLINE=1; HAVE_DECL_OBSTACK_PRINTF=1; @@ -14257,8 +14385,6 @@ _ACEOF - - { $as_echo "$as_me:$LINENO: checking for working fcntl.h" >&5 $as_echo_n "checking for working fcntl.h... " >&6; } if test "${gl_cv_header_working_fcntl_h+set}" = set; then @@ -14293,29 +14419,56 @@ int main () { - int status = !constants; + int result = !constants; { static char const sym[] = "conftest.sym"; - if (symlink (".", sym) != 0 - || close (open (sym, O_RDONLY | O_NOFOLLOW)) == 0) - status |= 32; + if (symlink (".", sym) != 0) + result |= 2; + else + { + int fd = open (sym, O_RDONLY | O_NOFOLLOW); + if (fd >= 0) + { + close (fd); + result |= 4; + } + } unlink (sym); } { static char const file[] = "confdefs.h"; int fd = open (file, O_RDONLY | O_NOATIME); - char c; - struct stat st0, st1; - if (fd < 0 - || fstat (fd, &st0) != 0 - || sleep (1) != 0 - || read (fd, &c, 1) != 1 - || close (fd) != 0 - || stat (file, &st1) != 0 - || st0.st_atime != st1.st_atime) - status |= 64; + if (fd < 0) + result |= 8; + else + { + struct stat st0; + if (fstat (fd, &st0) != 0) + result |= 16; + else + { + char c; + sleep (1); + if (read (fd, &c, 1) != 1) + result |= 24; + else + { + if (close (fd) != 0) + result |= 32; + else + { + struct stat st1; + if (stat (file, &st1) != 0) + result |= 40; + else + if (st0.st_atime != st1.st_atime) + result |= 64; + } + } + } + } } - return status; + return result; ; return 0; } @@ -14350,9 +14503,9 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) case $? in #( - 32) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #( + 4) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #( 64) gl_cv_header_working_fcntl_h='no (bad O_NOATIME)';; #( - 96) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #( + 68) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #( *) gl_cv_header_working_fcntl_h='no';; esac fi @@ -14389,8 +14542,6 @@ _ACEOF - - { $as_echo "$as_me:$LINENO: checking for mbstate_t" >&5 $as_echo_n "checking for mbstate_t... " >&6; } if test "${ac_cv_type_mbstate_t+set}" = set; then @@ -14403,7 +14554,14 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -# include +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include +#include int main () { @@ -14603,6 +14761,75 @@ fi { $as_echo "$as_me:$LINENO: result: $gl_cv_var_stdin_large_offset" >&5 $as_echo "$gl_cv_var_stdin_large_offset" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether fseeko is declared" >&5 +$as_echo_n "checking whether fseeko is declared... " >&6; } +if test "${ac_cv_have_decl_fseeko+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +#ifndef fseeko + (void) fseeko; +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_have_decl_fseeko=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_have_decl_fseeko=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_fseeko" >&5 +$as_echo "$ac_cv_have_decl_fseeko" >&6; } +if test "x$ac_cv_have_decl_fseeko" = x""yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_FSEEKO 1 +_ACEOF + + +else + cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_FSEEKO 0 +_ACEOF + + +fi + + @@ -14649,7 +14876,13 @@ main () else { char *f = getcwd (NULL, 0); - return ! (f && f[0] == '/' && !f[1]); + if (! f) + return 2; + if (f[0] != '/') + return 3; + if (f[1] != '\0') + return 4; + return 0; } #endif @@ -14923,6 +15156,9 @@ fi + + + if test $gl_cv_have_include_next = yes; then @@ -14934,8 +15170,10 @@ if test "${gl_cv_next_getopt_h+set}" = set; then $as_echo_n "(cached) " >&6 else - if test $ac_cv_header_getopt_h = yes; then - cat >conftest.$ac_ext <<_ACEOF + if test $ac_cv_header_getopt_h = yes; then + + + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -14944,20 +15182,21 @@ cat >>conftest.$ac_ext <<_ACEOF #include _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - gl_cv_next_getopt_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n '\#/getopt.h#{ - s#.*"\(.*/getopt.h\)".*#\1# - s#^/[^/]#//&# - p - q - }'`'"' + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_getopt_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n '\#/getopt.h#{ + s#.*"\(.*/getopt.h\)".*#\1# + s#^/[^/]#//&# + p + q + }'`'"' else - gl_cv_next_getopt_h='<'getopt.h'>' - fi + gl_cv_next_getopt_h='<'getopt.h'>' + fi + fi { $as_echo "$as_me:$LINENO: result: $gl_cv_next_getopt_h" >&5 @@ -14977,11 +15216,6 @@ $as_echo "$gl_cv_next_getopt_h" >&6; } - - - - - if test $ac_cv_header_getopt_h = yes; then HAVE_GETOPT_H=1 else @@ -15253,27 +15487,24 @@ done fi - if test -z "$gl_replace_getopt"; then - { $as_echo "$as_me:$LINENO: checking whether optreset is declared" >&5 -$as_echo_n "checking whether optreset is declared... " >&6; } -if test "${ac_cv_have_decl_optreset+set}" = set; then + if test -z "$gl_replace_getopt"; then + { $as_echo "$as_me:$LINENO: checking whether getopt is POSIX compatible" >&5 +$as_echo_n "checking whether getopt is POSIX compatible... " >&6; } +if test "${gl_cv_func_getopt_posix+set}" = set; then $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF + + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include - +#include int main () { -#ifndef optreset - (void) optreset; -#endif - +int *p = &optreset; return optreset; ; return 0; } @@ -15296,50 +15527,22 @@ $as_echo "$ac_try_echo") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_have_decl_optreset=yes + gl_optind_min=1 else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_have_decl_optreset=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_optreset" >&5 -$as_echo "$ac_cv_have_decl_optreset" >&6; } -if test "x$ac_cv_have_decl_optreset" = x""yes; then - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_OPTRESET 1 -_ACEOF - - -else - cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_OPTRESET 0 -_ACEOF - -{ $as_echo "$as_me:$LINENO: checking whether getopt_clip is declared" >&5 -$as_echo_n "checking whether getopt_clip is declared... " >&6; } -if test "${ac_cv_have_decl_getopt_clip+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include - int main () { -#ifndef getopt_clip - (void) getopt_clip; -#endif - +return !getopt_clip; ; return 0; } @@ -15362,48 +15565,22 @@ $as_echo "$ac_try_echo") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_have_decl_getopt_clip=yes + gl_optind_min=1 else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_have_decl_getopt_clip=no + gl_optind_min=0 fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_getopt_clip" >&5 -$as_echo "$ac_cv_have_decl_getopt_clip" >&6; } -if test "x$ac_cv_have_decl_getopt_clip" = x""yes; then - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_GETOPT_CLIP 1 -_ACEOF - - -else - cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_GETOPT_CLIP 0 -_ACEOF - - -fi - - - -fi - - - fi - if test -z "$gl_replace_getopt"; then - { $as_echo "$as_me:$LINENO: checking whether getopt is POSIX compatible" >&5 -$as_echo_n "checking whether getopt is POSIX compatible... " >&6; } -if test "${gl_cv_func_getopt_posix+set}" = set; then - $as_echo_n "(cached) " >&6 -else +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if test "$cross_compiling" = yes; then + gl_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -DOPTIND_MIN=$gl_optind_min" + if test "$cross_compiling" = yes; then case "$host_os" in mingw*) gl_cv_func_getopt_posix="guessing no";; darwin* | aix*) gl_cv_func_getopt_posix="guessing no";; @@ -15422,12 +15599,6 @@ cat >>conftest.$ac_ext <<_ACEOF #include #include -#if !HAVE_DECL_OPTRESET && !HAVE_DECL_GETOPT_CLIP -# define OPTIND_MIN 0 -#else -# define OPTIND_MIN 1 -#endif - int main () { @@ -15545,6 +15716,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$a fi + CPPFLAGS=$gl_save_CPPFLAGS fi { $as_echo "$as_me:$LINENO: result: $gl_cv_func_getopt_posix" >&5 @@ -15596,6 +15768,7 @@ int main () { + int result = 0; /* This code succeeds on glibc 2.8, OpenBSD 4.0, Cygwin, mingw, and fails on MacOS X 10.5, AIX 5.2, HP-UX 11, IRIX 6.5, OSF/1 5.1, Solaris 10. */ @@ -15606,7 +15779,7 @@ main () myargv[2] = 0; opterr = 0; if (getopt (2, myargv, "+a") != '?') - return 1; + result |= 1; } /* This code succeeds on glibc 2.8, mingw, and fails on MacOS X 10.5, OpenBSD 4.0, AIX 5.2, HP-UX 11, @@ -15616,33 +15789,33 @@ main () optind = 1; if (getopt (4, argv, "p::") != 'p') - return 2; - if (optarg != NULL) - return 3; - if (getopt (4, argv, "p::") != -1) - return 4; - if (optind != 2) - return 5; + result |= 2; + else if (optarg != NULL) + result |= 4; + else if (getopt (4, argv, "p::") != -1) + result |= 6; + else if (optind != 2) + result |= 8; } /* This code succeeds on glibc 2.8 and fails on Cygwin 1.7.0. */ { char *argv[] = { "program", "foo", "-p", NULL }; optind = 0; if (getopt (3, argv, "-p") != 1) - return 6; - if (getopt (3, argv, "-p") != 'p') - return 7; + result |= 16; + else if (getopt (3, argv, "-p") != 'p') + result |= 32; } /* This code fails on glibc 2.11. */ { char *argv[] = { "program", "-b", "-a", NULL }; optind = opterr = 0; if (getopt (3, argv, "+:a:b") != 'b') - return 8; - if (getopt (3, argv, "+:a:b") != ':') - return 9; + result |= 64; + else if (getopt (3, argv, "+:a:b") != ':') + result |= 64; } - return 0; + return result; ; return 0; @@ -15778,6 +15951,9 @@ fi + + + @@ -15791,8 +15967,10 @@ if test "${gl_cv_next_sys_time_h+set}" = set; then $as_echo_n "(cached) " >&6 else - if test $ac_cv_header_sys_time_h = yes; then - cat >conftest.$ac_ext <<_ACEOF + if test $ac_cv_header_sys_time_h = yes; then + + + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -15801,20 +15979,21 @@ cat >>conftest.$ac_ext <<_ACEOF #include _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - gl_cv_next_sys_time_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n '\#/sys/time.h#{ - s#.*"\(.*/sys/time.h\)".*#\1# - s#^/[^/]#//&# - p - q - }'`'"' + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_sys_time_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n '\#/sys/time.h#{ + s#.*"\(.*/sys/time.h\)".*#\1# + s#^/[^/]#//&# + p + q + }'`'"' else - gl_cv_next_sys_time_h='<'sys/time.h'>' - fi + gl_cv_next_sys_time_h='<'sys/time.h'>' + fi + fi { $as_echo "$as_me:$LINENO: result: $gl_cv_next_sys_time_h" >&5 @@ -15834,6 +16013,7 @@ $as_echo "$gl_cv_next_sys_time_h" >&6; } + if test $ac_cv_header_sys_time_h != yes; then HAVE_SYS_TIME_H=0 fi @@ -16178,13 +16358,7 @@ _ACEOF fi - if test $ac_cv_header_stdbool_h = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_STDBOOL_H 1 -_ACEOF - - fi @@ -16205,12 +16379,14 @@ _ACEOF - { $as_echo "$as_me:$LINENO: checking for long long int" >&5 -$as_echo_n "checking for long long int... " >&6; } -if test "${ac_cv_type_long_long_int+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for unsigned long long int" >&5 +$as_echo_n "checking for unsigned long long int... " >&6; } +if test "${ac_cv_type_unsigned_long_long_int+set}" = set; then $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_cv_type_unsigned_long_long_int=yes + if test "x${ac_cv_prog_cc_c99-no}" = xno; then + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -16267,8 +16443,42 @@ $as_echo "$ac_try_echo") >&5 test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - if test "$cross_compiling" = yes; then + : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_unsigned_long_long_int=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long_int" >&5 +$as_echo "$ac_cv_type_unsigned_long_long_int" >&6; } + if test $ac_cv_type_unsigned_long_long_int = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_UNSIGNED_LONG_LONG_INT 1 +_ACEOF + + fi + + + + { $as_echo "$as_me:$LINENO: checking for long long int" >&5 +$as_echo_n "checking for long long int... " >&6; } +if test "${ac_cv_type_long_long_int+set}" = set; then + $as_echo_n "(cached) " >&6 +else ac_cv_type_long_long_int=yes + if test "x${ac_cv_prog_cc_c99-no}" = xno; then + ac_cv_type_long_long_int=$ac_cv_type_unsigned_long_long_int + if test $ac_cv_type_long_long_int = yes; then + if test "$cross_compiling" = yes; then + : else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -16277,25 +16487,25 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include - #ifndef LLONG_MAX - # define HALF \ - (1LL << (sizeof (long long int) * CHAR_BIT - 2)) - # define LLONG_MAX (HALF - 1 + HALF) - #endif + #ifndef LLONG_MAX + # define HALF \ + (1LL << (sizeof (long long int) * CHAR_BIT - 2)) + # define LLONG_MAX (HALF - 1 + HALF) + #endif int main () { long long int n = 1; - int i; - for (i = 0; ; i++) - { - long long int m = n << i; - if (m >> i != n) - return 1; - if (LLONG_MAX / 2 < m) - break; - } - return 0; + int i; + for (i = 0; ; i++) + { + long long int m = n << i; + if (m >> i != n) + return 1; + if (LLONG_MAX / 2 < m) + break; + } + return 0; ; return 0; } @@ -16322,7 +16532,7 @@ $as_echo "$ac_try_echo") >&5 ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_long_long_int=yes + : else $as_echo "$as_me: program exited with status $ac_status" >&5 $as_echo "$as_me: failed program was:" >&5 @@ -16336,16 +16546,8 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$a fi -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_long_long_int=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext + fi + fi fi { $as_echo "$as_me:$LINENO: result: $ac_cv_type_long_long_int" >&5 $as_echo "$ac_cv_type_long_long_int" >&6; } @@ -16358,91 +16560,6 @@ _ACEOF fi - { $as_echo "$as_me:$LINENO: checking for unsigned long long int" >&5 -$as_echo_n "checking for unsigned long long int... " >&6; } -if test "${ac_cv_type_unsigned_long_long_int+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF - - /* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* For now, do not test the preprocessor; as of 2007 there are too many - implementations with broken preprocessors. Perhaps this can - be revisited in 2012. In the meantime, code should not expect - #if to work with literals wider than 32 bits. */ - /* Test literals. */ - long long int ll = 9223372036854775807ll; - long long int nll = -9223372036854775807LL; - unsigned long long int ull = 18446744073709551615ULL; - /* Test constant expressions. */ - typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) - ? 1 : -1)]; - typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1 - ? 1 : -1)]; - int i = 63; -int -main () -{ -/* Test availability of runtime routines for shift and division. */ - long long int llmax = 9223372036854775807ll; - unsigned long long int ullmax = 18446744073709551615ull; - return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i) - | (llmax / ll) | (llmax % ll) - | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i) - | (ullmax / ull) | (ullmax % ull)); - ; - return 0; -} - -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_type_unsigned_long_long_int=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_unsigned_long_long_int=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long_int" >&5 -$as_echo "$ac_cv_type_unsigned_long_long_int" >&6; } - if test $ac_cv_type_unsigned_long_long_int = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_UNSIGNED_LONG_LONG_INT 1 -_ACEOF - - fi - - @@ -16509,11 +16626,6 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $gl_cv_c_multiarch = yes; then - -cat >>confdefs.h <<\_ACEOF -#define AA_APPLE_UNIVERSAL_BUILD 1 -_ACEOF - APPLE_UNIVERSAL_BUILD=1 else APPLE_UNIVERSAL_BUILD=0 @@ -16538,6 +16650,19 @@ _ACEOF fi + + + + + + + if test $ac_cv_header_wchar_h = yes; then + HAVE_WCHAR_H=1 + else + HAVE_WCHAR_H=0 + fi + + if test $ac_cv_header_inttypes_h = yes; then HAVE_INTTYPES_H=1 else @@ -16563,6 +16688,9 @@ _ACEOF + + + if test $gl_cv_have_include_next = yes; then gl_cv_next_stdint_h='<'stdint.h'>' else @@ -16572,8 +16700,10 @@ if test "${gl_cv_next_stdint_h+set}" = set; then $as_echo_n "(cached) " >&6 else - if test $ac_cv_header_stdint_h = yes; then - cat >conftest.$ac_ext <<_ACEOF + if test $ac_cv_header_stdint_h = yes; then + + + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -16582,20 +16712,21 @@ cat >>conftest.$ac_ext <<_ACEOF #include _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - gl_cv_next_stdint_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n '\#/stdint.h#{ - s#.*"\(.*/stdint.h\)".*#\1# - s#^/[^/]#//&# - p - q - }'`'"' + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_stdint_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n '\#/stdint.h#{ + s#.*"\(.*/stdint.h\)".*#\1# + s#^/[^/]#//&# + p + q + }'`'"' else - gl_cv_next_stdint_h='<'stdint.h'>' - fi + gl_cv_next_stdint_h='<'stdint.h'>' + fi + fi { $as_echo "$as_me:$LINENO: result: $gl_cv_next_stdint_h" >&5 @@ -16614,6 +16745,7 @@ $as_echo "$gl_cv_next_stdint_h" >&6; } + if test $ac_cv_header_stdint_h = yes; then HAVE_STDINT_H=1 else @@ -16731,9 +16863,11 @@ uintmax_t j = UINTMAX_MAX; #include /* for CHAR_BIT */ #define TYPE_MINIMUM(t) \ - ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1))) + ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ TYPE_MAXIMUM (t))) #define TYPE_MAXIMUM(t) \ - ((t) ((t) 0 < (t) -1 ? (t) -1 : ~ (~ (t) 0 << (sizeof (t) * CHAR_BIT - 1)))) + ((t) ((t) 0 < (t) -1 \ + ? (t) -1 \ + : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1))) struct s { int check_PTRDIFF: PTRDIFF_MIN == TYPE_MINIMUM (ptrdiff_t) @@ -16890,7 +17024,7 @@ main () || strncmp (value, "((int)"/*)*/, 6) == 0 || strncmp (value, "((signed short)"/*)*/, 15) == 0 || strncmp (value, "((signed char)"/*)*/, 14) == 0) - return 1; + return mv - macro_values + 1; } return 0; @@ -17116,13 +17250,6 @@ done - - - - - - - if test $APPLE_UNIVERSAL_BUILD = 0; then @@ -18765,31 +18892,23 @@ fi HAVE_DECL_STRTOUMAX=1; - GNULIB_NL_LANGINFO=0; - HAVE_NL_LANGINFO=1; - REPLACE_NL_LANGINFO=0; - - + GNULIB_ISWBLANK=0; + GNULIB_WCTYPE=0; + GNULIB_ISWCTYPE=0; + GNULIB_WCTRANS=0; + GNULIB_TOWCTRANS=0; + HAVE_ISWBLANK=1; + HAVE_WCTYPE_T=1; + HAVE_WCTRANS_T=1; + REPLACE_ISWBLANK=0; - - - { $as_echo "$as_me:$LINENO: checking whether lstat correctly handles trailing slash" >&5 -$as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; } -if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for wint_t" >&5 +$as_echo_n "checking for wint_t... " >&6; } +if test "${gt_cv_c_wint_t+set}" = set; then $as_echo_n "(cached) " >&6 -else - rm -f conftest.sym conftest.file - echo >conftest.file - if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then - if test "$cross_compiling" = yes; then - # When cross-compiling, be pessimistic so we will end up using the - # replacement version of lstat that checks for trailing slashes and - # calls lstat a second time when necessary. - ac_cv_func_lstat_dereferences_slashed_symlink=no - else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -18797,73 +18916,64 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default + +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be included + before . */ +#include +#include +#include +#include + wint_t foo = (wchar_t)'\0'; int main () { -struct stat sbuf; - /* Linux will dereference the symlink and fail, as required by - POSIX. That is better in the sense that it means we will not - have to compile and use the lstat wrapper. */ - return lstat ("conftest.sym/", &sbuf) == 0; ; return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" $as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_lstat_dereferences_slashed_symlink=yes + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + gt_cv_c_wint_t=yes else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -( exit $ac_status ) -ac_cv_func_lstat_dereferences_slashed_symlink=no + gt_cv_c_wint_t=no fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +{ $as_echo "$as_me:$LINENO: result: $gt_cv_c_wint_t" >&5 +$as_echo "$gt_cv_c_wint_t" >&6; } + if test $gt_cv_c_wint_t = yes; then +cat >>confdefs.h <<\_ACEOF +#define HAVE_WINT_T 1 +_ACEOF - else - # If the 'ln -s' command failed, then we probably don't even - # have an lstat function. - ac_cv_func_lstat_dereferences_slashed_symlink=no - fi - rm -f conftest.sym conftest.file + fi -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5 -$as_echo "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; } - test $ac_cv_func_lstat_dereferences_slashed_symlink = yes && -cat >>confdefs.h <<_ACEOF -#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1 -_ACEOF - if test "x$ac_cv_func_lstat_dereferences_slashed_symlink" = xno; then @@ -18872,43 +18982,665 @@ _ACEOF - gl_LIBOBJS="$gl_LIBOBJS lstat.$ac_objext" + if test $ac_cv_func_iswcntrl = yes; then + HAVE_ISWCNTRL=1 + else + HAVE_ISWCNTRL=0 + fi + + + + + if test $gt_cv_c_wint_t = yes; then + HAVE_WINT_T=1 + else + HAVE_WINT_T=0 fi - { $as_echo "$as_me:$LINENO: checking whether unlink honors trailing slashes" >&5 -$as_echo_n "checking whether unlink honors trailing slashes... " >&6; } -if test "${gl_cv_func_unlink_honors_slashes+set}" = set; then + + + + + + + + + + + + if test $gl_cv_have_include_next = yes; then + gl_cv_next_wctype_h='<'wctype.h'>' + else + { $as_echo "$as_me:$LINENO: checking absolute name of " >&5 +$as_echo_n "checking absolute name of ... " >&6; } +if test "${gl_cv_next_wctype_h+set}" = set; then $as_echo_n "(cached) " >&6 else - touch conftest.file - # Assume that if we have lstat, we can also check symlinks. - if test $ac_cv_func_lstat = yes; then - ln -s conftest.file conftest.lnk + + if test $ac_cv_header_wctype_h = yes; then + + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +_ACEOF + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_wctype_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n '\#/wctype.h#{ + s#.*"\(.*/wctype.h\)".*#\1# + s#^/[^/]#//&# + p + q + }'`'"' + else + gl_cv_next_wctype_h='<'wctype.h'>' + fi + + +fi +{ $as_echo "$as_me:$LINENO: result: $gl_cv_next_wctype_h" >&5 +$as_echo "$gl_cv_next_wctype_h" >&6; } fi - if test "$cross_compiling" = yes; then - gl_cv_func_unlink_honors_slashes="guessing no" + NEXT_WCTYPE_H=$gl_cv_next_wctype_h + + if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' + gl_next_as_first_directive='<'wctype.h'>' + else + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' + gl_next_as_first_directive=$gl_cv_next_wctype_h + fi + NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H=$gl_next_as_first_directive + + + + + if test $ac_cv_header_wctype_h = yes; then + if test $ac_cv_func_iswcntrl = yes; then + { $as_echo "$as_me:$LINENO: checking whether iswcntrl works" >&5 +$as_echo_n "checking whether iswcntrl works... " >&6; } +if test "${gl_cv_func_iswcntrl_works+set}" = set; then + $as_echo_n "(cached) " >&6 else + + if test "$cross_compiling" = yes; then cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include - #include - +#include + #if __GNU_LIBRARY__ == 1 + Linux libc5 i18n is broken. + #endif int main () { -if (!unlink ("conftest.file/") || errno != ENOTDIR) return 1; -#if HAVE_LSTAT - if (!unlink ("conftest.lnk/") || errno != ENOTDIR) return 2; -#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + gl_cv_func_iswcntrl_works=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + gl_cv_func_iswcntrl_works=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + /* Tru64 with Desktop Toolkit C has a bug: must be + included before . + BSD/OS 4.0.1 has a bug: , and + must be included before . */ + #include + #include + #include + #include + #include + int main () { return iswprint ('x') == 0; } + +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + gl_cv_func_iswcntrl_works=yes +else + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +gl_cv_func_iswcntrl_works=no +fi +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + + + +fi +{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_iswcntrl_works" >&5 +$as_echo "$gl_cv_func_iswcntrl_works" >&6; } + fi + HAVE_WCTYPE_H=1 + else + HAVE_WCTYPE_H=0 + fi + + + if test "$gl_cv_func_iswcntrl_works" = no; then + REPLACE_ISWCNTRL=1 + else + REPLACE_ISWCNTRL=0 + fi + + + if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then + : + fi + + { $as_echo "$as_me:$LINENO: checking for wctype_t" >&5 +$as_echo_n "checking for wctype_t... " >&6; } +if test "${gl_cv_type_wctype_t+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Tru64 with Desktop Toolkit C has a bug: must be + included before . + BSD/OS 4.0.1 has a bug: , and + must be included before . */ + #include + #include + #include + #include + #if HAVE_WCTYPE_H + # include + #endif + wctype_t a; + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + gl_cv_type_wctype_t=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + gl_cv_type_wctype_t=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ $as_echo "$as_me:$LINENO: result: $gl_cv_type_wctype_t" >&5 +$as_echo "$gl_cv_type_wctype_t" >&6; } + if test $gl_cv_type_wctype_t = no; then + HAVE_WCTYPE_T=0 + fi + + { $as_echo "$as_me:$LINENO: checking for wctrans_t" >&5 +$as_echo_n "checking for wctrans_t... " >&6; } +if test "${gl_cv_type_wctrans_t+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Tru64 with Desktop Toolkit C has a bug: must be + included before . + BSD/OS 4.0.1 has a bug: , and + must be included before . */ + #include + #include + #include + #include + #include + wctrans_t a; + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + gl_cv_type_wctrans_t=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + gl_cv_type_wctrans_t=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ $as_echo "$as_me:$LINENO: result: $gl_cv_type_wctrans_t" >&5 +$as_echo "$gl_cv_type_wctrans_t" >&6; } + if test $gl_cv_type_wctrans_t = no; then + HAVE_WCTRANS_T=0 + fi + + + + + + + for gl_func in wctype iswctype wctrans towctrans ; do + as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh` + { $as_echo "$as_me:$LINENO: checking whether $gl_func is declared without a macro" >&5 +$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; } +if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#if !(defined __GLIBC__ && !defined __UCLIBC__) +# include +# include +# include +# include +#endif +#include + +int +main () +{ +#undef $gl_func + (void) $gl_func; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + eval "$as_gl_Symbol=yes" +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_gl_Symbol=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +ac_res=`eval 'as_val=${'$as_gl_Symbol'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + as_val=`eval 'as_val=${'$as_gl_Symbol'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1 +_ACEOF + + eval ac_cv_have_decl_$gl_func=yes +fi + + done + + + + +{ $as_echo "$as_me:$LINENO: checking whether iswblank is declared" >&5 +$as_echo_n "checking whether iswblank is declared... " >&6; } +if test "${ac_cv_have_decl_iswblank+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +#ifndef iswblank + (void) iswblank; +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_have_decl_iswblank=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_have_decl_iswblank=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_iswblank" >&5 +$as_echo "$ac_cv_have_decl_iswblank" >&6; } +if test "x$ac_cv_have_decl_iswblank" = x""yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_ISWBLANK 1 +_ACEOF + + +else + cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_ISWBLANK 0 +_ACEOF + + +fi + + + + GNULIB_NL_LANGINFO=0; + HAVE_NL_LANGINFO=1; + REPLACE_NL_LANGINFO=0; + + + + + + + + + { $as_echo "$as_me:$LINENO: checking whether lstat correctly handles trailing slash" >&5 +$as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; } +if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then + $as_echo_n "(cached) " >&6 +else + rm -f conftest.sym conftest.file + echo >conftest.file + if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then + if test "$cross_compiling" = yes; then + # When cross-compiling, be pessimistic so we will end up using the + # replacement version of lstat that checks for trailing slashes and + # calls lstat a second time when necessary. + ac_cv_func_lstat_dereferences_slashed_symlink=no + +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +struct stat sbuf; + /* Linux will dereference the symlink and fail, as required by + POSIX. That is better in the sense that it means we will not + have to compile and use the lstat wrapper. */ + return lstat ("conftest.sym/", &sbuf) == 0; + + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_lstat_dereferences_slashed_symlink=yes +else + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +ac_cv_func_lstat_dereferences_slashed_symlink=no +fi +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + + + else + # If the 'ln -s' command failed, then we probably don't even + # have an lstat function. + ac_cv_func_lstat_dereferences_slashed_symlink=no + fi + rm -f conftest.sym conftest.file + +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5 +$as_echo "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; } + test $ac_cv_func_lstat_dereferences_slashed_symlink = yes && + +cat >>confdefs.h <<_ACEOF +#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1 +_ACEOF + + if test "x$ac_cv_func_lstat_dereferences_slashed_symlink" = xno; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS lstat.$ac_objext" + + fi + + + + + { $as_echo "$as_me:$LINENO: checking whether unlink honors trailing slashes" >&5 +$as_echo_n "checking whether unlink honors trailing slashes... " >&6; } +if test "${gl_cv_func_unlink_honors_slashes+set}" = set; then + $as_echo_n "(cached) " >&6 +else + touch conftest.file + # Assume that if we have lstat, we can also check symlinks. + if test $ac_cv_func_lstat = yes; then + ln -s conftest.file conftest.lnk + fi + if test "$cross_compiling" = yes; then + gl_cv_func_unlink_honors_slashes="guessing no" +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + #include + +int +main () +{ +int result = 0; + if (!unlink ("conftest.file/")) + result |= 1; + else if (errno != ENOTDIR) + result |= 2; +#if HAVE_LSTAT + if (!unlink ("conftest.lnk/")) + result |= 4; + else if (errno != ENOTDIR) + result |= 8; +#endif + return result; ; return 0; @@ -18954,8 +19686,8 @@ fi fi { $as_echo "$as_me:$LINENO: result: $gl_cv_func_unlink_honors_slashes" >&5 $as_echo "$gl_cv_func_unlink_honors_slashes" >&6; } - { $as_echo "$as_me:$LINENO: checking whether unlink of a parent directory fails is it should" >&5 -$as_echo_n "checking whether unlink of a parent directory fails is it should... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether unlink of a parent directory fails as it should" >&5 +$as_echo_n "checking whether unlink of a parent directory fails as it should... " >&6; } if test "${gl_cv_func_unlink_parent_fails+set}" = set; then $as_echo_n "(cached) " >&6 else @@ -18993,9 +19725,12 @@ cat >>conftest.$ac_ext <<_ACEOF #include int main () { + int result = 0; if (chdir (getenv ("GL_SUBDIR_FOR_UNLINK")) != 0) - return 1; - return unlink ("..") == 0; + result |= 1; + else if (unlink ("..") == 0) + result |= 2; + return result; } _ACEOF @@ -19326,6 +20061,7 @@ done fi + { $as_echo "$as_me:$LINENO: checking for fchownat" >&5 $as_echo_n "checking for fchownat... " >&6; } if test "${ac_cv_func_fchownat+set}" = set; then @@ -19413,6 +20149,8 @@ fi $as_echo "$ac_cv_func_fchownat" >&6; } if test "x$ac_cv_func_fchownat" = x""yes; then + + { $as_echo "$as_me:$LINENO: checking whether fchownat works with AT_SYMLINK_NOFOLLOW" >&5 $as_echo_n "checking whether fchownat works with AT_SYMLINK_NOFOLLOW... " >&6; } if test "${gl_cv_func_fchownat_nofollow_works+set}" = set; then @@ -19497,6 +20235,96 @@ cat >>confdefs.h <<\_ACEOF _ACEOF +fi + + + + + + { $as_echo "$as_me:$LINENO: checking whether fchownat works with an empty file name" >&5 +$as_echo_n "checking whether fchownat works with an empty file name... " >&6; } +if test "${gl_cv_func_fchownat_empty_filename_works+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then + gl_cv_func_fchownat_empty_filename_works="guessing no" +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + #include + +int +main () +{ +int fd; + int ret; + if (mkdir ("conftestdir", 0700) < 0) + return 2; + fd = open ("conftestdir", O_RDONLY); + if (fd < 0) + return 3; + ret = fchownat (fd, "", -1, -1, 0); + close (fd); + rmdir ("conftestdir"); + return ret == 0; + + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + gl_cv_func_fchownat_empty_filename_works=yes +else + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +gl_cv_func_fchownat_empty_filename_works=no +fi +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + + + +fi +{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_fchownat_empty_filename_works" >&5 +$as_echo "$gl_cv_func_fchownat_empty_filename_works" >&6; } + if test "$gl_cv_func_fchownat_empty_filename_works" != yes; then + REPLACE_FCHOWNAT=1 + +cat >>confdefs.h <<\_ACEOF +#define FCHOWNAT_EMPTY_FILENAME_BUG 1 +_ACEOF + + fi @@ -19526,8 +20354,8 @@ fi - { $as_echo "$as_me:$LINENO: checking whether we are using the GNU C Library 2.1 or newer" >&5 -$as_echo_n "checking whether we are using the GNU C Library 2.1 or newer... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether we are using the GNU C Library >= 2.1 or uClibc" >&5 +$as_echo_n "checking whether we are using the GNU C Library >= 2.1 or uClibc... " >&6; } if test "${ac_cv_gnu_library_2_1+set}" = set; then $as_echo_n "(cached) " >&6 else @@ -19544,10 +20372,13 @@ cat >>conftest.$ac_ext <<_ACEOF Lucky GNU user #endif #endif +#ifdef __UCLIBC__ + Lucky user +#endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Lucky GNU user" >/dev/null 2>&1; then + $EGREP "Lucky" >/dev/null 2>&1; then ac_cv_gnu_library_2_1=yes else ac_cv_gnu_library_2_1=no @@ -19887,7 +20718,17 @@ int main () { const char *p; /* Check whether the given locale name is recognized by the system. */ +#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ + /* On native Win32, setlocale(category, "") looks at the system settings, + not at the environment variables. Also, when an encoding suffix such + as ".65001" or ".54936" is speficied, it succeeds but sets the LC_CTYPE + category of the locale to "C". */ + if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL + || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0) + return 1; +#else if (setlocale (LC_ALL, "") == NULL) return 1; +#endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. @@ -19930,42 +20771,57 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -s conftest$ac_exeext; then - # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the - # configure script would override the LC_ALL setting. Likewise for - # LC_CTYPE, which is also set at the beginning of the configure script. - # Test for the AIX locale name. - if (LC_ALL=ja_JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_ja=ja_JP - else - # Test for the locale name with explicit encoding suffix. - if (LC_ALL=ja_JP.EUC-JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_ja=ja_JP.EUC-JP - else - # Test for the HP-UX, OSF/1, NetBSD locale name. - if (LC_ALL=ja_JP.eucJP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_ja=ja_JP.eucJP + case "$host_os" in + # Handle native Windows specially, because there setlocale() interprets + # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256", + # "fr" or "fra" as "French" or "French_France.1252", + # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252", + # "ja" as "Japanese" or "Japanese_Japan.932", + # and similar. + mingw*) + # Note that on native Win32, the Japanese locale is Japanese_Japan.932, + # and CP932 is very different from EUC-JP, so we cannot use it here. + gt_cv_locale_ja=none + ;; + *) + # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because + # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # configure script would override the LC_ALL setting. Likewise for + # LC_CTYPE, which is also set at the beginning of the configure script. + # Test for the AIX locale name. + if (LC_ALL=ja_JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_ja=ja_JP else - # Test for the IRIX, FreeBSD locale name. - if (LC_ALL=ja_JP.EUC LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_ja=ja_JP.EUC + # Test for the locale name with explicit encoding suffix. + if (LC_ALL=ja_JP.EUC-JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_ja=ja_JP.EUC-JP else - # Test for the Solaris 7 locale name. - if (LC_ALL=ja LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_ja=ja + # Test for the HP-UX, OSF/1, NetBSD locale name. + if (LC_ALL=ja_JP.eucJP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_ja=ja_JP.eucJP else - # Special test for NetBSD 1.6. - if test -f /usr/share/locale/ja_JP.eucJP/LC_CTYPE; then - gt_cv_locale_ja=ja_JP.eucJP + # Test for the IRIX, FreeBSD locale name. + if (LC_ALL=ja_JP.EUC LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_ja=ja_JP.EUC else - # None found. - gt_cv_locale_ja=none + # Test for the Solaris 7 locale name. + if (LC_ALL=ja LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_ja=ja + else + # Special test for NetBSD 1.6. + if test -f /usr/share/locale/ja_JP.eucJP/LC_CTYPE; then + gt_cv_locale_ja=ja_JP.eucJP + else + # None found. + gt_cv_locale_ja=none + fi + fi fi fi fi fi - fi - fi + ;; + esac fi rm -fr conftest* @@ -20005,7 +20861,17 @@ int main () { const char *p; /* Check whether the given locale name is recognized by the system. */ +#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ + /* On native Win32, setlocale(category, "") looks at the system settings, + not at the environment variables. Also, when an encoding suffix such + as ".65001" or ".54936" is speficied, it succeeds but sets the LC_CTYPE + category of the locale to "C". */ + if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL + || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0) + return 1; +#else if (setlocale (LC_ALL, "") == NULL) return 1; +#endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. @@ -20048,22 +20914,41 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -s conftest$ac_exeext; then - # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the - # configure script would override the LC_ALL setting. Likewise for - # LC_CTYPE, which is also set at the beginning of the configure script. - # Test for the locale name without encoding suffix. - if (LC_ALL=zh_CN LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_zh_CN=zh_CN - else - # Test for the locale name with explicit encoding suffix. - if (LC_ALL=zh_CN.GB18030 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_zh_CN=zh_CN.GB18030 - else - # None found. - gt_cv_locale_zh_CN=none - fi - fi + case "$host_os" in + # Handle native Windows specially, because there setlocale() interprets + # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256", + # "fr" or "fra" as "French" or "French_France.1252", + # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252", + # "ja" as "Japanese" or "Japanese_Japan.932", + # and similar. + mingw*) + # Test for the hypothetical native Win32 locale name. + if (LC_ALL=Chinese_China.54936 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_zh_CN=Chinese_China.54936 + else + # None found. + gt_cv_locale_zh_CN=none + fi + ;; + *) + # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because + # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # configure script would override the LC_ALL setting. Likewise for + # LC_CTYPE, which is also set at the beginning of the configure script. + # Test for the locale name without encoding suffix. + if (LC_ALL=zh_CN LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_zh_CN=zh_CN + else + # Test for the locale name with explicit encoding suffix. + if (LC_ALL=zh_CN.GB18030 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_zh_CN=zh_CN.GB18030 + else + # None found. + gt_cv_locale_zh_CN=none + fi + fi + ;; + esac else # If there was a link error, due to mblen(), the system is so old that # it certainly doesn't have a chinese locale. @@ -20107,7 +20992,17 @@ int main () { variables, and all locales use the UTF-8 encoding. */ #if !(defined __BEOS__ || defined __HAIKU__) /* Check whether the given locale name is recognized by the system. */ +# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ + /* On native Win32, setlocale(category, "") looks at the system settings, + not at the environment variables. Also, when an encoding suffix such + as ".65001" or ".54936" is speficied, it succeeds but sets the LC_CTYPE + category of the locale to "C". */ + if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL + || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0) + return 1; +# else if (setlocale (LC_ALL, "") == NULL) return 1; +# endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. @@ -20148,27 +21043,46 @@ _ACEOF ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -s conftest$ac_exeext; then - # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the - # configure script would override the LC_ALL setting. Likewise for - # LC_CTYPE, which is also set at the beginning of the configure script. - # Test for the usual locale name. - if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_fr_utf8=fr_FR - else - # Test for the locale name with explicit encoding suffix. - if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_fr_utf8=fr_FR.UTF-8 - else - # Test for the Solaris 7 locale name. - if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_fr_utf8=fr.UTF-8 + case "$host_os" in + # Handle native Windows specially, because there setlocale() interprets + # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256", + # "fr" or "fra" as "French" or "French_France.1252", + # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252", + # "ja" as "Japanese" or "Japanese_Japan.932", + # and similar. + mingw*) + # Test for the hypothetical native Win32 locale name. + if (LC_ALL=French_France.65001 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr_utf8=French_France.65001 else # None found. gt_cv_locale_fr_utf8=none fi - fi - fi + ;; + *) + # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because + # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # configure script would override the LC_ALL setting. Likewise for + # LC_CTYPE, which is also set at the beginning of the configure script. + # Test for the usual locale name. + if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr_utf8=fr_FR + else + # Test for the locale name with explicit encoding suffix. + if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr_utf8=fr_FR.UTF-8 + else + # Test for the Solaris 7 locale name. + if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr_utf8=fr.UTF-8 + else + # None found. + gt_cv_locale_fr_utf8=none + fi + fi + fi + ;; + esac fi rm -fr conftest* @@ -20211,6 +21125,7 @@ $as_echo "$gt_cv_locale_fr_utf8" >&6; } GNULIB_MBSSEP=0; GNULIB_MBSTOK_R=0; GNULIB_STRERROR=0; + GNULIB_STRERROR_R=0; GNULIB_STRSIGNAL=0; GNULIB_STRVERSCMP=0; HAVE_MBSLEN=0; @@ -20229,6 +21144,7 @@ $as_echo "$gt_cv_locale_fr_utf8" >&6; } HAVE_STRSEP=1; HAVE_STRCASESTR=1; HAVE_DECL_STRTOK_R=1; + HAVE_DECL_STRERROR_R=1; HAVE_DECL_STRSIGNAL=1; HAVE_STRVERSCMP=1; REPLACE_MEMCHR=0; @@ -20238,6 +21154,7 @@ $as_echo "$gt_cv_locale_fr_utf8" >&6; } REPLACE_STRSTR=0; REPLACE_STRCASESTR=0; REPLACE_STRERROR=0; + REPLACE_STRERROR_R=0; REPLACE_STRNCAT=0; REPLACE_STRNDUP=0; REPLACE_STRNLEN=0; @@ -20246,77 +21163,6 @@ $as_echo "$gt_cv_locale_fr_utf8" >&6; } UNDEFINE_STRTOK_R=0; - { $as_echo "$as_me:$LINENO: checking whether mbrtowc and mbstate_t are properly declared" >&5 -$as_echo_n "checking whether mbrtowc and mbstate_t are properly declared... " >&6; } -if test "${ac_cv_func_mbrtowc+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -wchar_t wc; - char const s[] = ""; - size_t n = 1; - mbstate_t state; - return ! (sizeof state && (mbrtowc) (&wc, s, n, &state)); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_mbrtowc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_mbrtowc=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_mbrtowc" >&5 -$as_echo "$ac_cv_func_mbrtowc" >&6; } - if test $ac_cv_func_mbrtowc = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_MBRTOWC 1 -_ACEOF - - fi - - - - - @@ -20540,6 +21386,7 @@ int main () { + int result = 0; char *fence = NULL; #if HAVE_SYS_MMAN_H && HAVE_MPROTECT # if HAVE_MAP_ANONYMOUS @@ -20563,14 +21410,14 @@ main () if (fence) { if (memchr (fence, 0, 0)) - return 1; + result |= 1; strcpy (fence - 9, "12345678"); if (memchr (fence - 9, 0, 79) != fence - 1) - return 2; + result |= 2; if (memchr (fence - 1, 0, 3) != fence - 1) - return 3; + result |= 4; } - return 0; + return result; ; return 0; @@ -20870,7 +21717,7 @@ fi GNULIB_STRPTIME=0; GNULIB_TIMEGM=0; GNULIB_TIME_R=0; - HAVE_LOCALTIME_R=1; + HAVE_DECL_LOCALTIME_R=1; HAVE_NANOSLEEP=1; HAVE_STRPTIME=1; HAVE_TIMEGM=1; @@ -21124,9 +21971,73 @@ fi +{ $as_echo "$as_me:$LINENO: checking whether setenv is declared" >&5 +$as_echo_n "checking whether setenv is declared... " >&6; } +if test "${ac_cv_have_decl_setenv+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +#ifndef setenv + (void) setenv; +#endif + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_have_decl_setenv=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_have_decl_setenv=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_setenv" >&5 +$as_echo "$ac_cv_have_decl_setenv" >&6; } +if test "x$ac_cv_have_decl_setenv" = x""yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_SETENV 1 +_ACEOF +else + cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_SETENV 0 +_ACEOF + + +fi @@ -21134,6 +22045,18 @@ fi + + + + if test $ac_cv_have_decl_setenv = no; then + HAVE_DECL_SETENV=0 + fi + + + + + + if test $ac_cv_func_setenv = no; then HAVE_SETENV=0 else @@ -21160,10 +22083,20 @@ int main () { - if (setenv ("", "", 0) != -1) return 1; - if (errno != EINVAL) return 2; - if (setenv ("a", "=", 1) != 0) return 3; - if (strcmp (getenv ("a"), "=") != 0) return 4; + int result = 0; + { + if (setenv ("", "", 0) != -1) + result |= 1; + else if (errno != EINVAL) + result |= 2; + } + { + if (setenv ("a", "=", 1) != 0) + result |= 4; + else if (strcmp (getenv ("a"), "=") != 0) + result |= 8; + } + return result; ; return 0; @@ -21487,6 +22420,109 @@ done + + + { $as_echo "$as_me:$LINENO: checking whether snprintf returns a byte count as in C99" >&5 +$as_echo_n "checking whether snprintf returns a byte count as in C99... " >&6; } +if test "${gl_cv_func_snprintf_retval_c99+set}" = set; then + $as_echo_n "(cached) " >&6 +else + + if test "$cross_compiling" = yes; then + + case "$host_os" in + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_snprintf_retval_c99="guessing yes";; + # Guess yes on FreeBSD >= 5. + freebsd[1-4]*) gl_cv_func_snprintf_retval_c99="guessing no";; + freebsd* | kfreebsd*) gl_cv_func_snprintf_retval_c99="guessing yes";; + # Guess yes on MacOS X >= 10.3. + darwin[1-6].*) gl_cv_func_snprintf_retval_c99="guessing no";; + darwin*) gl_cv_func_snprintf_retval_c99="guessing yes";; + # Guess yes on OpenBSD >= 3.9. + openbsd[1-2].* | openbsd3.[0-8] | openbsd3.[0-8].*) + gl_cv_func_snprintf_retval_c99="guessing no";; + openbsd*) gl_cv_func_snprintf_retval_c99="guessing yes";; + # Guess yes on Solaris >= 2.10. + solaris2.[1-9][0-9]*) gl_cv_func_printf_sizes_c99="guessing yes";; + solaris*) gl_cv_func_printf_sizes_c99="guessing no";; + # Guess yes on AIX >= 4. + aix[1-3]*) gl_cv_func_snprintf_retval_c99="guessing no";; + aix*) gl_cv_func_snprintf_retval_c99="guessing yes";; + # Guess yes on NetBSD >= 3. + netbsd[1-2]* | netbsdelf[1-2]* | netbsdaout[1-2]* | netbsdcoff[1-2]*) + gl_cv_func_snprintf_retval_c99="guessing no";; + netbsd*) gl_cv_func_snprintf_retval_c99="guessing yes";; + # Guess yes on BeOS. + beos*) gl_cv_func_snprintf_retval_c99="guessing yes";; + # If we don't know, assume the worst. + *) gl_cv_func_snprintf_retval_c99="guessing no";; + esac + +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#include +static char buf[100]; +int main () +{ + strcpy (buf, "ABCDEF"); + if (snprintf (buf, 3, "%d %d", 4567, 89) != 7) + return 1; + if (snprintf (buf, 0, "%d %d", 4567, 89) != 7) + return 2; + if (snprintf (NULL, 0, "%d %d", 4567, 89) != 7) + return 3; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + gl_cv_func_snprintf_retval_c99=yes +else + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +gl_cv_func_snprintf_retval_c99=no +fi +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + + + +fi +{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_snprintf_retval_c99" >&5 +$as_echo "$gl_cv_func_snprintf_retval_c99" >&6; } + { $as_echo "$as_me:$LINENO: checking whether snprintf is declared" >&5 $as_echo_n "checking whether snprintf is declared... " >&6; } if test "${ac_cv_have_decl_snprintf+set}" = set; then @@ -21557,8 +22593,6 @@ fi - - REPLACE_NULL=0; HAVE_WCHAR_T=1; STDDEF_H=''; @@ -21624,54 +22658,6 @@ _ACEOF fi - - - { $as_echo "$as_me:$LINENO: checking whether C symbols are prefixed with underscore at the linker level" >&5 -$as_echo_n "checking whether C symbols are prefixed with underscore at the linker level... " >&6; } -if test "${gl_cv_prog_as_underscore+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat > conftest.c <&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } >/dev/null 2>&1 - if grep _foo conftest.s >/dev/null ; then - gl_cv_prog_as_underscore=yes - else - gl_cv_prog_as_underscore=no - fi - rm -f conftest* - -fi -{ $as_echo "$as_me:$LINENO: result: $gl_cv_prog_as_underscore" >&5 -$as_echo "$gl_cv_prog_as_underscore" >&6; } - if test $gl_cv_prog_as_underscore = yes; then - USER_LABEL_PREFIX=_ - else - USER_LABEL_PREFIX= - fi - -cat >>confdefs.h <<_ACEOF -#define USER_LABEL_PREFIX $USER_LABEL_PREFIX -_ACEOF - - ASM_SYMBOL_PREFIX='"'${USER_LABEL_PREFIX}'"' - - - - - - - HAVE_STRCASECMP=1; HAVE_DECL_STRNCASECMP=1; @@ -22109,9 +23095,6 @@ done - - - if test $gl_cv_have_include_next = yes; then gl_cv_next_string_h='<'string.h'>' else @@ -22121,8 +23104,7 @@ if test "${gl_cv_next_string_h+set}" = set; then $as_echo_n "(cached) " >&6 else - if test $ac_cv_header_string_h = yes; then - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22131,20 +23113,18 @@ cat >>conftest.$ac_ext <<_ACEOF #include _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - gl_cv_next_string_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n '\#/string.h#{ - s#.*"\(.*/string.h\)".*#\1# - s#^/[^/]#//&# - p - q - }'`'"' - else - gl_cv_next_string_h='<'string.h'>' - fi + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_string_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n '\#/string.h#{ + s#.*"\(.*/string.h\)".*#\1# + s#^/[^/]#//&# + p + q + }'`'"' + fi { $as_echo "$as_me:$LINENO: result: $gl_cv_next_string_h" >&5 @@ -22182,7 +23162,9 @@ $as_echo "$gl_cv_next_string_h" >&6; } - for gl_func in memmem mempcpy memrchr rawmemchr stpcpy stpncpy strchrnul strdup strncat strndup strnlen strpbrk strsep strcasestr strtok_r strsignal strverscmp; do + + + for gl_func in memmem mempcpy memrchr rawmemchr stpcpy stpncpy strchrnul strdup strncat strndup strnlen strpbrk strsep strcasestr strtok_r strerror_r strsignal strverscmp; do as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh` { $as_echo "$as_me:$LINENO: checking whether $gl_func is declared without a macro" >&5 $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; } @@ -22266,6 +23248,9 @@ fi + + + if test $gl_cv_have_include_next = yes; then gl_cv_next_strings_h='<'strings.h'>' else @@ -22275,8 +23260,10 @@ if test "${gl_cv_next_strings_h+set}" = set; then $as_echo_n "(cached) " >&6 else - if test $ac_cv_header_strings_h = yes; then - cat >conftest.$ac_ext <<_ACEOF + if test $ac_cv_header_strings_h = yes; then + + + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22285,20 +23272,21 @@ cat >>conftest.$ac_ext <<_ACEOF #include _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - gl_cv_next_strings_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n '\#/strings.h#{ - s#.*"\(.*/strings.h\)".*#\1# - s#^/[^/]#//&# - p - q - }'`'"' + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_strings_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n '\#/strings.h#{ + s#.*"\(.*/strings.h\)".*#\1# + s#^/[^/]#//&# + p + q + }'`'"' else - gl_cv_next_strings_h='<'strings.h'>' - fi + gl_cv_next_strings_h='<'strings.h'>' + fi + fi { $as_echo "$as_me:$LINENO: result: $gl_cv_next_strings_h" >&5 @@ -22321,6 +23309,7 @@ $as_echo "$gl_cv_next_strings_h" >&6; } + for gl_func in strcasecmp strncasecmp; do as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh` { $as_echo "$as_me:$LINENO: checking whether $gl_func is declared without a macro" >&5 @@ -22543,8 +23532,6 @@ fi - - { $as_echo "$as_me:$LINENO: checking for struct timespec in " >&5 $as_echo_n "checking for struct timespec in ... " >&6; } if test "${gl_cv_sys_struct_timespec_in_time_h+set}" = set; then @@ -22728,9 +23715,6 @@ $as_echo "$gl_cv_sys_struct_timespec_in_pthread_h" >&6; } - - - if test $gl_cv_have_include_next = yes; then gl_cv_next_time_h='<'time.h'>' else @@ -22740,8 +23724,7 @@ if test "${gl_cv_next_time_h+set}" = set; then $as_echo_n "(cached) " >&6 else - if test $ac_cv_header_time_h = yes; then - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -22750,20 +23733,18 @@ cat >>conftest.$ac_ext <<_ACEOF #include _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - gl_cv_next_time_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n '\#/time.h#{ - s#.*"\(.*/time.h\)".*#\1# - s#^/[^/]#//&# - p - q - }'`'"' - else - gl_cv_next_time_h='<'time.h'>' - fi + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_time_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n '\#/time.h#{ + s#.*"\(.*/time.h\)".*#\1# + s#^/[^/]#//&# + p + q + }'`'"' + fi { $as_echo "$as_me:$LINENO: result: $gl_cv_next_time_h" >&5 @@ -22785,6 +23766,76 @@ $as_echo "$gl_cv_next_time_h" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether localtime_r is declared" >&5 +$as_echo_n "checking whether localtime_r is declared... " >&6; } +if test "${ac_cv_have_decl_localtime_r+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +#ifndef localtime_r + (void) localtime_r; +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_have_decl_localtime_r=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_have_decl_localtime_r=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_localtime_r" >&5 +$as_echo "$ac_cv_have_decl_localtime_r" >&6; } +if test "x$ac_cv_have_decl_localtime_r" = x""yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_LOCALTIME_R 1 +_ACEOF + + +else + cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_LOCALTIME_R 0 +_ACEOF + + +fi + + + @@ -22817,6 +23868,75 @@ q LIBUNISTRING_VERSION_SUBMINOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_subminor"` fi +{ $as_echo "$as_me:$LINENO: checking whether unsetenv is declared" >&5 +$as_echo_n "checking whether unsetenv is declared... " >&6; } +if test "${ac_cv_have_decl_unsetenv+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +#ifndef unsetenv + (void) unsetenv; +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_have_decl_unsetenv=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_have_decl_unsetenv=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_unsetenv" >&5 +$as_echo "$ac_cv_have_decl_unsetenv" >&6; } +if test "x$ac_cv_have_decl_unsetenv" = x""yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_UNSETENV 1 +_ACEOF + + +else + cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_UNSETENV 0 +_ACEOF + + +fi + + { $as_echo "$as_me:$LINENO: checking whether the utimes function works" >&5 $as_echo_n "checking whether the utimes function works... " >&6; } @@ -22844,44 +23964,96 @@ cat >>conftest.$ac_ext <<_ACEOF #include #include +static int +inorder (time_t a, time_t b, time_t c) +{ + return a <= b && b <= c; +} + int main () { - static struct timeval timeval[2] = {{9, 10}, {999999, 999999}}; - struct stat sbuf; + int result = 0; char const *file = "conftest.utimes"; - FILE *f; - time_t now; - int fd; - - int ok = ((f = fopen (file, "w")) - && fclose (f) == 0 - && utimes (file, timeval) == 0 - && lstat (file, &sbuf) == 0 - && sbuf.st_atime == timeval[0].tv_sec - && sbuf.st_mtime == timeval[1].tv_sec); - unlink (file); - if (!ok) - exit (1); - - ok = - ((f = fopen (file, "w")) - && fclose (f) == 0 - && time (&now) != (time_t)-1 - && utimes (file, NULL) == 0 - && lstat (file, &sbuf) == 0 - && now - sbuf.st_atime <= 2 - && now - sbuf.st_mtime <= 2); - unlink (file); - if (!ok) - exit (1); - - ok = (0 <= (fd = open (file, O_WRONLY|O_CREAT, 0444)) - && close (fd) == 0 - && utimes (file, NULL) == 0); - unlink (file); - - exit (!ok); + static struct timeval timeval[2] = {{9, 10}, {999999, 999999}}; + + /* Test whether utimes() essentially works. */ + { + struct stat sbuf; + FILE *f = fopen (file, "w"); + if (f == NULL) + result |= 1; + else if (fclose (f) != 0) + result |= 1; + else if (utimes (file, timeval) != 0) + result |= 2; + else if (lstat (file, &sbuf) != 0) + result |= 1; + else if (!(sbuf.st_atime == timeval[0].tv_sec + && sbuf.st_mtime == timeval[1].tv_sec)) + result |= 4; + if (unlink (file) != 0) + result |= 1; + } + + /* Test whether utimes() with a NULL argument sets the file's timestamp + to the current time. Use 'fstat' as well as 'time' to + determine the "current" time, to accommodate NFS file systems + if there is a time skew between the host and the NFS server. */ + { + int fd = open (file, O_WRONLY|O_CREAT, 0644); + if (fd < 0) + result |= 1; + else + { + time_t t0, t2; + struct stat st0, st1, st2; + if (time (&t0) == (time_t) -1) + result |= 1; + else if (fstat (fd, &st0) != 0) + result |= 1; + else if (utimes (file, timeval) != 0) + result |= 2; + else if (utimes (file, NULL) != 0) + result |= 8; + else if (fstat (fd, &st1) != 0) + result |= 1; + else if (write (fd, "\n", 1) != 1) + result |= 1; + else if (fstat (fd, &st2) != 0) + result |= 1; + else if (time (&t2) == (time_t) -1) + result |= 1; + else + { + int m_ok_POSIX = inorder (t0, st1.st_mtime, t2); + int m_ok_NFS = inorder (st0.st_mtime, st1.st_mtime, st2.st_mtime); + if (! (st1.st_atime == st1.st_mtime)) + result |= 16; + if (! (m_ok_POSIX || m_ok_NFS)) + result |= 32; + } + if (close (fd) != 0) + result |= 1; + } + if (unlink (file) != 0) + result |= 1; + } + + /* Test whether utimes() with a NULL argument works on read-only files. */ + { + int fd = open (file, O_WRONLY|O_CREAT, 0444); + if (fd < 0) + result |= 1; + else if (close (fd) != 0) + result |= 1; + else if (utimes (file, NULL) != 0) + result |= 64; + if (unlink (file) != 0) + result |= 1; + } + + return result; } _ACEOF @@ -23021,74 +24193,20 @@ _ACEOF - { $as_echo "$as_me:$LINENO: checking for wint_t" >&5 -$as_echo_n "checking for wint_t... " >&6; } -if test "${gt_cv_c_wint_t+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Tru64 with Desktop Toolkit C has a bug: must be included before - . - BSD/OS 4.0.1 has a bug: , and must be included - before . */ -#include -#include -#include -#include - wint_t foo = (wchar_t)'\0'; -int -main () -{ - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - gt_cv_c_wint_t=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - gt_cv_c_wint_t=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $gt_cv_c_wint_t" >&5 -$as_echo "$gt_cv_c_wint_t" >&6; } - if test $gt_cv_c_wint_t = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_WINT_T 1 -_ACEOF + if test $ac_cv_header_features_h = yes; then + HAVE_FEATURES_H=1 + else + HAVE_FEATURES_H=0 fi + { $as_echo "$as_me:$LINENO: checking for inttypes.h" >&5 $as_echo_n "checking for inttypes.h... " >&6; } if test "${gl_cv_header_inttypes_h+set}" = set; then @@ -23292,106 +24410,6 @@ _ACEOF - { $as_echo "$as_me:$LINENO: checking whether snprintf returns a byte count as in C99" >&5 -$as_echo_n "checking whether snprintf returns a byte count as in C99... " >&6; } -if test "${gl_cv_func_snprintf_retval_c99+set}" = set; then - $as_echo_n "(cached) " >&6 -else - - if test "$cross_compiling" = yes; then - - case "$host_os" in - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_snprintf_retval_c99="guessing yes";; - # Guess yes on FreeBSD >= 5. - freebsd[1-4]*) gl_cv_func_snprintf_retval_c99="guessing no";; - freebsd* | kfreebsd*) gl_cv_func_snprintf_retval_c99="guessing yes";; - # Guess yes on MacOS X >= 10.3. - darwin[1-6].*) gl_cv_func_snprintf_retval_c99="guessing no";; - darwin*) gl_cv_func_snprintf_retval_c99="guessing yes";; - # Guess yes on OpenBSD >= 3.9. - openbsd[1-2].* | openbsd3.[0-8] | openbsd3.[0-8].*) - gl_cv_func_snprintf_retval_c99="guessing no";; - openbsd*) gl_cv_func_snprintf_retval_c99="guessing yes";; - # Guess yes on Solaris >= 2.6. - solaris2.[0-5]*) gl_cv_func_snprintf_retval_c99="guessing no";; - solaris*) gl_cv_func_snprintf_retval_c99="guessing yes";; - # Guess yes on AIX >= 4. - aix[1-3]*) gl_cv_func_snprintf_retval_c99="guessing no";; - aix*) gl_cv_func_snprintf_retval_c99="guessing yes";; - # Guess yes on NetBSD >= 3. - netbsd[1-2]* | netbsdelf[1-2]* | netbsdaout[1-2]* | netbsdcoff[1-2]*) - gl_cv_func_snprintf_retval_c99="guessing no";; - netbsd*) gl_cv_func_snprintf_retval_c99="guessing yes";; - # Guess yes on BeOS. - beos*) gl_cv_func_snprintf_retval_c99="guessing yes";; - # If we don't know, assume the worst. - *) gl_cv_func_snprintf_retval_c99="guessing no";; - esac - -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include -#include -static char buf[100]; -int main () -{ - strcpy (buf, "ABCDEF"); - if (snprintf (buf, 3, "%d %d", 4567, 89) != 7) - return 1; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - gl_cv_func_snprintf_retval_c99=yes -else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -gl_cv_func_snprintf_retval_c99=no -fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - - -fi -{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_snprintf_retval_c99" >&5 -$as_echo "$gl_cv_func_snprintf_retval_c99" >&6; } - - - - @@ -23657,79 +24675,6 @@ fi - -{ $as_echo "$as_me:$LINENO: checking whether iswblank is declared" >&5 -$as_echo_n "checking whether iswblank is declared... " >&6; } -if test "${ac_cv_have_decl_iswblank+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -#ifndef iswblank - (void) iswblank; -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_have_decl_iswblank=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_have_decl_iswblank=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_iswblank" >&5 -$as_echo "$ac_cv_have_decl_iswblank" >&6; } -if test "x$ac_cv_have_decl_iswblank" = x""yes; then - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_ISWBLANK 1 -_ACEOF - - -else - cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_ISWBLANK 0 -_ACEOF - - -fi - - - - - if false; then GL_COND_LIBTOOL_TRUE= GL_COND_LIBTOOL_FALSE='#' @@ -23756,9 +24701,6 @@ fi # Code from module alloca-opt: - - - if test $ac_cv_func_alloca_works = no; then : fi @@ -24232,7 +25174,6 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - # Code from module bitrotate: # Code from module btowc: @@ -24277,8 +25218,14 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include #include +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include #include int main () { @@ -24352,8 +25299,14 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include -#include #include +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include #include int main () { @@ -24862,6 +25815,43 @@ _ACEOF : # Code from module configmake: + + if test "x$datarootdir" = x; then + datarootdir='${datadir}' + + fi + if test "x$docdir" = x; then + docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' + + fi + if test "x$htmldir" = x; then + htmldir='${docdir}' + + fi + if test "x$dvidir" = x; then + dvidir='${docdir}' + + fi + if test "x$pdfdir" = x; then + pdfdir='${docdir}' + + fi + if test "x$psdir" = x; then + psdir='${docdir}' + + fi + if test "x$lispdir" = x; then + lispdir='${datarootdir}/emacs/site-lisp' + + fi + if test "x$localedir" = x; then + localedir='${datarootdir}/locale' + + fi + + pkglibexecdir='${libexecdir}/${PACKAGE}' + + # Code from module d-ino: { $as_echo "$as_me:$LINENO: checking for d_ino member in directory struct" >&5 $as_echo_n "checking for d_ino member in directory struct... " >&6; } @@ -24890,9 +25880,14 @@ DIR *dp = opendir ("."); if (! dp) return 1; e = readdir (dp); - return ! (e - && stat (e->d_name, &st) == 0 - && e->d_ino == st.st_ino); + if (! e) + return 2; + if (stat (e->d_name, &st) != 0) + return 3; + if (e->d_ino != st.st_ino) + return 4; + return 0; + ; return 0; } @@ -24960,6 +25955,9 @@ _ACEOF + + + if test $gl_cv_have_include_next = yes; then gl_cv_next_dirent_h='<'dirent.h'>' else @@ -24969,8 +25967,10 @@ if test "${gl_cv_next_dirent_h+set}" = set; then $as_echo_n "(cached) " >&6 else - if test $ac_cv_header_dirent_h = yes; then - cat >conftest.$ac_ext <<_ACEOF + if test $ac_cv_header_dirent_h = yes; then + + + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -24979,20 +25979,21 @@ cat >>conftest.$ac_ext <<_ACEOF #include _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - gl_cv_next_dirent_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n '\#/dirent.h#{ - s#.*"\(.*/dirent.h\)".*#\1# - s#^/[^/]#//&# - p - q - }'`'"' + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_dirent_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n '\#/dirent.h#{ + s#.*"\(.*/dirent.h\)".*#\1# + s#^/[^/]#//&# + p + q + }'`'"' else - gl_cv_next_dirent_h='<'dirent.h'>' - fi + gl_cv_next_dirent_h='<'dirent.h'>' + fi + fi { $as_echo "$as_me:$LINENO: result: $gl_cv_next_dirent_h" >&5 @@ -25017,6 +26018,7 @@ $as_echo "$gl_cv_next_dirent_h" >&6; } + for gl_func in alphasort dirfd fdopendir scandir; do as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh` { $as_echo "$as_me:$LINENO: checking whether $gl_func is declared without a macro" >&5 @@ -25122,9 +26124,6 @@ _ACEOF - - - for ac_func in dirfd do as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -25503,7 +26502,7 @@ _ACEOF - + # Code from module dosname: # Code from module double-slash-root: @@ -25556,6 +26555,8 @@ _ACEOF + + if test $ac_cv_func_dup2 = no; then HAVE_DUP2=0 @@ -25585,6 +26586,8 @@ else gl_cv_func_dup2_works=no;; freebsd*) # on FreeBSD 6.1, dup2(1,1000000) gives EMFILE, not EBADF. gl_cv_func_dup2_works=no;; + haiku*) # on Haiku alpha 2, dup2(1, 1) resets FD_CLOEXEC. + gl_cv_func_dup2_works=no;; *) gl_cv_func_dup2_works=yes;; esac else @@ -25596,19 +26599,29 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include +#include #include int main () { -if (dup2 (1, 1) == 0) - return 1; +int result = 0; +#if HAVE_FCNTL + if (fcntl (1, F_SETFD, FD_CLOEXEC) == -1) + result |= 1; +#endif HAVE_FCNTL + if (dup2 (1, 1) == 0) + result |= 2; +#if HAVE_FCNTL + if (fcntl (1, F_GETFD) != FD_CLOEXEC) + result |= 4; +#endif close (0); if (dup2 (0, 0) != -1) - return 2; + result |= 8; /* Many gnulib modules require POSIX conformance of EBADF. */ - if (dup2 (1, 1000000) == -1 && errno != EBADF) - return 3; - return 0; + if (dup2 (2, 1000000) == -1 && errno != EBADF) + result |= 16; + return result; ; return 0; @@ -25827,6 +26840,15 @@ $as_echo "$ac_cv_lib_error_at_line" >&6; } + if test $ac_cv_have_decl_fchdir = no; then + HAVE_DECL_FCHDIR=0 + fi + + + + + + if test $ac_cv_func_fchdir = no; then HAVE_FCHDIR=0 @@ -26078,7 +27100,7 @@ _ACEOF else - { $as_echo "$as_me:$LINENO: checking whether fcntl handles F_DUPFD correctly" >&5 + { $as_echo "$as_me:$LINENO: checking whether fcntl handles F_DUPFD correctly" >&5 $as_echo_n "checking whether fcntl handles F_DUPFD correctly... " >&6; } if test "${gl_cv_func_fcntl_f_dupfd_works+set}" = set; then $as_echo_n "(cached) " >&6 @@ -26098,11 +27120,15 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include +#include int main () { -return fcntl (0, F_DUPFD, -1) != -1; +int result = 0; + if (fcntl (0, F_DUPFD, -1) != -1) result |= 1; + if (errno != EINVAL) result |= 2; + return result; ; return 0; @@ -26335,9 +27361,6 @@ _ACEOF - - - if test $gl_cv_have_include_next = yes; then gl_cv_next_fcntl_h='<'fcntl.h'>' else @@ -26347,8 +27370,7 @@ if test "${gl_cv_next_fcntl_h+set}" = set; then $as_echo_n "(cached) " >&6 else - if test $ac_cv_header_fcntl_h = yes; then - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -26357,20 +27379,18 @@ cat >>conftest.$ac_ext <<_ACEOF #include _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - gl_cv_next_fcntl_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n '\#/fcntl.h#{ - s#.*"\(.*/fcntl.h\)".*#\1# - s#^/[^/]#//&# - p - q - }'`'"' - else - gl_cv_next_fcntl_h='<'fcntl.h'>' - fi + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_fcntl_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n '\#/fcntl.h#{ + s#.*"\(.*/fcntl.h\)".*#\1# + s#^/[^/]#//&# + p + q + }'`'"' + fi { $as_echo "$as_me:$LINENO: result: $gl_cv_next_fcntl_h" >&5 @@ -26393,6 +27413,7 @@ $as_echo "$gl_cv_next_fcntl_h" >&6; } + for gl_func in fcntl openat; do as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh` { $as_echo "$as_me:$LINENO: checking whether $gl_func is declared without a macro" >&5 @@ -26586,6 +27607,7 @@ cat >>conftest.$ac_ext <<_ACEOF #include #include +#include #if !HAVE_DECL_FDOPENDIR extern DIR *fdopendir (int); #endif @@ -26593,9 +27615,12 @@ extern DIR *fdopendir (int); int main () { -int fd = open ("conftest.c", O_RDONLY); - if (fd < 0) return 2; - return !!fdopendir (fd); +int result = 0; + int fd = open ("conftest.c", O_RDONLY); + if (fd < 0) result |= 1; + if (fdopendir (fd)) result |= 2; + if (close (fd)) result |= 4; + return result; ; return 0; } @@ -26855,9 +27880,6 @@ fi - - - if test $gl_cv_have_include_next = yes; then gl_cv_next_float_h='<'float.h'>' else @@ -26867,8 +27889,7 @@ if test "${gl_cv_next_float_h+set}" = set; then $as_echo_n "(cached) " >&6 else - if test $ac_cv_header_float_h = yes; then - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -26877,20 +27898,18 @@ cat >>conftest.$ac_ext <<_ACEOF #include _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - gl_cv_next_float_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n '\#/float.h#{ - s#.*"\(.*/float.h\)".*#\1# - s#^/[^/]#//&# - p - q - }'`'"' - else - gl_cv_next_float_h='<'float.h'>' - fi + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_float_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n '\#/float.h#{ + s#.*"\(.*/float.h\)".*#\1# + s#^/[^/]#//&# + p + q + }'`'"' + fi { $as_echo "$as_me:$LINENO: result: $gl_cv_next_float_h" >&5 @@ -26909,6 +27928,7 @@ $as_echo "$gl_cv_next_float_h" >&6; } + ;; esac @@ -26968,33 +27988,60 @@ char const *Apat = 'A' < '\\\\' ? "[A-\\\\\\\\]" : "[\\\\\\\\-A]"; static char const a01[] = { 'a' + 1, 0 }; static char const bs_1[] = { '\\\\' - 1, 0 }; static char const bs01[] = { '\\\\' + 1, 0 }; - return - !(n ("a*", "", 0) - && y ("a*", "abc", 0) - && n ("d*/*1", "d/s/1", FNM_PATHNAME) - && y ("a\\\\bc", "abc", 0) - && n ("a\\\\bc", "abc", FNM_NOESCAPE) - && y ("*x", ".x", 0) - && n ("*x", ".x", FNM_PERIOD) - && y (Apat, "\\\\", 0) && y (Apat, "A", 0) - && y (apat, "\\\\", 0) && y (apat, "a", 0) - && n (Apat, A_1, 0) == ('A' < '\\\\') - && n (apat, a_1, 0) == ('a' < '\\\\') - && y (Apat, A01, 0) == ('A' < '\\\\') - && y (apat, a01, 0) == ('a' < '\\\\') - && y (Apat, bs_1, 0) == ('A' < '\\\\') - && y (apat, bs_1, 0) == ('a' < '\\\\') - && n (Apat, bs01, 0) == ('A' < '\\\\') - && n (apat, bs01, 0) == ('a' < '\\\\') - $gl_fnmatch_gnu_start - && y ("xxXX", "xXxX", FNM_CASEFOLD) - && y ("a++(x|yy)b", "a+xyyyyxb", FNM_EXTMATCH) - && n ("d*/*1", "d/s/1", FNM_FILE_NAME) - && y ("*", "x", FNM_FILE_NAME | FNM_LEADING_DIR) - && y ("x*", "x/y/z", FNM_FILE_NAME | FNM_LEADING_DIR) - && y ("*c*", "c/x", FNM_FILE_NAME | FNM_LEADING_DIR) - $gl_fnmatch_gnu_end - ); + int result = 0; + if (!n ("a*", "", 0)) + return 1; + if (!y ("a*", "abc", 0)) + return 1; + if (!n ("d*/*1", "d/s/1", FNM_PATHNAME)) + return 2; + if (!y ("a\\\\bc", "abc", 0)) + return 3; + if (!n ("a\\\\bc", "abc", FNM_NOESCAPE)) + return 3; + if (!y ("*x", ".x", 0)) + return 4; + if (!n ("*x", ".x", FNM_PERIOD)) + return 4; + if (!y (Apat, "\\\\", 0)) + return 5; + if (!y (Apat, "A", 0)) + return 5; + if (!y (apat, "\\\\", 0)) + return 5; + if (!y (apat, "a", 0)) + return 5; + if (!(n (Apat, A_1, 0) == ('A' < '\\\\'))) + return 5; + if (!(n (apat, a_1, 0) == ('a' < '\\\\'))) + return 5; + if (!(y (Apat, A01, 0) == ('A' < '\\\\'))) + return 5; + if (!(y (apat, a01, 0) == ('a' < '\\\\'))) + return 5; + if (!(y (Apat, bs_1, 0) == ('A' < '\\\\'))) + return 5; + if (!(y (apat, bs_1, 0) == ('a' < '\\\\'))) + return 5; + if (!(n (Apat, bs01, 0) == ('A' < '\\\\'))) + return 5; + if (!(n (apat, bs01, 0) == ('a' < '\\\\'))) + return 5; + $gl_fnmatch_gnu_start + if (!y ("xxXX", "xXxX", FNM_CASEFOLD)) + result |= 8; + if (!y ("a++(x|yy)b", "a+xyyyyxb", FNM_EXTMATCH)) + result |= 16; + if (!n ("d*/*1", "d/s/1", FNM_FILE_NAME)) + result |= 32; + if (!y ("*", "x", FNM_FILE_NAME | FNM_LEADING_DIR)) + result |= 64; + if (!y ("x*", "x/y/z", FNM_FILE_NAME | FNM_LEADING_DIR)) + result |= 64; + if (!y ("*c*", "c/x", FNM_FILE_NAME | FNM_LEADING_DIR)) + result |= 64; + $gl_fnmatch_gnu_end + return result; ; return 0; @@ -27376,6 +28423,14 @@ _ACEOF + + + + + if test $ac_cv_have_decl_fseeko = no; then + HAVE_DECL_FSEEKO=0 + fi + if test $gl_cv_func_fseeko = no; then HAVE_FSEEKO=0 @@ -27708,7 +28763,7 @@ main () size_t n_chdirs = 0; if (cwd == NULL) - exit (1); + exit (10); cwd_len = initial_cwd_len = strlen (cwd); @@ -27726,7 +28781,7 @@ main () if (mkdir (DIR_NAME, S_IRWXU) < 0 || chdir (DIR_NAME) < 0) { if (! (errno == ERANGE || is_ENAMETOOLONG (errno))) - fail = 2; + fail = 20; break; } @@ -27735,12 +28790,12 @@ main () c = getcwd (buf, PATH_MAX); if (!c && errno == ENOENT) { - fail = 1; + fail = 11; break; } if (c || ! (errno == ERANGE || is_ENAMETOOLONG (errno))) { - fail = 2; + fail = 21; break; } } @@ -27755,12 +28810,12 @@ main () if (! (errno == ERANGE || errno == ENOENT || is_ENAMETOOLONG (errno))) { - fail = 2; + fail = 22; break; } if (AT_FDCWD || errno == ERANGE || errno == ENOENT) { - fail = 1; + fail = 12; break; } } @@ -27768,7 +28823,7 @@ main () if (c && strlen (c) != cwd_len) { - fail = 2; + fail = 23; break; } ++n_chdirs; @@ -27826,7 +28881,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) case $? in - 1) gl_cv_func_getcwd_path_max='no, but it is partly working';; + 10|11|12) gl_cv_func_getcwd_path_max='no, but it is partly working';; *) gl_cv_func_getcwd_path_max=no;; esac fi @@ -28163,7 +29218,7 @@ cat >>conftest.$ac_ext <<_ACEOF #include #ifdef __GNU_LIBRARY__ - #if (__GLIBC__ >= 2) + #if (__GLIBC__ >= 2) && !defined __UCLIBC__ Lucky GNU user #endif #endif @@ -28201,7 +29256,7 @@ cat >>conftest.$ac_ext <<_ACEOF size_t siz = 0; int len = getdelim (&line, &siz, '\n', in); if (!(len == 4 && line && strcmp (line, "foo\n") == 0)) - return 1; + return 2; } { /* Test result for a NULL buffer and a non-zero size. @@ -28209,7 +29264,7 @@ cat >>conftest.$ac_ext <<_ACEOF char *line = NULL; size_t siz = (size_t)(~0) / 4; if (getdelim (&line, &siz, '\n', in) == -1) - return 1; + return 3; } return 0; } @@ -28620,7 +29675,7 @@ cat >>conftest.$ac_ext <<_ACEOF #include #ifdef __GNU_LIBRARY__ - #if (__GLIBC__ >= 2) + #if (__GLIBC__ >= 2) && !defined __UCLIBC__ Lucky GNU user #endif #endif @@ -28658,7 +29713,7 @@ cat >>conftest.$ac_ext <<_ACEOF size_t siz = 0; int len = getline (&line, &siz, in); if (!(len == 4 && line && strcmp (line, "foo\n") == 0)) - return 1; + return 2; } { /* Test result for a NULL buffer and a non-zero size. @@ -28666,7 +29721,7 @@ cat >>conftest.$ac_ext <<_ACEOF char *line = NULL; size_t siz = (size_t)(~0) / 4; if (getline (&line, &siz, in) == -1) - return 1; + return 3; } return 0; } @@ -28764,7 +29819,7 @@ cat >>conftest.$ac_ext <<_ACEOF #include #ifdef __GNU_LIBRARY__ - #if (__GLIBC__ >= 2) + #if (__GLIBC__ >= 2) && !defined __UCLIBC__ Lucky GNU user #endif #endif @@ -28802,7 +29857,7 @@ cat >>conftest.$ac_ext <<_ACEOF size_t siz = 0; int len = getdelim (&line, &siz, '\n', in); if (!(len == 4 && line && strcmp (line, "foo\n") == 0)) - return 1; + return 2; } { /* Test result for a NULL buffer and a non-zero size. @@ -28810,7 +29865,7 @@ cat >>conftest.$ac_ext <<_ACEOF char *line = NULL; size_t siz = (size_t)(~0) / 4; if (getdelim (&line, &siz, '\n', in) == -1) - return 1; + return 3; } return 0; } @@ -31014,6 +32069,9 @@ $as_echo "$gl_cv_header_working_inttypes_h" >&6; } + + + if test $gl_cv_have_include_next = yes; then gl_cv_next_inttypes_h='<'inttypes.h'>' else @@ -31023,8 +32081,10 @@ if test "${gl_cv_next_inttypes_h+set}" = set; then $as_echo_n "(cached) " >&6 else - if test $ac_cv_header_inttypes_h = yes; then - cat >conftest.$ac_ext <<_ACEOF + if test $ac_cv_header_inttypes_h = yes; then + + + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -31033,20 +32093,21 @@ cat >>conftest.$ac_ext <<_ACEOF #include _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - gl_cv_next_inttypes_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n '\#/inttypes.h#{ - s#.*"\(.*/inttypes.h\)".*#\1# - s#^/[^/]#//&# - p - q - }'`'"' + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_inttypes_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n '\#/inttypes.h#{ + s#.*"\(.*/inttypes.h\)".*#\1# + s#^/[^/]#//&# + p + q + }'`'"' else - gl_cv_next_inttypes_h='<'inttypes.h'>' - fi + gl_cv_next_inttypes_h='<'inttypes.h'>' + fi + fi { $as_echo "$as_me:$LINENO: result: $gl_cv_next_inttypes_h" >&5 @@ -31069,6 +32130,7 @@ $as_echo "$gl_cv_next_inttypes_h" >&6; } + cat >>confdefs.h <<\_ACEOF #define GL_TRIGGER_STDC_LIMIT_MACROS 1 _ACEOF @@ -31547,6 +32609,58 @@ fi done + # Code from module iswblank: + + + + + + + + + + + + + + + if test $ac_cv_func_iswblank = no; then + HAVE_ISWBLANK=0 + if test $ac_cv_have_decl_iswblank = yes; then + REPLACE_ISWBLANK=1 + fi + fi + if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then + : + else + if test $HAVE_ISWBLANK = 0 || test $REPLACE_ISWBLANK = 1; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS iswblank.$ac_objext" + + fi + fi + + + + + + GNULIB_ISWBLANK=1 + + + +cat >>confdefs.h <<\_ACEOF +#define GNULIB_TEST_ISWBLANK 1 +_ACEOF + + + # Code from module langinfo: @@ -31564,6 +32678,9 @@ fi + + + if test $gl_cv_have_include_next = yes; then gl_cv_next_langinfo_h='<'langinfo.h'>' else @@ -31573,8 +32690,10 @@ if test "${gl_cv_next_langinfo_h+set}" = set; then $as_echo_n "(cached) " >&6 else - if test $ac_cv_header_langinfo_h = yes; then - cat >conftest.$ac_ext <<_ACEOF + if test $ac_cv_header_langinfo_h = yes; then + + + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -31583,20 +32702,21 @@ cat >>conftest.$ac_ext <<_ACEOF #include _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - gl_cv_next_langinfo_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n '\#/langinfo.h#{ - s#.*"\(.*/langinfo.h\)".*#\1# - s#^/[^/]#//&# - p - q - }'`'"' + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_langinfo_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n '\#/langinfo.h#{ + s#.*"\(.*/langinfo.h\)".*#\1# + s#^/[^/]#//&# + p + q + }'`'"' else - gl_cv_next_langinfo_h='<'langinfo.h'>' - fi + gl_cv_next_langinfo_h='<'langinfo.h'>' + fi + fi { $as_echo "$as_me:$LINENO: result: $gl_cv_next_langinfo_h" >&5 @@ -31616,6 +32736,7 @@ $as_echo "$gl_cv_next_langinfo_h" >&6; } + HAVE_LANGINFO_CODESET=0 HAVE_LANGINFO_T_FMT_AMPM=0 HAVE_LANGINFO_ERA=0 @@ -32132,10 +33253,14 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -if (!link ("conftest.a", "conftest.b/")) return 1; +int result = 0; + if (!link ("conftest.a", "conftest.b/")) + result |= 1; #if HAVE_LSTAT - if (!link ("conftest.lnk/", "conftest.b")) return 2; + if (!link ("conftest.lnk/", "conftest.b")) + result |= 2; #endif + return result; ; return 0; @@ -32218,16 +33343,75 @@ _ACEOF gl_link_follows_symlinks=0 # assume GNU behavior if test $ac_cv_func_readlink = yes; then - { $as_echo "$as_me:$LINENO: checking whether link(2) dereferences a symlink" >&5 + { $as_echo "$as_me:$LINENO: checking for __xpg4" >&5 +$as_echo_n "checking for __xpg4... " >&6; } +if test "${gl_cv_have___xpg4+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +extern int __xpg4; +int +main () +{ +return __xpg4; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + gl_cv_have___xpg4=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + gl_cv_have___xpg4=no +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ $as_echo "$as_me:$LINENO: result: $gl_cv_have___xpg4" >&5 +$as_echo "$gl_cv_have___xpg4" >&6; } + if test $gl_cv_have___xpg4 = yes; then + gl_link_follows_symlinks=-1 + else + { $as_echo "$as_me:$LINENO: checking whether link(2) dereferences a symlink" >&5 $as_echo_n "checking whether link(2) dereferences a symlink... " >&6; } if test "${gl_cv_func_link_follows_symlink+set}" = set; then $as_echo_n "(cached) " >&6 else - # Create a regular file. - echo > conftest.file - if test "$cross_compiling" = yes; then - gl_cv_func_link_follows_symlink=unknown + # Create a regular file. + echo > conftest.file + if test "$cross_compiling" = yes; then + gl_cv_func_link_follows_symlink=unknown else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -32301,23 +33485,24 @@ $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) - gl_cv_func_link_follows_symlink=yes + gl_cv_func_link_follows_symlink=yes fi rm -rf conftest.dSYM rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - rm -f conftest.file conftest.sym conftest.hard + rm -f conftest.file conftest.sym conftest.hard fi { $as_echo "$as_me:$LINENO: result: $gl_cv_func_link_follows_symlink" >&5 $as_echo "$gl_cv_func_link_follows_symlink" >&6; } - case $gl_cv_func_link_follows_symlink in - yes) gl_link_follows_symlinks=1 ;; - no) ;; # already defaulted to 0 - *) gl_link_follows_symlinks=-1 ;; - esac + case $gl_cv_func_link_follows_symlink in + yes) gl_link_follows_symlinks=1 ;; + no) ;; # already defaulted to 0 + *) gl_link_follows_symlinks=-2 ;; + esac + fi fi cat >>confdefs.h <<_ACEOF @@ -32459,9 +33644,8 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -int fd; - int err; - int ret; +int result; + int fd; /* Create a regular file. */ fd = open ("conftest.a", O_CREAT | O_EXCL | O_WRONLY, 0600); if (fd < 0) @@ -32475,14 +33659,15 @@ int fd; if (linkat (AT_FDCWD, "conftest.a", AT_FDCWD, "conftest.b", AT_SYMLINK_FOLLOW) < 0) return 0; + result = 0; /* Test whether a trailing "/" is treated like "/.". */ if (linkat (AT_FDCWD, "conftest.a/", AT_FDCWD, "conftest.c", AT_SYMLINK_FOLLOW) == 0) - return 4; + result |= 4; if (linkat (AT_FDCWD, "conftest.a", AT_FDCWD, "conftest.d/", AT_SYMLINK_FOLLOW) == 0) - return 5; - return 0; + result |= 8; + return result; ; return 0; @@ -33118,6 +34303,13 @@ cat >>conftest.$ac_ext <<_ACEOF #include #include +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include #include int main () { @@ -33206,6 +34398,13 @@ cat >>conftest.$ac_ext <<_ACEOF #include #include #include +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include #include int main () { @@ -33302,17 +34501,125 @@ $as_echo "$gl_cv_func_mbrtowc_sanitycheck" >&6; } + { $as_echo "$as_me:$LINENO: checking whether mbrtowc handles a NULL pwc argument" >&5 +$as_echo_n "checking whether mbrtowc handles a NULL pwc argument... " >&6; } +if test "${gl_cv_func_mbrtowc_null_arg1+set}" = set; then + $as_echo_n "(cached) " >&6 +else + + case "$host_os" in + # Guess no on Solaris. + solaris*) gl_cv_func_mbrtowc_null_arg1="guessing no" ;; + # Guess yes otherwise. + *) gl_cv_func_mbrtowc_null_arg1="guessing yes" ;; + esac + if test $LOCALE_FR_UTF8 != none; then + if test "$cross_compiling" = yes; then + : +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#include +#include +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include +#include +int main () +{ + int result = 0; + + if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) + { + char input[] = "\303\237er"; + mbstate_t state; + wchar_t wc; + size_t ret; + + memset (&state, '\0', sizeof (mbstate_t)); + wc = (wchar_t) 0xBADFACE; + ret = mbrtowc (&wc, input, 5, &state); + if (ret != 2) + result |= 1; + if (!mbsinit (&state)) + result |= 2; + + memset (&state, '\0', sizeof (mbstate_t)); + ret = mbrtowc (NULL, input, 5, &state); + if (ret != 2) /* Solaris 7 fails here: ret is -1. */ + result |= 4; + if (!mbsinit (&state)) + result |= 8; + } + return result; +} +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + gl_cv_func_mbrtowc_null_arg1=yes +else + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +gl_cv_func_mbrtowc_null_arg1=no +fi +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + + + fi + +fi +{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_mbrtowc_null_arg1" >&5 +$as_echo "$gl_cv_func_mbrtowc_null_arg1" >&6; } + + + + { $as_echo "$as_me:$LINENO: checking whether mbrtowc handles a NULL string argument" >&5 $as_echo_n "checking whether mbrtowc handles a NULL string argument... " >&6; } -if test "${gl_cv_func_mbrtowc_null_arg+set}" = set; then +if test "${gl_cv_func_mbrtowc_null_arg2+set}" = set; then $as_echo_n "(cached) " >&6 else case "$host_os" in # Guess no on OSF/1. - osf*) gl_cv_func_mbrtowc_null_arg="guessing no" ;; + osf*) gl_cv_func_mbrtowc_null_arg2="guessing no" ;; # Guess yes otherwise. - *) gl_cv_func_mbrtowc_null_arg="guessing yes" ;; + *) gl_cv_func_mbrtowc_null_arg2="guessing yes" ;; esac if test $LOCALE_FR_UTF8 != none; then if test "$cross_compiling" = yes; then @@ -33327,6 +34634,13 @@ cat >>conftest.$ac_ext <<_ACEOF #include #include +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include #include int main () { @@ -33368,14 +34682,14 @@ $as_echo "$ac_try_echo") >&5 ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - gl_cv_func_mbrtowc_null_arg=yes + gl_cv_func_mbrtowc_null_arg2=yes else $as_echo "$as_me: program exited with status $ac_status" >&5 $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -gl_cv_func_mbrtowc_null_arg=no +gl_cv_func_mbrtowc_null_arg2=no fi rm -rf conftest.dSYM rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext @@ -33385,26 +34699,28 @@ fi fi fi -{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_mbrtowc_null_arg" >&5 -$as_echo "$gl_cv_func_mbrtowc_null_arg" >&6; } +{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_mbrtowc_null_arg2" >&5 +$as_echo "$gl_cv_func_mbrtowc_null_arg2" >&6; } - { $as_echo "$as_me:$LINENO: checking whether mbrtowc has a correct return value" >&5 + + { $as_echo "$as_me:$LINENO: checking whether mbrtowc has a correct return value" >&5 $as_echo_n "checking whether mbrtowc has a correct return value... " >&6; } if test "${gl_cv_func_mbrtowc_retval+set}" = set; then $as_echo_n "(cached) " >&6 else case "$host_os" in - # Guess no on HP-UX and Solaris. - hpux* | solaris*) gl_cv_func_mbrtowc_retval="guessing no" ;; - # Guess yes otherwise. - *) gl_cv_func_mbrtowc_retval="guessing yes" ;; + # Guess no on HP-UX, Solaris, native Windows. + hpux* | solaris* | mingw*) gl_cv_func_mbrtowc_retval="guessing no" ;; + # Guess yes otherwise. + *) gl_cv_func_mbrtowc_retval="guessing yes" ;; esac - if test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none; then + if test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none \ + || { case "$host_os" in mingw*) true;; *) false;; esac; }; then if test "$cross_compiling" = yes; then : else @@ -33417,9 +34733,18 @@ cat >>conftest.$ac_ext <<_ACEOF #include #include +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include #include int main () { + int result = 0; + int found_some_locale = 0; /* This fails on Solaris. */ if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) { @@ -33432,8 +34757,9 @@ int main () { input[1] = '\0'; if (mbrtowc (&wc, input + 2, 5, &state) != 1) - return 1; + result |= 1; } + found_some_locale = 1; } /* This fails on HP-UX 11.11. */ if (setlocale (LC_ALL, "$LOCALE_JA") != NULL) @@ -33447,10 +34773,57 @@ int main () { input[1] = '\0'; if (mbrtowc (&wc, input + 2, 5, &state) != 2) - return 1; + result |= 2; } + found_some_locale = 1; } - return 0; + /* This fails on native Windows. */ + if (setlocale (LC_ALL, "Japanese_Japan.932") != NULL) + { + char input[] = "<\223\372\226\173\214\352>"; /* "<日本語>" */ + mbstate_t state; + wchar_t wc; + + memset (&state, '\0', sizeof (mbstate_t)); + if (mbrtowc (&wc, input + 3, 1, &state) == (size_t)(-2)) + { + input[3] = '\0'; + if (mbrtowc (&wc, input + 4, 4, &state) != 1) + result |= 4; + } + found_some_locale = 1; + } + if (setlocale (LC_ALL, "Chinese_Taiwan.950") != NULL) + { + char input[] = "<\244\351\245\273\273\171>"; /* "<日本語>" */ + mbstate_t state; + wchar_t wc; + + memset (&state, '\0', sizeof (mbstate_t)); + if (mbrtowc (&wc, input + 3, 1, &state) == (size_t)(-2)) + { + input[3] = '\0'; + if (mbrtowc (&wc, input + 4, 4, &state) != 1) + result |= 8; + } + found_some_locale = 1; + } + if (setlocale (LC_ALL, "Chinese_China.936") != NULL) + { + char input[] = "<\310\325\261\276\325\132>"; /* "<日本語>" */ + mbstate_t state; + wchar_t wc; + + memset (&state, '\0', sizeof (mbstate_t)); + if (mbrtowc (&wc, input + 3, 1, &state) == (size_t)(-2)) + { + input[3] = '\0'; + if (mbrtowc (&wc, input + 4, 4, &state) != 1) + result |= 16; + } + found_some_locale = 1; + } + return (found_some_locale ? result : 77); } _ACEOF rm -f conftest$ac_exeext @@ -33482,7 +34855,10 @@ $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -gl_cv_func_mbrtowc_retval=no +if test $? != 77; then + gl_cv_func_mbrtowc_retval=no + fi + fi rm -rf conftest.dSYM rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext @@ -33523,6 +34899,13 @@ cat >>conftest.$ac_ext <<_ACEOF #include #include +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include #include int main () { @@ -33581,11 +34964,21 @@ fi { $as_echo "$as_me:$LINENO: result: $gl_cv_func_mbrtowc_nul_retval" >&5 $as_echo "$gl_cv_func_mbrtowc_nul_retval" >&6; } - case "$gl_cv_func_mbrtowc_null_arg" in + case "$gl_cv_func_mbrtowc_null_arg1" in + *yes) ;; + *) +cat >>confdefs.h <<\_ACEOF +#define MBRTOWC_NULL_ARG1_BUG 1 +_ACEOF + + REPLACE_MBRTOWC=1 + ;; + esac + case "$gl_cv_func_mbrtowc_null_arg2" in *yes) ;; *) cat >>confdefs.h <<\_ACEOF -#define MBRTOWC_NULL_ARG_BUG 1 +#define MBRTOWC_NULL_ARG2_BUG 1 _ACEOF REPLACE_MBRTOWC=1 @@ -33679,6 +35072,7 @@ _ACEOF + if test $ac_cv_func_mbsinit = yes && test $ac_cv_func_mbrtowc = yes; then @@ -33709,6 +35103,13 @@ cat >>conftest.$ac_ext <<_ACEOF #include #include +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include #include int main () { @@ -33797,6 +35198,13 @@ cat >>conftest.$ac_ext <<_ACEOF #include #include #include +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include #include int main () { @@ -33889,6 +35297,10 @@ $as_echo "$gl_cv_func_mbrtowc_sanitycheck" >&6; } else if test $REPLACE_MBSTATE_T = 1; then REPLACE_MBSINIT=1 + else + case "$host_os" in + mingw*) REPLACE_MBSINIT=1 ;; + esac fi fi if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then @@ -33973,6 +35385,13 @@ cat >>conftest.$ac_ext <<_ACEOF #include #include +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include #include int main () { @@ -34061,6 +35480,13 @@ cat >>conftest.$ac_ext <<_ACEOF #include #include #include +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include #include int main () { @@ -34159,6 +35585,7 @@ $as_echo "$gl_cv_func_mbrtowc_sanitycheck" >&6; } + { $as_echo "$as_me:$LINENO: checking whether mbsrtowcs works" >&5 $as_echo_n "checking whether mbsrtowcs works... " >&6; } if test "${gl_cv_func_mbsrtowcs_works+set}" = set; then @@ -34166,12 +35593,12 @@ if test "${gl_cv_func_mbsrtowcs_works+set}" = set; then else case "$host_os" in - # Guess no on HP-UX and Solaris. - hpux* | solaris*) gl_cv_func_mbsrtowcs_works="guessing no" ;; - # Guess yes otherwise. - *) gl_cv_func_mbsrtowcs_works="guessing yes" ;; + # Guess no on HP-UX, Solaris, mingw. + hpux* | solaris* | mingw*) gl_cv_func_mbsrtowcs_works="guessing no" ;; + # Guess yes otherwise. + *) gl_cv_func_mbsrtowcs_works="guessing yes" ;; esac - if test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none || test $LOCALE_ZH_CN != none; then + if test $LOCALE_FR != none || test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none || test $LOCALE_ZH_CN != none; then if test "$cross_compiling" = yes; then : else @@ -34184,9 +35611,30 @@ cat >>conftest.$ac_ext <<_ACEOF #include #include +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include #include int main () { + int result = 0; + /* Test whether the function supports a NULL destination argument. + This fails on native Windows. */ + if (setlocale (LC_ALL, "$LOCALE_FR") != NULL) + { + const char input[] = "\337er"; + const char *src = input; + mbstate_t state; + + memset (&state, '\0', sizeof (mbstate_t)); + if (mbsrtowcs (NULL, &src, 1, &state) != 3 + || src != input) + result |= 1; + } /* Test whether the function works when started with a conversion state in non-initial state. This fails on HP-UX 11.11 and Solaris 10. */ if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) @@ -34200,7 +35648,7 @@ int main () { const char *src = input + 2; if (mbsrtowcs (NULL, &src, 10, &state) != 4) - return 1; + result |= 2; } } if (setlocale (LC_ALL, "$LOCALE_JA") != NULL) @@ -34214,7 +35662,7 @@ int main () { const char *src = input + 4; if (mbsrtowcs (NULL, &src, 10, &state) != 3) - return 1; + result |= 4; } } if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL) @@ -34228,10 +35676,10 @@ int main () { const char *src = input + 2; if (mbsrtowcs (NULL, &src, 10, &state) != 4) - return 1; + result |= 8; } } - return 0; + return result; } _ACEOF rm -f conftest$ac_exeext @@ -34324,8 +35772,43 @@ _ACEOF - # Code from module mbuiter: + # Code from module mbtowc: + + + + if false; then + REPLACE_MBTOWC=1 + fi + if test $REPLACE_MBTOWC = 1; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS mbtowc.$ac_objext" + + : + + fi + + + + + GNULIB_MBTOWC=1 + + + +cat >>confdefs.h <<\_ACEOF +#define GNULIB_TEST_MBTOWC 1 +_ACEOF + + + + # Code from module mbuiter: @@ -34997,10 +36480,14 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -if (!mkfifo ("conftest.tmp/", 0600)) return 1; +int result = 0; + if (!mkfifo ("conftest.tmp/", 0600)) + result |= 1; #if HAVE_LSTAT - if (!mkfifo ("conftest.lnk/", 0600)) return 2; + if (!mkfifo ("conftest.lnk/", 0600)) + result |= 2; #endif + return result; ; return 0; @@ -35225,7 +36712,7 @@ $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -if test $? == 99 && test x"$FORCE_UNSAFE_CONFIGURE" = x; then +if test $? = 99 && test x"$FORCE_UNSAFE_CONFIGURE" = x; then { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { { $as_echo "$as_me:$LINENO: error: you should not run configure as root (set FORCE_UNSAFE_CONFIGURE=1 in environment to bypass this check) @@ -35456,22 +36943,26 @@ year_2050_test () int main () { + int result = 0; time_t t, delta; int i, j; + int time_t_signed_magnitude = (time_t) ~ (time_t) 0 < (time_t) -1; + int time_t_signed = ! ((time_t) 0 < (time_t) -1); /* This test makes some buggy mktime implementations loop. Give up after 60 seconds; a mktime slower than that isn't worth using anyway. */ alarm (60); - for (;;) - { - t = (time_t_max << 1) + 1; - if (t <= time_t_max) - break; - time_t_max = t; - } - time_t_min = - ((time_t) ~ (time_t) 0 == (time_t) -1) - time_t_max; + time_t_max = (! time_t_signed + ? (time_t) -1 + : ((((time_t) 1 << (sizeof (time_t) * CHAR_BIT - 2)) - 1) + * 2 + 1)); + time_t_min = (! time_t_signed + ? (time_t) 0 + : time_t_signed_magnitude + ? ~ (time_t) 0 + : ~ time_t_max); delta = time_t_max / 997; /* a suitable prime number */ for (i = 0; i < N_STRINGS; i++) @@ -35481,21 +36972,27 @@ main () for (t = 0; t <= time_t_max - delta; t += delta) if (! mktime_test (t)) - return 1; + result |= 1; if (! (mktime_test ((time_t) 1) && mktime_test ((time_t) (60 * 60)) && mktime_test ((time_t) (60 * 60 * 24)))) - return 1; + result |= 2; for (j = 1; ; j <<= 1) if (! bigtime_test (j)) - return 1; + result |= 4; else if (INT_MAX / 2 < j) break; if (! bigtime_test (INT_MAX)) - return 1; + result |= 8; } - return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ()); + if (! irix_6_4_bug ()) + result |= 16; + if (! spring_forward_gap ()) + result |= 32; + if (! year_2050_test ()) + result |= 64; + return result; } _ACEOF rm -f conftest$ac_exeext @@ -35597,8 +37094,91 @@ _ACEOF - if test $ac_cv_func_nl_langinfo = yes; then - if test $HAVE_LANGINFO_CODESET = 1 && test $HAVE_LANGINFO_ERA = 1; then + if test $ac_cv_func_nl_langinfo = yes; then + # On Irix 6.5, YESEXPR is defined, but nl_langinfo(YESEXPR) is broken. + { $as_echo "$as_me:$LINENO: checking whether YESEXPR works" >&5 +$as_echo_n "checking whether YESEXPR works... " >&6; } +if test "${gl_cv_func_nl_langinfo_yesexpr_works+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then + + case "$host_os" in + # Guess no on irix systems. + irix*) gl_cv_func_nl_langinfo_yesexpr_works="guessing no";; + # Guess yes elsewhere. + *) gl_cv_func_nl_langinfo_yesexpr_works="guessing yes";; + esac + +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +int +main () +{ +return !*nl_langinfo(YESEXPR); + + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + gl_cv_func_nl_langinfo_yesexpr_works=yes +else + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +gl_cv_func_nl_langinfo_yesexpr_works=no +fi +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + + + +fi +{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_nl_langinfo_yesexpr_works" >&5 +$as_echo "$gl_cv_func_nl_langinfo_yesexpr_works" >&6; } + case $gl_cv_func_nl_langinfo_yesexpr_works in + *yes) FUNC_NL_LANGINFO_YESEXPR_WORKS=1 ;; + *) FUNC_NL_LANGINFO_YESEXPR_WORKS=0 ;; + esac + +cat >>confdefs.h <<_ACEOF +#define FUNC_NL_LANGINFO_YESEXPR_WORKS $FUNC_NL_LANGINFO_YESEXPR_WORKS +_ACEOF + + if test $HAVE_LANGINFO_CODESET = 1 && test $HAVE_LANGINFO_ERA = 1 \ + && test $FUNC_NL_LANGINFO_YESEXPR_WORKS = 1; then : else REPLACE_NL_LANGINFO=1 @@ -35782,7 +37362,7 @@ else if test "$cross_compiling" = yes; then case "$host_os" in - freebsd* | aix* | hpux* | solaris2.[0-9]*) + freebsd* | aix* | hpux* | solaris2.[0-9] | solaris2.[0-9].*) gl_cv_func_open_slash="guessing no" ;; *) gl_cv_func_open_slash="guessing yes" ;; @@ -35802,10 +37382,14 @@ cat >>conftest.$ac_ext <<_ACEOF #endif int main () { + int result = 0; #if HAVE_LSTAT - if (open ("conftest.lnk/", O_RDONLY) != -1) return 2; + if (open ("conftest.lnk/", O_RDONLY) != -1) + result |= 1; #endif - return open ("conftest.sl/", O_CREAT, 0600) >= 0; + if (open ("conftest.sl/", O_CREAT, 0600) >= 0) + result |= 2; + return result; } _ACEOF rm -f conftest$ac_exeext @@ -36143,6 +37727,7 @@ done fi + { $as_echo "$as_me:$LINENO: checking for fchownat" >&5 $as_echo_n "checking for fchownat... " >&6; } if test "${ac_cv_func_fchownat+set}" = set; then @@ -36230,6 +37815,8 @@ fi $as_echo "$ac_cv_func_fchownat" >&6; } if test "x$ac_cv_func_fchownat" = x""yes; then + + { $as_echo "$as_me:$LINENO: checking whether fchownat works with AT_SYMLINK_NOFOLLOW" >&5 $as_echo_n "checking whether fchownat works with AT_SYMLINK_NOFOLLOW... " >&6; } if test "${gl_cv_func_fchownat_nofollow_works+set}" = set; then @@ -36314,6 +37901,96 @@ cat >>confdefs.h <<\_ACEOF _ACEOF +fi + + + + + + { $as_echo "$as_me:$LINENO: checking whether fchownat works with an empty file name" >&5 +$as_echo_n "checking whether fchownat works with an empty file name... " >&6; } +if test "${gl_cv_func_fchownat_empty_filename_works+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then + gl_cv_func_fchownat_empty_filename_works="guessing no" +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + #include + +int +main () +{ +int fd; + int ret; + if (mkdir ("conftestdir", 0700) < 0) + return 2; + fd = open ("conftestdir", O_RDONLY); + if (fd < 0) + return 3; + ret = fchownat (fd, "", -1, -1, 0); + close (fd); + rmdir ("conftestdir"); + return ret == 0; + + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + gl_cv_func_fchownat_empty_filename_works=yes +else + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +gl_cv_func_fchownat_empty_filename_works=no +fi +rm -rf conftest.dSYM +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + + + +fi +{ $as_echo "$as_me:$LINENO: result: $gl_cv_func_fchownat_empty_filename_works" >&5 +$as_echo "$gl_cv_func_fchownat_empty_filename_works" >&6; } + if test "$gl_cv_func_fchownat_empty_filename_works" != yes; then + REPLACE_FCHOWNAT=1 + +cat >>confdefs.h <<\_ACEOF +#define FCHOWNAT_EMPTY_FILENAME_BUG 1 +_ACEOF + + fi @@ -36613,9 +38290,11 @@ cat >>conftest.$ac_ext <<_ACEOF #include /* for time_t */ #include /* for CHAR_BIT, LONG_MIN, LONG_MAX */ #define TYPE_MINIMUM(t) \ - ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1))) + ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ TYPE_MAXIMUM (t))) #define TYPE_MAXIMUM(t) \ - ((t) ((t) 0 < (t) -1 ? (t) -1 : ~ (~ (t) 0 << (sizeof (t) * CHAR_BIT - 1)))) + ((t) ((t) 0 < (t) -1 \ + ? (t) -1 \ + : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1))) typedef int verify_min[2 * (LONG_MIN <= TYPE_MINIMUM (time_t)) - 1]; typedef int verify_max[2 * (TYPE_MAXIMUM (time_t) <= LONG_MAX) - 1]; @@ -37355,13 +39034,6 @@ _ACEOF # Code from module regex: - - - - - - - # Check whether --with-included-regex was given. if test "${with_included_regex+set}" = set; then withval=$with_included_regex; @@ -37391,57 +39063,53 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default - #if HAVE_LOCALE_H - #include - #endif + #include #include #include int main () { -static struct re_pattern_buffer regex; +int result = 0; + static struct re_pattern_buffer regex; unsigned char folded_chars[UCHAR_MAX + 1]; int i; const char *s; struct re_registers regs; - #if HAVE_LOCALE_H - /* http://sourceware.org/ml/libc-hacker/2006-09/msg00008.html - This test needs valgrind to catch the bug on Debian - GNU/Linux 3.1 x86, but it might catch the bug better - on other platforms and it shouldn't hurt to try the - test here. */ - if (setlocale (LC_ALL, "en_US.UTF-8")) - { - static char const pat[] = "insert into"; - static char const data[] = - "\xFF\0\x12\xA2\xAA\xC4\xB1,K\x12\xC4\xB1*\xACK"; - re_set_syntax (RE_SYNTAX_GREP | RE_HAT_LISTS_NOT_NEWLINE - | RE_ICASE); - memset (®ex, 0, sizeof regex); - s = re_compile_pattern (pat, sizeof pat - 1, ®ex); - if (s) - return 1; - if (re_search (®ex, data, sizeof data - 1, - 0, sizeof data - 1, ®s) - != -1) - return 1; - if (! setlocale (LC_ALL, "C")) - return 1; - } - #endif + /* http://sourceware.org/ml/libc-hacker/2006-09/msg00008.html + This test needs valgrind to catch the bug on Debian + GNU/Linux 3.1 x86, but it might catch the bug better + on other platforms and it shouldn't hurt to try the + test here. */ + if (setlocale (LC_ALL, "en_US.UTF-8")) + { + static char const pat[] = "insert into"; + static char const data[] = + "\xFF\0\x12\xA2\xAA\xC4\xB1,K\x12\xC4\xB1*\xACK"; + re_set_syntax (RE_SYNTAX_GREP | RE_HAT_LISTS_NOT_NEWLINE + | RE_ICASE); + memset (®ex, 0, sizeof regex); + s = re_compile_pattern (pat, sizeof pat - 1, ®ex); + if (s) + result |= 1; + else if (re_search (®ex, data, sizeof data - 1, + 0, sizeof data - 1, ®s) + != -1) + result |= 1; + if (! setlocale (LC_ALL, "C")) + return 1; + } /* This test is from glibc bug 3957, reported by Andrew Mackey. */ re_set_syntax (RE_SYNTAX_EGREP | RE_HAT_LISTS_NOT_NEWLINE); memset (®ex, 0, sizeof regex); s = re_compile_pattern ("a[^x]b", 6, ®ex); if (s) - return 1; - + result |= 2; /* This should fail, but succeeds for glibc-2.5. */ - if (re_search (®ex, "a\nb", 3, 0, 3, ®s) != -1) - return 1; + else if (re_search (®ex, "a\nb", 3, 0, 3, ®s) != -1) + result |= 2; /* This regular expression is from Spencer ere test number 75 in grep-2.3. */ @@ -37453,7 +39121,7 @@ static struct re_pattern_buffer regex; s = re_compile_pattern ("a[[:]:]]b\n", 11, ®ex); /* This should fail with _Invalid character class name_ error. */ if (!s) - return 1; + result |= 4; /* Ensure that [b-a] is diagnosed as invalid, when using RE_NO_EMPTY_RANGES. */ @@ -37461,34 +39129,31 @@ static struct re_pattern_buffer regex; memset (®ex, 0, sizeof regex); s = re_compile_pattern ("a[b-a]", 6, ®ex); if (s == 0) - return 1; + result |= 8; /* This should succeed, but does not for glibc-2.1.3. */ memset (®ex, 0, sizeof regex); s = re_compile_pattern ("{1", 2, ®ex); - if (s) - return 1; + result |= 8; /* The following example is derived from a problem report against gawk from Jorge Stolfi . */ memset (®ex, 0, sizeof regex); s = re_compile_pattern ("[an\371]*n", 7, ®ex); if (s) - return 1; - + result |= 8; /* This should match, but does not for glibc-2.2.1. */ - if (re_match (®ex, "an", 2, 0, ®s) != 2) - return 1; + else if (re_match (®ex, "an", 2, 0, ®s) != 2) + result |= 8; memset (®ex, 0, sizeof regex); s = re_compile_pattern ("x", 1, ®ex); if (s) - return 1; - + result |= 8; /* glibc-2.2.93 does not work with a negative RANGE argument. */ - if (re_search (®ex, "wxy", 3, 2, -2, ®s) != 1) - return 1; + else if (re_search (®ex, "wxy", 3, 2, -2, ®s) != 1) + result |= 8; /* The version of regex.c in older versions of gnulib ignored RE_ICASE. Detect that problem too. */ @@ -37496,10 +39161,9 @@ static struct re_pattern_buffer regex; memset (®ex, 0, sizeof regex); s = re_compile_pattern ("x", 1, ®ex); if (s) - return 1; - - if (re_search (®ex, "WXY", 3, 0, 3, ®s) < 0) - return 1; + result |= 16; + else if (re_search (®ex, "WXY", 3, 0, 3, ®s) < 0) + result |= 16; /* Catch a bug reported by Vin Shelton in http://lists.gnu.org/archive/html/bug-coreutils/2007-06/msg00089.html @@ -37510,12 +39174,12 @@ static struct re_pattern_buffer regex; memset (®ex, 0, sizeof regex); s = re_compile_pattern ("[[:alnum:]_-]\\\\+$", 16, ®ex); if (s) - return 1; + result |= 32; /* REG_STARTEND was added to glibc on 2004-01-15. Reject older versions. */ if (! REG_STARTEND) - return 1; + result |= 64; #if 0 /* It would be nice to reject hosts whose regoff_t values are too @@ -37526,10 +39190,11 @@ static struct re_pattern_buffer regex; when compiling --without-included-regex. */ if (sizeof (regoff_t) < sizeof (ptrdiff_t) || sizeof (regoff_t) < sizeof (ssize_t)) - return 1; + result |= 64; #endif - return 0; + return result; + ; return 0; } @@ -37930,8 +39595,8 @@ $as_echo_n "checking whether rename honors trailing slash on destination... " >& if test "${gl_cv_func_rename_slash_dst_works+set}" = set; then $as_echo_n "(cached) " >&6 else - rm -rf conftest.f conftest.f1 conftest.d1 conftest.d2 conftest.lnk - touch conftest.f && mkdir conftest.d1 || + rm -rf conftest.f conftest.f1 conftest.f2 conftest.d1 conftest.d2 conftest.lnk + touch conftest.f && touch conftest.f1 && mkdir conftest.d1 || { { $as_echo "$as_me:$LINENO: error: cannot create temporary files" >&5 $as_echo "$as_me: error: cannot create temporary files" >&2;} { (exit 1); exit 1; }; } @@ -37949,17 +39614,22 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -# include -# include +# include +# include int main () { -if (rename ("conftest.f", "conftest.f1/") == 0) return 1; - if (rename ("conftest.d1", "conftest.d2/") != 0) return 2; +int result = 0; + if (rename ("conftest.f1", "conftest.f2/") == 0) + result |= 1; + if (rename ("conftest.d1", "conftest.d2/") != 0) + result |= 2; #if HAVE_LSTAT - if (rename ("conftest.f", "conftest.lnk/") == 0) return 3; + if (rename ("conftest.f", "conftest.lnk/") == 0) + result |= 4; #endif + return result; ; return 0; @@ -38001,7 +39671,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$a fi - rm -rf conftest.f conftest.f1 conftest.d1 conftest.d2 conftest.lnk + rm -rf conftest.f conftest.f1 conftest.f2 conftest.d1 conftest.d2 conftest.lnk fi { $as_echo "$as_me:$LINENO: result: $gl_cv_func_rename_slash_dst_works" >&5 @@ -38030,8 +39700,8 @@ $as_echo_n "checking whether rename honors trailing slash on source... " >&6; } if test "${gl_cv_func_rename_slash_src_works+set}" = set; then $as_echo_n "(cached) " >&6 else - rm -rf conftest.f conftest.d1 conftest.d2 conftest.lnk - touch conftest.f && mkdir conftest.d1 || + rm -rf conftest.f conftest.f1 conftest.d1 conftest.d2 conftest.d3 conftest.lnk + touch conftest.f && touch conftest.f1 && mkdir conftest.d1 || { { $as_echo "$as_me:$LINENO: error: cannot create temporary files" >&5 $as_echo "$as_me: error: cannot create temporary files" >&2;} { (exit 1); exit 1; }; } @@ -38049,17 +39719,22 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -# include -# include +# include +# include int main () { -if (rename ("conftest.f/", "conftest.d2") == 0) return 1; - if (rename ("conftest.d1/", "conftest.d2") != 0) return 2; +int result = 0; + if (rename ("conftest.f1/", "conftest.d3") == 0) + result |= 1; + if (rename ("conftest.d1/", "conftest.d2") != 0) + result |= 2; #if HAVE_LSTAT - if (rename ("conftest.lnk/", "conftest.f") == 0) return 3; + if (rename ("conftest.lnk/", "conftest.f") == 0) + result |= 4; #endif + return result; ; return 0; @@ -38101,7 +39776,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$a fi - rm -rf conftest.f conftest.d1 conftest.d2 conftest.lnk + rm -rf conftest.f conftest.f1 conftest.d1 conftest.d2 conftest.d3 conftest.lnk fi { $as_echo "$as_me:$LINENO: result: $gl_cv_func_rename_slash_src_works" >&5 @@ -38143,17 +39818,24 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -# include -# include -# include +# include +# include +# include int main () { -if (rename ("conftest.f", "conftest.f1")) return 1; - if (unlink ("conftest.f1")) return 2; - if (rename ("conftest.f", "conftest.f")) return 3; - if (rename ("conftest.f1", "conftest.f1") == 0) return 4; +int result = 0; + if (rename ("conftest.f", "conftest.f1")) + result |= 1; + if (unlink ("conftest.f1")) + result |= 2; + if (rename ("conftest.f", "conftest.f")) + result |= 4; + if (rename ("conftest.f1", "conftest.f1") == 0) + result |= 8; + return result; + ; return 0; } @@ -38241,14 +39923,19 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -# include -# include +# include +# include int main () { -if (rename ("conftest.d1", "conftest.d2") != 0) return 1; - if (rename ("conftest.d2", "conftest.f") == 0) return 2; +int result = 0; + if (rename ("conftest.d1", "conftest.d2") != 0) + result |= 1; + if (rename ("conftest.d2", "conftest.f") == 0) + result |= 2; + return result; + ; return 0; } @@ -38400,7 +40087,6 @@ _ACEOF # Code from module rmdir: - { $as_echo "$as_me:$LINENO: checking whether rmdir works" >&5 $as_echo_n "checking whether rmdir works... " >&6; } if test "${gl_cv_func_rmdir_works+set}" = set; then @@ -38424,8 +40110,15 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -return !rmdir ("conftest.file/") || errno != ENOTDIR - || !rmdir ("conftest.dir/./"); +int result = 0; + if (!rmdir ("conftest.file/")) + result |= 1; + else if (errno != ENOTDIR) + result |= 2; + if (!rmdir ("conftest.dir/./")) + result |= 4; + return result; + ; return 0; } @@ -39822,7 +41515,12 @@ main () signal (SIGALRM, handle_alarm); alarm (1); remaining = sleep (pentecost); - return !(pentecost - 10 < remaining && remaining <= pentecost); + if (remaining > pentecost) + return 3; + if (remaining <= pentecost - 10) + return 4; + return 0; + ; return 0; } @@ -40069,7 +41767,12 @@ $as_echo "$gl_cv_func_snprintf_size1" >&6; } case "$gl_cv_func_snprintf_size1" in *yes) - gl_cv_func_snprintf_usable=yes + + case "$gl_cv_func_snprintf_retval_c99" in + *yes) + gl_cv_func_snprintf_usable=yes + ;; + esac ;; esac fi @@ -40113,6 +41816,13 @@ _ACEOF + + +cat >>confdefs.h <<_ACEOF +#define GNULIB_SNPRINTF 1 +_ACEOF + + # Code from module ssize_t: { $as_echo "$as_me:$LINENO: checking for ssize_t" >&5 @@ -40183,7 +41893,6 @@ _ACEOF - { $as_echo "$as_me:$LINENO: checking whether stat handles trailing slashes on directories" >&5 $as_echo_n "checking whether stat handles trailing slashes on directories... " >&6; } if test "${gl_cv_func_stat_dir_slash+set}" = set; then @@ -40274,11 +41983,15 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -struct stat st; - if (!stat ("conftest.tmp/", &st)) return 1; +int result = 0; + struct stat st; + if (!stat ("conftest.tmp/", &st)) + result |= 1; #if HAVE_LSTAT - if (!stat ("conftest.lnk/", &st)) return 2; + if (!stat ("conftest.lnk/", &st)) + result |= 2; #endif + return result; ; return 0; @@ -41308,9 +43021,6 @@ rm -f conftest* - - - if test $gl_cv_have_include_next = yes; then gl_cv_next_stdarg_h='<'stdarg.h'>' else @@ -41320,8 +43030,7 @@ if test "${gl_cv_next_stdarg_h+set}" = set; then $as_echo_n "(cached) " >&6 else - if test $ac_cv_header_stdarg_h = yes; then - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -41330,20 +43039,18 @@ cat >>conftest.$ac_ext <<_ACEOF #include _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - gl_cv_next_stdarg_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n '\#/stdarg.h#{ - s#.*"\(.*/stdarg.h\)".*#\1# - s#^/[^/]#//&# - p - q - }'`'"' - else - gl_cv_next_stdarg_h='<'stdarg.h'>' - fi + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_stdarg_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n '\#/stdarg.h#{ + s#.*"\(.*/stdarg.h\)".*#\1# + s#^/[^/]#//&# + p + q + }'`'"' + fi { $as_echo "$as_me:$LINENO: result: $gl_cv_next_stdarg_h" >&5 @@ -41362,6 +43069,7 @@ $as_echo "$gl_cv_next_stdarg_h" >&6; } + if test "$gl_cv_next_stdarg_h" = '""'; then gl_cv_next_stdarg_h='"///usr/include/stdarg.h"' NEXT_STDARG_H="$gl_cv_next_stdarg_h" @@ -41535,9 +43243,6 @@ $as_echo "$gl_cv_decl_null_works" >&6; } - - - if test $gl_cv_have_include_next = yes; then gl_cv_next_stddef_h='<'stddef.h'>' else @@ -41547,8 +43252,7 @@ if test "${gl_cv_next_stddef_h+set}" = set; then $as_echo_n "(cached) " >&6 else - if test $ac_cv_header_stddef_h = yes; then - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -41557,20 +43261,18 @@ cat >>conftest.$ac_ext <<_ACEOF #include _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - gl_cv_next_stddef_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n '\#/stddef.h#{ - s#.*"\(.*/stddef.h\)".*#\1# - s#^/[^/]#//&# - p - q - }'`'"' - else - gl_cv_next_stddef_h='<'stddef.h'>' - fi + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_stddef_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n '\#/stddef.h#{ + s#.*"\(.*/stddef.h\)".*#\1# + s#^/[^/]#//&# + p + q + }'`'"' + fi { $as_echo "$as_me:$LINENO: result: $gl_cv_next_stddef_h" >&5 @@ -41589,6 +43291,7 @@ $as_echo "$gl_cv_next_stddef_h" >&6; } + fi # Code from module stdint: @@ -41609,6 +43312,19 @@ $as_echo "$gl_cv_next_stddef_h" >&6; } fi + + + + + + + if test $ac_cv_header_wchar_h = yes; then + HAVE_WCHAR_H=1 + else + HAVE_WCHAR_H=0 + fi + + if test $ac_cv_header_inttypes_h = yes; then HAVE_INTTYPES_H=1 else @@ -41634,6 +43350,9 @@ $as_echo "$gl_cv_next_stddef_h" >&6; } + + + if test $gl_cv_have_include_next = yes; then gl_cv_next_stdint_h='<'stdint.h'>' else @@ -41643,8 +43362,10 @@ if test "${gl_cv_next_stdint_h+set}" = set; then $as_echo_n "(cached) " >&6 else - if test $ac_cv_header_stdint_h = yes; then - cat >conftest.$ac_ext <<_ACEOF + if test $ac_cv_header_stdint_h = yes; then + + + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -41653,20 +43374,21 @@ cat >>conftest.$ac_ext <<_ACEOF #include _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - gl_cv_next_stdint_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n '\#/stdint.h#{ - s#.*"\(.*/stdint.h\)".*#\1# - s#^/[^/]#//&# - p - q - }'`'"' + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_stdint_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n '\#/stdint.h#{ + s#.*"\(.*/stdint.h\)".*#\1# + s#^/[^/]#//&# + p + q + }'`'"' else - gl_cv_next_stdint_h='<'stdint.h'>' - fi + gl_cv_next_stdint_h='<'stdint.h'>' + fi + fi { $as_echo "$as_me:$LINENO: result: $gl_cv_next_stdint_h" >&5 @@ -41685,6 +43407,7 @@ $as_echo "$gl_cv_next_stdint_h" >&6; } + if test $ac_cv_header_stdint_h = yes; then HAVE_STDINT_H=1 else @@ -41802,9 +43525,11 @@ uintmax_t j = UINTMAX_MAX; #include /* for CHAR_BIT */ #define TYPE_MINIMUM(t) \ - ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1))) + ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ TYPE_MAXIMUM (t))) #define TYPE_MAXIMUM(t) \ - ((t) ((t) 0 < (t) -1 ? (t) -1 : ~ (~ (t) 0 << (sizeof (t) * CHAR_BIT - 1)))) + ((t) ((t) 0 < (t) -1 \ + ? (t) -1 \ + : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1))) struct s { int check_PTRDIFF: PTRDIFF_MIN == TYPE_MINIMUM (ptrdiff_t) @@ -41961,7 +43686,7 @@ main () || strncmp (value, "((int)"/*)*/, 6) == 0 || strncmp (value, "((signed short)"/*)*/, 15) == 0 || strncmp (value, "((signed char)"/*)*/, 14) == 0) - return 1; + return mv - macro_values + 1; } return 0; @@ -42187,13 +43912,6 @@ done - - - - - - - if test $APPLE_UNIVERSAL_BUILD = 0; then @@ -43336,10 +45054,6 @@ _ACEOF - - - - if test $gl_cv_have_include_next = yes; then gl_cv_next_stdio_h='<'stdio.h'>' else @@ -43349,8 +45063,7 @@ if test "${gl_cv_next_stdio_h+set}" = set; then $as_echo_n "(cached) " >&6 else - if test $ac_cv_header_stdio_h = yes; then - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -43359,20 +45072,18 @@ cat >>conftest.$ac_ext <<_ACEOF #include _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - gl_cv_next_stdio_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n '\#/stdio.h#{ - s#.*"\(.*/stdio.h\)".*#\1# - s#^/[^/]#//&# - p - q - }'`'"' - else - gl_cv_next_stdio_h='<'stdio.h'>' - fi + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_stdio_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n '\#/stdio.h#{ + s#.*"\(.*/stdio.h\)".*#\1# + s#^/[^/]#//&# + p + q + }'`'"' + fi { $as_echo "$as_me:$LINENO: result: $gl_cv_next_stdio_h" >&5 @@ -43391,6 +45102,7 @@ $as_echo "$gl_cv_next_stdio_h" >&6; } + GNULIB_FPRINTF=1 GNULIB_PRINTF=1 GNULIB_VFPRINTF=1 @@ -43496,9 +45208,6 @@ fi - - - if test $gl_cv_have_include_next = yes; then gl_cv_next_stdlib_h='<'stdlib.h'>' else @@ -43508,8 +45217,7 @@ if test "${gl_cv_next_stdlib_h+set}" = set; then $as_echo_n "(cached) " >&6 else - if test $ac_cv_header_stdlib_h = yes; then - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -43518,20 +45226,18 @@ cat >>conftest.$ac_ext <<_ACEOF #include _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - gl_cv_next_stdlib_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n '\#/stdlib.h#{ - s#.*"\(.*/stdlib.h\)".*#\1# - s#^/[^/]#//&# - p - q - }'`'"' - else - gl_cv_next_stdlib_h='<'stdlib.h'>' - fi + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_stdlib_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n '\#/stdlib.h#{ + s#.*"\(.*/stdlib.h\)".*#\1# + s#^/[^/]#//&# + p + q + }'`'"' + fi { $as_echo "$as_me:$LINENO: result: $gl_cv_next_stdlib_h" >&5 @@ -43551,188 +45257,6 @@ $as_echo "$gl_cv_next_stdlib_h" >&6; } -for ac_header in random.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - if test $ac_cv_header_random_h = yes; then - HAVE_RANDOM_H=1 - else - HAVE_RANDOM_H=0 - fi - - { $as_echo "$as_me:$LINENO: checking for struct random_data" >&5 -$as_echo_n "checking for struct random_data... " >&6; } -if test "${ac_cv_type_struct_random_data+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_type_struct_random_data=no -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - #if HAVE_RANDOM_H - # include - #endif - - -int -main () -{ -if (sizeof (struct random_data)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - #if HAVE_RANDOM_H - # include - #endif - - -int -main () -{ -if (sizeof ((struct random_data))) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_struct_random_data=yes -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_random_data" >&5 -$as_echo "$ac_cv_type_struct_random_data" >&6; } -if test "x$ac_cv_type_struct_random_data" = x""yes; then - -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_RANDOM_DATA 1 -_ACEOF - - -else - HAVE_STRUCT_RANDOM_DATA=0 -fi - @@ -44808,9 +46332,6 @@ _ACEOF # Code from module strnlen1: # Code from module strtoimax: - - - { $as_echo "$as_me:$LINENO: checking whether defines strtoimax as a macro" >&5 $as_echo_n "checking whether defines strtoimax as a macro... " >&6; } if test "${gl_cv_func_strtoimax_macro+set}" = set; then @@ -45552,9 +47073,6 @@ _ACEOF # Code from module strtoumax: - - - { $as_echo "$as_me:$LINENO: checking whether defines strtoumax as a macro" >&5 $as_echo_n "checking whether defines strtoumax as a macro... " >&6; } if test "${gl_cv_func_strtoumax_macro+set}" = set; then @@ -45821,9 +47339,15 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -if (!symlink ("a", "conftest.link/")) return 1; - if (symlink ("conftest.f", "conftest.lnk2")) return 2; - if (!symlink ("a", "conftest.lnk2/")) return 3; +int result = 0; + if (!symlink ("a", "conftest.link/")) + result |= 1; + if (symlink ("conftest.f", "conftest.lnk2")) + result |= 2; + else if (!symlink ("a", "conftest.lnk2/")) + result |= 4; + return result; + ; return 0; } @@ -45952,6 +47476,9 @@ _ACEOF + + + if test $gl_cv_have_include_next = yes; then gl_cv_next_sys_stat_h='<'sys/stat.h'>' @@ -45962,8 +47489,10 @@ if test "${gl_cv_next_sys_stat_h+set}" = set; then $as_echo_n "(cached) " >&6 else - if test $ac_cv_header_sys_stat_h = yes; then - cat >conftest.$ac_ext <<_ACEOF + if test $ac_cv_header_sys_stat_h = yes; then + + + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -45972,20 +47501,21 @@ cat >>conftest.$ac_ext <<_ACEOF #include _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - gl_cv_next_sys_stat_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n '\#/sys/stat.h#{ - s#.*"\(.*/sys/stat.h\)".*#\1# - s#^/[^/]#//&# - p - q - }'`'"' + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_sys_stat_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n '\#/sys/stat.h#{ + s#.*"\(.*/sys/stat.h\)".*#\1# + s#^/[^/]#//&# + p + q + }'`'"' else - gl_cv_next_sys_stat_h='<'sys/stat.h'>' - fi + gl_cv_next_sys_stat_h='<'sys/stat.h'>' + fi + fi { $as_echo "$as_me:$LINENO: result: $gl_cv_next_sys_stat_h" >&5 @@ -46005,6 +47535,7 @@ $as_echo "$gl_cv_next_sys_stat_h" >&6; } + { $as_echo "$as_me:$LINENO: checking for nlink_t" >&5 $as_echo_n "checking for nlink_t... " >&6; } if test "${ac_cv_type_nlink_t+set}" = set; then @@ -46307,6 +47838,9 @@ $as_echo "$MKDIR_P" >&6; } + + + if test $gl_cv_have_include_next = yes; then gl_cv_next_sysexits_h='<'sysexits.h'>' else @@ -46316,8 +47850,10 @@ if test "${gl_cv_next_sysexits_h+set}" = set; then $as_echo_n "(cached) " >&6 else - if test $ac_cv_header_sysexits_h = yes; then - cat >conftest.$ac_ext <<_ACEOF + if test $ac_cv_header_sysexits_h = yes; then + + + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -46326,20 +47862,21 @@ cat >>conftest.$ac_ext <<_ACEOF #include _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - gl_cv_next_sysexits_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n '\#/sysexits.h#{ - s#.*"\(.*/sysexits.h\)".*#\1# - s#^/[^/]#//&# - p - q - }'`'"' + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_sysexits_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n '\#/sysexits.h#{ + s#.*"\(.*/sysexits.h\)".*#\1# + s#^/[^/]#//&# + p + q + }'`'"' else - gl_cv_next_sysexits_h='<'sysexits.h'>' - fi + gl_cv_next_sysexits_h='<'sysexits.h'>' + fi + fi { $as_echo "$as_me:$LINENO: result: $gl_cv_next_sysexits_h" >&5 @@ -46358,6 +47895,7 @@ $as_echo "$gl_cv_next_sysexits_h" >&6; } + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -46460,9 +47998,18 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test $ac_cv_have_decl_localtime_r = no; then + HAVE_DECL_LOCALTIME_R=0 + fi + + + + + if test $ac_cv_func_localtime_r = yes; then + HAVE_LOCALTIME_R=1 { $as_echo "$as_me:$LINENO: checking whether localtime_r is compatible with its POSIX signature" >&5 $as_echo_n "checking whether localtime_r is compatible with its POSIX signature... " >&6; } if test "${gl_cv_time_r_posix+set}" = set; then @@ -46579,6 +48126,9 @@ _ACEOF + + + if test $gl_cv_have_include_next = yes; then gl_cv_next_unistd_h='<'unistd.h'>' else @@ -46588,8 +48138,10 @@ if test "${gl_cv_next_unistd_h+set}" = set; then $as_echo_n "(cached) " >&6 else - if test $ac_cv_header_unistd_h = yes; then - cat >conftest.$ac_ext <<_ACEOF + if test $ac_cv_header_unistd_h = yes; then + + + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -46598,20 +48150,21 @@ cat >>conftest.$ac_ext <<_ACEOF #include _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - gl_cv_next_unistd_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n '\#/unistd.h#{ - s#.*"\(.*/unistd.h\)".*#\1# - s#^/[^/]#//&# - p - q - }'`'"' + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_unistd_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n '\#/unistd.h#{ + s#.*"\(.*/unistd.h\)".*#\1# + s#^/[^/]#//&# + p + q + }'`'"' else - gl_cv_next_unistd_h='<'unistd.h'>' - fi + gl_cv_next_unistd_h='<'unistd.h'>' + fi + fi { $as_echo "$as_me:$LINENO: result: $gl_cv_next_unistd_h" >&5 @@ -46631,12 +48184,6 @@ $as_echo "$gl_cv_next_unistd_h" >&6; } - - - - - - if test $ac_cv_header_unistd_h = yes; then HAVE_UNISTD_H=1 else @@ -46683,7 +48230,8 @@ $as_echo "$gl_cv_next_unistd_h" >&6; } - for gl_func in chown dup2 dup3 environ euidaccess faccessat fchdir fchownat fsync ftruncate getcwd getdomainname getdtablesize getgroups gethostname getlogin getlogin_r getpagesize getusershell setusershell endusershell lchown link linkat lseek pipe2 pread pwrite readlink readlinkat rmdir sleep symlink symlinkat ttyname_r unlink unlinkat usleep; do + + for gl_func in chown dup2 dup3 environ euidaccess faccessat fchdir fchownat fsync ftruncate getcwd getdomainname getdtablesize getgroups gethostname getlogin getlogin_r getpagesize getusershell setusershell endusershell lchown link linkat lseek pipe pipe2 pread pwrite readlink readlinkat rmdir sleep symlink symlinkat ttyname_r unlink unlinkat usleep; do as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh` { $as_echo "$as_me:$LINENO: checking whether $gl_func is declared without a macro" >&5 $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; } @@ -46698,7 +48246,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include /* Some systems declare various items in the wrong headers. */ -#ifndef __GLIBC__ +#if !(defined __GLIBC__ && !defined __UCLIBC__) # include # include # include @@ -46868,7 +48416,7 @@ fi || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \ && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \ || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \ - && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0 + && test $LIBUNISTRING_VERSION_SUBMINOR -lt 4 } } } @@ -46890,7 +48438,6 @@ fi - { $as_echo "$as_me:$LINENO: checking whether unlink honors trailing slashes" >&5 $as_echo_n "checking whether unlink honors trailing slashes... " >&6; } if test "${gl_cv_func_unlink_honors_slashes+set}" = set; then @@ -46916,10 +48463,18 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -if (!unlink ("conftest.file/") || errno != ENOTDIR) return 1; +int result = 0; + if (!unlink ("conftest.file/")) + result |= 1; + else if (errno != ENOTDIR) + result |= 2; #if HAVE_LSTAT - if (!unlink ("conftest.lnk/") || errno != ENOTDIR) return 2; + if (!unlink ("conftest.lnk/")) + result |= 4; + else if (errno != ENOTDIR) + result |= 8; #endif + return result; ; return 0; @@ -46965,8 +48520,8 @@ fi fi { $as_echo "$as_me:$LINENO: result: $gl_cv_func_unlink_honors_slashes" >&5 $as_echo "$gl_cv_func_unlink_honors_slashes" >&6; } - { $as_echo "$as_me:$LINENO: checking whether unlink of a parent directory fails is it should" >&5 -$as_echo_n "checking whether unlink of a parent directory fails is it should... " >&6; } + { $as_echo "$as_me:$LINENO: checking whether unlink of a parent directory fails as it should" >&5 +$as_echo_n "checking whether unlink of a parent directory fails as it should... " >&6; } if test "${gl_cv_func_unlink_parent_fails+set}" = set; then $as_echo_n "(cached) " >&6 else @@ -47004,9 +48559,12 @@ cat >>conftest.$ac_ext <<_ACEOF #include int main () { + int result = 0; if (chdir (getenv ("GL_SUBDIR_FOR_UNLINK")) != 0) - return 1; - return unlink ("..") == 0; + result |= 1; + else if (unlink ("..") == 0) + result |= 2; + return result; } _ACEOF @@ -47209,6 +48767,13 @@ _ACEOF + + + + if test $ac_cv_have_decl_unsetenv = no; then + HAVE_DECL_UNSETENV=0 + fi + for ac_func in unsetenv do as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -47310,7 +48875,6 @@ fi done if test $ac_cv_func_unsetenv = no; then - HAVE_UNSETENV=0 @@ -47343,6 +48907,8 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#undef _BSD +#define _BSD 1 /* unhide unsetenv declaration in OSF/1 5.1 */ #include extern #ifdef __cplusplus @@ -47411,7 +48977,7 @@ _ACEOF fi - { $as_echo "$as_me:$LINENO: checking whether unsetenv obeys POSIX" >&5 + { $as_echo "$as_me:$LINENO: checking whether unsetenv obeys POSIX" >&5 $as_echo_n "checking whether unsetenv obeys POSIX... " >&6; } if test "${gl_cv_func_unsetenv_works+set}" = set; then $as_echo_n "(cached) " >&6 @@ -47428,18 +48994,27 @@ cat >>conftest.$ac_ext <<_ACEOF #include #include + extern char **environ; int main () { - char entry[] = "b=2"; + char entry1[] = "a=1"; + char entry2[] = "b=2"; + char *env[] = { entry1, entry2, NULL }; if (putenv ((char *) "a=1")) return 1; - if (putenv (entry)) return 2; - entry[0] = 'a'; + if (putenv (entry2)) return 2; + entry2[0] = 'a'; unsetenv ("a"); if (getenv ("a")) return 3; if (!unsetenv ("") || errno != EINVAL) return 4; + entry2[0] = 'b'; + environ = env; + if (!getenv ("a")) return 5; + entry2[0] = 'a'; + unsetenv ("a"); + if (getenv ("a")) return 6; ; return 0; @@ -47562,6 +49137,7 @@ cat >>conftest.$ac_ext <<_ACEOF #include #include +#include int main () @@ -47668,18 +49244,34 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -struct timespec ts[2] = { { 1, UTIME_OMIT }, { 1, UTIME_NOW } }; - struct stat st; - const char *f = "conftest.file"; - if (close (creat (f, 0600))) return 1; - if (utimensat (AT_FDCWD, f, NULL, AT_SYMLINK_NOFOLLOW)) return 2; - if (utimensat (AT_FDCWD, f, ts, 0)) return 3; - sleep (1); - ts[0].tv_nsec = UTIME_NOW; - ts[1].tv_nsec = UTIME_OMIT; - if (utimensat (AT_FDCWD, f, ts, 0)) return 4; - if (stat (f, &st)) return 5; - if (st.st_ctime < st.st_atime) return 6; +int result = 0; + const char *f = "conftest.file"; + if (close (creat (f, 0600))) + return 1; + /* Test whether the AT_SYMLINK_NOFOLLOW flag is supported. */ + { + if (utimensat (AT_FDCWD, f, NULL, AT_SYMLINK_NOFOLLOW)) + result |= 2; + } + /* Test whether UTIME_NOW and UTIME_OMIT work. */ + { + struct timespec ts[2] = { { 1, UTIME_OMIT }, { 1, UTIME_NOW } }; + if (utimensat (AT_FDCWD, f, ts, 0)) + result |= 4; + } + sleep (1); + { + struct timespec ts[2] = { { 1, UTIME_NOW }, { 1, UTIME_OMIT } }; + struct stat st; + if (utimensat (AT_FDCWD, f, ts, 0)) + result |= 8; + if (stat (f, &st)) + result |= 16; + else if (st.st_ctime < st.st_atime) + result |= 32; + } + return result; + ; return 0; } @@ -47872,6 +49464,7 @@ _ACEOF + { $as_echo "$as_me:$LINENO: checking for ptrdiff_t" >&5 $as_echo_n "checking for ptrdiff_t... " >&6; } if test "${ac_cv_type_ptrdiff_t+set}" = set; then @@ -48378,7 +49971,12 @@ $as_echo "$gl_cv_func_snprintf_size1" >&6; } case "$gl_cv_func_snprintf_size1" in *yes) - gl_cv_func_vsnprintf_usable=yes + + case "$gl_cv_func_snprintf_retval_c99" in + *yes) + gl_cv_func_vsnprintf_usable=yes + ;; + esac ;; esac fi @@ -48441,9 +50039,6 @@ _ACEOF - - - if test $gl_cv_have_include_next = yes; then gl_cv_next_wchar_h='<'wchar.h'>' else @@ -48453,8 +50048,10 @@ if test "${gl_cv_next_wchar_h+set}" = set; then $as_echo_n "(cached) " >&6 else - if test $ac_cv_header_wchar_h = yes; then - cat >conftest.$ac_ext <<_ACEOF + if test $ac_cv_header_wchar_h = yes; then + + + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -48463,20 +50060,21 @@ cat >>conftest.$ac_ext <<_ACEOF #include _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - gl_cv_next_wchar_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n '\#/wchar.h#{ - s#.*"\(.*/wchar.h\)".*#\1# - s#^/[^/]#//&# - p - q - }'`'"' + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_wchar_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n '\#/wchar.h#{ + s#.*"\(.*/wchar.h\)".*#\1# + s#^/[^/]#//&# + p + q + }'`'"' else - gl_cv_next_wchar_h='<'wchar.h'>' - fi + gl_cv_next_wchar_h='<'wchar.h'>' + fi + fi { $as_echo "$as_me:$LINENO: result: $gl_cv_next_wchar_h" >&5 @@ -48495,6 +50093,7 @@ $as_echo "$gl_cv_next_wchar_h" >&6; } + if test $ac_cv_header_wchar_h = yes; then HAVE_WCHAR_H=1 else @@ -48503,6 +50102,8 @@ $as_echo "$gl_cv_next_wchar_h" >&6; } + + if test $gt_cv_c_wint_t = yes; then HAVE_WINT_T=1 else @@ -48522,7 +50123,35 @@ $as_echo "$gl_cv_next_wchar_h" >&6; } - for gl_func in btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb wcsrtombs wcsnrtombs wcwidth; do + + + + + + + + + + + + + + + + + + + + + + + + + + + + + for gl_func in btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb wcsrtombs wcsnrtombs wcwidth wmemchr wmemcmp wmemcpy wmemmove wmemset wcslen wcsnlen wcscpy wcpcpy wcsncpy wcpncpy wcscat wcsncat wcscmp wcsncmp wcscasecmp wcsncasecmp wcscoll wcsxfrm wcsdup wcschr wcsrchr wcscspn wcsspn wcspbrk wcsstr wcstok wcswidth ; do as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh` { $as_echo "$as_me:$LINENO: checking whether $gl_func is declared without a macro" >&5 $as_echo_n "checking whether $gl_func is declared without a macro... " >&6; } @@ -48536,8 +50165,11 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Some systems require additional headers. */ -#ifndef __GLIBC__ +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#if !(defined __GLIBC__ && !defined __UCLIBC__) # include # include # include @@ -48648,6 +50280,13 @@ cat >>conftest.$ac_ext <<_ACEOF #include #include +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include #include int main () { @@ -48736,6 +50375,13 @@ cat >>conftest.$ac_ext <<_ACEOF #include #include #include +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include #include int main () { @@ -48858,32 +50504,39 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include -#include #include +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include #include int main () { + int result = 0; if (setlocale (LC_ALL, "$LOCALE_FR") != NULL) { if (wcrtomb (NULL, 0, NULL) != 1) - return 1; + result |= 1; } if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) { if (wcrtomb (NULL, 0, NULL) != 1) - return 1; + result |= 2; } if (setlocale (LC_ALL, "$LOCALE_JA") != NULL) { if (wcrtomb (NULL, 0, NULL) != 1) - return 1; + result |= 4; } if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL) { if (wcrtomb (NULL, 0, NULL) != 1) - return 1; + result |= 8; } - return 0; + return result; } _ACEOF rm -f conftest$ac_exeext @@ -48965,7 +50618,8 @@ _ACEOF - # Code from module wctype: + # Code from module wctype-h: + @@ -48985,23 +50639,17 @@ _ACEOF + if test $gt_cv_c_wint_t = yes; then + HAVE_WINT_T=1 + else + HAVE_WINT_T=0 + fi - if test $ac_cv_func_iswblank = yes; then - HAVE_ISWBLANK=1 - REPLACE_ISWBLANK=0 - else - HAVE_ISWBLANK=0 - if test $ac_cv_have_decl_iswblank = yes; then - REPLACE_ISWBLANK=1 - else - REPLACE_ISWBLANK=0 - fi - fi @@ -49012,13 +50660,59 @@ _ACEOF + if test $gl_cv_have_include_next = yes; then + gl_cv_next_wctype_h='<'wctype.h'>' + else + { $as_echo "$as_me:$LINENO: checking absolute name of " >&5 +$as_echo_n "checking absolute name of ... " >&6; } +if test "${gl_cv_next_wctype_h+set}" = set; then + $as_echo_n "(cached) " >&6 +else + + if test $ac_cv_header_wctype_h = yes; then + + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +_ACEOF + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_wctype_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n '\#/wctype.h#{ + s#.*"\(.*/wctype.h\)".*#\1# + s#^/[^/]#//&# + p + q + }'`'"' + else + gl_cv_next_wctype_h='<'wctype.h'>' + fi + + +fi +{ $as_echo "$as_me:$LINENO: result: $gl_cv_next_wctype_h" >&5 +$as_echo "$gl_cv_next_wctype_h" >&6; } + fi + NEXT_WCTYPE_H=$gl_cv_next_wctype_h + + if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' + gl_next_as_first_directive='<'wctype.h'>' + else + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' + gl_next_as_first_directive=$gl_cv_next_wctype_h + fi + NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H=$gl_next_as_first_directive - if test $gt_cv_c_wint_t = yes; then - HAVE_WINT_T=1 - else - HAVE_WINT_T=0 - fi if test $ac_cv_header_wctype_h = yes; then @@ -49084,12 +50778,17 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - #include - #include - #include - #include - int main () { return iswprint ('x') == 0; } + /* Tru64 with Desktop Toolkit C has a bug: must be + included before . + BSD/OS 4.0.1 has a bug: , and + must be included before . */ + #include + #include + #include + #include + #include + int main () { return iswprint ('x') == 0; } + _ACEOF rm -f conftest$ac_exeext if { (ac_try="$ac_link" @@ -49132,79 +50831,238 @@ fi { $as_echo "$as_me:$LINENO: result: $gl_cv_func_iswcntrl_works" >&5 $as_echo "$gl_cv_func_iswcntrl_works" >&6; } fi + HAVE_WCTYPE_H=1 + else + HAVE_WCTYPE_H=0 + fi + if test "$gl_cv_func_iswcntrl_works" = no; then + REPLACE_ISWCNTRL=1 + else + REPLACE_ISWCNTRL=0 + fi + if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then + : + fi + { $as_echo "$as_me:$LINENO: checking for wctype_t" >&5 +$as_echo_n "checking for wctype_t... " >&6; } +if test "${gl_cv_type_wctype_t+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Tru64 with Desktop Toolkit C has a bug: must be + included before . + BSD/OS 4.0.1 has a bug: , and + must be included before . */ + #include + #include + #include + #include + #if HAVE_WCTYPE_H + # include + #endif + wctype_t a; +int +main () +{ + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + gl_cv_type_wctype_t=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + gl_cv_type_wctype_t=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $gl_cv_type_wctype_t" >&5 +$as_echo "$gl_cv_type_wctype_t" >&6; } + if test $gl_cv_type_wctype_t = no; then + HAVE_WCTYPE_T=0 + fi - if test $gl_cv_have_include_next = yes; then - gl_cv_next_wctype_h='<'wctype.h'>' - else - { $as_echo "$as_me:$LINENO: checking absolute name of " >&5 -$as_echo_n "checking absolute name of ... " >&6; } -if test "${gl_cv_next_wctype_h+set}" = set; then + { $as_echo "$as_me:$LINENO: checking for wctrans_t" >&5 +$as_echo_n "checking for wctrans_t... " >&6; } +if test "${gl_cv_type_wctrans_t+set}" = set; then $as_echo_n "(cached) " >&6 else - - if test $ac_cv_header_wctype_h = yes; then - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +/* Tru64 with Desktop Toolkit C has a bug: must be + included before . + BSD/OS 4.0.1 has a bug: , and + must be included before . */ + #include + #include + #include + #include + #include + wctrans_t a; + +int +main () +{ + ; + return 0; +} _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - gl_cv_next_wctype_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n '\#/wctype.h#{ - s#.*"\(.*/wctype.h\)".*#\1# - s#^/[^/]#//&# - p - q - }'`'"' - else - gl_cv_next_wctype_h='<'wctype.h'>' - fi +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + gl_cv_type_wctrans_t=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + gl_cv_type_wctrans_t=no fi -{ $as_echo "$as_me:$LINENO: result: $gl_cv_next_wctype_h" >&5 -$as_echo "$gl_cv_next_wctype_h" >&6; } - fi - NEXT_WCTYPE_H=$gl_cv_next_wctype_h - if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then - # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' - gl_next_as_first_directive='<'wctype.h'>' - else - # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' - gl_next_as_first_directive=$gl_cv_next_wctype_h - fi - NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H=$gl_next_as_first_directive +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $gl_cv_type_wctrans_t" >&5 +$as_echo "$gl_cv_type_wctrans_t" >&6; } + if test $gl_cv_type_wctrans_t = no; then + HAVE_WCTRANS_T=0 + fi - HAVE_WCTYPE_H=1 - else - HAVE_WCTYPE_H=0 - fi - if test "$gl_cv_func_iswcntrl_works" = no; then - REPLACE_ISWCNTRL=1 - else - REPLACE_ISWCNTRL=0 - fi + + + for gl_func in wctype iswctype wctrans towctrans ; do + as_gl_Symbol=`$as_echo "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh` + { $as_echo "$as_me:$LINENO: checking whether $gl_func is declared without a macro" >&5 +$as_echo_n "checking whether $gl_func is declared without a macro... " >&6; } +if { as_var=$as_gl_Symbol; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#if !(defined __GLIBC__ && !defined __UCLIBC__) +# include +# include +# include +# include +#endif +#include + +int +main () +{ +#undef $gl_func + (void) $gl_func; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + eval "$as_gl_Symbol=yes" +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_gl_Symbol=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +ac_res=`eval 'as_val=${'$as_gl_Symbol'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + as_val=`eval 'as_val=${'$as_gl_Symbol'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1 +_ACEOF + + eval ac_cv_have_decl_$gl_func=yes +fi + + done # Code from module wcwidth: @@ -49357,10 +51215,15 @@ int wcwidth (int); #endif int main () { + int result = 0; if (setlocale (LC_ALL, "fr_FR.UTF-8") != NULL) - if (wcwidth (0x0301) > 0 || wcwidth (0x200B) > 0) - return 1; - return 0; + { + if (wcwidth (0x0301) > 0) + result |= 1; + if (wcwidth (0x200B) > 0) + result |= 2; + } + return result; } _ACEOF rm -f conftest$ac_exeext @@ -52427,6 +54290,7 @@ cat >>conftest.$ac_ext <<_ACEOF #include int main () { + int result = 0; /* Test against AIX 5.1 bug: Failures are not distinguishable from successful returns. */ { @@ -52443,7 +54307,8 @@ int main () (char **) &inptr, &inbytesleft, &outptr, &outbytesleft); if (res == 0) - return 1; + result |= 1; + iconv_close (cd_utf8_to_88591); } } /* Test against Solaris 10 bug: Failures are not distinguishable from @@ -52462,7 +54327,8 @@ int main () (char **) &inptr, &inbytesleft, &outptr, &outbytesleft); if (res == 0) - return 1; + result |= 2; + iconv_close (cd_ascii_to_88591); } } /* Test against AIX 6.1..7.1 bug: Buffer overrun. */ @@ -52480,7 +54346,8 @@ int main () (char **) &inptr, &inbytesleft, &outptr, &outbytesleft); if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD) - return 1; + result |= 4; + iconv_close (cd_88591_to_utf8); } } #if 0 /* This bug could be worked around by the caller. */ @@ -52499,7 +54366,8 @@ int main () (char **) &inptr, &inbytesleft, &outptr, &outbytesleft); if ((int)res > 0) - return 1; + result |= 8; + iconv_close (cd_88591_to_utf8); } } #endif @@ -52513,8 +54381,8 @@ int main () && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) /* Try HP-UX names. */ && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) - return 1; - return 0; + result |= 16; + return result; } _ACEOF rm -f conftest$ac_exeext @@ -52659,6 +54527,7 @@ cat >>confdefs.h <<_ACEOF #define ICONV_CONST $am_cv_proto_iconv_arg1 _ACEOF + fi @@ -53671,6 +55540,7 @@ cat >>conftest.$ac_ext <<_ACEOF #include int main () { + int result = 0; /* Test against AIX 5.1 bug: Failures are not distinguishable from successful returns. */ { @@ -53687,7 +55557,8 @@ int main () (char **) &inptr, &inbytesleft, &outptr, &outbytesleft); if (res == 0) - return 1; + result |= 1; + iconv_close (cd_utf8_to_88591); } } /* Test against Solaris 10 bug: Failures are not distinguishable from @@ -53706,7 +55577,8 @@ int main () (char **) &inptr, &inbytesleft, &outptr, &outbytesleft); if (res == 0) - return 1; + result |= 2; + iconv_close (cd_ascii_to_88591); } } /* Test against AIX 6.1..7.1 bug: Buffer overrun. */ @@ -53724,7 +55596,8 @@ int main () (char **) &inptr, &inbytesleft, &outptr, &outbytesleft); if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD) - return 1; + result |= 4; + iconv_close (cd_88591_to_utf8); } } #if 0 /* This bug could be worked around by the caller. */ @@ -53743,7 +55616,8 @@ int main () (char **) &inptr, &inbytesleft, &outptr, &outbytesleft); if ((int)res > 0) - return 1; + result |= 8; + iconv_close (cd_88591_to_utf8); } } #endif @@ -53757,8 +55631,8 @@ int main () && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) /* Try HP-UX names. */ && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) - return 1; - return 0; + result |= 16; + return result; } _ACEOF rm -f conftest$ac_exeext @@ -55063,7 +56937,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GNU tar $as_me 1.25, which was +This file was extended by GNU tar $as_me 1.26, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -55126,7 +57000,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -GNU tar config.status 1.25 +GNU tar config.status 1.26 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index d112474f..db69cb82 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. -AC_INIT([GNU tar], [1.25], [bug-tar@gnu.org]) +AC_INIT([GNU tar], [1.26], [bug-tar@gnu.org]) AC_CONFIG_SRCDIR([src/tar.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) diff --git a/doc/Makefile.in b/doc/Makefile.in index 471f868c..933cd13f 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -23,7 +23,6 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -44,16 +43,16 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/argmatch.m4 \ - $(top_srcdir)/m4/argp.m4 $(top_srcdir)/m4/asm-underscore.m4 \ - $(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/bison.m4 \ - $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/canonicalize.m4 \ + $(top_srcdir)/m4/argp.m4 $(top_srcdir)/m4/backupfile.m4 \ + $(top_srcdir)/m4/bison.m4 $(top_srcdir)/m4/btowc.m4 \ + $(top_srcdir)/m4/canonicalize.m4 \ $(top_srcdir)/m4/chdir-long.m4 $(top_srcdir)/m4/chown.m4 \ $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/cloexec.m4 \ $(top_srcdir)/m4/close-stream.m4 $(top_srcdir)/m4/close.m4 \ $(top_srcdir)/m4/closeout.m4 $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/d-ino.m4 $(top_srcdir)/m4/dirent-safer.m4 \ - $(top_srcdir)/m4/dirent_h.m4 $(top_srcdir)/m4/dirfd.m4 \ - $(top_srcdir)/m4/dirname.m4 $(top_srcdir)/m4/dos.m4 \ + $(top_srcdir)/m4/configmake.m4 $(top_srcdir)/m4/d-ino.m4 \ + $(top_srcdir)/m4/dirent-safer.m4 $(top_srcdir)/m4/dirent_h.m4 \ + $(top_srcdir)/m4/dirfd.m4 $(top_srcdir)/m4/dirname.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup2.m4 \ $(top_srcdir)/m4/eealloc.m4 $(top_srcdir)/m4/environ.m4 \ $(top_srcdir)/m4/errno_h.m4 $(top_srcdir)/m4/error.m4 \ @@ -78,9 +77,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax_t.m4 \ $(top_srcdir)/m4/inttostr.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ - $(top_srcdir)/m4/langinfo_h.m4 $(top_srcdir)/m4/lchown.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/iswblank.m4 $(top_srcdir)/m4/langinfo_h.m4 \ + $(top_srcdir)/m4/lchown.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ $(top_srcdir)/m4/libunistring-base.m4 \ $(top_srcdir)/m4/link-follow.m4 $(top_srcdir)/m4/link.m4 \ $(top_srcdir)/m4/linkat.m4 $(top_srcdir)/m4/localcharset.m4 \ @@ -91,61 +90,62 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \ $(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \ - $(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdir.m4 \ - $(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mkfifo.m4 \ - $(top_srcdir)/m4/mkfifoat.m4 $(top_srcdir)/m4/mknod.m4 \ - $(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/mmap-anon.m4 \ - $(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/modechange.m4 \ - $(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/nl_langinfo.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/open.m4 \ - $(top_srcdir)/m4/openat.m4 $(top_srcdir)/m4/parse-datetime.m4 \ - $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/paxutils.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf.m4 \ - $(top_srcdir)/m4/priv-set.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ - $(top_srcdir)/m4/rawmemchr.m4 $(top_srcdir)/m4/readlink.m4 \ - $(top_srcdir)/m4/readlinkat.m4 $(top_srcdir)/m4/realloc.m4 \ - $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/rename.m4 \ - $(top_srcdir)/m4/renameat.m4 $(top_srcdir)/m4/rmdir.m4 \ - $(top_srcdir)/m4/rmt.m4 $(top_srcdir)/m4/rpmatch.m4 \ - $(top_srcdir)/m4/rtapelib.m4 $(top_srcdir)/m4/safe-read.m4 \ - $(top_srcdir)/m4/safe-write.m4 $(top_srcdir)/m4/save-cwd.m4 \ - $(top_srcdir)/m4/savedir.m4 $(top_srcdir)/m4/setenv.m4 \ - $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/sleep.m4 \ - $(top_srcdir)/m4/snprintf.m4 $(top_srcdir)/m4/ssize_t.m4 \ - $(top_srcdir)/m4/stat-time.m4 $(top_srcdir)/m4/stat.m4 \ - $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \ - $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio_h.m4 \ - $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/stpcpy.m4 \ - $(top_srcdir)/m4/strcase.m4 $(top_srcdir)/m4/strchrnul.m4 \ - $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ - $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strings_h.m4 \ - $(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \ - $(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \ - $(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \ - $(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \ - $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/symlinkat.m4 \ - $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ - $(top_srcdir)/m4/sysexits.m4 $(top_srcdir)/m4/system.m4 \ - $(top_srcdir)/m4/tempname.m4 $(top_srcdir)/m4/time_h.m4 \ - $(top_srcdir)/m4/time_r.m4 $(top_srcdir)/m4/timespec.m4 \ - $(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/unistd-safer.m4 \ - $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ - $(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/unlocked-io.m4 \ - $(top_srcdir)/m4/utimbuf.m4 $(top_srcdir)/m4/utimens.m4 \ - $(top_srcdir)/m4/utimensat.m4 $(top_srcdir)/m4/utimes.m4 \ - $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \ - $(top_srcdir)/m4/version-etc.m4 $(top_srcdir)/m4/vsnprintf.m4 \ - $(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/wchar_h.m4 \ - $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wcrtomb.m4 \ - $(top_srcdir)/m4/wctype_h.m4 $(top_srcdir)/m4/wcwidth.m4 \ - $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/write.m4 \ - $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xgetcwd.m4 \ - $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/xstrndup.m4 \ - $(top_srcdir)/m4/xstrtol.m4 $(top_srcdir)/m4/xvasprintf.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \ + $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \ + $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkdtemp.m4 \ + $(top_srcdir)/m4/mkfifo.m4 $(top_srcdir)/m4/mkfifoat.m4 \ + $(top_srcdir)/m4/mknod.m4 $(top_srcdir)/m4/mktime.m4 \ + $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ + $(top_srcdir)/m4/modechange.m4 $(top_srcdir)/m4/multiarch.m4 \ + $(top_srcdir)/m4/nl_langinfo.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/open.m4 $(top_srcdir)/m4/openat.m4 \ + $(top_srcdir)/m4/parse-datetime.m4 $(top_srcdir)/m4/pathmax.m4 \ + $(top_srcdir)/m4/paxutils.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/printf.m4 $(top_srcdir)/m4/priv-set.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/quote.m4 \ + $(top_srcdir)/m4/quotearg.m4 $(top_srcdir)/m4/rawmemchr.m4 \ + $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/readlinkat.m4 \ + $(top_srcdir)/m4/realloc.m4 $(top_srcdir)/m4/regex.m4 \ + $(top_srcdir)/m4/rename.m4 $(top_srcdir)/m4/renameat.m4 \ + $(top_srcdir)/m4/rmdir.m4 $(top_srcdir)/m4/rmt.m4 \ + $(top_srcdir)/m4/rpmatch.m4 $(top_srcdir)/m4/rtapelib.m4 \ + $(top_srcdir)/m4/safe-read.m4 $(top_srcdir)/m4/safe-write.m4 \ + $(top_srcdir)/m4/save-cwd.m4 $(top_srcdir)/m4/savedir.m4 \ + $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/size_max.m4 \ + $(top_srcdir)/m4/sleep.m4 $(top_srcdir)/m4/snprintf.m4 \ + $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \ + $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdarg.m4 \ + $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stddef_h.m4 \ + $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdint_h.m4 \ + $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ + $(top_srcdir)/m4/stpcpy.m4 $(top_srcdir)/m4/strcase.m4 \ + $(top_srcdir)/m4/strchrnul.m4 $(top_srcdir)/m4/strdup.m4 \ + $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/string_h.m4 \ + $(top_srcdir)/m4/strings_h.m4 $(top_srcdir)/m4/strndup.m4 \ + $(top_srcdir)/m4/strnlen.m4 $(top_srcdir)/m4/strtoimax.m4 \ + $(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \ + $(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \ + $(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/symlink.m4 \ + $(top_srcdir)/m4/symlinkat.m4 $(top_srcdir)/m4/sys_stat_h.m4 \ + $(top_srcdir)/m4/sys_time_h.m4 $(top_srcdir)/m4/sysexits.m4 \ + $(top_srcdir)/m4/system.m4 $(top_srcdir)/m4/tempname.m4 \ + $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \ + $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \ + $(top_srcdir)/m4/unistd-safer.m4 $(top_srcdir)/m4/unistd_h.m4 \ + $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlinkdir.m4 \ + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/utimbuf.m4 \ + $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimensat.m4 \ + $(top_srcdir)/m4/utimes.m4 $(top_srcdir)/m4/vasnprintf.m4 \ + $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/version-etc.m4 \ + $(top_srcdir)/m4/vsnprintf.m4 $(top_srcdir)/m4/warn-on-use.m4 \ + $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ + $(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wctype_h.m4 \ + $(top_srcdir)/m4/wcwidth.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/write.m4 $(top_srcdir)/m4/xalloc.m4 \ + $(top_srcdir)/m4/xgetcwd.m4 $(top_srcdir)/m4/xsize.m4 \ + $(top_srcdir)/m4/xstrndup.m4 $(top_srcdir)/m4/xstrtol.m4 \ + $(top_srcdir)/m4/xvasprintf.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -195,13 +195,13 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALLOCA_H = @ALLOCA_H@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ -ASM_SYMBOL_PREFIX = @ASM_SYMBOL_PREFIX@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOM4TE = @AUTOM4TE@ @@ -302,6 +302,8 @@ GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ GNULIB_GRANTPT = @GNULIB_GRANTPT@ GNULIB_IMAXABS = @GNULIB_IMAXABS@ GNULIB_IMAXDIV = @GNULIB_IMAXDIV@ +GNULIB_ISWBLANK = @GNULIB_ISWBLANK@ +GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@ GNULIB_LCHMOD = @GNULIB_LCHMOD@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LINK = @GNULIB_LINK@ @@ -328,6 +330,7 @@ GNULIB_MBSSEP = @GNULIB_MBSSEP@ GNULIB_MBSSPN = @GNULIB_MBSSPN@ GNULIB_MBSSTR = @GNULIB_MBSSTR@ GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@ +GNULIB_MBTOWC = @GNULIB_MBTOWC@ GNULIB_MEMCHR = @GNULIB_MEMCHR@ GNULIB_MEMMEM = @GNULIB_MEMMEM@ GNULIB_MEMPCPY = @GNULIB_MEMPCPY@ @@ -350,6 +353,7 @@ GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ GNULIB_OPEN = @GNULIB_OPEN@ GNULIB_OPENAT = @GNULIB_OPENAT@ GNULIB_PERROR = @GNULIB_PERROR@ +GNULIB_PIPE = @GNULIB_PIPE@ GNULIB_PIPE2 = @GNULIB_PIPE2@ GNULIB_POPEN = @GNULIB_POPEN@ GNULIB_PREAD = @GNULIB_PREAD@ @@ -385,6 +389,7 @@ GNULIB_STRCASESTR = @GNULIB_STRCASESTR@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ +GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ GNULIB_STRNCAT = @GNULIB_STRNCAT@ GNULIB_STRNDUP = @GNULIB_STRNDUP@ GNULIB_STRNLEN = @GNULIB_STRNLEN@ @@ -406,6 +411,7 @@ GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@ GNULIB_TIMEGM = @GNULIB_TIMEGM@ GNULIB_TIME_R = @GNULIB_TIME_R@ GNULIB_TMPFILE = @GNULIB_TMPFILE@ +GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@ GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ @@ -423,11 +429,42 @@ GNULIB_VPRINTF = @GNULIB_VPRINTF@ GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@ GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@ GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@ +GNULIB_WCPCPY = @GNULIB_WCPCPY@ +GNULIB_WCPNCPY = @GNULIB_WCPNCPY@ GNULIB_WCRTOMB = @GNULIB_WCRTOMB@ +GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@ +GNULIB_WCSCAT = @GNULIB_WCSCAT@ +GNULIB_WCSCHR = @GNULIB_WCSCHR@ +GNULIB_WCSCMP = @GNULIB_WCSCMP@ +GNULIB_WCSCOLL = @GNULIB_WCSCOLL@ +GNULIB_WCSCPY = @GNULIB_WCSCPY@ +GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ +GNULIB_WCSDUP = @GNULIB_WCSDUP@ +GNULIB_WCSLEN = @GNULIB_WCSLEN@ +GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ +GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ +GNULIB_WCSNCMP = @GNULIB_WCSNCMP@ +GNULIB_WCSNCPY = @GNULIB_WCSNCPY@ +GNULIB_WCSNLEN = @GNULIB_WCSNLEN@ GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@ +GNULIB_WCSPBRK = @GNULIB_WCSPBRK@ +GNULIB_WCSRCHR = @GNULIB_WCSRCHR@ GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@ +GNULIB_WCSSPN = @GNULIB_WCSSPN@ +GNULIB_WCSSTR = @GNULIB_WCSSTR@ +GNULIB_WCSTOK = @GNULIB_WCSTOK@ +GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@ +GNULIB_WCSXFRM = @GNULIB_WCSXFRM@ GNULIB_WCTOB = @GNULIB_WCTOB@ +GNULIB_WCTOMB = @GNULIB_WCTOMB@ +GNULIB_WCTRANS = @GNULIB_WCTRANS@ +GNULIB_WCTYPE = @GNULIB_WCTYPE@ GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ +GNULIB_WMEMCHR = @GNULIB_WMEMCHR@ +GNULIB_WMEMCMP = @GNULIB_WMEMCMP@ +GNULIB_WMEMCPY = @GNULIB_WMEMCPY@ +GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@ +GNULIB_WMEMSET = @GNULIB_WMEMSET@ GNULIB_WRITE = @GNULIB_WRITE@ GNULIB__EXIT = @GNULIB__EXIT@ GREP = @GREP@ @@ -438,9 +475,13 @@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ +HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ HAVE_DECL_FDOPENDIR = @HAVE_DECL_FDOPENDIR@ HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@ +HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@ +HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ +HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ @@ -448,11 +489,14 @@ HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ +HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ +HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ +HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ HAVE_DECL_STRNCASECMP = @HAVE_DECL_STRNCASECMP@ HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@ HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@ @@ -460,6 +504,8 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ +HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ @@ -473,13 +519,13 @@ HAVE_FCHMODAT = @HAVE_FCHMODAT@ HAVE_FCHOWNAT = @HAVE_FCHOWNAT@ HAVE_FCNTL = @HAVE_FCNTL@ HAVE_FDOPENDIR = @HAVE_FDOPENDIR@ +HAVE_FEATURES_H = @HAVE_FEATURES_H@ HAVE_FSEEKO = @HAVE_FSEEKO@ HAVE_FSTATAT = @HAVE_FSTATAT@ HAVE_FSYNC = @HAVE_FSYNC@ HAVE_FTELLO = @HAVE_FTELLO@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ HAVE_FUTIMENS = @HAVE_FUTIMENS@ -HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@ HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ HAVE_GETGROUPS = @HAVE_GETGROUPS@ HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@ @@ -501,7 +547,6 @@ HAVE_LCHMOD = @HAVE_LCHMOD@ HAVE_LCHOWN = @HAVE_LCHOWN@ HAVE_LINK = @HAVE_LINK@ HAVE_LINKAT = @HAVE_LINKAT@ -HAVE_LOCALTIME_R = @HAVE_LOCALTIME_R@ HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MBRLEN = @HAVE_MBRLEN@ @@ -526,6 +571,7 @@ HAVE_NANOSLEEP = @HAVE_NANOSLEEP@ HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@ HAVE_OPENAT = @HAVE_OPENAT@ HAVE_OS_H = @HAVE_OS_H@ +HAVE_PIPE = @HAVE_PIPE@ HAVE_PIPE2 = @HAVE_PIPE2@ HAVE_PREAD = @HAVE_PREAD@ HAVE_PTSNAME = @HAVE_PTSNAME@ @@ -569,11 +615,9 @@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ -HAVE_TTYNAME_R = @HAVE_TTYNAME_R@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ -HAVE_UNSETENV = @HAVE_UNSETENV@ HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_USLEEP = @HAVE_USLEEP@ HAVE_UTIMENSAT = @HAVE_UTIMENSAT@ @@ -581,11 +625,41 @@ HAVE_VASPRINTF = @HAVE_VASPRINTF@ HAVE_VDPRINTF = @HAVE_VDPRINTF@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ HAVE_WCHAR_T = @HAVE_WCHAR_T@ +HAVE_WCPCPY = @HAVE_WCPCPY@ +HAVE_WCPNCPY = @HAVE_WCPNCPY@ HAVE_WCRTOMB = @HAVE_WCRTOMB@ +HAVE_WCSCASECMP = @HAVE_WCSCASECMP@ +HAVE_WCSCAT = @HAVE_WCSCAT@ +HAVE_WCSCHR = @HAVE_WCSCHR@ +HAVE_WCSCMP = @HAVE_WCSCMP@ +HAVE_WCSCOLL = @HAVE_WCSCOLL@ +HAVE_WCSCPY = @HAVE_WCSCPY@ +HAVE_WCSCSPN = @HAVE_WCSCSPN@ +HAVE_WCSDUP = @HAVE_WCSDUP@ +HAVE_WCSLEN = @HAVE_WCSLEN@ +HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ +HAVE_WCSNCAT = @HAVE_WCSNCAT@ +HAVE_WCSNCMP = @HAVE_WCSNCMP@ +HAVE_WCSNCPY = @HAVE_WCSNCPY@ +HAVE_WCSNLEN = @HAVE_WCSNLEN@ HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@ +HAVE_WCSPBRK = @HAVE_WCSPBRK@ +HAVE_WCSRCHR = @HAVE_WCSRCHR@ HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@ +HAVE_WCSSPN = @HAVE_WCSSPN@ +HAVE_WCSSTR = @HAVE_WCSSTR@ +HAVE_WCSTOK = @HAVE_WCSTOK@ +HAVE_WCSWIDTH = @HAVE_WCSWIDTH@ +HAVE_WCSXFRM = @HAVE_WCSXFRM@ +HAVE_WCTRANS_T = @HAVE_WCTRANS_T@ HAVE_WCTYPE_H = @HAVE_WCTYPE_H@ +HAVE_WCTYPE_T = @HAVE_WCTYPE_T@ HAVE_WINT_T = @HAVE_WINT_T@ +HAVE_WMEMCHR = @HAVE_WMEMCHR@ +HAVE_WMEMCMP = @HAVE_WMEMCMP@ +HAVE_WMEMCPY = @HAVE_WMEMCPY@ +HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ +HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE__BOOL = @HAVE__BOOL@ HAVE__EXIT = @HAVE__EXIT@ INCLUDE_NEXT = @INCLUDE_NEXT@ @@ -710,8 +784,10 @@ REPLACE_FTELLO = @REPLACE_FTELLO@ REPLACE_FUTIMENS = @REPLACE_FUTIMENS@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETDELIM = @REPLACE_GETDELIM@ +REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETLINE = @REPLACE_GETLINE@ +REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ @@ -729,6 +805,7 @@ REPLACE_MBSINIT = @REPLACE_MBSINIT@ REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@ REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@ REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@ +REPLACE_MBTOWC = @REPLACE_MBTOWC@ REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ REPLACE_MKDIR = @REPLACE_MKDIR@ @@ -766,6 +843,7 @@ REPLACE_STPNCPY = @REPLACE_STPNCPY@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ +REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ REPLACE_STRNCAT = @REPLACE_STRNCAT@ REPLACE_STRNDUP = @REPLACE_STRNDUP@ REPLACE_STRNLEN = @REPLACE_STRNLEN@ @@ -791,7 +869,9 @@ REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ +REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ +REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ SET_MAKE = @SET_MAKE@ @@ -858,6 +938,7 @@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +lispdir = @lispdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ diff --git a/doc/parse-datetime.texi b/doc/parse-datetime.texi index 8218d9fe..2f1ab34e 100644 --- a/doc/parse-datetime.texi +++ b/doc/parse-datetime.texi @@ -1,7 +1,6 @@ @c GNU date syntax documentation -@c Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, -@c 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc. +@c Copyright (C) 1994-2006, 2009-2011 Free Software Foundation, Inc. @c Permission is granted to copy, distribute and/or modify this document @c under the terms of the GNU Free Documentation License, Version 1.3 or diff --git a/doc/stamp-vti b/doc/stamp-vti index 9e8b5023..019935b1 100644 --- a/doc/stamp-vti +++ b/doc/stamp-vti @@ -1,4 +1,4 @@ -@set UPDATED 5 November 2010 -@set UPDATED-MONTH November 2010 -@set EDITION 1.25 -@set VERSION 1.25 +@set UPDATED 12 March 2011 +@set UPDATED-MONTH March 2011 +@set EDITION 1.26 +@set VERSION 1.26 diff --git a/doc/tar.info b/doc/tar.info index 85bf6e80..b07ee4ec 100644 --- a/doc/tar.info +++ b/doc/tar.info @@ -1,6 +1,6 @@ This is tar.info, produced by makeinfo version 4.13 from tar.texi. -This manual is for GNU `tar' (version 1.25, 5 November 2010), which +This manual is for GNU `tar' (version 1.26, 12 March 2011), which creates and extracts files from archives. Copyright (C) 1992, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2003, @@ -30,402 +30,402 @@ END-INFO-DIR-ENTRY  Indirect: -tar.info-1: 1255 -tar.info-2: 301801 +tar.info-1: 1253 +tar.info-2: 301909  Tag Table: (Indirect) -Node: Top1255 -Node: Introduction10671 -Node: Book Contents11458 -Node: Definitions13630 -Node: What tar Does15433 -Node: Naming tar Archives18199 -Node: Authors18919 -Node: Reports20732 -Node: Tutorial21089 -Node: assumptions21902 -Node: stylistic conventions24377 -Node: basic tar options24820 -Node: frequent operations28458 -Node: Two Frequent Options29110 -Node: file tutorial29741 -Node: verbose tutorial31098 -Ref: verbose member listing33312 -Node: help tutorial36065 -Node: create36419 -Node: prepare for examples37920 -Node: Creating the archive39689 -Node: create verbose42521 -Node: short create43341 -Node: create dir46094 -Node: list48802 -Ref: listing member and file names50076 -Node: list dir52390 -Node: extract53379 -Node: extracting archives54493 -Node: extracting files54983 -Ref: extracting files-Footnote-157630 -Node: extract dir58010 -Node: extracting untrusted archives60393 -Node: failing commands61272 -Node: going further62366 -Node: tar invocation62579 -Node: Synopsis64041 -Node: using tar options68996 -Ref: TAR_OPTIONS70573 -Node: Styles71590 -Ref: Styles-Footnote-173089 -Node: Long Options73345 -Node: Short Options75517 -Ref: Short Options-Footnote-177325 -Node: Old Options77542 -Ref: Old Options-Footnote-180429 -Node: Mixing80599 -Ref: Mixing-Footnote-182965 -Node: All Options83085 -Node: Operation Summary83690 -Ref: --append83810 -Ref: --catenate83890 -Ref: --compare83961 -Ref: --concatenate84164 -Ref: --create84274 -Ref: --delete84342 -Ref: --diff84456 -Ref: --extract84512 -Ref: --get84614 -Ref: --list84672 -Ref: --update84740 -Node: Option Summary84950 -Ref: --absolute-names85105 -Ref: --after-date85283 -Ref: --anchored85335 -Ref: --atime-preserve85468 -Ref: --auto-compress87988 -Ref: --backup88215 -Ref: --block-number88406 -Ref: --blocking-factor88580 -Ref: --bzip288732 -Ref: --check-device88839 -Ref: --checkpoint89034 -Ref: --checkpoint-action89476 -Ref: --check-links90627 -Ref: --compress90904 -Ref: --uncompress90904 -Ref: --confirmation91108 -Ref: --delay-directory-restore91176 -Ref: --dereference91377 -Ref: --directory91571 -Ref: --exclude91824 -Ref: --exclude-backups91943 -Ref: --exclude-from92033 -Ref: --exclude-caches92179 -Ref: --exclude-caches-under92387 -Ref: --exclude-caches-all92565 -Ref: --exclude-tag92694 -Ref: --exclude-tag-under92865 -Ref: --exclude-tag-all93055 -Ref: --exclude-vcs93184 -Ref: --file93350 -Ref: --files-from93550 -Ref: --force-local93753 -Ref: --format93944 -Ref: --full-time94614 -Ref: --group95294 -Ref: --gzip95642 -Ref: --gunzip95642 -Ref: --ungzip95642 -Ref: --hard-dereference95865 -Ref: --help96052 -Ref: --ignore-case96186 -Ref: --ignore-command-error96313 -Ref: --ignore-failed-read96424 -Ref: --ignore-zeros96554 -Ref: --incremental96699 -Ref: --index-file96964 -Ref: --info-script97049 -Ref: --new-volume-script97049 -Ref: --interactive97370 -Ref: --keep-newer-files97582 -Ref: --keep-old-files97724 -Ref: --label97855 -Ref: --level98143 -Ref: --listed-incremental98584 -Ref: --lzip98948 -Ref: --lzma99048 -Ref: --mode99248 -Ref: --mtime99539 -Ref: --multi-volume99980 -Ref: --newer100184 -Ref: --newer-mtime100462 -Ref: --no-anchored100686 -Ref: --no-auto-compress100823 -Ref: --no-check-device100974 -Ref: --no-delay-directory-restore101157 -Ref: --no-ignore-case101410 -Ref: --no-ignore-command-error101503 -Ref: --no-null101658 -Ref: --no-overwrite-dir101863 -Ref: --no-quote-chars102006 -Ref: --no-recursion102187 -Ref: --no-same-owner102292 -Ref: --no-same-permissions102475 -Ref: --no-seek102677 -Ref: --no-unquote102895 -Ref: --no-wildcards103033 -Ref: --no-wildcards-match-slash103117 -Ref: --null103219 -Ref: --numeric-owner103447 -Ref: --occurrence104098 -Ref: --old-archive104665 -Ref: --one-file-system104714 -Ref: --overwrite104892 -Ref: --overwrite-dir105034 -Ref: --owner105179 -Ref: --pax-option105558 -Ref: --portability105865 -Ref: --posix105930 -Ref: --preserve105972 -Ref: --preserve-order106110 -Ref: --preserve-permissions106174 -Ref: --same-permissions106174 -Ref: --quote-chars106588 -Ref: --quoting-style106741 -Ref: --read-full-records107062 -Ref: --record-size107227 -Ref: --recursion107571 -Ref: --recursive-unlink107674 -Ref: --remove-files107841 -Ref: --restrict107987 -Ref: --rmt-command108175 -Ref: --rsh-command108316 -Ref: --same-order108438 -Ref: --same-owner108730 -Ref: --seek109107 -Ref: --show-defaults109476 -Ref: --show-omitted-dirs109966 -Ref: --show-transformed-names110120 -Ref: --show-stored-names110120 -Ref: --sparse110509 -Ref: --sparse-version110648 -Ref: --starting-file110872 -Ref: --strip-components111061 -Ref: --suffix111373 -Ref: --tape-length111492 -Ref: --test-label111907 -Ref: --to-command112059 -Ref: --to-stdout112218 -Ref: --totals112371 -Ref: --touch112602 -Ref: --transform112804 -Ref: --xform112804 -Ref: --unlink-first113415 -Ref: --unquote113583 -Ref: --use-compress-program113690 -Ref: --utc113868 -Ref: --verbose113961 -Ref: --verify114213 -Ref: --version114331 -Ref: --volno-file114503 -Ref: --warning114690 -Ref: --wildcards114867 -Ref: --wildcards-match-slash114987 -Ref: --xz115079 -Ref: Option Summary-Footnote-1115210 -Node: Short Option Summary115428 -Node: help117629 -Ref: help-Footnote-1121513 -Node: defaults121724 -Node: verbose122743 -Ref: totals125044 -Ref: Progress information126634 -Ref: show-omitted-dirs127613 -Ref: block-number128032 -Ref: verbose-Footnote-1129059 -Node: checkpoints129166 -Node: warnings134560 -Node: interactive137910 -Node: operations139992 -Node: Basic tar140251 -Ref: Basic tar-Footnote-1143355 -Node: Advanced tar143499 -Node: Operations144344 -Node: append146243 -Ref: append-Footnote-1149338 -Node: appending files149501 -Node: multiple151219 -Node: update153911 -Node: how to update154887 -Node: concatenate156671 -Ref: concatenate-Footnote-1159919 -Node: delete160062 -Node: compare161835 -Node: create options163267 -Node: override163725 -Node: Ignore Failed Read167153 -Node: extract options167373 -Node: Reading168206 -Node: read full records169706 -Node: Ignore Zeros170042 -Node: Writing171033 -Node: Dealing with Old Files171590 -Node: Overwrite Old Files174017 -Node: Keep Old Files175474 -Node: Keep Newer Files175984 -Node: Unlink First176274 -Node: Recursive Unlink176678 -Node: Data Modification Times177231 -Node: Setting Access Permissions178041 -Node: Directory Modification Times and Permissions178673 -Node: Writing to Standard Output182285 -Node: Writing to an External Program183820 -Node: remove files186959 -Node: Scarce187152 -Node: Starting File187400 -Node: Same Order188201 -Node: backup189037 -Node: Applications192123 -Node: looking ahead193584 -Node: Backups194410 -Node: Full Dumps195991 -Node: Incremental Dumps197797 -Ref: --level=0200711 -Ref: device numbers201244 -Ref: incremental-op205222 -Ref: Incremental Dumps-Footnote-1205596 -Ref: Incremental Dumps-Footnote-2205746 -Node: Backup Levels206234 -Node: Backup Parameters208621 -Node: General-Purpose Variables209802 -Ref: RSH212963 -Node: Magnetic Tape Control214842 -Node: User Hooks216180 -Node: backup-specs example217509 -Node: Scripted Backups218652 -Ref: Scripted Backups-Footnote-1221515 -Node: Scripted Restoration221899 -Node: Choosing224510 -Node: file225632 -Ref: remote-dev228268 -Ref: local and remote archives228653 -Node: Selecting Archive Members229684 -Ref: input name quoting230365 -Node: files232351 -Ref: files-Footnote-1235624 -Node: nul235782 -Node: exclude238181 -Node: problems with exclude243355 -Node: wildcards245400 -Node: controlling pattern-matching247984 -Ref: controlling pattern-matching-Footnote-1251974 -Node: quoting styles252190 -Ref: escape sequences252536 -Node: transform258671 -Ref: show-transformed-names260662 -Node: after266853 -Node: recurse270455 -Node: one273179 -Node: directory274612 -Node: absolute277674 -Ref: absolute-Footnote-1280845 -Node: Date input formats281196 -Node: General date syntax283518 -Node: Calendar date items286469 -Node: Time of day items288466 -Node: Time zone items290662 -Node: Day of week items291896 -Node: Relative items in date strings292885 -Node: Pure numbers in date strings295687 -Node: Seconds since the Epoch296668 -Node: Specifying time zone rules298289 -Node: Authors of parse_datetime300659 -Ref: Authors of get_date300838 -Node: Formats301801 -Node: Compression306489 -Node: gzip306781 -Ref: alternative decompression programs308990 -Ref: auto-compress312821 -Ref: gzip-Footnote-1315061 -Ref: gzip-Footnote-2315110 -Node: lbzip2315250 -Node: sparse316347 -Node: Attributes319401 -Node: Portability325222 -Node: Portable Names326708 -Node: dereference327413 -Node: hard links328540 -Ref: hard links-Footnote-1331438 -Node: old331494 -Node: ustar332678 -Node: gnu333269 -Node: posix334146 -Node: PAX keywords334627 -Node: Checksumming340237 -Node: Large or Negative Values342163 -Node: Other Tars343763 -Node: Split Recovery344899 -Node: Sparse Recovery348631 -Ref: extracting sparse v.0.x352264 -Ref: Sparse Recovery-Footnote-1355553 -Ref: Sparse Recovery-Footnote-2355576 -Node: cpio355697 -Node: Media360454 -Node: Device362401 -Ref: size-suffixes367190 -Node: Remote Tape Server368300 -Node: Common Problems and Solutions372023 -Node: Blocking372415 -Node: Format Variations378859 -Node: Blocking Factor379771 -Node: Many391423 -Node: Tape Positioning395217 -Node: mt397090 -Node: Using Multiple Tapes398645 -Node: Multi-Volume Archives400711 -Ref: tape-length402196 -Ref: change volume prompt402756 -Ref: volno-file403627 -Ref: info-script404179 -Ref: Multi-Volume Archives-Footnote-1409366 -Ref: Multi-Volume Archives-Footnote-2409476 -Node: Tape Files409544 -Node: Tarcat411026 -Node: label412071 -Ref: --test-label option413645 -Ref: label-Footnote-1417090 -Ref: label-Footnote-2417199 -Ref: label-Footnote-3417332 -Node: verify417567 -Node: Write Protection420867 -Node: Reliability and security421697 -Node: Reliability422085 -Node: Permissions problems422863 -Node: Data corruption and repair423302 -Node: Race conditions424228 -Node: Security425968 -Node: Privacy426571 -Node: Integrity427820 -Node: Live untrusted data429861 -Node: Security rules of thumb432201 -Node: Changes433730 -Node: Configuring Help Summary437345 -Node: Fixing Snapshot Files443846 -Node: Tar Internals446032 -Node: Standard446364 -Node: Extensions468565 -Node: Sparse Formats471125 -Node: Old GNU Format472415 -Node: PAX 0474816 -Node: PAX 1477947 -Node: Snapshot Files479685 -Node: Dumpdir484146 -Node: Genfile487392 -Node: Generate Mode488485 -Node: Status Mode492782 -Node: Exec Mode494581 -Node: Free Software Needs Free Documentation497326 -Node: GNU Free Documentation License502308 -Node: Index of Command Line Options527521 -Node: Index553020 +Node: Top1253 +Node: Introduction10667 +Node: Book Contents11454 +Node: Definitions13626 +Node: What tar Does15429 +Node: Naming tar Archives18195 +Node: Authors18915 +Node: Reports20728 +Node: Tutorial21085 +Node: assumptions21898 +Node: stylistic conventions24373 +Node: basic tar options24816 +Node: frequent operations28454 +Node: Two Frequent Options29106 +Node: file tutorial29737 +Node: verbose tutorial31094 +Ref: verbose member listing33308 +Node: help tutorial36068 +Node: create36422 +Node: prepare for examples37923 +Node: Creating the archive39692 +Node: create verbose42524 +Node: short create43344 +Node: create dir46097 +Node: list48805 +Ref: listing member and file names50084 +Node: list dir52398 +Node: extract53410 +Node: extracting archives54524 +Node: extracting files55029 +Ref: extracting files-Footnote-157676 +Node: extract dir58056 +Node: extracting untrusted archives60449 +Node: failing commands61328 +Node: going further62422 +Node: tar invocation62635 +Node: Synopsis64097 +Node: using tar options69052 +Ref: TAR_OPTIONS70629 +Node: Styles71646 +Ref: Styles-Footnote-173145 +Node: Long Options73401 +Node: Short Options75573 +Ref: Short Options-Footnote-177381 +Node: Old Options77598 +Ref: Old Options-Footnote-180485 +Node: Mixing80655 +Ref: Mixing-Footnote-183021 +Node: All Options83141 +Node: Operation Summary83746 +Ref: --append83866 +Ref: --catenate83946 +Ref: --compare84017 +Ref: --concatenate84220 +Ref: --create84330 +Ref: --delete84398 +Ref: --diff84512 +Ref: --extract84568 +Ref: --get84670 +Ref: --list84728 +Ref: --update84796 +Node: Option Summary85006 +Ref: --absolute-names85161 +Ref: --after-date85339 +Ref: --anchored85391 +Ref: --atime-preserve85524 +Ref: --auto-compress88044 +Ref: --backup88271 +Ref: --block-number88462 +Ref: --blocking-factor88636 +Ref: --bzip288788 +Ref: --check-device88895 +Ref: --checkpoint89090 +Ref: --checkpoint-action89532 +Ref: --check-links90683 +Ref: --compress90960 +Ref: --uncompress90960 +Ref: --confirmation91164 +Ref: --delay-directory-restore91232 +Ref: --dereference91433 +Ref: --directory91627 +Ref: --exclude91880 +Ref: --exclude-backups91999 +Ref: --exclude-from92089 +Ref: --exclude-caches92235 +Ref: --exclude-caches-under92443 +Ref: --exclude-caches-all92621 +Ref: --exclude-tag92750 +Ref: --exclude-tag-under92921 +Ref: --exclude-tag-all93111 +Ref: --exclude-vcs93240 +Ref: --file93406 +Ref: --files-from93606 +Ref: --force-local93809 +Ref: --format94000 +Ref: --full-time94670 +Ref: --group95350 +Ref: --gzip95698 +Ref: --gunzip95698 +Ref: --ungzip95698 +Ref: --hard-dereference95921 +Ref: --help96108 +Ref: --ignore-case96242 +Ref: --ignore-command-error96369 +Ref: --ignore-failed-read96480 +Ref: --ignore-zeros96610 +Ref: --incremental96755 +Ref: --index-file97020 +Ref: --info-script97105 +Ref: --new-volume-script97105 +Ref: --interactive97426 +Ref: --keep-newer-files97638 +Ref: --keep-old-files97780 +Ref: --label97911 +Ref: --level98199 +Ref: --listed-incremental98640 +Ref: --lzip99004 +Ref: --lzma99104 +Ref: --mode99304 +Ref: --mtime99595 +Ref: --multi-volume100036 +Ref: --newer100240 +Ref: --newer-mtime100518 +Ref: --no-anchored100742 +Ref: --no-auto-compress100879 +Ref: --no-check-device101030 +Ref: --no-delay-directory-restore101213 +Ref: --no-ignore-case101466 +Ref: --no-ignore-command-error101559 +Ref: --no-null101714 +Ref: --no-overwrite-dir101919 +Ref: --no-quote-chars102062 +Ref: --no-recursion102243 +Ref: --no-same-owner102348 +Ref: --no-same-permissions102531 +Ref: --no-seek102733 +Ref: --no-unquote102951 +Ref: --no-wildcards103089 +Ref: --no-wildcards-match-slash103173 +Ref: --null103275 +Ref: --numeric-owner103503 +Ref: --occurrence104154 +Ref: --old-archive104721 +Ref: --one-file-system104770 +Ref: --overwrite104948 +Ref: --overwrite-dir105090 +Ref: --owner105235 +Ref: --pax-option105614 +Ref: --portability105921 +Ref: --posix105986 +Ref: --preserve106028 +Ref: --preserve-order106166 +Ref: --preserve-permissions106230 +Ref: --same-permissions106230 +Ref: --quote-chars106644 +Ref: --quoting-style106797 +Ref: --read-full-records107118 +Ref: --record-size107283 +Ref: --recursion107627 +Ref: --recursive-unlink107730 +Ref: --remove-files107897 +Ref: --restrict108043 +Ref: --rmt-command108231 +Ref: --rsh-command108372 +Ref: --same-order108494 +Ref: --same-owner108786 +Ref: --seek109163 +Ref: --show-defaults109532 +Ref: --show-omitted-dirs110022 +Ref: --show-transformed-names110176 +Ref: --show-stored-names110176 +Ref: --sparse110565 +Ref: --sparse-version110704 +Ref: --starting-file110928 +Ref: --strip-components111117 +Ref: --suffix111429 +Ref: --tape-length111548 +Ref: --test-label111963 +Ref: --to-command112115 +Ref: --to-stdout112274 +Ref: --totals112427 +Ref: --touch112658 +Ref: --transform112860 +Ref: --xform112860 +Ref: --unlink-first113471 +Ref: --unquote113639 +Ref: --use-compress-program113746 +Ref: --utc113924 +Ref: --verbose114017 +Ref: --verify114269 +Ref: --version114387 +Ref: --volno-file114559 +Ref: --warning114746 +Ref: --wildcards114923 +Ref: --wildcards-match-slash115043 +Ref: --xz115135 +Ref: Option Summary-Footnote-1115266 +Node: Short Option Summary115484 +Node: help117685 +Ref: help-Footnote-1121569 +Node: defaults121780 +Node: verbose122799 +Ref: totals125100 +Ref: Progress information126690 +Ref: show-omitted-dirs127669 +Ref: block-number128088 +Ref: verbose-Footnote-1129115 +Node: checkpoints129222 +Node: warnings134616 +Node: interactive137968 +Node: operations140050 +Node: Basic tar140309 +Ref: Basic tar-Footnote-1143413 +Node: Advanced tar143557 +Node: Operations144402 +Node: append146301 +Ref: append-Footnote-1149396 +Node: appending files149559 +Node: multiple151297 +Node: update154019 +Node: how to update154995 +Node: concatenate156779 +Ref: concatenate-Footnote-1160027 +Node: delete160170 +Node: compare161943 +Node: create options163375 +Node: override163833 +Node: Ignore Failed Read167261 +Node: extract options167481 +Node: Reading168314 +Node: read full records169814 +Node: Ignore Zeros170150 +Node: Writing171141 +Node: Dealing with Old Files171698 +Node: Overwrite Old Files174125 +Node: Keep Old Files175582 +Node: Keep Newer Files176092 +Node: Unlink First176382 +Node: Recursive Unlink176786 +Node: Data Modification Times177339 +Node: Setting Access Permissions178149 +Node: Directory Modification Times and Permissions178781 +Node: Writing to Standard Output182393 +Node: Writing to an External Program183928 +Node: remove files187067 +Node: Scarce187260 +Node: Starting File187508 +Node: Same Order188309 +Node: backup189145 +Node: Applications192231 +Node: looking ahead193692 +Node: Backups194518 +Node: Full Dumps196099 +Node: Incremental Dumps197905 +Ref: --level=0200819 +Ref: device numbers201352 +Ref: incremental-op205330 +Ref: Incremental Dumps-Footnote-1205704 +Ref: Incremental Dumps-Footnote-2205854 +Node: Backup Levels206342 +Node: Backup Parameters208729 +Node: General-Purpose Variables209910 +Ref: RSH213071 +Node: Magnetic Tape Control214950 +Node: User Hooks216288 +Node: backup-specs example217617 +Node: Scripted Backups218760 +Ref: Scripted Backups-Footnote-1221623 +Node: Scripted Restoration222007 +Node: Choosing224618 +Node: file225740 +Ref: remote-dev228376 +Ref: local and remote archives228761 +Node: Selecting Archive Members229792 +Ref: input name quoting230473 +Node: files232459 +Ref: files-Footnote-1235732 +Node: nul235890 +Node: exclude238289 +Node: problems with exclude243463 +Node: wildcards245508 +Node: controlling pattern-matching248092 +Ref: controlling pattern-matching-Footnote-1252082 +Node: quoting styles252298 +Ref: escape sequences252644 +Node: transform258779 +Ref: show-transformed-names260770 +Node: after266961 +Node: recurse270563 +Node: one273287 +Node: directory274720 +Node: absolute277782 +Ref: absolute-Footnote-1280953 +Node: Date input formats281304 +Node: General date syntax283626 +Node: Calendar date items286577 +Node: Time of day items288574 +Node: Time zone items290770 +Node: Day of week items292004 +Node: Relative items in date strings292993 +Node: Pure numbers in date strings295795 +Node: Seconds since the Epoch296776 +Node: Specifying time zone rules298397 +Node: Authors of parse_datetime300767 +Ref: Authors of get_date300946 +Node: Formats301909 +Node: Compression306597 +Node: gzip306889 +Ref: alternative decompression programs309098 +Ref: auto-compress312929 +Ref: gzip-Footnote-1315169 +Ref: gzip-Footnote-2315218 +Node: lbzip2315358 +Node: sparse316455 +Node: Attributes319509 +Node: Portability325330 +Node: Portable Names326816 +Node: dereference327521 +Node: hard links328648 +Ref: hard links-Footnote-1331533 +Node: old331589 +Node: ustar332773 +Node: gnu333364 +Node: posix334241 +Node: PAX keywords334722 +Node: Checksumming340332 +Node: Large or Negative Values342258 +Node: Other Tars343858 +Node: Split Recovery344994 +Node: Sparse Recovery348726 +Ref: extracting sparse v.0.x352359 +Ref: Sparse Recovery-Footnote-1355648 +Ref: Sparse Recovery-Footnote-2355671 +Node: cpio355792 +Node: Media360549 +Node: Device362496 +Ref: size-suffixes367285 +Node: Remote Tape Server368395 +Node: Common Problems and Solutions372118 +Node: Blocking372510 +Node: Format Variations378954 +Node: Blocking Factor379866 +Node: Many391518 +Node: Tape Positioning395312 +Node: mt397185 +Node: Using Multiple Tapes398740 +Node: Multi-Volume Archives400806 +Ref: tape-length402291 +Ref: change volume prompt402851 +Ref: volno-file403722 +Ref: info-script404274 +Ref: Multi-Volume Archives-Footnote-1409461 +Ref: Multi-Volume Archives-Footnote-2409571 +Node: Tape Files409639 +Node: Tarcat411121 +Node: label412166 +Ref: --test-label option413753 +Ref: label-Footnote-1417198 +Ref: label-Footnote-2417307 +Ref: label-Footnote-3417440 +Node: verify417675 +Node: Write Protection420975 +Node: Reliability and security421805 +Node: Reliability422193 +Node: Permissions problems422971 +Node: Data corruption and repair423410 +Node: Race conditions424336 +Node: Security426076 +Node: Privacy426679 +Node: Integrity427928 +Node: Live untrusted data429969 +Node: Security rules of thumb432309 +Node: Changes433838 +Node: Configuring Help Summary437453 +Node: Fixing Snapshot Files443954 +Node: Tar Internals446140 +Node: Standard446472 +Node: Extensions468673 +Node: Sparse Formats471233 +Node: Old GNU Format472523 +Node: PAX 0474924 +Node: PAX 1478055 +Node: Snapshot Files479793 +Node: Dumpdir484254 +Node: Genfile487500 +Node: Generate Mode488593 +Node: Status Mode492890 +Node: Exec Mode494689 +Node: Free Software Needs Free Documentation497434 +Node: GNU Free Documentation License502416 +Node: Index of Command Line Options527629 +Node: Index553128  End Tag Table diff --git a/doc/tar.info-1 b/doc/tar.info-1 index b420f633..3935da52 100644 --- a/doc/tar.info-1 +++ b/doc/tar.info-1 @@ -1,6 +1,6 @@ This is tar.info, produced by makeinfo version 4.13 from tar.texi. -This manual is for GNU `tar' (version 1.25, 5 November 2010), which +This manual is for GNU `tar' (version 1.26, 12 March 2011), which creates and extracts files from archives. Copyright (C) 1992, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2003, @@ -34,7 +34,7 @@ File: tar.info, Node: Top, Next: Introduction, Up: (dir) GNU tar: an archiver tool ************************* -This manual is for GNU `tar' (version 1.25, 5 November 2010), which +This manual is for GNU `tar' (version 1.26, 12 March 2011), which creates and extracts files from archives. Copyright (C) 1992, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2003, @@ -567,7 +567,7 @@ in version 1.11. Thomas Bushnell, n/BSG and Amy Gorin worked on a tutorial and manual for GNU `tar'. Franc,ois Pinard put version 1.11.8 of the manual together by taking information from all these sources and merging them. Melissa Weisshaus finally edited and redesigned the book -to create version 1.12. The book for versions from 1.14 up to 1.25 +to create version 1.12. The book for versions from 1.14 up to 1.26 were edited by the current maintainer, Sergey Poznyakoff. For version 1.12, Daniel Hagerty contributed a great deal of @@ -941,13 +941,12 @@ Note that you must double the hyphens properly each time. For example, here is an archive listing containing most of the special suffixes explained above: - V--------- 0/0 1536 2006-06-09 13:07 MyVolume--Volume Header-- - -rw-r--r-- gray/staff 456783 2006-06-09 12:06 aspic--Continued at - byte 32456-- - -rw-r--r-- gray/staff 62373 2006-06-09 12:06 apple - lrwxrwxrwx gray/staff 0 2006-06-09 13:01 angst -> apple - -rw-r--r-- gray/staff 35793 2006-06-09 12:06 blues - hrw-r--r-- gray/staff 0 2006-06-09 12:06 music link to blues + V--------- 0/0 1536 2006-06-09 13:07 MyVolume--Volume Header-- + -rw-r--r-- gray/staff 456783 2006-06-09 12:06 aspic--Continued at byte 32456-- + -rw-r--r-- gray/staff 62373 2006-06-09 12:06 apple + lrwxrwxrwx gray/staff 0 2006-06-09 13:01 angst -> apple + -rw-r--r-- gray/staff 35793 2006-06-09 12:06 blues + hrw-r--r-- gray/staff 0 2006-06-09 12:06 music link to blues  @@ -1285,7 +1284,7 @@ verbose member listing::. look like: $ tar --list --verbose --file=collection.tar folk - -rw-r--r-- myself user 62 1990-05-23 10:55 folk + -rw-r--r-- myself/user 62 1990-05-23 10:55 folk It is important to notice that the output of `tar --list --verbose' does not necessarily match that produced by `tar --create --verbose' @@ -1362,11 +1361,11 @@ the archive file `music.tar', type: `tar' responds: - drwxrwxrwx myself user 0 1990-05-31 21:49 practice/ - -rw-r--r-- myself user 42 1990-05-21 13:29 practice/blues - -rw-r--r-- myself user 62 1990-05-23 10:55 practice/folk - -rw-r--r-- myself user 40 1990-05-21 13:30 practice/jazz - -rw-r--r-- myself user 10240 1990-05-31 21:49 practice/collection.tar + drwxrwxrwx myself/user 0 1990-05-31 21:49 practice/ + -rw-r--r-- myself/user 42 1990-05-21 13:29 practice/blues + -rw-r--r-- myself/user 62 1990-05-23 10:55 practice/folk + -rw-r--r-- myself/user 40 1990-05-21 13:30 practice/jazz + -rw-r--r-- myself/user 10240 1990-05-31 21:49 practice/collection.tar When you use a directory name as a file name argument, `tar' acts on all the files (including sub-directories) in that directory. @@ -1412,9 +1411,9 @@ no individual file names as arguments. For example, produces this: - -rw-r--r-- me user 28 1996-10-18 16:31 jazz - -rw-r--r-- me user 21 1996-09-23 16:44 blues - -rw-r--r-- me user 20 1996-09-23 16:44 folk + -rw-r--r-- me/user 28 1996-10-18 16:31 jazz + -rw-r--r-- me/user 21 1996-09-23 16:44 blues + -rw-r--r-- me/user 20 1996-09-23 16:44 folk  File: tar.info, Node: extracting files, Next: extract dir, Prev: extracting archives, Up: extract @@ -1522,8 +1521,8 @@ displayed more detail about the extracted files, as shown in the example below: $ tar -xvvf music.tar practice/folk practice/jazz - -rw-r--r-- me user 28 1996-10-18 16:31 practice/jazz - -rw-r--r-- me user 20 1996-09-23 16:44 practice/folk + -rw-r--r-- me/user 28 1996-10-18 16:31 practice/jazz + -rw-r--r-- me/user 20 1996-09-23 16:44 practice/folk Because you created the directory with `practice' as part of the file names of each of the files by archiving the `practice' directory as @@ -2514,7 +2513,7 @@ File: tar.info, Node: Option Summary, Next: Short Option Summary, Prev: Opera `--level=N' Force incremental backup of level N. As of GNU `tar' version - 1.25, the option `--level=0' truncates the snapshot file, thereby + 1.26, the option `--level=0' truncates the snapshot file, thereby forcing the level 0 dump. Other values of N are effectively ignored. *Note --level=0::, for details and examples. @@ -3058,7 +3057,7 @@ information about its name, version, origin and legal status, all on standard output, and then exit successfully. For example, `tar --version' might print: - tar (GNU tar) 1.25 + tar (GNU tar) 1.26 Copyright (C) 2010 Free Software Foundation, Inc. Copyright (C) 2010 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later . @@ -3526,11 +3525,11 @@ unknown-keyword `Ignoring unknown extended header keyword `%s'' decompress-program - Controls verbose messages describing execution failures when trying - alternative decompressor programs (*note alternative decompression - programs::). This warning is disabled by default (unless - `--verbose' is used). A common example of what you can get when - using this warning is: + Controls verbose description of failures occurring when trying to + run alternative decompressor programs (*note alternative + decompression programs::). This warning is disabled by default + (unless `--verbose' is used). A common example of what you can get + when using this warning is: $ tar --warning=decompress-program -x -f archive.Z tar (child): cannot run compress: No such file or directory @@ -3863,10 +3862,10 @@ If you now use the `--list' (`-t') operation, you will see that `rock' has been added to the archive: $ tar --list --file=collection.tar - -rw-r--r-- me user 28 1996-10-18 16:31 jazz - -rw-r--r-- me user 21 1996-09-23 16:44 blues - -rw-r--r-- me user 20 1996-09-23 16:44 folk - -rw-r--r-- me user 20 1996-09-23 16:44 rock + -rw-r--r-- me/user 28 1996-10-18 16:31 jazz + -rw-r--r-- me/user 21 1996-09-23 16:44 blues + -rw-r--r-- me/user 20 1996-09-23 16:44 folk + -rw-r--r-- me/user 20 1996-09-23 16:44 rock  File: tar.info, Node: multiple, Prev: appending files, Up: append @@ -3905,11 +3904,11 @@ name of the file being appended as it was acted on. Now list the contents of the archive: $ tar --list --verbose --file=collection.tar - -rw-r--r-- me user 28 1996-10-18 16:31 jazz - -rw-r--r-- me user 21 1996-09-23 16:44 blues - -rw-r--r-- me user 20 1996-09-23 16:44 folk - -rw-r--r-- me user 20 1996-09-23 16:44 rock - -rw-r--r-- me user 58 1996-10-24 18:30 blues + -rw-r--r-- me/user 28 1996-10-18 16:31 jazz + -rw-r--r-- me/user 21 1996-09-23 16:44 blues + -rw-r--r-- me/user 20 1996-09-23 16:44 folk + -rw-r--r-- me/user 20 1996-09-23 16:44 rock + -rw-r--r-- me/user 58 1996-10-24 18:30 blues The newest version of `blues' is now at the end of the archive (note the different creation dates and file sizes). If you extract the @@ -3922,7 +3921,7 @@ the archive, use `--occurrence' option, as shown in the following example: $ tar --extract -vv --occurrence --file=collection.tar blues - -rw-r--r-- me user 21 1996-09-23 16:44 blues + -rw-r--r-- me/user 21 1996-09-23 16:44 blues *Note Writing::, for more information on `--extract' and see *note -occurrence: Option Summary, for a description of `--occurrence' option. @@ -4027,11 +4026,11 @@ If you like, You can run `tar --list' to make sure the archives contain what they are supposed to: $ tar -tvf bluesrock.tar - -rw-r--r-- melissa user 105 1997-01-21 19:42 blues - -rw-r--r-- melissa user 33 1997-01-20 15:34 rock + -rw-r--r-- melissa/user 105 1997-01-21 19:42 blues + -rw-r--r-- melissa/user 33 1997-01-20 15:34 rock $ tar -tvf jazzfolk.tar - -rw-r--r-- melissa user 20 1996-09-23 16:44 folk - -rw-r--r-- melissa user 65 1997-01-30 14:15 jazz + -rw-r--r-- melissa/user 20 1996-09-23 16:44 folk + -rw-r--r-- melissa/user 65 1997-01-30 14:15 jazz We can concatenate these two archives with `tar': @@ -6123,7 +6122,7 @@ difficult to catch using text editors. systems: `CVS', `RCS', `SCCS', `SVN', `Arch', `Bazaar', `Mercurial', and `Darcs'. - As of version 1.25, the following files are excluded: + As of version 1.26, the following files are excluded: * `CVS/', and everything under it diff --git a/doc/tar.info-2 b/doc/tar.info-2 index 18117aba..3c726720 100644 --- a/doc/tar.info-2 +++ b/doc/tar.info-2 @@ -1,6 +1,6 @@ This is tar.info, produced by makeinfo version 4.13 from tar.texi. -This manual is for GNU `tar' (version 1.25, 5 November 2010), which +This manual is for GNU `tar' (version 1.26, 12 March 2011), which creates and extracts files from archives. Copyright (C) 1992, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2003, @@ -77,7 +77,7 @@ v7 Makefiles. This practice will change in the future, in the meantime, however this means that projects containing file names more than 99 characters long will not be able to use GNU `tar' - 1.25 and Automake prior to 1.9. + 1.26 and Automake prior to 1.9. ustar Archive format defined by POSIX.1-1988 specification. It stores @@ -213,7 +213,7 @@ a list of recognized suffixes). Some compression programs are able to handle different compression formats. GNU `tar' uses this, if the principal decompressor for the given format is not available. For example, if `compress' is not -installed, `tar' will try to use `gzip'. As of version 1.25 the +installed, `tar' will try to use `gzip'. As of version 1.26 the following alternatives are tried(2): Format Main decompressor Alternatives @@ -692,9 +692,9 @@ archive naming the target of the link (a `1' type block). In that way, the actual file contents is stored in file only once. For example, consider the following two files: - $ ls - -rw-r--r-- 2 gray staff 4 2007-10-30 15:11 one - -rw-r--r-- 2 gray staff 4 2007-10-30 15:11 jeden + $ ls -l + -rw-r--r-- 2 gray staff 4 2007-10-30 15:11 one + -rw-r--r-- 2 gray staff 4 2007-10-30 15:11 jeden Here, `jeden' is a link to `one'. When archiving this directory with a verbose level 2, you will get an output similar to the following: @@ -2605,8 +2605,8 @@ contents. If verbose display is requested, it will also be explicitly marked as in the example below: $ tar --verbose --list --file=iamanarchive - V--------- 0 0 0 1992-03-07 12:01 iamalabel--Volume Header-- - -rw-r--r-- ringo user 40 1990-05-21 13:30 iamafilename + V--------- 0/0 0 1992-03-07 12:01 iamalabel--Volume Header-- + -rw-r--r-- ringo/user 40 1990-05-21 13:30 iamafilename However, `--list' option will cause listing entire contents of the archive, which may be undesirable (for example, if the archive is @@ -3069,7 +3069,7 @@ Appendix A Changes ****************** This appendix lists some important user-visible changes between version -GNU `tar' 1.25 and previous versions. An up-to-date version of this +GNU `tar' 1.26 and previous versions. An up-to-date version of this document is available at the GNU `tar' documentation page (http://www.gnu.org/software/tar/manual/changes.html). @@ -4105,12 +4105,12 @@ backups (*note Incremental Dumps::). It contains the status of the file system at the time of the dump and is used to determine which files were modified since the last backup. - GNU `tar' version 1.25 supports three snapshot file formats. The + GNU `tar' version 1.26 supports three snapshot file formats. The first format, called "format 0", is the one used by GNU `tar' versions up to 1.15.1. The second format, called "format 1" is an extended version of this format, that contains more metadata and allows for further extensions. It was used by version 1.15.1. Starting from -version 1.16 and up to 1.25, the "format 2" is used. +version 1.16 and up to 1.26, the "format 2" is used. GNU `tar' is able to read all three formats, but will create snapshots only in format 2. @@ -4166,7 +4166,7 @@ snapshots only in format 2. 2. `Format 2' snapshot file begins with a format identifier, as described for version 1, e.g.: - GNU tar-1.25-2 + GNU tar-1.26-2 This line is followed by newline. Rest of file consists of records, separated by null (ASCII 0) characters. Thus, in contrast diff --git a/doc/tar.texi b/doc/tar.texi index 2c259ff9..db8f986e 100644 --- a/doc/tar.texi +++ b/doc/tar.texi @@ -1022,13 +1022,12 @@ suffixes explained above: @smallexample @group -V--------- 0/0 1536 2006-06-09 13:07 MyVolume--Volume Header-- --rw-r--r-- gray/staff 456783 2006-06-09 12:06 aspic--Continued at -byte 32456-- --rw-r--r-- gray/staff 62373 2006-06-09 12:06 apple -lrwxrwxrwx gray/staff 0 2006-06-09 13:01 angst -> apple --rw-r--r-- gray/staff 35793 2006-06-09 12:06 blues -hrw-r--r-- gray/staff 0 2006-06-09 12:06 music link to blues +V--------- 0/0 1536 2006-06-09 13:07 MyVolume--Volume Header-- +-rw-r--r-- gray/staff 456783 2006-06-09 12:06 aspic--Continued at byte 32456-- +-rw-r--r-- gray/staff 62373 2006-06-09 12:06 apple +lrwxrwxrwx gray/staff 0 2006-06-09 13:01 angst -> apple +-rw-r--r-- gray/staff 35793 2006-06-09 12:06 blues +hrw-r--r-- gray/staff 0 2006-06-09 12:06 music link to blues @end group @end smallexample @@ -1421,7 +1420,7 @@ above would look like: @smallexample $ @kbd{tar --list --verbose --file=collection.tar folk} --rw-r--r-- myself user 62 1990-05-23 10:55 folk +-rw-r--r-- myself/user 62 1990-05-23 10:55 folk @end smallexample @cindex listing member and file names @@ -1513,11 +1512,11 @@ $ @kbd{tar --list --verbose --file=music.tar practice} @command{tar} responds: @smallexample -drwxrwxrwx myself user 0 1990-05-31 21:49 practice/ --rw-r--r-- myself user 42 1990-05-21 13:29 practice/blues --rw-r--r-- myself user 62 1990-05-23 10:55 practice/folk --rw-r--r-- myself user 40 1990-05-21 13:30 practice/jazz --rw-r--r-- myself user 10240 1990-05-31 21:49 practice/collection.tar +drwxrwxrwx myself/user 0 1990-05-31 21:49 practice/ +-rw-r--r-- myself/user 42 1990-05-21 13:29 practice/blues +-rw-r--r-- myself/user 62 1990-05-23 10:55 practice/folk +-rw-r--r-- myself/user 40 1990-05-21 13:30 practice/jazz +-rw-r--r-- myself/user 10240 1990-05-31 21:49 practice/collection.tar @end smallexample When you use a directory name as a file name argument, @command{tar} acts on @@ -1567,9 +1566,9 @@ $ @kbd{tar -xvf collection.tar} produces this: @smallexample --rw-r--r-- me user 28 1996-10-18 16:31 jazz --rw-r--r-- me user 21 1996-09-23 16:44 blues --rw-r--r-- me user 20 1996-09-23 16:44 folk +-rw-r--r-- me/user 28 1996-10-18 16:31 jazz +-rw-r--r-- me/user 21 1996-09-23 16:44 blues +-rw-r--r-- me/user 20 1996-09-23 16:44 folk @end smallexample @node extracting files @@ -1683,8 +1682,8 @@ in the example below: @smallexample $ @kbd{tar -xvvf music.tar practice/folk practice/jazz} --rw-r--r-- me user 28 1996-10-18 16:31 practice/jazz --rw-r--r-- me user 20 1996-09-23 16:44 practice/folk +-rw-r--r-- me/user 28 1996-10-18 16:31 practice/jazz +-rw-r--r-- me/user 20 1996-09-23 16:44 practice/folk @end smallexample @noindent @@ -4168,7 +4167,7 @@ Disable all warning messages. @samp{Ignoring unknown extended header keyword `%s'} @kwindex decompress-program @item decompress-program -Controls verbose messages describing execution failures when trying +Controls verbose description of failures occurring when trying to run alternative decompressor programs (@pxref{alternative decompression programs}). This warning is disabled by default (unless @option{--verbose} is used). A common example of what you can get @@ -4534,10 +4533,10 @@ If you now use the @option{--list} (@option{-t}) operation, you will see that @smallexample $ @kbd{tar --list --file=collection.tar} --rw-r--r-- me user 28 1996-10-18 16:31 jazz --rw-r--r-- me user 21 1996-09-23 16:44 blues --rw-r--r-- me user 20 1996-09-23 16:44 folk --rw-r--r-- me user 20 1996-09-23 16:44 rock +-rw-r--r-- me/user 28 1996-10-18 16:31 jazz +-rw-r--r-- me/user 21 1996-09-23 16:44 blues +-rw-r--r-- me/user 20 1996-09-23 16:44 folk +-rw-r--r-- me/user 20 1996-09-23 16:44 rock @end smallexample @node multiple @@ -4581,11 +4580,11 @@ list the contents of the archive: @smallexample $ @kbd{tar --list --verbose --file=collection.tar} --rw-r--r-- me user 28 1996-10-18 16:31 jazz --rw-r--r-- me user 21 1996-09-23 16:44 blues --rw-r--r-- me user 20 1996-09-23 16:44 folk --rw-r--r-- me user 20 1996-09-23 16:44 rock --rw-r--r-- me user 58 1996-10-24 18:30 blues +-rw-r--r-- me/user 28 1996-10-18 16:31 jazz +-rw-r--r-- me/user 21 1996-09-23 16:44 blues +-rw-r--r-- me/user 20 1996-09-23 16:44 folk +-rw-r--r-- me/user 20 1996-09-23 16:44 rock +-rw-r--r-- me/user 58 1996-10-24 18:30 blues @end smallexample @noindent @@ -4601,7 +4600,7 @@ the following example: @smallexample $ @kbd{tar --extract -vv --occurrence --file=collection.tar blues} --rw-r--r-- me user 21 1996-09-23 16:44 blues +-rw-r--r-- me/user 21 1996-09-23 16:44 blues @end smallexample @xref{Writing}, for more information on @option{--extract} and @@ -4728,11 +4727,11 @@ contain what they are supposed to: @smallexample $ @kbd{tar -tvf bluesrock.tar} --rw-r--r-- melissa user 105 1997-01-21 19:42 blues --rw-r--r-- melissa user 33 1997-01-20 15:34 rock +-rw-r--r-- melissa/user 105 1997-01-21 19:42 blues +-rw-r--r-- melissa/user 33 1997-01-20 15:34 rock $ @kbd{tar -tvf jazzfolk.tar} --rw-r--r-- melissa user 20 1996-09-23 16:44 folk --rw-r--r-- melissa user 65 1997-01-30 14:15 jazz +-rw-r--r-- melissa/user 20 1996-09-23 16:44 folk +-rw-r--r-- melissa/user 65 1997-01-30 14:15 jazz @end smallexample We can concatenate these two archives with @command{tar}: @@ -8783,7 +8782,7 @@ tried@footnote{To verbosely trace the decompressor selection, use the @option{--warning=decompress-program} option (@pxref{warnings,decompress-program}).}: -@multitable @columnfractions 0.3 0.3 0.3 +@multitable @columnfractions 0.3 0.3 0.3 @headitem Format @tab Main decompressor @tab Alternatives @item compress @tab compress @tab gzip @item lzma @tab lzma @tab xz @@ -9387,9 +9386,9 @@ once. For example, consider the following two files: @smallexample @group -$ ls --rw-r--r-- 2 gray staff 4 2007-10-30 15:11 one --rw-r--r-- 2 gray staff 4 2007-10-30 15:11 jeden +$ ls -l +-rw-r--r-- 2 gray staff 4 2007-10-30 15:11 one +-rw-r--r-- 2 gray staff 4 2007-10-30 15:11 jeden @end group @end smallexample @@ -11551,8 +11550,8 @@ explicitly marked as in the example below: @smallexample @group $ @kbd{tar --verbose --list --file=iamanarchive} -V--------- 0 0 0 1992-03-07 12:01 iamalabel--Volume Header-- --rw-r--r-- ringo user 40 1990-05-21 13:30 iamafilename +V--------- 0/0 0 1992-03-07 12:01 iamalabel--Volume Header-- +-rw-r--r-- ringo/user 40 1990-05-21 13:30 iamafilename @end group @end smallexample diff --git a/doc/version.texi b/doc/version.texi index 9e8b5023..019935b1 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 5 November 2010 -@set UPDATED-MONTH November 2010 -@set EDITION 1.25 -@set VERSION 1.25 +@set UPDATED 12 March 2011 +@set UPDATED-MONTH March 2011 +@set EDITION 1.26 +@set VERSION 1.26 diff --git a/gnu/Makefile.am b/gnu/Makefile.am index 5fca573f..06eb0d95 100644 --- a/gnu/Makefile.am +++ b/gnu/Makefile.am @@ -2,7 +2,7 @@ # DO NOT EDIT! GENERATED AUTOMATICALLY! ## DO NOT EDIT! GENERATED AUTOMATICALLY! ## Process this file with automake to produce Makefile.in. -# Copyright (C) 2002-2010 Free Software Foundation, Inc. +# Copyright (C) 2002-2011 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 @@ -258,21 +258,8 @@ EXTRA_libgnu_a_SOURCES += closeout.c ## begin gnulib module configmake -# Retrieve values of the variables through 'configure' followed by -# 'make', not directly through 'configure', so that a user who -# sets some of these variables consistently on the 'make' command -# line gets correct results. -# -# One advantage of this approach, compared to the classical -# approach of adding -DLIBDIR=\"$(libdir)\" etc. to AM_CPPFLAGS, -# is that it protects against the use of undefined variables. -# If, say, $(libdir) is not set in the Makefile, LIBDIR is not -# defined by this module, and code using LIBDIR gives a -# compilation error. -# -# Another advantage is that 'make' output is shorter. -# -# Listed in the same order as the GNU makefile conventions. +# Listed in the same order as the GNU makefile conventions, and +# provided by autoconf 2.59c+. # The Automake-defined pkg* macros are appended, in the order # listed in the Automake 1.10a+ documentation. configmake.h: Makefile @@ -391,6 +378,13 @@ EXTRA_libgnu_a_SOURCES += basename-lgpl.c dirname-lgpl.c stripslash.c ## end gnulib module dirname-lgpl +## begin gnulib module dosname + + +EXTRA_DIST += dosname.h + +## end gnulib module dosname + ## begin gnulib module dup2 @@ -832,6 +826,15 @@ EXTRA_DIST += inttypes.in.h ## end gnulib module inttypes +## begin gnulib module iswblank + + +EXTRA_DIST += iswblank.c + +EXTRA_libgnu_a_SOURCES += iswblank.c + +## end gnulib module iswblank + ## begin gnulib module langinfo BUILT_SOURCES += langinfo.h @@ -1044,12 +1047,21 @@ EXTRA_libgnu_a_SOURCES += mbsinit.c ## begin gnulib module mbsrtowcs -EXTRA_DIST += mbsrtowcs-state.c mbsrtowcs.c +EXTRA_DIST += mbsrtowcs-impl.h mbsrtowcs-state.c mbsrtowcs.c EXTRA_libgnu_a_SOURCES += mbsrtowcs-state.c mbsrtowcs.c ## end gnulib module mbsrtowcs +## begin gnulib module mbtowc + + +EXTRA_DIST += mbtowc-impl.h mbtowc.c + +EXTRA_libgnu_a_SOURCES += mbtowc.c + +## end gnulib module mbtowc + ## begin gnulib module mbuiter libgnu_a_SOURCES += mbuiter.h @@ -1512,6 +1524,7 @@ stdint.h: stdint.in.h -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \ -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \ -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \ + -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \ -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \ -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \ -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \ @@ -1593,6 +1606,8 @@ stdio.h: stdio.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''GNULIB_VSPRINTF_POSIX''@|$(GNULIB_VSPRINTF_POSIX)|g' \ < $(srcdir)/stdio.in.h | \ sed -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \ + -e 's|@''HAVE_DECL_FSEEKO''@|$(HAVE_DECL_FSEEKO)|g' \ + -e 's|@''HAVE_DECL_FTELLO''@|$(HAVE_DECL_FTELLO)|g' \ -e 's|@''HAVE_DECL_GETDELIM''@|$(HAVE_DECL_GETDELIM)|g' \ -e 's|@''HAVE_DECL_GETLINE''@|$(HAVE_DECL_GETLINE)|g' \ -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|$(HAVE_DECL_OBSTACK_PRINTF)|g' \ @@ -1642,9 +1657,7 @@ stdio.h: stdio.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) mv $@-t $@ MOSTLYCLEANFILES += stdio.h stdio.h-t -EXTRA_DIST += stdio-write.c stdio.in.h - -EXTRA_libgnu_a_SOURCES += stdio-write.c +EXTRA_DIST += stdio.in.h ## end gnulib module stdio @@ -1669,6 +1682,7 @@ stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''GNULIB_GETSUBOPT''@|$(GNULIB_GETSUBOPT)|g' \ -e 's|@''GNULIB_GRANTPT''@|$(GNULIB_GRANTPT)|g' \ -e 's|@''GNULIB_MALLOC_POSIX''@|$(GNULIB_MALLOC_POSIX)|g' \ + -e 's|@''GNULIB_MBTOWC''@|$(GNULIB_MBTOWC)|g' \ -e 's|@''GNULIB_MKDTEMP''@|$(GNULIB_MKDTEMP)|g' \ -e 's|@''GNULIB_MKOSTEMP''@|$(GNULIB_MKOSTEMP)|g' \ -e 's|@''GNULIB_MKOSTEMPS''@|$(GNULIB_MKOSTEMPS)|g' \ @@ -1687,7 +1701,9 @@ stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''GNULIB_SYSTEM_POSIX''@|$(GNULIB_SYSTEM_POSIX)|g' \ -e 's|@''GNULIB_UNLOCKPT''@|$(GNULIB_UNLOCKPT)|g' \ -e 's|@''GNULIB_UNSETENV''@|$(GNULIB_UNSETENV)|g' \ - -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \ + -e 's|@''GNULIB_WCTOMB''@|$(GNULIB_WCTOMB)|g' \ + < $(srcdir)/stdlib.in.h | \ + sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \ -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \ -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|$(HAVE_CANONICALIZE_FILE_NAME)|g' \ -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \ @@ -1703,17 +1719,18 @@ stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \ -e 's|@''HAVE_REALPATH''@|$(HAVE_REALPATH)|g' \ -e 's|@''HAVE_RPMATCH''@|$(HAVE_RPMATCH)|g' \ - -e 's|@''HAVE_SETENV''@|$(HAVE_SETENV)|g' \ + -e 's|@''HAVE_DECL_SETENV''@|$(HAVE_DECL_SETENV)|g' \ -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \ -e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \ -e 's|@''HAVE_STRTOULL''@|$(HAVE_STRTOULL)|g' \ -e 's|@''HAVE_STRUCT_RANDOM_DATA''@|$(HAVE_STRUCT_RANDOM_DATA)|g' \ -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \ -e 's|@''HAVE_UNLOCKPT''@|$(HAVE_UNLOCKPT)|g' \ - -e 's|@''HAVE_UNSETENV''@|$(HAVE_UNSETENV)|g' \ + -e 's|@''HAVE_DECL_UNSETENV''@|$(HAVE_DECL_UNSETENV)|g' \ -e 's|@''REPLACE_CALLOC''@|$(REPLACE_CALLOC)|g' \ -e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@|$(REPLACE_CANONICALIZE_FILE_NAME)|g' \ -e 's|@''REPLACE_MALLOC''@|$(REPLACE_MALLOC)|g' \ + -e 's|@''REPLACE_MBTOWC''@|$(REPLACE_MBTOWC)|g' \ -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \ -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \ -e 's|@''REPLACE_REALLOC''@|$(REPLACE_REALLOC)|g' \ @@ -1721,10 +1738,10 @@ stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \ -e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \ -e 's|@''REPLACE_UNSETENV''@|$(REPLACE_UNSETENV)|g' \ + -e 's|@''REPLACE_WCTOMB''@|$(REPLACE_WCTOMB)|g' \ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/stdlib.in.h; \ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ } > $@-t && \ mv $@-t $@ MOSTLYCLEANFILES += stdlib.h stdlib.h-t @@ -1830,6 +1847,7 @@ string.h: string.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''GNULIB_STRCASESTR''@|$(GNULIB_STRCASESTR)|g' \ -e 's|@''GNULIB_STRTOK_R''@|$(GNULIB_STRTOK_R)|g' \ -e 's|@''GNULIB_STRERROR''@|$(GNULIB_STRERROR)|g' \ + -e 's|@''GNULIB_STRERROR_R''@|$(GNULIB_STRERROR_R)|g' \ -e 's|@''GNULIB_STRSIGNAL''@|$(GNULIB_STRSIGNAL)|g' \ -e 's|@''GNULIB_STRVERSCMP''@|$(GNULIB_STRVERSCMP)|g' \ < $(srcdir)/string.in.h | \ @@ -1849,6 +1867,7 @@ string.h: string.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''HAVE_STRSEP''@|$(HAVE_STRSEP)|g' \ -e 's|@''HAVE_STRCASESTR''@|$(HAVE_STRCASESTR)|g' \ -e 's|@''HAVE_DECL_STRTOK_R''@|$(HAVE_DECL_STRTOK_R)|g' \ + -e 's|@''HAVE_DECL_STRERROR_R''@|$(HAVE_DECL_STRERROR_R)|g' \ -e 's|@''HAVE_DECL_STRSIGNAL''@|$(HAVE_DECL_STRSIGNAL)|g' \ -e 's|@''HAVE_STRVERSCMP''@|$(HAVE_STRVERSCMP)|g' \ -e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \ @@ -1858,6 +1877,7 @@ string.h: string.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''REPLACE_STRDUP''@|$(REPLACE_STRDUP)|g' \ -e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \ -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \ + -e 's|@''REPLACE_STRERROR_R''@|$(REPLACE_STRERROR_R)|g' \ -e 's|@''REPLACE_STRNCAT''@|$(REPLACE_STRNCAT)|g' \ -e 's|@''REPLACE_STRNDUP''@|$(REPLACE_STRNDUP)|g' \ -e 's|@''REPLACE_STRNLEN''@|$(REPLACE_STRNLEN)|g' \ @@ -2138,7 +2158,7 @@ time.h: time.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''GNULIB_STRPTIME''@|$(GNULIB_STRPTIME)|g' \ -e 's|@''GNULIB_TIMEGM''@|$(GNULIB_TIMEGM)|g' \ -e 's|@''GNULIB_TIME_R''@|$(GNULIB_TIME_R)|g' \ - -e 's|@''HAVE_LOCALTIME_R''@|$(HAVE_LOCALTIME_R)|g' \ + -e 's|@''HAVE_DECL_LOCALTIME_R''@|$(HAVE_DECL_LOCALTIME_R)|g' \ -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \ -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \ -e 's|@''HAVE_TIMEGM''@|$(HAVE_TIMEGM)|g' \ @@ -2215,6 +2235,7 @@ unistd.h: unistd.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''GNULIB_LINK''@|$(GNULIB_LINK)|g' \ -e 's|@''GNULIB_LINKAT''@|$(GNULIB_LINKAT)|g' \ -e 's|@''GNULIB_LSEEK''@|$(GNULIB_LSEEK)|g' \ + -e 's|@''GNULIB_PIPE''@|$(GNULIB_PIPE)|g' \ -e 's|@''GNULIB_PIPE2''@|$(GNULIB_PIPE2)|g' \ -e 's|@''GNULIB_PREAD''@|$(GNULIB_PREAD)|g' \ -e 's|@''GNULIB_PWRITE''@|$(GNULIB_PWRITE)|g' \ @@ -2241,7 +2262,6 @@ unistd.h: unistd.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''HAVE_FCHOWNAT''@|$(HAVE_FCHOWNAT)|g' \ -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \ -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \ - -e 's|@''HAVE_GETDOMAINNAME''@|$(HAVE_GETDOMAINNAME)|g' \ -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \ -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \ -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \ @@ -2250,6 +2270,7 @@ unistd.h: unistd.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''HAVE_LCHOWN''@|$(HAVE_LCHOWN)|g' \ -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \ -e 's|@''HAVE_LINKAT''@|$(HAVE_LINKAT)|g' \ + -e 's|@''HAVE_PIPE''@|$(HAVE_PIPE)|g' \ -e 's|@''HAVE_PIPE2''@|$(HAVE_PIPE2)|g' \ -e 's|@''HAVE_PREAD''@|$(HAVE_PREAD)|g' \ -e 's|@''HAVE_PWRITE''@|$(HAVE_PWRITE)|g' \ @@ -2258,21 +2279,26 @@ unistd.h: unistd.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \ -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \ -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \ - -e 's|@''HAVE_TTYNAME_R''@|$(HAVE_TTYNAME_R)|g' \ -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \ -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \ -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \ + -e 's|@''HAVE_DECL_FCHDIR''@|$(HAVE_DECL_FCHDIR)|g' \ + -e 's|@''HAVE_DECL_GETDOMAINNAME''@|$(HAVE_DECL_GETDOMAINNAME)|g' \ -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \ -e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \ -e 's|@''HAVE_DECL_GETUSERSHELL''@|$(HAVE_DECL_GETUSERSHELL)|g' \ + -e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \ -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \ -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \ - -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ + | \ + sed -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \ -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \ -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \ -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \ -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \ + -e 's|@''REPLACE_GETDOMAINNAME''@|$(REPLACE_GETDOMAINNAME)|g' \ + -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \ -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \ -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \ @@ -2482,6 +2508,7 @@ wchar.h: wchar.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \ -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \ -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \ -e 's|@''GNULIB_BTOWC''@|$(GNULIB_BTOWC)|g' \ @@ -2495,7 +2522,36 @@ wchar.h: wchar.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''GNULIB_WCSRTOMBS''@|$(GNULIB_WCSRTOMBS)|g' \ -e 's|@''GNULIB_WCSNRTOMBS''@|$(GNULIB_WCSNRTOMBS)|g' \ -e 's|@''GNULIB_WCWIDTH''@|$(GNULIB_WCWIDTH)|g' \ - -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ + -e 's|@''GNULIB_WMEMCHR''@|$(GNULIB_WMEMCHR)|g' \ + -e 's|@''GNULIB_WMEMCMP''@|$(GNULIB_WMEMCMP)|g' \ + -e 's|@''GNULIB_WMEMCPY''@|$(GNULIB_WMEMCPY)|g' \ + -e 's|@''GNULIB_WMEMMOVE''@|$(GNULIB_WMEMMOVE)|g' \ + -e 's|@''GNULIB_WMEMSET''@|$(GNULIB_WMEMSET)|g' \ + -e 's|@''GNULIB_WCSLEN''@|$(GNULIB_WCSLEN)|g' \ + -e 's|@''GNULIB_WCSNLEN''@|$(GNULIB_WCSNLEN)|g' \ + -e 's|@''GNULIB_WCSCPY''@|$(GNULIB_WCSCPY)|g' \ + -e 's|@''GNULIB_WCPCPY''@|$(GNULIB_WCPCPY)|g' \ + -e 's|@''GNULIB_WCSNCPY''@|$(GNULIB_WCSNCPY)|g' \ + -e 's|@''GNULIB_WCPNCPY''@|$(GNULIB_WCPNCPY)|g' \ + -e 's|@''GNULIB_WCSCAT''@|$(GNULIB_WCSCAT)|g' \ + -e 's|@''GNULIB_WCSNCAT''@|$(GNULIB_WCSNCAT)|g' \ + -e 's|@''GNULIB_WCSCMP''@|$(GNULIB_WCSCMP)|g' \ + -e 's|@''GNULIB_WCSNCMP''@|$(GNULIB_WCSNCMP)|g' \ + -e 's|@''GNULIB_WCSCASECMP''@|$(GNULIB_WCSCASECMP)|g' \ + -e 's|@''GNULIB_WCSNCASECMP''@|$(GNULIB_WCSNCASECMP)|g' \ + -e 's|@''GNULIB_WCSCOLL''@|$(GNULIB_WCSCOLL)|g' \ + -e 's|@''GNULIB_WCSXFRM''@|$(GNULIB_WCSXFRM)|g' \ + -e 's|@''GNULIB_WCSDUP''@|$(GNULIB_WCSDUP)|g' \ + -e 's|@''GNULIB_WCSCHR''@|$(GNULIB_WCSCHR)|g' \ + -e 's|@''GNULIB_WCSRCHR''@|$(GNULIB_WCSRCHR)|g' \ + -e 's|@''GNULIB_WCSCSPN''@|$(GNULIB_WCSCSPN)|g' \ + -e 's|@''GNULIB_WCSSPN''@|$(GNULIB_WCSSPN)|g' \ + -e 's|@''GNULIB_WCSPBRK''@|$(GNULIB_WCSPBRK)|g' \ + -e 's|@''GNULIB_WCSSTR''@|$(GNULIB_WCSSTR)|g' \ + -e 's|@''GNULIB_WCSTOK''@|$(GNULIB_WCSTOK)|g' \ + -e 's|@''GNULIB_WCSWIDTH''@|$(GNULIB_WCSWIDTH)|g' \ + < $(srcdir)/wchar.in.h | \ + sed -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \ -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \ -e 's|@''HAVE_MBRTOWC''@|$(HAVE_MBRTOWC)|g' \ @@ -2505,9 +2561,38 @@ wchar.h: wchar.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''HAVE_WCRTOMB''@|$(HAVE_WCRTOMB)|g' \ -e 's|@''HAVE_WCSRTOMBS''@|$(HAVE_WCSRTOMBS)|g' \ -e 's|@''HAVE_WCSNRTOMBS''@|$(HAVE_WCSNRTOMBS)|g' \ + -e 's|@''HAVE_WMEMCHR''@|$(HAVE_WMEMCHR)|g' \ + -e 's|@''HAVE_WMEMCMP''@|$(HAVE_WMEMCMP)|g' \ + -e 's|@''HAVE_WMEMCPY''@|$(HAVE_WMEMCPY)|g' \ + -e 's|@''HAVE_WMEMMOVE''@|$(HAVE_WMEMMOVE)|g' \ + -e 's|@''HAVE_WMEMSET''@|$(HAVE_WMEMSET)|g' \ + -e 's|@''HAVE_WCSLEN''@|$(HAVE_WCSLEN)|g' \ + -e 's|@''HAVE_WCSNLEN''@|$(HAVE_WCSNLEN)|g' \ + -e 's|@''HAVE_WCSCPY''@|$(HAVE_WCSCPY)|g' \ + -e 's|@''HAVE_WCPCPY''@|$(HAVE_WCPCPY)|g' \ + -e 's|@''HAVE_WCSNCPY''@|$(HAVE_WCSNCPY)|g' \ + -e 's|@''HAVE_WCPNCPY''@|$(HAVE_WCPNCPY)|g' \ + -e 's|@''HAVE_WCSCAT''@|$(HAVE_WCSCAT)|g' \ + -e 's|@''HAVE_WCSNCAT''@|$(HAVE_WCSNCAT)|g' \ + -e 's|@''HAVE_WCSCMP''@|$(HAVE_WCSCMP)|g' \ + -e 's|@''HAVE_WCSNCMP''@|$(HAVE_WCSNCMP)|g' \ + -e 's|@''HAVE_WCSCASECMP''@|$(HAVE_WCSCASECMP)|g' \ + -e 's|@''HAVE_WCSNCASECMP''@|$(HAVE_WCSNCASECMP)|g' \ + -e 's|@''HAVE_WCSCOLL''@|$(HAVE_WCSCOLL)|g' \ + -e 's|@''HAVE_WCSXFRM''@|$(HAVE_WCSXFRM)|g' \ + -e 's|@''HAVE_WCSDUP''@|$(HAVE_WCSDUP)|g' \ + -e 's|@''HAVE_WCSCHR''@|$(HAVE_WCSCHR)|g' \ + -e 's|@''HAVE_WCSRCHR''@|$(HAVE_WCSRCHR)|g' \ + -e 's|@''HAVE_WCSCSPN''@|$(HAVE_WCSCSPN)|g' \ + -e 's|@''HAVE_WCSSPN''@|$(HAVE_WCSSPN)|g' \ + -e 's|@''HAVE_WCSPBRK''@|$(HAVE_WCSPBRK)|g' \ + -e 's|@''HAVE_WCSSTR''@|$(HAVE_WCSSTR)|g' \ + -e 's|@''HAVE_WCSTOK''@|$(HAVE_WCSTOK)|g' \ + -e 's|@''HAVE_WCSWIDTH''@|$(HAVE_WCSWIDTH)|g' \ -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \ -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \ - -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \ + | \ + sed -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \ -e 's|@''REPLACE_BTOWC''@|$(REPLACE_BTOWC)|g' \ -e 's|@''REPLACE_WCTOB''@|$(REPLACE_WCTOB)|g' \ -e 's|@''REPLACE_MBSINIT''@|$(REPLACE_MBSINIT)|g' \ @@ -2519,10 +2604,10 @@ wchar.h: wchar.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''REPLACE_WCSRTOMBS''@|$(REPLACE_WCSRTOMBS)|g' \ -e 's|@''REPLACE_WCSNRTOMBS''@|$(REPLACE_WCSNRTOMBS)|g' \ -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \ + -e 's|@''REPLACE_WCSWIDTH''@|$(REPLACE_WCSWIDTH)|g' \ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/wchar.in.h; \ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ } > $@-t && \ mv $@-t $@ MOSTLYCLEANFILES += wchar.h wchar.h-t @@ -2540,7 +2625,7 @@ EXTRA_libgnu_a_SOURCES += wcrtomb.c ## end gnulib module wcrtomb -## begin gnulib module wctype +## begin gnulib module wctype-h BUILT_SOURCES += wctype.h @@ -2554,8 +2639,15 @@ wctype.h: wctype.in.h $(CXXDEFS_H) $(WARN_ON_USE_H) -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \ + -e 's/@''GNULIB_ISWBLANK''@/$(GNULIB_ISWBLANK)/g' \ + -e 's/@''GNULIB_WCTYPE''@/$(GNULIB_WCTYPE)/g' \ + -e 's/@''GNULIB_ISWCTYPE''@/$(GNULIB_ISWCTYPE)/g' \ + -e 's/@''GNULIB_WCTRANS''@/$(GNULIB_WCTRANS)/g' \ + -e 's/@''GNULIB_TOWCTRANS''@/$(GNULIB_TOWCTRANS)/g' \ -e 's/@''HAVE_ISWBLANK''@/$(HAVE_ISWBLANK)/g' \ -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \ + -e 's/@''HAVE_WCTYPE_T''@/$(HAVE_WCTYPE_T)/g' \ + -e 's/@''HAVE_WCTRANS_T''@/$(HAVE_WCTRANS_T)/g' \ -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \ -e 's/@''REPLACE_ISWBLANK''@/$(REPLACE_ISWBLANK)/g' \ -e 's/@''REPLACE_ISWCNTRL''@/$(REPLACE_ISWCNTRL)/g' \ @@ -2568,7 +2660,7 @@ MOSTLYCLEANFILES += wctype.h wctype.h-t EXTRA_DIST += wctype.in.h -## end gnulib module wctype +## end gnulib module wctype-h ## begin gnulib module wcwidth diff --git a/gnu/Makefile.in b/gnu/Makefile.in index 752456c0..03c8447b 100644 --- a/gnu/Makefile.in +++ b/gnu/Makefile.in @@ -17,7 +17,7 @@ # -*- buffer-read-only: t -*- vi: set ro: # DO NOT EDIT! GENERATED AUTOMATICALLY! -# Copyright (C) 2002-2010 Free Software Foundation, Inc. +# Copyright (C) 2002-2011 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 @@ -34,7 +34,6 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -56,16 +55,16 @@ DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/argmatch.m4 \ - $(top_srcdir)/m4/argp.m4 $(top_srcdir)/m4/asm-underscore.m4 \ - $(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/bison.m4 \ - $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/canonicalize.m4 \ + $(top_srcdir)/m4/argp.m4 $(top_srcdir)/m4/backupfile.m4 \ + $(top_srcdir)/m4/bison.m4 $(top_srcdir)/m4/btowc.m4 \ + $(top_srcdir)/m4/canonicalize.m4 \ $(top_srcdir)/m4/chdir-long.m4 $(top_srcdir)/m4/chown.m4 \ $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/cloexec.m4 \ $(top_srcdir)/m4/close-stream.m4 $(top_srcdir)/m4/close.m4 \ $(top_srcdir)/m4/closeout.m4 $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/d-ino.m4 $(top_srcdir)/m4/dirent-safer.m4 \ - $(top_srcdir)/m4/dirent_h.m4 $(top_srcdir)/m4/dirfd.m4 \ - $(top_srcdir)/m4/dirname.m4 $(top_srcdir)/m4/dos.m4 \ + $(top_srcdir)/m4/configmake.m4 $(top_srcdir)/m4/d-ino.m4 \ + $(top_srcdir)/m4/dirent-safer.m4 $(top_srcdir)/m4/dirent_h.m4 \ + $(top_srcdir)/m4/dirfd.m4 $(top_srcdir)/m4/dirname.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup2.m4 \ $(top_srcdir)/m4/eealloc.m4 $(top_srcdir)/m4/environ.m4 \ $(top_srcdir)/m4/errno_h.m4 $(top_srcdir)/m4/error.m4 \ @@ -90,9 +89,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax_t.m4 \ $(top_srcdir)/m4/inttostr.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ - $(top_srcdir)/m4/langinfo_h.m4 $(top_srcdir)/m4/lchown.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/iswblank.m4 $(top_srcdir)/m4/langinfo_h.m4 \ + $(top_srcdir)/m4/lchown.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ $(top_srcdir)/m4/libunistring-base.m4 \ $(top_srcdir)/m4/link-follow.m4 $(top_srcdir)/m4/link.m4 \ $(top_srcdir)/m4/linkat.m4 $(top_srcdir)/m4/localcharset.m4 \ @@ -103,61 +102,62 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \ $(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \ - $(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdir.m4 \ - $(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mkfifo.m4 \ - $(top_srcdir)/m4/mkfifoat.m4 $(top_srcdir)/m4/mknod.m4 \ - $(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/mmap-anon.m4 \ - $(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/modechange.m4 \ - $(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/nl_langinfo.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/open.m4 \ - $(top_srcdir)/m4/openat.m4 $(top_srcdir)/m4/parse-datetime.m4 \ - $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/paxutils.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf.m4 \ - $(top_srcdir)/m4/priv-set.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ - $(top_srcdir)/m4/rawmemchr.m4 $(top_srcdir)/m4/readlink.m4 \ - $(top_srcdir)/m4/readlinkat.m4 $(top_srcdir)/m4/realloc.m4 \ - $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/rename.m4 \ - $(top_srcdir)/m4/renameat.m4 $(top_srcdir)/m4/rmdir.m4 \ - $(top_srcdir)/m4/rmt.m4 $(top_srcdir)/m4/rpmatch.m4 \ - $(top_srcdir)/m4/rtapelib.m4 $(top_srcdir)/m4/safe-read.m4 \ - $(top_srcdir)/m4/safe-write.m4 $(top_srcdir)/m4/save-cwd.m4 \ - $(top_srcdir)/m4/savedir.m4 $(top_srcdir)/m4/setenv.m4 \ - $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/sleep.m4 \ - $(top_srcdir)/m4/snprintf.m4 $(top_srcdir)/m4/ssize_t.m4 \ - $(top_srcdir)/m4/stat-time.m4 $(top_srcdir)/m4/stat.m4 \ - $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \ - $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio_h.m4 \ - $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/stpcpy.m4 \ - $(top_srcdir)/m4/strcase.m4 $(top_srcdir)/m4/strchrnul.m4 \ - $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ - $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strings_h.m4 \ - $(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \ - $(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \ - $(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \ - $(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \ - $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/symlinkat.m4 \ - $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ - $(top_srcdir)/m4/sysexits.m4 $(top_srcdir)/m4/system.m4 \ - $(top_srcdir)/m4/tempname.m4 $(top_srcdir)/m4/time_h.m4 \ - $(top_srcdir)/m4/time_r.m4 $(top_srcdir)/m4/timespec.m4 \ - $(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/unistd-safer.m4 \ - $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ - $(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/unlocked-io.m4 \ - $(top_srcdir)/m4/utimbuf.m4 $(top_srcdir)/m4/utimens.m4 \ - $(top_srcdir)/m4/utimensat.m4 $(top_srcdir)/m4/utimes.m4 \ - $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \ - $(top_srcdir)/m4/version-etc.m4 $(top_srcdir)/m4/vsnprintf.m4 \ - $(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/wchar_h.m4 \ - $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wcrtomb.m4 \ - $(top_srcdir)/m4/wctype_h.m4 $(top_srcdir)/m4/wcwidth.m4 \ - $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/write.m4 \ - $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xgetcwd.m4 \ - $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/xstrndup.m4 \ - $(top_srcdir)/m4/xstrtol.m4 $(top_srcdir)/m4/xvasprintf.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \ + $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \ + $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkdtemp.m4 \ + $(top_srcdir)/m4/mkfifo.m4 $(top_srcdir)/m4/mkfifoat.m4 \ + $(top_srcdir)/m4/mknod.m4 $(top_srcdir)/m4/mktime.m4 \ + $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ + $(top_srcdir)/m4/modechange.m4 $(top_srcdir)/m4/multiarch.m4 \ + $(top_srcdir)/m4/nl_langinfo.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/open.m4 $(top_srcdir)/m4/openat.m4 \ + $(top_srcdir)/m4/parse-datetime.m4 $(top_srcdir)/m4/pathmax.m4 \ + $(top_srcdir)/m4/paxutils.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/printf.m4 $(top_srcdir)/m4/priv-set.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/quote.m4 \ + $(top_srcdir)/m4/quotearg.m4 $(top_srcdir)/m4/rawmemchr.m4 \ + $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/readlinkat.m4 \ + $(top_srcdir)/m4/realloc.m4 $(top_srcdir)/m4/regex.m4 \ + $(top_srcdir)/m4/rename.m4 $(top_srcdir)/m4/renameat.m4 \ + $(top_srcdir)/m4/rmdir.m4 $(top_srcdir)/m4/rmt.m4 \ + $(top_srcdir)/m4/rpmatch.m4 $(top_srcdir)/m4/rtapelib.m4 \ + $(top_srcdir)/m4/safe-read.m4 $(top_srcdir)/m4/safe-write.m4 \ + $(top_srcdir)/m4/save-cwd.m4 $(top_srcdir)/m4/savedir.m4 \ + $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/size_max.m4 \ + $(top_srcdir)/m4/sleep.m4 $(top_srcdir)/m4/snprintf.m4 \ + $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \ + $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdarg.m4 \ + $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stddef_h.m4 \ + $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdint_h.m4 \ + $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ + $(top_srcdir)/m4/stpcpy.m4 $(top_srcdir)/m4/strcase.m4 \ + $(top_srcdir)/m4/strchrnul.m4 $(top_srcdir)/m4/strdup.m4 \ + $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/string_h.m4 \ + $(top_srcdir)/m4/strings_h.m4 $(top_srcdir)/m4/strndup.m4 \ + $(top_srcdir)/m4/strnlen.m4 $(top_srcdir)/m4/strtoimax.m4 \ + $(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \ + $(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \ + $(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/symlink.m4 \ + $(top_srcdir)/m4/symlinkat.m4 $(top_srcdir)/m4/sys_stat_h.m4 \ + $(top_srcdir)/m4/sys_time_h.m4 $(top_srcdir)/m4/sysexits.m4 \ + $(top_srcdir)/m4/system.m4 $(top_srcdir)/m4/tempname.m4 \ + $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \ + $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \ + $(top_srcdir)/m4/unistd-safer.m4 $(top_srcdir)/m4/unistd_h.m4 \ + $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlinkdir.m4 \ + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/utimbuf.m4 \ + $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimensat.m4 \ + $(top_srcdir)/m4/utimes.m4 $(top_srcdir)/m4/vasnprintf.m4 \ + $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/version-etc.m4 \ + $(top_srcdir)/m4/vsnprintf.m4 $(top_srcdir)/m4/warn-on-use.m4 \ + $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ + $(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wctype_h.m4 \ + $(top_srcdir)/m4/wcwidth.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/write.m4 $(top_srcdir)/m4/xalloc.m4 \ + $(top_srcdir)/m4/xgetcwd.m4 $(top_srcdir)/m4/xsize.m4 \ + $(top_srcdir)/m4/xstrndup.m4 $(top_srcdir)/m4/xstrtol.m4 \ + $(top_srcdir)/m4/xvasprintf.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -274,13 +274,13 @@ am__relativize = \ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ done; \ reldir="$$dir2" +pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALLOCA_H = @ALLOCA_H@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ -ASM_SYMBOL_PREFIX = @ASM_SYMBOL_PREFIX@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOM4TE = @AUTOM4TE@ @@ -381,6 +381,8 @@ GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ GNULIB_GRANTPT = @GNULIB_GRANTPT@ GNULIB_IMAXABS = @GNULIB_IMAXABS@ GNULIB_IMAXDIV = @GNULIB_IMAXDIV@ +GNULIB_ISWBLANK = @GNULIB_ISWBLANK@ +GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@ GNULIB_LCHMOD = @GNULIB_LCHMOD@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LINK = @GNULIB_LINK@ @@ -407,6 +409,7 @@ GNULIB_MBSSEP = @GNULIB_MBSSEP@ GNULIB_MBSSPN = @GNULIB_MBSSPN@ GNULIB_MBSSTR = @GNULIB_MBSSTR@ GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@ +GNULIB_MBTOWC = @GNULIB_MBTOWC@ GNULIB_MEMCHR = @GNULIB_MEMCHR@ GNULIB_MEMMEM = @GNULIB_MEMMEM@ GNULIB_MEMPCPY = @GNULIB_MEMPCPY@ @@ -429,6 +432,7 @@ GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ GNULIB_OPEN = @GNULIB_OPEN@ GNULIB_OPENAT = @GNULIB_OPENAT@ GNULIB_PERROR = @GNULIB_PERROR@ +GNULIB_PIPE = @GNULIB_PIPE@ GNULIB_PIPE2 = @GNULIB_PIPE2@ GNULIB_POPEN = @GNULIB_POPEN@ GNULIB_PREAD = @GNULIB_PREAD@ @@ -464,6 +468,7 @@ GNULIB_STRCASESTR = @GNULIB_STRCASESTR@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ +GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ GNULIB_STRNCAT = @GNULIB_STRNCAT@ GNULIB_STRNDUP = @GNULIB_STRNDUP@ GNULIB_STRNLEN = @GNULIB_STRNLEN@ @@ -485,6 +490,7 @@ GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@ GNULIB_TIMEGM = @GNULIB_TIMEGM@ GNULIB_TIME_R = @GNULIB_TIME_R@ GNULIB_TMPFILE = @GNULIB_TMPFILE@ +GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@ GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ @@ -502,11 +508,42 @@ GNULIB_VPRINTF = @GNULIB_VPRINTF@ GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@ GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@ GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@ +GNULIB_WCPCPY = @GNULIB_WCPCPY@ +GNULIB_WCPNCPY = @GNULIB_WCPNCPY@ GNULIB_WCRTOMB = @GNULIB_WCRTOMB@ +GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@ +GNULIB_WCSCAT = @GNULIB_WCSCAT@ +GNULIB_WCSCHR = @GNULIB_WCSCHR@ +GNULIB_WCSCMP = @GNULIB_WCSCMP@ +GNULIB_WCSCOLL = @GNULIB_WCSCOLL@ +GNULIB_WCSCPY = @GNULIB_WCSCPY@ +GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ +GNULIB_WCSDUP = @GNULIB_WCSDUP@ +GNULIB_WCSLEN = @GNULIB_WCSLEN@ +GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ +GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ +GNULIB_WCSNCMP = @GNULIB_WCSNCMP@ +GNULIB_WCSNCPY = @GNULIB_WCSNCPY@ +GNULIB_WCSNLEN = @GNULIB_WCSNLEN@ GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@ +GNULIB_WCSPBRK = @GNULIB_WCSPBRK@ +GNULIB_WCSRCHR = @GNULIB_WCSRCHR@ GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@ +GNULIB_WCSSPN = @GNULIB_WCSSPN@ +GNULIB_WCSSTR = @GNULIB_WCSSTR@ +GNULIB_WCSTOK = @GNULIB_WCSTOK@ +GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@ +GNULIB_WCSXFRM = @GNULIB_WCSXFRM@ GNULIB_WCTOB = @GNULIB_WCTOB@ +GNULIB_WCTOMB = @GNULIB_WCTOMB@ +GNULIB_WCTRANS = @GNULIB_WCTRANS@ +GNULIB_WCTYPE = @GNULIB_WCTYPE@ GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ +GNULIB_WMEMCHR = @GNULIB_WMEMCHR@ +GNULIB_WMEMCMP = @GNULIB_WMEMCMP@ +GNULIB_WMEMCPY = @GNULIB_WMEMCPY@ +GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@ +GNULIB_WMEMSET = @GNULIB_WMEMSET@ GNULIB_WRITE = @GNULIB_WRITE@ GNULIB__EXIT = @GNULIB__EXIT@ GREP = @GREP@ @@ -517,9 +554,13 @@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ +HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ HAVE_DECL_FDOPENDIR = @HAVE_DECL_FDOPENDIR@ HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@ +HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@ +HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ +HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ @@ -527,11 +568,14 @@ HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ +HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ +HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ +HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ HAVE_DECL_STRNCASECMP = @HAVE_DECL_STRNCASECMP@ HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@ HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@ @@ -539,6 +583,8 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ +HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ @@ -552,13 +598,13 @@ HAVE_FCHMODAT = @HAVE_FCHMODAT@ HAVE_FCHOWNAT = @HAVE_FCHOWNAT@ HAVE_FCNTL = @HAVE_FCNTL@ HAVE_FDOPENDIR = @HAVE_FDOPENDIR@ +HAVE_FEATURES_H = @HAVE_FEATURES_H@ HAVE_FSEEKO = @HAVE_FSEEKO@ HAVE_FSTATAT = @HAVE_FSTATAT@ HAVE_FSYNC = @HAVE_FSYNC@ HAVE_FTELLO = @HAVE_FTELLO@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ HAVE_FUTIMENS = @HAVE_FUTIMENS@ -HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@ HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ HAVE_GETGROUPS = @HAVE_GETGROUPS@ HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@ @@ -580,7 +626,6 @@ HAVE_LCHMOD = @HAVE_LCHMOD@ HAVE_LCHOWN = @HAVE_LCHOWN@ HAVE_LINK = @HAVE_LINK@ HAVE_LINKAT = @HAVE_LINKAT@ -HAVE_LOCALTIME_R = @HAVE_LOCALTIME_R@ HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MBRLEN = @HAVE_MBRLEN@ @@ -605,6 +650,7 @@ HAVE_NANOSLEEP = @HAVE_NANOSLEEP@ HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@ HAVE_OPENAT = @HAVE_OPENAT@ HAVE_OS_H = @HAVE_OS_H@ +HAVE_PIPE = @HAVE_PIPE@ HAVE_PIPE2 = @HAVE_PIPE2@ HAVE_PREAD = @HAVE_PREAD@ HAVE_PTSNAME = @HAVE_PTSNAME@ @@ -648,11 +694,9 @@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ -HAVE_TTYNAME_R = @HAVE_TTYNAME_R@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ -HAVE_UNSETENV = @HAVE_UNSETENV@ HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_USLEEP = @HAVE_USLEEP@ HAVE_UTIMENSAT = @HAVE_UTIMENSAT@ @@ -660,11 +704,41 @@ HAVE_VASPRINTF = @HAVE_VASPRINTF@ HAVE_VDPRINTF = @HAVE_VDPRINTF@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ HAVE_WCHAR_T = @HAVE_WCHAR_T@ +HAVE_WCPCPY = @HAVE_WCPCPY@ +HAVE_WCPNCPY = @HAVE_WCPNCPY@ HAVE_WCRTOMB = @HAVE_WCRTOMB@ +HAVE_WCSCASECMP = @HAVE_WCSCASECMP@ +HAVE_WCSCAT = @HAVE_WCSCAT@ +HAVE_WCSCHR = @HAVE_WCSCHR@ +HAVE_WCSCMP = @HAVE_WCSCMP@ +HAVE_WCSCOLL = @HAVE_WCSCOLL@ +HAVE_WCSCPY = @HAVE_WCSCPY@ +HAVE_WCSCSPN = @HAVE_WCSCSPN@ +HAVE_WCSDUP = @HAVE_WCSDUP@ +HAVE_WCSLEN = @HAVE_WCSLEN@ +HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ +HAVE_WCSNCAT = @HAVE_WCSNCAT@ +HAVE_WCSNCMP = @HAVE_WCSNCMP@ +HAVE_WCSNCPY = @HAVE_WCSNCPY@ +HAVE_WCSNLEN = @HAVE_WCSNLEN@ HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@ +HAVE_WCSPBRK = @HAVE_WCSPBRK@ +HAVE_WCSRCHR = @HAVE_WCSRCHR@ HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@ +HAVE_WCSSPN = @HAVE_WCSSPN@ +HAVE_WCSSTR = @HAVE_WCSSTR@ +HAVE_WCSTOK = @HAVE_WCSTOK@ +HAVE_WCSWIDTH = @HAVE_WCSWIDTH@ +HAVE_WCSXFRM = @HAVE_WCSXFRM@ +HAVE_WCTRANS_T = @HAVE_WCTRANS_T@ HAVE_WCTYPE_H = @HAVE_WCTYPE_H@ +HAVE_WCTYPE_T = @HAVE_WCTYPE_T@ HAVE_WINT_T = @HAVE_WINT_T@ +HAVE_WMEMCHR = @HAVE_WMEMCHR@ +HAVE_WMEMCMP = @HAVE_WMEMCMP@ +HAVE_WMEMCPY = @HAVE_WMEMCPY@ +HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ +HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE__BOOL = @HAVE__BOOL@ HAVE__EXIT = @HAVE__EXIT@ INCLUDE_NEXT = @INCLUDE_NEXT@ @@ -789,8 +863,10 @@ REPLACE_FTELLO = @REPLACE_FTELLO@ REPLACE_FUTIMENS = @REPLACE_FUTIMENS@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETDELIM = @REPLACE_GETDELIM@ +REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETLINE = @REPLACE_GETLINE@ +REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ @@ -808,6 +884,7 @@ REPLACE_MBSINIT = @REPLACE_MBSINIT@ REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@ REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@ REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@ +REPLACE_MBTOWC = @REPLACE_MBTOWC@ REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ REPLACE_MKDIR = @REPLACE_MKDIR@ @@ -845,6 +922,7 @@ REPLACE_STPNCPY = @REPLACE_STPNCPY@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ +REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ REPLACE_STRNCAT = @REPLACE_STRNCAT@ REPLACE_STRNDUP = @REPLACE_STRNDUP@ REPLACE_STRNLEN = @REPLACE_STRNLEN@ @@ -870,7 +948,9 @@ REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ +REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ +REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ SET_MAKE = @SET_MAKE@ @@ -937,6 +1017,7 @@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +lispdir = @lispdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -967,22 +1048,23 @@ EXTRA_DIST = alloca.c alloca.in.h areadlink.h areadlink.h \ cloexec.h close.c close-hook.h close-stream.c close-stream.h \ closeout.c closeout.h dirent.in.h dirent--.h dirent-safer.h \ opendir-safer.c dirfd.c basename.c dirname.c stripslash.c \ - basename-lgpl.c dirname-lgpl.c dirname.h stripslash.c dup2.c \ - errno.in.h error.c error.h exclude.c exclude.h exitfail.h \ - fchdir.c fclose.c fcntl.c fcntl.in.h fdopendir.c openat-priv.h \ - openat-proc.c utimens.h fileblocks.c filenamecat-lgpl.c \ - filenamecat.h float.in.h fnmatch.c fnmatch.in.h fnmatch_loop.c \ - fpending.c fpending.h fseeko.c stdio-impl.h futimens.c \ - getcwd.c getdelim.c getdtablesize.c getline.c getopt.c \ - getopt.in.h getopt1.c getopt_int.h getpagesize.c \ - $(top_srcdir)/build-aux/config.rpath gettime.c gettimeofday.c \ - $(top_srcdir)/build-aux/gitlog-to-changelog hash.c hash.h \ - $(top_srcdir)/build-aux/config.rpath human.c human.h \ - intprops.h anytostr.c inttostr.h inttypes.in.h langinfo.in.h \ - lchown.c link.c at-func2.c linkat.c config.charset ref-add.sin \ - ref-del.sin lseek.c lstat.c malloc.c malloc.c malloca.h \ - malloca.valgrind mbchar.h mbrtowc.c mbsinit.c \ - mbsrtowcs-state.c mbsrtowcs.c memchr.c memchr.valgrind \ + basename-lgpl.c dirname-lgpl.c dirname.h stripslash.c \ + dosname.h dup2.c errno.in.h error.c error.h exclude.c \ + exclude.h exitfail.h fchdir.c fclose.c fcntl.c fcntl.in.h \ + fdopendir.c openat-priv.h openat-proc.c utimens.h fileblocks.c \ + filenamecat-lgpl.c filenamecat.h float.in.h fnmatch.c \ + fnmatch.in.h fnmatch_loop.c fpending.c fpending.h fseeko.c \ + stdio-impl.h futimens.c getcwd.c getdelim.c getdtablesize.c \ + getline.c getopt.c getopt.in.h getopt1.c getopt_int.h \ + getpagesize.c $(top_srcdir)/build-aux/config.rpath gettime.c \ + gettimeofday.c $(top_srcdir)/build-aux/gitlog-to-changelog \ + hash.c hash.h $(top_srcdir)/build-aux/config.rpath human.c \ + human.h intprops.h anytostr.c inttostr.h inttypes.in.h \ + iswblank.c langinfo.in.h lchown.c link.c at-func2.c linkat.c \ + config.charset ref-add.sin ref-del.sin lseek.c lstat.c \ + malloc.c malloc.c malloca.h malloca.valgrind mbchar.h \ + mbrtowc.c mbsinit.c mbsrtowcs-impl.h mbsrtowcs-state.c \ + mbsrtowcs.c mbtowc-impl.h mbtowc.c memchr.c memchr.valgrind \ mempcpy.c memrchr.c mkdir.c mkdtemp.c mkfifo.c mkfifoat.c \ mknodat.c mknod.c mktime-internal.h mktime.c modechange.c \ modechange.h nl_langinfo.c obstack.c obstack.h open.c \ @@ -996,23 +1078,23 @@ EXTRA_DIST = alloca.c alloca.in.h areadlink.h areadlink.h \ safe-read.h safe-write.c safe-write.h same-inode.h save-cwd.c \ save-cwd.h savedir.c savedir.h setenv.c sleep.c snprintf.c \ stat.c stat-macros.h stat-time.h stdarg.in.h stdbool.in.h \ - stddef.in.h stdint.in.h stdio-write.c stdio.in.h stdlib.in.h \ - stpcpy.c strcasecmp.c strncasecmp.c strchrnul.c \ - strchrnul.valgrind strdup.c streq.h strerror.c string.in.h \ - strings.in.h strndup.c strnlen.c strtoimax.c strtol.c \ - strtoll.c strtoul.c strtoull.c strtoumax.c symlink.c \ - symlinkat.c sys_stat.in.h sys_time.in.h sysexits.in.h \ - tempname.c tempname.h time.in.h time_r.c timespec.h \ - unistd.in.h dup-safer.c fd-safer.c pipe-safer.c unistd--.h \ - unistd-safer.h unitypes.in.h localcharset.h uniwidth.in.h \ - uniwidth/cjk.h unlink.c unlinkdir.c unlinkdir.h unlocked-io.h \ - unsetenv.c utimens.c utimens.h utimensat.c asnprintf.c \ - float+.h printf-args.c printf-args.h printf-parse.c \ - printf-parse.h vasnprintf.c vasnprintf.h asprintf.c \ - vasprintf.c vsnprintf.c $(top_srcdir)/build-aux/warn-on-use.h \ - wchar.in.h wcrtomb.c wctype.in.h wcwidth.c write.c xalloc.h \ - xmalloc.c xgetcwd.c xgetcwd.h xstrtol-error.c xstrtol.c \ - xstrtol.h xstrtoul.c xalloc.h + stddef.in.h stdint.in.h stdio.in.h stdlib.in.h stpcpy.c \ + strcasecmp.c strncasecmp.c strchrnul.c strchrnul.valgrind \ + strdup.c streq.h strerror.c string.in.h strings.in.h strndup.c \ + strnlen.c strtoimax.c strtol.c strtoll.c strtoul.c strtoull.c \ + strtoumax.c symlink.c symlinkat.c sys_stat.in.h sys_time.in.h \ + sysexits.in.h tempname.c tempname.h time.in.h time_r.c \ + timespec.h unistd.in.h dup-safer.c fd-safer.c pipe-safer.c \ + unistd--.h unistd-safer.h unitypes.in.h localcharset.h \ + uniwidth.in.h uniwidth/cjk.h unlink.c unlinkdir.c unlinkdir.h \ + unlocked-io.h unsetenv.c utimens.c utimens.h utimensat.c \ + asnprintf.c float+.h printf-args.c printf-args.h \ + printf-parse.c printf-parse.h vasnprintf.c vasnprintf.h \ + asprintf.c vasprintf.c vsnprintf.c \ + $(top_srcdir)/build-aux/warn-on-use.h wchar.in.h wcrtomb.c \ + wctype.in.h wcwidth.c write.c xalloc.h xmalloc.c xgetcwd.c \ + xgetcwd.h xstrtol-error.c xstrtol.c xstrtol.h xstrtoul.c \ + xalloc.h # The BUILT_SOURCES created by this Makefile snippet are not used via #include # statements but through direct file reference. Therefore this snippet must be @@ -1083,18 +1165,18 @@ EXTRA_libgnu_a_SOURCES = alloca.c argmatch.c backupfile.c btowc.c \ filenamecat-lgpl.c fnmatch.c fnmatch_loop.c fpending.c \ fseeko.c futimens.c getcwd.c getdelim.c getdtablesize.c \ getline.c getopt.c getopt1.c getpagesize.c gettime.c \ - gettimeofday.c hash.c human.c anytostr.c lchown.c link.c \ - at-func2.c linkat.c lseek.c lstat.c malloc.c malloc.c \ - mbrtowc.c mbsinit.c mbsrtowcs-state.c mbsrtowcs.c memchr.c \ - mempcpy.c memrchr.c mkdir.c mkdtemp.c mkfifo.c mkfifoat.c \ - mknodat.c mknod.c mktime.c modechange.c nl_langinfo.c \ - obstack.c open.c at-func.c fchmodat.c fchownat.c fstatat.c \ - mkdirat.c openat-proc.c openat.c unlinkat.c quote.c quotearg.c \ - rawmemchr.c readlink.c readlinkat.c realloc.c regcomp.c \ - regex.c regex_internal.c regexec.c rename.c at-func2.c \ - renameat.c rmdir.c rpmatch.c safe-read.c safe-write.c \ - save-cwd.c savedir.c setenv.c sleep.c snprintf.c stat.c \ - stdio-write.c stpcpy.c strcasecmp.c strncasecmp.c strchrnul.c \ + gettimeofday.c hash.c human.c anytostr.c iswblank.c lchown.c \ + link.c at-func2.c linkat.c lseek.c lstat.c malloc.c malloc.c \ + mbrtowc.c mbsinit.c mbsrtowcs-state.c mbsrtowcs.c mbtowc.c \ + memchr.c mempcpy.c memrchr.c mkdir.c mkdtemp.c mkfifo.c \ + mkfifoat.c mknodat.c mknod.c mktime.c modechange.c \ + nl_langinfo.c obstack.c open.c at-func.c fchmodat.c fchownat.c \ + fstatat.c mkdirat.c openat-proc.c openat.c unlinkat.c quote.c \ + quotearg.c rawmemchr.c readlink.c readlinkat.c realloc.c \ + regcomp.c regex.c regex_internal.c regexec.c rename.c \ + at-func2.c renameat.c rmdir.c rpmatch.c safe-read.c \ + safe-write.c save-cwd.c savedir.c setenv.c sleep.c snprintf.c \ + stat.c stpcpy.c strcasecmp.c strncasecmp.c strchrnul.c \ strdup.c strerror.c strndup.c strnlen.c strtoimax.c strtol.c \ strtoll.c strtoul.c strtoull.c strtoumax.c symlink.c \ symlinkat.c tempname.c time_r.c dup-safer.c fd-safer.c \ @@ -1248,6 +1330,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/human.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imaxtostr.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inttostr.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iswblank.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lchown.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/link.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linkat.Po@am__quote@ @@ -1262,6 +1345,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbsinit.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbsrtowcs-state.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbsrtowcs.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbtowc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memchr.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mempcpy.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memrchr.Po@am__quote@ @@ -1310,7 +1394,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sleep.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snprintf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stat.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stdio-write.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stpcpy.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strcasecmp.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strchrnul.Po@am__quote@ @@ -1729,21 +1812,8 @@ c++defs.h: $(top_srcdir)/build-aux/c++defs.h > $@-t && \ mv $@-t $@ -# Retrieve values of the variables through 'configure' followed by -# 'make', not directly through 'configure', so that a user who -# sets some of these variables consistently on the 'make' command -# line gets correct results. -# -# One advantage of this approach, compared to the classical -# approach of adding -DLIBDIR=\"$(libdir)\" etc. to AM_CPPFLAGS, -# is that it protects against the use of undefined variables. -# If, say, $(libdir) is not set in the Makefile, LIBDIR is not -# defined by this module, and code using LIBDIR gives a -# compilation error. -# -# Another advantage is that 'make' output is shorter. -# -# Listed in the same order as the GNU makefile conventions. +# Listed in the same order as the GNU makefile conventions, and +# provided by autoconf 2.59c+. # The Automake-defined pkg* macros are appended, in the order # listed in the Automake 1.10a+ documentation. configmake.h: Makefile @@ -2071,6 +2141,7 @@ stdint.h: stdint.in.h -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \ -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \ -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \ + -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \ -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \ -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \ -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \ @@ -2143,6 +2214,8 @@ stdio.h: stdio.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''GNULIB_VSPRINTF_POSIX''@|$(GNULIB_VSPRINTF_POSIX)|g' \ < $(srcdir)/stdio.in.h | \ sed -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \ + -e 's|@''HAVE_DECL_FSEEKO''@|$(HAVE_DECL_FSEEKO)|g' \ + -e 's|@''HAVE_DECL_FTELLO''@|$(HAVE_DECL_FTELLO)|g' \ -e 's|@''HAVE_DECL_GETDELIM''@|$(HAVE_DECL_GETDELIM)|g' \ -e 's|@''HAVE_DECL_GETLINE''@|$(HAVE_DECL_GETLINE)|g' \ -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|$(HAVE_DECL_OBSTACK_PRINTF)|g' \ @@ -2208,6 +2281,7 @@ stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''GNULIB_GETSUBOPT''@|$(GNULIB_GETSUBOPT)|g' \ -e 's|@''GNULIB_GRANTPT''@|$(GNULIB_GRANTPT)|g' \ -e 's|@''GNULIB_MALLOC_POSIX''@|$(GNULIB_MALLOC_POSIX)|g' \ + -e 's|@''GNULIB_MBTOWC''@|$(GNULIB_MBTOWC)|g' \ -e 's|@''GNULIB_MKDTEMP''@|$(GNULIB_MKDTEMP)|g' \ -e 's|@''GNULIB_MKOSTEMP''@|$(GNULIB_MKOSTEMP)|g' \ -e 's|@''GNULIB_MKOSTEMPS''@|$(GNULIB_MKOSTEMPS)|g' \ @@ -2226,7 +2300,9 @@ stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''GNULIB_SYSTEM_POSIX''@|$(GNULIB_SYSTEM_POSIX)|g' \ -e 's|@''GNULIB_UNLOCKPT''@|$(GNULIB_UNLOCKPT)|g' \ -e 's|@''GNULIB_UNSETENV''@|$(GNULIB_UNSETENV)|g' \ - -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \ + -e 's|@''GNULIB_WCTOMB''@|$(GNULIB_WCTOMB)|g' \ + < $(srcdir)/stdlib.in.h | \ + sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \ -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \ -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|$(HAVE_CANONICALIZE_FILE_NAME)|g' \ -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \ @@ -2242,17 +2318,18 @@ stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \ -e 's|@''HAVE_REALPATH''@|$(HAVE_REALPATH)|g' \ -e 's|@''HAVE_RPMATCH''@|$(HAVE_RPMATCH)|g' \ - -e 's|@''HAVE_SETENV''@|$(HAVE_SETENV)|g' \ + -e 's|@''HAVE_DECL_SETENV''@|$(HAVE_DECL_SETENV)|g' \ -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \ -e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \ -e 's|@''HAVE_STRTOULL''@|$(HAVE_STRTOULL)|g' \ -e 's|@''HAVE_STRUCT_RANDOM_DATA''@|$(HAVE_STRUCT_RANDOM_DATA)|g' \ -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \ -e 's|@''HAVE_UNLOCKPT''@|$(HAVE_UNLOCKPT)|g' \ - -e 's|@''HAVE_UNSETENV''@|$(HAVE_UNSETENV)|g' \ + -e 's|@''HAVE_DECL_UNSETENV''@|$(HAVE_DECL_UNSETENV)|g' \ -e 's|@''REPLACE_CALLOC''@|$(REPLACE_CALLOC)|g' \ -e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@|$(REPLACE_CANONICALIZE_FILE_NAME)|g' \ -e 's|@''REPLACE_MALLOC''@|$(REPLACE_MALLOC)|g' \ + -e 's|@''REPLACE_MBTOWC''@|$(REPLACE_MBTOWC)|g' \ -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \ -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \ -e 's|@''REPLACE_REALLOC''@|$(REPLACE_REALLOC)|g' \ @@ -2260,10 +2337,10 @@ stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \ -e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \ -e 's|@''REPLACE_UNSETENV''@|$(REPLACE_UNSETENV)|g' \ + -e 's|@''REPLACE_WCTOMB''@|$(REPLACE_WCTOMB)|g' \ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/stdlib.in.h; \ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ } > $@-t && \ mv $@-t $@ @@ -2308,6 +2385,7 @@ string.h: string.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''GNULIB_STRCASESTR''@|$(GNULIB_STRCASESTR)|g' \ -e 's|@''GNULIB_STRTOK_R''@|$(GNULIB_STRTOK_R)|g' \ -e 's|@''GNULIB_STRERROR''@|$(GNULIB_STRERROR)|g' \ + -e 's|@''GNULIB_STRERROR_R''@|$(GNULIB_STRERROR_R)|g' \ -e 's|@''GNULIB_STRSIGNAL''@|$(GNULIB_STRSIGNAL)|g' \ -e 's|@''GNULIB_STRVERSCMP''@|$(GNULIB_STRVERSCMP)|g' \ < $(srcdir)/string.in.h | \ @@ -2327,6 +2405,7 @@ string.h: string.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''HAVE_STRSEP''@|$(HAVE_STRSEP)|g' \ -e 's|@''HAVE_STRCASESTR''@|$(HAVE_STRCASESTR)|g' \ -e 's|@''HAVE_DECL_STRTOK_R''@|$(HAVE_DECL_STRTOK_R)|g' \ + -e 's|@''HAVE_DECL_STRERROR_R''@|$(HAVE_DECL_STRERROR_R)|g' \ -e 's|@''HAVE_DECL_STRSIGNAL''@|$(HAVE_DECL_STRSIGNAL)|g' \ -e 's|@''HAVE_STRVERSCMP''@|$(HAVE_STRVERSCMP)|g' \ -e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \ @@ -2336,6 +2415,7 @@ string.h: string.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''REPLACE_STRDUP''@|$(REPLACE_STRDUP)|g' \ -e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \ -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \ + -e 's|@''REPLACE_STRERROR_R''@|$(REPLACE_STRERROR_R)|g' \ -e 's|@''REPLACE_STRNCAT''@|$(REPLACE_STRNCAT)|g' \ -e 's|@''REPLACE_STRNDUP''@|$(REPLACE_STRNDUP)|g' \ -e 's|@''REPLACE_STRNLEN''@|$(REPLACE_STRNLEN)|g' \ @@ -2465,7 +2545,7 @@ time.h: time.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''GNULIB_STRPTIME''@|$(GNULIB_STRPTIME)|g' \ -e 's|@''GNULIB_TIMEGM''@|$(GNULIB_TIMEGM)|g' \ -e 's|@''GNULIB_TIME_R''@|$(GNULIB_TIME_R)|g' \ - -e 's|@''HAVE_LOCALTIME_R''@|$(HAVE_LOCALTIME_R)|g' \ + -e 's|@''HAVE_DECL_LOCALTIME_R''@|$(HAVE_DECL_LOCALTIME_R)|g' \ -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \ -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \ -e 's|@''HAVE_TIMEGM''@|$(HAVE_TIMEGM)|g' \ @@ -2517,6 +2597,7 @@ unistd.h: unistd.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''GNULIB_LINK''@|$(GNULIB_LINK)|g' \ -e 's|@''GNULIB_LINKAT''@|$(GNULIB_LINKAT)|g' \ -e 's|@''GNULIB_LSEEK''@|$(GNULIB_LSEEK)|g' \ + -e 's|@''GNULIB_PIPE''@|$(GNULIB_PIPE)|g' \ -e 's|@''GNULIB_PIPE2''@|$(GNULIB_PIPE2)|g' \ -e 's|@''GNULIB_PREAD''@|$(GNULIB_PREAD)|g' \ -e 's|@''GNULIB_PWRITE''@|$(GNULIB_PWRITE)|g' \ @@ -2543,7 +2624,6 @@ unistd.h: unistd.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''HAVE_FCHOWNAT''@|$(HAVE_FCHOWNAT)|g' \ -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \ -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \ - -e 's|@''HAVE_GETDOMAINNAME''@|$(HAVE_GETDOMAINNAME)|g' \ -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \ -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \ -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \ @@ -2552,6 +2632,7 @@ unistd.h: unistd.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''HAVE_LCHOWN''@|$(HAVE_LCHOWN)|g' \ -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \ -e 's|@''HAVE_LINKAT''@|$(HAVE_LINKAT)|g' \ + -e 's|@''HAVE_PIPE''@|$(HAVE_PIPE)|g' \ -e 's|@''HAVE_PIPE2''@|$(HAVE_PIPE2)|g' \ -e 's|@''HAVE_PREAD''@|$(HAVE_PREAD)|g' \ -e 's|@''HAVE_PWRITE''@|$(HAVE_PWRITE)|g' \ @@ -2560,21 +2641,26 @@ unistd.h: unistd.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \ -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \ -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \ - -e 's|@''HAVE_TTYNAME_R''@|$(HAVE_TTYNAME_R)|g' \ -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \ -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \ -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \ + -e 's|@''HAVE_DECL_FCHDIR''@|$(HAVE_DECL_FCHDIR)|g' \ + -e 's|@''HAVE_DECL_GETDOMAINNAME''@|$(HAVE_DECL_GETDOMAINNAME)|g' \ -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \ -e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \ -e 's|@''HAVE_DECL_GETUSERSHELL''@|$(HAVE_DECL_GETUSERSHELL)|g' \ + -e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \ -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \ -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \ - -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ + | \ + sed -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \ -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \ -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \ -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \ -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \ + -e 's|@''REPLACE_GETDOMAINNAME''@|$(REPLACE_GETDOMAINNAME)|g' \ + -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \ -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \ -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \ @@ -2630,6 +2716,7 @@ wchar.h: wchar.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \ -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \ -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \ -e 's|@''GNULIB_BTOWC''@|$(GNULIB_BTOWC)|g' \ @@ -2643,7 +2730,36 @@ wchar.h: wchar.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''GNULIB_WCSRTOMBS''@|$(GNULIB_WCSRTOMBS)|g' \ -e 's|@''GNULIB_WCSNRTOMBS''@|$(GNULIB_WCSNRTOMBS)|g' \ -e 's|@''GNULIB_WCWIDTH''@|$(GNULIB_WCWIDTH)|g' \ - -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ + -e 's|@''GNULIB_WMEMCHR''@|$(GNULIB_WMEMCHR)|g' \ + -e 's|@''GNULIB_WMEMCMP''@|$(GNULIB_WMEMCMP)|g' \ + -e 's|@''GNULIB_WMEMCPY''@|$(GNULIB_WMEMCPY)|g' \ + -e 's|@''GNULIB_WMEMMOVE''@|$(GNULIB_WMEMMOVE)|g' \ + -e 's|@''GNULIB_WMEMSET''@|$(GNULIB_WMEMSET)|g' \ + -e 's|@''GNULIB_WCSLEN''@|$(GNULIB_WCSLEN)|g' \ + -e 's|@''GNULIB_WCSNLEN''@|$(GNULIB_WCSNLEN)|g' \ + -e 's|@''GNULIB_WCSCPY''@|$(GNULIB_WCSCPY)|g' \ + -e 's|@''GNULIB_WCPCPY''@|$(GNULIB_WCPCPY)|g' \ + -e 's|@''GNULIB_WCSNCPY''@|$(GNULIB_WCSNCPY)|g' \ + -e 's|@''GNULIB_WCPNCPY''@|$(GNULIB_WCPNCPY)|g' \ + -e 's|@''GNULIB_WCSCAT''@|$(GNULIB_WCSCAT)|g' \ + -e 's|@''GNULIB_WCSNCAT''@|$(GNULIB_WCSNCAT)|g' \ + -e 's|@''GNULIB_WCSCMP''@|$(GNULIB_WCSCMP)|g' \ + -e 's|@''GNULIB_WCSNCMP''@|$(GNULIB_WCSNCMP)|g' \ + -e 's|@''GNULIB_WCSCASECMP''@|$(GNULIB_WCSCASECMP)|g' \ + -e 's|@''GNULIB_WCSNCASECMP''@|$(GNULIB_WCSNCASECMP)|g' \ + -e 's|@''GNULIB_WCSCOLL''@|$(GNULIB_WCSCOLL)|g' \ + -e 's|@''GNULIB_WCSXFRM''@|$(GNULIB_WCSXFRM)|g' \ + -e 's|@''GNULIB_WCSDUP''@|$(GNULIB_WCSDUP)|g' \ + -e 's|@''GNULIB_WCSCHR''@|$(GNULIB_WCSCHR)|g' \ + -e 's|@''GNULIB_WCSRCHR''@|$(GNULIB_WCSRCHR)|g' \ + -e 's|@''GNULIB_WCSCSPN''@|$(GNULIB_WCSCSPN)|g' \ + -e 's|@''GNULIB_WCSSPN''@|$(GNULIB_WCSSPN)|g' \ + -e 's|@''GNULIB_WCSPBRK''@|$(GNULIB_WCSPBRK)|g' \ + -e 's|@''GNULIB_WCSSTR''@|$(GNULIB_WCSSTR)|g' \ + -e 's|@''GNULIB_WCSTOK''@|$(GNULIB_WCSTOK)|g' \ + -e 's|@''GNULIB_WCSWIDTH''@|$(GNULIB_WCSWIDTH)|g' \ + < $(srcdir)/wchar.in.h | \ + sed -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \ -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \ -e 's|@''HAVE_MBRTOWC''@|$(HAVE_MBRTOWC)|g' \ @@ -2653,9 +2769,38 @@ wchar.h: wchar.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''HAVE_WCRTOMB''@|$(HAVE_WCRTOMB)|g' \ -e 's|@''HAVE_WCSRTOMBS''@|$(HAVE_WCSRTOMBS)|g' \ -e 's|@''HAVE_WCSNRTOMBS''@|$(HAVE_WCSNRTOMBS)|g' \ + -e 's|@''HAVE_WMEMCHR''@|$(HAVE_WMEMCHR)|g' \ + -e 's|@''HAVE_WMEMCMP''@|$(HAVE_WMEMCMP)|g' \ + -e 's|@''HAVE_WMEMCPY''@|$(HAVE_WMEMCPY)|g' \ + -e 's|@''HAVE_WMEMMOVE''@|$(HAVE_WMEMMOVE)|g' \ + -e 's|@''HAVE_WMEMSET''@|$(HAVE_WMEMSET)|g' \ + -e 's|@''HAVE_WCSLEN''@|$(HAVE_WCSLEN)|g' \ + -e 's|@''HAVE_WCSNLEN''@|$(HAVE_WCSNLEN)|g' \ + -e 's|@''HAVE_WCSCPY''@|$(HAVE_WCSCPY)|g' \ + -e 's|@''HAVE_WCPCPY''@|$(HAVE_WCPCPY)|g' \ + -e 's|@''HAVE_WCSNCPY''@|$(HAVE_WCSNCPY)|g' \ + -e 's|@''HAVE_WCPNCPY''@|$(HAVE_WCPNCPY)|g' \ + -e 's|@''HAVE_WCSCAT''@|$(HAVE_WCSCAT)|g' \ + -e 's|@''HAVE_WCSNCAT''@|$(HAVE_WCSNCAT)|g' \ + -e 's|@''HAVE_WCSCMP''@|$(HAVE_WCSCMP)|g' \ + -e 's|@''HAVE_WCSNCMP''@|$(HAVE_WCSNCMP)|g' \ + -e 's|@''HAVE_WCSCASECMP''@|$(HAVE_WCSCASECMP)|g' \ + -e 's|@''HAVE_WCSNCASECMP''@|$(HAVE_WCSNCASECMP)|g' \ + -e 's|@''HAVE_WCSCOLL''@|$(HAVE_WCSCOLL)|g' \ + -e 's|@''HAVE_WCSXFRM''@|$(HAVE_WCSXFRM)|g' \ + -e 's|@''HAVE_WCSDUP''@|$(HAVE_WCSDUP)|g' \ + -e 's|@''HAVE_WCSCHR''@|$(HAVE_WCSCHR)|g' \ + -e 's|@''HAVE_WCSRCHR''@|$(HAVE_WCSRCHR)|g' \ + -e 's|@''HAVE_WCSCSPN''@|$(HAVE_WCSCSPN)|g' \ + -e 's|@''HAVE_WCSSPN''@|$(HAVE_WCSSPN)|g' \ + -e 's|@''HAVE_WCSPBRK''@|$(HAVE_WCSPBRK)|g' \ + -e 's|@''HAVE_WCSSTR''@|$(HAVE_WCSSTR)|g' \ + -e 's|@''HAVE_WCSTOK''@|$(HAVE_WCSTOK)|g' \ + -e 's|@''HAVE_WCSWIDTH''@|$(HAVE_WCSWIDTH)|g' \ -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \ -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \ - -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \ + | \ + sed -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \ -e 's|@''REPLACE_BTOWC''@|$(REPLACE_BTOWC)|g' \ -e 's|@''REPLACE_WCTOB''@|$(REPLACE_WCTOB)|g' \ -e 's|@''REPLACE_MBSINIT''@|$(REPLACE_MBSINIT)|g' \ @@ -2667,10 +2812,10 @@ wchar.h: wchar.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''REPLACE_WCSRTOMBS''@|$(REPLACE_WCSRTOMBS)|g' \ -e 's|@''REPLACE_WCSNRTOMBS''@|$(REPLACE_WCSNRTOMBS)|g' \ -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \ + -e 's|@''REPLACE_WCSWIDTH''@|$(REPLACE_WCSWIDTH)|g' \ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/wchar.in.h; \ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ } > $@-t && \ mv $@-t $@ @@ -2684,8 +2829,15 @@ wctype.h: wctype.in.h $(CXXDEFS_H) $(WARN_ON_USE_H) -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \ + -e 's/@''GNULIB_ISWBLANK''@/$(GNULIB_ISWBLANK)/g' \ + -e 's/@''GNULIB_WCTYPE''@/$(GNULIB_WCTYPE)/g' \ + -e 's/@''GNULIB_ISWCTYPE''@/$(GNULIB_ISWCTYPE)/g' \ + -e 's/@''GNULIB_WCTRANS''@/$(GNULIB_WCTRANS)/g' \ + -e 's/@''GNULIB_TOWCTRANS''@/$(GNULIB_TOWCTRANS)/g' \ -e 's/@''HAVE_ISWBLANK''@/$(HAVE_ISWBLANK)/g' \ -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \ + -e 's/@''HAVE_WCTYPE_T''@/$(HAVE_WCTYPE_T)/g' \ + -e 's/@''HAVE_WCTRANS_T''@/$(HAVE_WCTRANS_T)/g' \ -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \ -e 's/@''REPLACE_ISWBLANK''@/$(REPLACE_ISWBLANK)/g' \ -e 's/@''REPLACE_ISWCNTRL''@/$(REPLACE_ISWCNTRL)/g' \ diff --git a/gnu/alloca.c b/gnu/alloca.c index 8d98020e..a16fa392 100644 --- a/gnu/alloca.c +++ b/gnu/alloca.c @@ -96,21 +96,20 @@ static int stack_dir; /* 1 or -1 once known. */ # define STACK_DIR stack_dir static void -find_stack_direction (void) +find_stack_direction (char **ptr) { - static char *addr = NULL; /* Address of first `dummy', once known. */ auto char dummy; /* To get stack address. */ - if (addr == NULL) + if (*ptr == NULL) { /* Initial entry. */ - addr = ADDRESS_FUNCTION (dummy); + *ptr = ADDRESS_FUNCTION (dummy); - find_stack_direction (); /* Recurse once. */ + find_stack_direction (ptr); /* Recurse once. */ } else { /* Second entry. */ - if (ADDRESS_FUNCTION (dummy) > addr) + if (ADDRESS_FUNCTION (dummy) > *ptr) stack_dir = 1; /* Stack grew upward. */ else stack_dir = -1; /* Stack grew downward. */ @@ -157,7 +156,10 @@ alloca (size_t size) # if STACK_DIRECTION == 0 if (STACK_DIR == 0) /* Unknown growth direction. */ - find_stack_direction (); + { + char *addr = NULL; /* Address of first `dummy', once known. */ + find_stack_direction (&addr); + } # endif /* Reclaim garbage, defined as all alloca'd storage that diff --git a/gnu/alloca.in.h b/gnu/alloca.in.h index 34f8fe5e..1461669f 100644 --- a/gnu/alloca.in.h +++ b/gnu/alloca.in.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Memory allocation on the stack. - Copyright (C) 1995, 1999, 2001-2004, 2006-2010 Free Software Foundation, + Copyright (C) 1995, 1999, 2001-2004, 2006-2011 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it diff --git a/gnu/anytostr.c b/gnu/anytostr.c index 902e7a40..581c50fd 100644 --- a/gnu/anytostr.c +++ b/gnu/anytostr.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* anytostr.c -- convert integers to printable strings - Copyright (C) 2001, 2006, 2008, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2001, 2006, 2008-2011 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 @@ -19,10 +19,14 @@ /* Written by Paul Eggert */ +/* Tell gcc not to warn about the (i < 0) test, below. */ +#if (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) || 4 < __GNUC__ +# pragma GCC diagnostic ignored "-Wtype-limits" +#endif + #include #include "inttostr.h" -#include "verify.h" /* Convert I to a printable string in BUF, which must be at least INT_BUFSIZE_BOUND (INTTYPE) bytes long. Return the address of the @@ -31,11 +35,9 @@ char * __attribute_warn_unused_result__ anytostr (inttype i, char *buf) { - verify (TYPE_SIGNED (inttype) == inttype_is_signed); char *p = buf + INT_STRLEN_BOUND (inttype); *p = 0; -#if inttype_is_signed if (i < 0) { do @@ -45,7 +47,6 @@ anytostr (inttype i, char *buf) *--p = '-'; } else -#endif { do *--p = '0' + i % 10; diff --git a/gnu/areadlink.c b/gnu/areadlink.c index f1c5d7da..681b12d2 100644 --- a/gnu/areadlink.c +++ b/gnu/areadlink.c @@ -3,7 +3,7 @@ /* areadlink.c -- readlink wrapper to return the link name in malloc'd storage Unlike xreadlink and xreadlink_with_size, don't ever call exit. - Copyright (C) 2001, 2003-2007, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2001, 2003-2007, 2009-2011 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 diff --git a/gnu/areadlink.h b/gnu/areadlink.h index d17b4c31..ada8eb1f 100644 --- a/gnu/areadlink.h +++ b/gnu/areadlink.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Read symbolic links without size limitation. - Copyright (C) 2001, 2003-2004, 2007, 2009-2010 Free Software Foundation, + Copyright (C) 2001, 2003-2004, 2007, 2009-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/areadlinkat.c b/gnu/areadlinkat.c index 47fd1ba3..abbfed3b 100644 --- a/gnu/areadlinkat.c +++ b/gnu/areadlinkat.c @@ -3,7 +3,7 @@ /* areadlinkat.c -- readlinkat wrapper to return malloc'd link name Unlike xreadlinkat, only call exit on failure to change directory. - Copyright (C) 2001, 2003-2007, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2001, 2003-2007, 2009-2011 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 diff --git a/gnu/argmatch.c b/gnu/argmatch.c index 5a176f84..f5128447 100644 --- a/gnu/argmatch.c +++ b/gnu/argmatch.c @@ -2,8 +2,8 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* argmatch.c -- find a match for a string in an array - Copyright (C) 1990, 1998, 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, - 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1990, 1998-1999, 2001-2007, 2009-2011 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 diff --git a/gnu/argmatch.h b/gnu/argmatch.h index 15eb04d8..3c307796 100644 --- a/gnu/argmatch.h +++ b/gnu/argmatch.h @@ -2,8 +2,8 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* argmatch.h -- definitions and prototypes for argmatch.c - Copyright (C) 1990, 1998, 1999, 2001, 2002, 2004, 2005, 2009, 2010 Free - Software Foundation, Inc. + Copyright (C) 1990, 1998-1999, 2001-2002, 2004-2005, 2009-2011 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 diff --git a/gnu/argp-ba.c b/gnu/argp-ba.c index d8ae7dd5..607c0786 100644 --- a/gnu/argp-ba.c +++ b/gnu/argp-ba.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Default definition for ARGP_PROGRAM_BUG_ADDRESS. - Copyright (C) 1996, 1997, 1999, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1996-1997, 1999, 2009-2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader . diff --git a/gnu/argp-eexst.c b/gnu/argp-eexst.c index cf809aa7..c7d8d03c 100644 --- a/gnu/argp-eexst.c +++ b/gnu/argp-eexst.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Default definition for ARGP_ERR_EXIT_STATUS - Copyright (C) 1997, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1997, 2009-2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader . diff --git a/gnu/argp-fmtstream.c b/gnu/argp-fmtstream.c index 1cda3079..1abc5679 100644 --- a/gnu/argp-fmtstream.c +++ b/gnu/argp-fmtstream.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Word-wrapping and line-truncating streams - Copyright (C) 1997-1999, 2001-2003, 2005, 2009-2010 Free Software + Copyright (C) 1997-1999, 2001-2003, 2005, 2009-2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader . diff --git a/gnu/argp-fmtstream.h b/gnu/argp-fmtstream.h index f50f4e73..2e1c44cc 100644 --- a/gnu/argp-fmtstream.h +++ b/gnu/argp-fmtstream.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Word-wrapping and line-truncating streams. - Copyright (C) 1997, 2006-2010 Free Software Foundation, Inc. + Copyright (C) 1997, 2006-2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader . @@ -30,16 +30,16 @@ #include #include -#ifndef __attribute__ /* The __attribute__ feature is available in gcc versions 2.5 and later. The __-protected variants of the attributes 'format' and 'printf' are accepted by gcc versions 2.6.4 (effectively 2.7) and later. - We enable __attribute__ only if these are supported too, because + We enable _GL_ATTRIBUTE_FORMAT only if these are supported too, because gnulib and libintl do '#define printf __printf__' when they override the 'printf' function. */ -# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) -# define __attribute__(Spec) /* empty */ -# endif +#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) +# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec)) +#else +# define _GL_ATTRIBUTE_FORMAT(spec) /* empty */ #endif #if (_LIBC - 0 && !defined (USE_IN_LIBIO)) \ @@ -130,10 +130,10 @@ extern void argp_fmtstream_free (argp_fmtstream_t __fs); extern ssize_t __argp_fmtstream_printf (argp_fmtstream_t __fs, const char *__fmt, ...) - __attribute__ ((__format__ (printf, 2, 3))); + _GL_ATTRIBUTE_FORMAT ((printf, 2, 3)); extern ssize_t argp_fmtstream_printf (argp_fmtstream_t __fs, const char *__fmt, ...) - __attribute__ ((__format__ (printf, 2, 3))); + _GL_ATTRIBUTE_FORMAT ((printf, 2, 3)); #if _LIBC || !defined __OPTIMIZE__ extern int __argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch); diff --git a/gnu/argp-fs-xinl.c b/gnu/argp-fs-xinl.c index ad8ee767..cb205644 100644 --- a/gnu/argp-fs-xinl.c +++ b/gnu/argp-fs-xinl.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Real definitions for extern inline functions in argp-fmtstream.h - Copyright (C) 1997, 2003, 2004, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1997, 2003-2004, 2009-2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader . diff --git a/gnu/argp-help.c b/gnu/argp-help.c index ab1262a6..7acfdac8 100644 --- a/gnu/argp-help.c +++ b/gnu/argp-help.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Hierarchial argument parsing help output - Copyright (C) 1995-2005, 2007, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 1995-2005, 2007, 2009-2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader . @@ -572,7 +572,9 @@ hol_entry_short_iterate (const struct hol_entry *entry, } static inline int +#if __GNUC__ >= 3 __attribute__ ((always_inline)) +#endif hol_entry_long_iterate (const struct hol_entry *entry, int (*func)(const struct argp_option *opt, const struct argp_option *real, diff --git a/gnu/argp-namefrob.h b/gnu/argp-namefrob.h index 13b15a1a..0b86d33d 100644 --- a/gnu/argp-namefrob.h +++ b/gnu/argp-namefrob.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Name frobnication for compiling argp outside of glibc - Copyright (C) 1997, 2003, 2007, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1997, 2003, 2007, 2009-2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader . @@ -102,45 +102,45 @@ #endif #if defined(HAVE_DECL_FEOF_UNLOCKED) && !HAVE_DECL_FEOF_UNLOCKED # define feof_unlocked(x) feof (x) -# endif +#endif #if defined(HAVE_DECL_FERROR_UNLOCKED) && !HAVE_DECL_FERROR_UNLOCKED # define ferror_unlocked(x) ferror (x) -# endif +#endif #if defined(HAVE_DECL_FFLUSH_UNLOCKED) && !HAVE_DECL_FFLUSH_UNLOCKED # define fflush_unlocked(x) fflush (x) -# endif +#endif #if defined(HAVE_DECL_FGETS_UNLOCKED) && !HAVE_DECL_FGETS_UNLOCKED # define fgets_unlocked(x,y,z) fgets (x,y,z) -# endif +#endif #if defined(HAVE_DECL_FPUTC_UNLOCKED) && !HAVE_DECL_FPUTC_UNLOCKED # define fputc_unlocked(x,y) fputc (x,y) -# endif +#endif #if defined(HAVE_DECL_FPUTS_UNLOCKED) && !HAVE_DECL_FPUTS_UNLOCKED # define fputs_unlocked(x,y) fputs (x,y) -# endif +#endif #if defined(HAVE_DECL_FREAD_UNLOCKED) && !HAVE_DECL_FREAD_UNLOCKED # define fread_unlocked(w,x,y,z) fread (w,x,y,z) -# endif +#endif #if defined(HAVE_DECL_FWRITE_UNLOCKED) && !HAVE_DECL_FWRITE_UNLOCKED # define fwrite_unlocked(w,x,y,z) fwrite (w,x,y,z) -# endif +#endif #if defined(HAVE_DECL_GETC_UNLOCKED) && !HAVE_DECL_GETC_UNLOCKED # define getc_unlocked(x) getc (x) -# endif +#endif #if defined(HAVE_DECL_GETCHAR_UNLOCKED) && !HAVE_DECL_GETCHAR_UNLOCKED # define getchar_unlocked() getchar () -# endif +#endif #if defined(HAVE_DECL_PUTC_UNLOCKED) && !HAVE_DECL_PUTC_UNLOCKED # define putc_unlocked(x,y) putc (x,y) -# endif +#endif #if defined(HAVE_DECL_PUTCHAR_UNLOCKED) && !HAVE_DECL_PUTCHAR_UNLOCKED # define putchar_unlocked(x) putchar (x) -# endif +#endif #endif /* !_LIBC */ #ifndef __set_errno -#define __set_errno(e) (errno = (e)) +# define __set_errno(e) (errno = (e)) #endif #if defined GNULIB_ARGP_DISABLE_DIRNAME diff --git a/gnu/argp-parse.c b/gnu/argp-parse.c index eaaad73e..07b72395 100644 --- a/gnu/argp-parse.c +++ b/gnu/argp-parse.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Hierarchial argument parsing, layered over getopt - Copyright (C) 1995-2000, 2002-2004, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 1995-2000, 2002-2004, 2009-2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader . diff --git a/gnu/argp-pin.c b/gnu/argp-pin.c index 500f9201..a1734636 100644 --- a/gnu/argp-pin.c +++ b/gnu/argp-pin.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Full and short program names for argp module - Copyright (C) 2005, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2005, 2009-2011 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 diff --git a/gnu/argp-pv.c b/gnu/argp-pv.c index 5a8d45d4..7071acdb 100644 --- a/gnu/argp-pv.c +++ b/gnu/argp-pv.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Default definition for ARGP_PROGRAM_VERSION. - Copyright (C) 1996, 1997, 1999, 2006, 2009, 2010 Free Software Foundation, + Copyright (C) 1996-1997, 1999, 2006, 2009-2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader . diff --git a/gnu/argp-pvh.c b/gnu/argp-pvh.c index aa7510a1..8147f51b 100644 --- a/gnu/argp-pvh.c +++ b/gnu/argp-pvh.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Default definition for ARGP_PROGRAM_VERSION_HOOK. - Copyright (C) 1996, 1997, 1999, 2004, 2009, 2010 Free Software Foundation, + Copyright (C) 1996-1997, 1999, 2004, 2009-2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader . diff --git a/gnu/argp-version-etc.c b/gnu/argp-version-etc.c index 4913bf51..0a7ea873 100644 --- a/gnu/argp-version-etc.c +++ b/gnu/argp-version-etc.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Version hook for Argp. - Copyright (C) 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2009-2011 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 diff --git a/gnu/argp-version-etc.h b/gnu/argp-version-etc.h index 23b6e7a9..60b13dbb 100644 --- a/gnu/argp-version-etc.h +++ b/gnu/argp-version-etc.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Version hook for Argp. - Copyright (C) 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2009-2011 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 diff --git a/gnu/argp-xinl.c b/gnu/argp-xinl.c index 909e1af5..30bb64dc 100644 --- a/gnu/argp-xinl.c +++ b/gnu/argp-xinl.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Real definitions for extern inline functions in argp.h - Copyright (C) 1997, 1998, 2004, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-1998, 2004, 2009-2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader . diff --git a/gnu/argp.h b/gnu/argp.h index 04e20810..a0856817 100644 --- a/gnu/argp.h +++ b/gnu/argp.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Hierarchial argument parsing, layered over getopt. - Copyright (C) 1995-1999, 2003-2010 Free Software Foundation, Inc. + Copyright (C) 1995-1999, 2003-2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader . @@ -36,16 +36,16 @@ # define __NTH(fct) fct __THROW #endif -#ifndef __attribute__ /* The __attribute__ feature is available in gcc versions 2.5 and later. The __-protected variants of the attributes 'format' and 'printf' are accepted by gcc versions 2.6.4 (effectively 2.7) and later. - We enable __attribute__ only if these are supported too, because + We enable _GL_ATTRIBUTE_FORMAT only if these are supported too, because gnulib and libintl do '#define printf __printf__' when they override the 'printf' function. */ -# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) -# define __attribute__(Spec) /* empty */ -# endif +#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) +# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec)) +#else +# define _GL_ATTRIBUTE_FORMAT(spec) /* empty */ #endif /* GCC 2.95 and later have "__restrict"; C99 compilers have @@ -532,10 +532,10 @@ extern void __argp_usage (const struct argp_state *__state); message, then exit (1). */ extern void argp_error (const struct argp_state *__restrict __state, const char *__restrict __fmt, ...) - __attribute__ ((__format__ (__printf__, 2, 3))); + _GL_ATTRIBUTE_FORMAT ((__printf__, 2, 3)); extern void __argp_error (const struct argp_state *__restrict __state, const char *__restrict __fmt, ...) - __attribute__ ((__format__ (__printf__, 2, 3))); + _GL_ATTRIBUTE_FORMAT ((__printf__, 2, 3)); /* Similar to the standard gnu error-reporting function error(), but will respect the ARGP_NO_EXIT and ARGP_NO_ERRS flags in STATE, and will print @@ -548,11 +548,11 @@ extern void __argp_error (const struct argp_state *__restrict __state, extern void argp_failure (const struct argp_state *__restrict __state, int __status, int __errnum, const char *__restrict __fmt, ...) - __attribute__ ((__format__ (__printf__, 4, 5))); + _GL_ATTRIBUTE_FORMAT ((__printf__, 4, 5)); extern void __argp_failure (const struct argp_state *__restrict __state, int __status, int __errnum, const char *__restrict __fmt, ...) - __attribute__ ((__format__ (__printf__, 4, 5))); + _GL_ATTRIBUTE_FORMAT ((__printf__, 4, 5)); #if _LIBC || !defined __USE_EXTERN_INLINES /* Returns true if the option OPT is a valid short option. */ diff --git a/gnu/asnprintf.c b/gnu/asnprintf.c index dc3dc1d4..d54b3e88 100644 --- a/gnu/asnprintf.c +++ b/gnu/asnprintf.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2006, 2009-2011 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 diff --git a/gnu/asprintf.c b/gnu/asprintf.c index c507a821..9e6817e7 100644 --- a/gnu/asprintf.c +++ b/gnu/asprintf.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006-2007, 2009-2010 Free Software Foundation, + Copyright (C) 1999, 2002, 2006-2007, 2009-2011 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/gnu/at-func.c b/gnu/at-func.c index 999c0600..96c16574 100644 --- a/gnu/at-func.c +++ b/gnu/at-func.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Define an at-style functions like fstatat, unlinkat, fchownat, etc. - Copyright (C) 2006, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2011 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 @@ -18,7 +18,7 @@ /* written by Jim Meyering */ -#include "dirname.h" /* solely for definition of IS_ABSOLUTE_FILE_NAME */ +#include "dosname.h" /* solely for definition of IS_ABSOLUTE_FILE_NAME */ #include "openat.h" #include "openat-priv.h" #include "save-cwd.h" diff --git a/gnu/at-func2.c b/gnu/at-func2.c index 41501172..c9727d9d 100644 --- a/gnu/at-func2.c +++ b/gnu/at-func2.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Define an at-style functions like linkat or renameat. - Copyright (C) 2006, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2011 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 @@ -27,7 +27,7 @@ #include #include -#include "dirname.h" /* solely for definition of IS_ABSOLUTE_FILE_NAME */ +#include "dosname.h" /* solely for definition of IS_ABSOLUTE_FILE_NAME */ #include "filenamecat.h" #include "openat.h" #include "same-inode.h" diff --git a/gnu/backupfile.c b/gnu/backupfile.c index fc9d74bf..b32877d7 100644 --- a/gnu/backupfile.c +++ b/gnu/backupfile.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* backupfile.c -- make Emacs style backup file names - Copyright (C) 1990-2006, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 1990-2006, 2009-2011 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 diff --git a/gnu/backupfile.h b/gnu/backupfile.h index 999eed2b..87efd844 100644 --- a/gnu/backupfile.h +++ b/gnu/backupfile.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* backupfile.h -- declarations for making Emacs style backup file names - Copyright (C) 1990-1992, 1997-1999, 2003-2004, 2009-2010 Free Software + Copyright (C) 1990-1992, 1997-1999, 2003-2004, 2009-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/basename-lgpl.c b/gnu/basename-lgpl.c index b2f273f9..ca8989f0 100644 --- a/gnu/basename-lgpl.c +++ b/gnu/basename-lgpl.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* basename.c -- return the last element in a file name - Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2010 Free Software + Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/basename.c b/gnu/basename.c index a7e8cb44..fd52498d 100644 --- a/gnu/basename.c +++ b/gnu/basename.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* basename.c -- return the last element in a file name - Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2010 Free Software + Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/bitrotate.h b/gnu/bitrotate.h index 9adefe3a..d7cce24d 100644 --- a/gnu/bitrotate.h +++ b/gnu/bitrotate.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* bitrotate.h - Rotate bits in integers - Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2008-2011 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 diff --git a/gnu/btowc.c b/gnu/btowc.c index b40d8e72..c6dbac53 100644 --- a/gnu/btowc.c +++ b/gnu/btowc.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Convert unibyte character to wide character. - Copyright (C) 2008, 2010 Free Software Foundation, Inc. + Copyright (C) 2008, 2010-2011 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify diff --git a/gnu/c-ctype.c b/gnu/c-ctype.c index 48baa72e..835f4e1a 100644 --- a/gnu/c-ctype.c +++ b/gnu/c-ctype.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Character handling in C locale. - Copyright 2000-2003, 2006, 2009-2010 Free Software Foundation, Inc. + Copyright 2000-2003, 2006, 2009-2011 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 diff --git a/gnu/c-ctype.h b/gnu/c-ctype.h index 26c89b81..a58913ea 100644 --- a/gnu/c-ctype.h +++ b/gnu/c-ctype.h @@ -7,7 +7,7 @@ functions' behaviour depends on the current locale set via setlocale. - Copyright (C) 2000-2003, 2006, 2008-2010 Free Software Foundation, Inc. + Copyright (C) 2000-2003, 2006, 2008-2011 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 diff --git a/gnu/canonicalize-lgpl.c b/gnu/canonicalize-lgpl.c index 9c5a12ea..5267f253 100644 --- a/gnu/canonicalize-lgpl.c +++ b/gnu/canonicalize-lgpl.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Return the canonical absolute name of a given file. - Copyright (C) 1996-2010 Free Software Foundation, Inc. + Copyright (C) 1996-2011 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software: you can redistribute it and/or modify diff --git a/gnu/chdir-long.c b/gnu/chdir-long.c index 338c050b..a7b40f09 100644 --- a/gnu/chdir-long.c +++ b/gnu/chdir-long.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* provide a chdir function that tries not to fail due to ENAMETOOLONG - Copyright (C) 2004-2010 Free Software Foundation, Inc. + Copyright (C) 2004-2011 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 diff --git a/gnu/chdir-long.h b/gnu/chdir-long.h index 286b04ce..56cbb93d 100644 --- a/gnu/chdir-long.h +++ b/gnu/chdir-long.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* provide a chdir function that tries not to fail due to ENAMETOOLONG - Copyright (C) 2004-2005, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2004-2005, 2009-2011 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 diff --git a/gnu/chown.c b/gnu/chown.c index 678e0f75..6f355691 100644 --- a/gnu/chown.c +++ b/gnu/chown.c @@ -3,7 +3,7 @@ /* provide consistent interface to chown for systems that don't interpret an ID of -1 as meaning `don't change the corresponding ID'. - Copyright (C) 1997, 2004-2007, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 1997, 2004-2007, 2009-2011 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 diff --git a/gnu/cloexec.c b/gnu/cloexec.c index 4fb995e8..98dad284 100644 --- a/gnu/cloexec.c +++ b/gnu/cloexec.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* closexec.c - set or clear the close-on-exec descriptor flag - Copyright (C) 1991, 2004-2006, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 1991, 2004-2006, 2009-2011 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 diff --git a/gnu/cloexec.h b/gnu/cloexec.h index 12f17a83..377ab6c9 100644 --- a/gnu/cloexec.h +++ b/gnu/cloexec.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* closexec.c - set or clear the close-on-exec descriptor flag - Copyright (C) 2004, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2004, 2009-2011 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 diff --git a/gnu/close-hook.c b/gnu/close-hook.c index 1d569c09..8fce37a4 100644 --- a/gnu/close-hook.c +++ b/gnu/close-hook.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Hook for making the close() function extensible. - Copyright (C) 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2009-2011 Free Software Foundation, Inc. Written by Bruno Haible , 2009. This program is free software: you can redistribute it and/or modify it @@ -12,7 +12,7 @@ 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 - Lesser General Public License for more details. + General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . */ diff --git a/gnu/close-hook.h b/gnu/close-hook.h index acc4c6a0..f37c7eab 100644 --- a/gnu/close-hook.h +++ b/gnu/close-hook.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Hook for making the close() function extensible. - Copyright (C) 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2009-2011 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 @@ -11,7 +11,7 @@ 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 - Lesser General Public License for more details. + General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . */ diff --git a/gnu/close-stream.c b/gnu/close-stream.c index 5004f30a..2afb01d4 100644 --- a/gnu/close-stream.c +++ b/gnu/close-stream.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Close a stream, with nicer error checking than fclose's. - Copyright (C) 1998-2002, 2004, 2006-2010 Free Software Foundation, Inc. + Copyright (C) 1998-2002, 2004, 2006-2011 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 diff --git a/gnu/close.c b/gnu/close.c index be9b9650..b8bdcfa7 100644 --- a/gnu/close.c +++ b/gnu/close.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* close replacement. - Copyright (C) 2008-2010 Free Software Foundation, Inc. + Copyright (C) 2008-2011 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 diff --git a/gnu/closeout.c b/gnu/closeout.c index 1915c79d..8a105d5a 100644 --- a/gnu/closeout.c +++ b/gnu/closeout.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Close standard output and standard error, exiting with a diagnostic on error. - Copyright (C) 1998-2002, 2004, 2006, 2008-2010 Free Software Foundation, + Copyright (C) 1998-2002, 2004, 2006, 2008-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/closeout.h b/gnu/closeout.h index 1216ba44..e90b1a28 100644 --- a/gnu/closeout.h +++ b/gnu/closeout.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Close standard output and standard error. - Copyright (C) 1998, 2000, 2003-2004, 2006, 2008-2010 Free Software + Copyright (C) 1998, 2000, 2003-2004, 2006, 2008-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/config.charset b/gnu/config.charset index aa7d00db..93b5a5d6 100644 --- a/gnu/config.charset +++ b/gnu/config.charset @@ -1,7 +1,7 @@ #! /bin/sh # Output a system dependent table of character encoding aliases. # -# Copyright (C) 2000-2004, 2006-2010 Free Software Foundation, Inc. +# Copyright (C) 2000-2004, 2006-2011 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 diff --git a/gnu/dirent--.h b/gnu/dirent--.h index f537fac3..f120077c 100644 --- a/gnu/dirent--.h +++ b/gnu/dirent--.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Like dirent.h, but redefine some names to avoid glitches. - Copyright (C) 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2009-2011 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 diff --git a/gnu/dirent-safer.h b/gnu/dirent-safer.h index d442ba03..4627a86b 100644 --- a/gnu/dirent-safer.h +++ b/gnu/dirent-safer.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Invoke dirent-like functions, but avoid some glitches. - Copyright (C) 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2009-2011 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 diff --git a/gnu/dirent.in.h b/gnu/dirent.in.h index ccc6a47b..691db924 100644 --- a/gnu/dirent.in.h +++ b/gnu/dirent.in.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A GNU-like . - Copyright (C) 2006-2010 Free Software Foundation, Inc. + Copyright (C) 2006-2011 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 diff --git a/gnu/dirfd.c b/gnu/dirfd.c index f0afda84..99dea729 100644 --- a/gnu/dirfd.c +++ b/gnu/dirfd.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* dirfd.c -- return the file descriptor associated with an open DIR* - Copyright (C) 2001, 2006, 2008-2010 Free Software Foundation, Inc. + Copyright (C) 2001, 2006, 2008-2011 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 diff --git a/gnu/dirname-lgpl.c b/gnu/dirname-lgpl.c index 969b465e..8ddec81b 100644 --- a/gnu/dirname-lgpl.c +++ b/gnu/dirname-lgpl.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* dirname.c -- return all but the last element in a file name - Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2010 Free Software + Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/dirname.c b/gnu/dirname.c index 8b3d28dc..d4e43b80 100644 --- a/gnu/dirname.c +++ b/gnu/dirname.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* dirname.c -- return all but the last element in a file name - Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2010 Free Software + Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/dirname.h b/gnu/dirname.h index ede162d4..c9a02b31 100644 --- a/gnu/dirname.h +++ b/gnu/dirname.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Take file names apart into directory and base names. - Copyright (C) 1998, 2001, 2003-2006, 2009-2010 Free Software Foundation, + Copyright (C) 1998, 2001, 2003-2006, 2009-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -23,44 +23,16 @@ # include # include +# include "dosname.h" # ifndef DIRECTORY_SEPARATOR # define DIRECTORY_SEPARATOR '/' # endif -# ifndef ISSLASH -# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR) -# endif - -# ifndef FILE_SYSTEM_PREFIX_LEN -# if FILE_SYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX - /* This internal macro assumes ASCII, but all hosts that support drive - letters use ASCII. */ -# define _IS_DRIVE_LETTER(c) (((unsigned int) (c) | ('a' - 'A')) - 'a' \ - <= 'z' - 'a') -# define FILE_SYSTEM_PREFIX_LEN(Filename) \ - (_IS_DRIVE_LETTER ((Filename)[0]) && (Filename)[1] == ':' ? 2 : 0) -# else -# define FILE_SYSTEM_PREFIX_LEN(Filename) 0 -# endif -# endif - -# ifndef FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE -# define FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE 0 -# endif - # ifndef DOUBLE_SLASH_IS_DISTINCT_ROOT # define DOUBLE_SLASH_IS_DISTINCT_ROOT 0 # endif -# if FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE -# define IS_ABSOLUTE_FILE_NAME(F) ISSLASH ((F)[FILE_SYSTEM_PREFIX_LEN (F)]) -# else -# define IS_ABSOLUTE_FILE_NAME(F) \ - (ISSLASH ((F)[0]) || 0 < FILE_SYSTEM_PREFIX_LEN (F)) -# endif -# define IS_RELATIVE_FILE_NAME(F) (! IS_ABSOLUTE_FILE_NAME (F)) - # if GNULIB_DIRNAME char *base_name (char const *file); char *dir_name (char const *file); diff --git a/gnu/dosname.h b/gnu/dosname.h new file mode 100644 index 00000000..d7285989 --- /dev/null +++ b/gnu/dosname.h @@ -0,0 +1,55 @@ +/* -*- buffer-read-only: t -*- vi: set ro: */ +/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ +/* File names on MS-DOS/Windows systems. + + Copyright (C) 2000-2001, 2004-2006, 2009-2011 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 3 of the License, 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, see . + + From Paul Eggert and Jim Meyering. */ + +#ifndef _DOSNAME_H +#define _DOSNAME_H + +#if (defined _WIN32 || defined __WIN32__ || \ + defined __MSDOS__ || defined __CYGWIN__ || \ + defined __EMX__ || defined __DJGPP__) + /* This internal macro assumes ASCII, but all hosts that support drive + letters use ASCII. */ +# define _IS_DRIVE_LETTER(C) (((unsigned int) (C) | ('a' - 'A')) - 'a' \ + <= 'z' - 'a') +# define FILE_SYSTEM_PREFIX_LEN(Filename) \ + (_IS_DRIVE_LETTER ((Filename)[0]) && (Filename)[1] == ':' ? 2 : 0) +# ifndef __CYGWIN__ +# define FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE 1 +# endif +# define ISSLASH(C) ((C) == '/' || (C) == '\\') +#else +# define FILE_SYSTEM_PREFIX_LEN(Filename) 0 +# define ISSLASH(C) ((C) == '/') +#endif + +#ifndef FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE +# define FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE 0 +#endif + +#if FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE +# define IS_ABSOLUTE_FILE_NAME(F) ISSLASH ((F)[FILE_SYSTEM_PREFIX_LEN (F)]) +# else +# define IS_ABSOLUTE_FILE_NAME(F) \ + (ISSLASH ((F)[0]) || FILE_SYSTEM_PREFIX_LEN (F) != 0) +#endif +#define IS_RELATIVE_FILE_NAME(F) (! IS_ABSOLUTE_FILE_NAME (F)) + +#endif /* DOSNAME_H_ */ diff --git a/gnu/dup-safer.c b/gnu/dup-safer.c index 3b75ab7d..3b336f46 100644 --- a/gnu/dup-safer.c +++ b/gnu/dup-safer.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Invoke dup, but avoid some glitches. - Copyright (C) 2001, 2004-2006, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2001, 2004-2006, 2009-2011 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 diff --git a/gnu/dup2.c b/gnu/dup2.c index 002aa84b..4d26dd0f 100644 --- a/gnu/dup2.c +++ b/gnu/dup2.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Duplicate an open file descriptor to a specified file descriptor. - Copyright (C) 1999, 2004-2007, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 1999, 2004-2007, 2009-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -61,6 +61,10 @@ rpl_dup2 (int fd, int desired_fd) errno = EBADF; return -1; } +# elif !defined __linux__ + /* On Haiku, dup2 (fd, fd) mistakenly clears FD_CLOEXEC. */ + if (fd == desired_fd) + return fcntl (fd, F_GETFL) == -1 ? -1 : fd; # endif result = dup2 (fd, desired_fd); # ifdef __linux__ diff --git a/gnu/errno.in.h b/gnu/errno.in.h index d59c1969..8ceed3a1 100644 --- a/gnu/errno.in.h +++ b/gnu/errno.in.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A POSIX-like . - Copyright (C) 2008-2010 Free Software Foundation, Inc. + Copyright (C) 2008-2011 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 diff --git a/gnu/error.c b/gnu/error.c index 37b2c6e3..120fc842 100644 --- a/gnu/error.c +++ b/gnu/error.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Error handler for noninteractive utilities - Copyright (C) 1990-1998, 2000-2007, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 1990-1998, 2000-2007, 2009-2011 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software: you can redistribute it and/or modify diff --git a/gnu/error.h b/gnu/error.h index 5e5d35a0..7622874d 100644 --- a/gnu/error.h +++ b/gnu/error.h @@ -1,8 +1,8 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Declaration for error-reporting function - Copyright (C) 1995, 1996, 1997, 2003, 2006, 2008, 2009, 2010 Free Software - Foundation, Inc. + Copyright (C) 1995-1997, 2003, 2006, 2008-2011 Free Software Foundation, + Inc. This file is part of the GNU C Library. This program is free software: you can redistribute it and/or modify @@ -21,16 +21,16 @@ #ifndef _ERROR_H #define _ERROR_H 1 -#ifndef __attribute__ /* The __attribute__ feature is available in gcc versions 2.5 and later. The __-protected variants of the attributes 'format' and 'printf' are accepted by gcc versions 2.6.4 (effectively 2.7) and later. - We enable __attribute__ only if these are supported too, because + We enable _GL_ATTRIBUTE_FORMAT only if these are supported too, because gnulib and libintl do '#define printf __printf__' when they override the 'printf' function. */ -# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) -# define __attribute__(Spec) /* empty */ -# endif +#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) +# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec)) +#else +# define _GL_ATTRIBUTE_FORMAT(spec) /* empty */ #endif #ifdef __cplusplus @@ -42,11 +42,11 @@ extern "C" { If STATUS is nonzero, terminate the program with `exit (STATUS)'. */ extern void error (int __status, int __errnum, const char *__format, ...) - __attribute__ ((__format__ (__printf__, 3, 4))); + _GL_ATTRIBUTE_FORMAT ((__printf__, 3, 4)); extern void error_at_line (int __status, int __errnum, const char *__fname, unsigned int __lineno, const char *__format, ...) - __attribute__ ((__format__ (__printf__, 5, 6))); + _GL_ATTRIBUTE_FORMAT ((__printf__, 5, 6)); /* If NULL, error will flush stdout, then print on stderr the program name, a colon and a space. Otherwise, error will call this diff --git a/gnu/exclude.c b/gnu/exclude.c index dfa2aabf..32334f16 100644 --- a/gnu/exclude.c +++ b/gnu/exclude.c @@ -2,8 +2,8 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* exclude.c -- exclude file names - Copyright (C) 1992, 1993, 1994, 1997, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1992-1994, 1997, 1999-2007, 2009-2011 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 diff --git a/gnu/exclude.h b/gnu/exclude.h index 7b514e46..81f2fd1b 100644 --- a/gnu/exclude.h +++ b/gnu/exclude.h @@ -2,8 +2,8 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* exclude.h -- declarations for excluding file names - Copyright (C) 1992, 1993, 1994, 1997, 1999, 2001, 2002, 2003, 2005, 2006, - 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1992-1994, 1997, 1999, 2001-2003, 2005-2006, 2009-2011 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 diff --git a/gnu/exitfail.c b/gnu/exitfail.c index 459e184f..19f90664 100644 --- a/gnu/exitfail.c +++ b/gnu/exitfail.c @@ -2,8 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Failure exit status - Copyright (C) 2002, 2003, 2005, 2006, 2007, 2009, 2010 Free Software - Foundation, Inc. + Copyright (C) 2002-2003, 2005-2007, 2009-2011 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 diff --git a/gnu/exitfail.h b/gnu/exitfail.h index bdbbce0b..a044d445 100644 --- a/gnu/exitfail.h +++ b/gnu/exitfail.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Failure exit status - Copyright (C) 2002, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2002, 2009-2011 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 diff --git a/gnu/fchdir.c b/gnu/fchdir.c index 83d3c339..d97dc380 100644 --- a/gnu/fchdir.c +++ b/gnu/fchdir.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* fchdir replacement. - Copyright (C) 2006-2010 Free Software Foundation, Inc. + Copyright (C) 2006-2011 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 diff --git a/gnu/fchmodat.c b/gnu/fchmodat.c index 80dcd9db..14bca0d6 100644 --- a/gnu/fchmodat.c +++ b/gnu/fchmodat.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Change the protections of file relative to an open directory. - Copyright (C) 2006, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2011 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 diff --git a/gnu/fchownat.c b/gnu/fchownat.c index 87c54937..6892fd03 100644 --- a/gnu/fchownat.c +++ b/gnu/fchownat.c @@ -6,7 +6,7 @@ when the buggy fchownat-with-AT_SYMLINK_NOFOLLOW operates on a symlink, it mistakenly affects the symlink referent, rather than the symlink itself. - Copyright (C) 2006-2007, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2006-2007, 2009-2011 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 @@ -68,15 +68,15 @@ static int local_lchownat (int fd, char const *file, uid_t owner, gid_t group); -# define AT_FUNC_NAME local_lchownat -# define AT_FUNC_F1 lchown -# define AT_FUNC_POST_FILE_PARAM_DECLS , uid_t owner, gid_t group -# define AT_FUNC_POST_FILE_ARGS , owner, group -# include "at-func.c" -# undef AT_FUNC_NAME -# undef AT_FUNC_F1 -# undef AT_FUNC_POST_FILE_PARAM_DECLS -# undef AT_FUNC_POST_FILE_ARGS +# define AT_FUNC_NAME local_lchownat +# define AT_FUNC_F1 lchown +# define AT_FUNC_POST_FILE_PARAM_DECLS , uid_t owner, gid_t group +# define AT_FUNC_POST_FILE_ARGS , owner, group +# include "at-func.c" +# undef AT_FUNC_NAME +# undef AT_FUNC_F1 +# undef AT_FUNC_POST_FILE_PARAM_DECLS +# undef AT_FUNC_POST_FILE_ARGS # endif @@ -90,6 +90,13 @@ rpl_fchownat (int fd, char const *file, uid_t owner, gid_t group, int flag) if (flag == AT_SYMLINK_NOFOLLOW) return local_lchownat (fd, file, owner, group); # endif +# if FCHOWNAT_EMPTY_FILENAME_BUG + if (file[0] == '\0') + { + errno = ENOENT; + return -1; + } +# endif # if CHOWN_TRAILING_SLASH_BUG { size_t len = strlen (file); diff --git a/gnu/fclose.c b/gnu/fclose.c index 86757fa0..b70a5dd7 100644 --- a/gnu/fclose.c +++ b/gnu/fclose.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* fclose replacement. - Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2008-2011 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 diff --git a/gnu/fcntl.c b/gnu/fcntl.c index 3f4af8a2..febc2136 100644 --- a/gnu/fcntl.c +++ b/gnu/fcntl.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Provide file descriptor control. - Copyright (C) 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2009-2011 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 @@ -189,7 +189,21 @@ rpl_fcntl (int fd, int action, /* arg */...) errno = EINVAL; else { + /* Haiku alpha 2 loses fd flags on original. */ + int flags = fcntl (fd, F_GETFD); + if (flags < 0) + { + result = -1; + break; + } result = fcntl (fd, action, target); + if (0 <= result && fcntl (fd, F_SETFD, flags) == -1) + { + int saved_errno = errno; + close (result); + result = -1; + errno = saved_errno; + } # if REPLACE_FCHDIR if (0 <= result) result = _gl_register_dup (fd, result); diff --git a/gnu/fcntl.in.h b/gnu/fcntl.in.h index c2ded08a..c7d871bf 100644 --- a/gnu/fcntl.in.h +++ b/gnu/fcntl.in.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Like , but with non-working flags defined to 0. - Copyright (C) 2006-2010 Free Software Foundation, Inc. + Copyright (C) 2006-2011 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 @@ -28,7 +28,13 @@ /* Special invocation convention. */ #include -#ifndef __GLIBC__ /* Avoid namespace pollution on glibc systems. */ +/* On some systems other than glibc, is a prerequisite of + . On glibc systems, we would like to avoid namespace pollution. + But on glibc systems, includes inside an + extern "C" { ... } block, which leads to errors in C++ mode with the + overridden from gnulib. These errors are known to be gone + with g++ version >= 4.3. */ +#if !(defined __GLIBC__ || defined __UCLIBC__) || (defined __cplusplus && defined GNULIB_NAMESPACE && !(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))) # include #endif #@INCLUDE_NEXT@ @NEXT_FCNTL_H@ @@ -39,7 +45,13 @@ #ifndef _GL_FCNTL_H #include -#ifndef __GLIBC__ /* Avoid namespace pollution on glibc systems. */ +/* On some systems other than glibc, is a prerequisite of + . On glibc systems, we would like to avoid namespace pollution. + But on glibc systems, includes inside an + extern "C" { ... } block, which leads to errors in C++ mode with the + overridden from gnulib. These errors are known to be gone + with g++ version >= 4.3. */ +#if !(defined __GLIBC__ || defined __UCLIBC__) || (defined __cplusplus && defined GNULIB_NAMESPACE && !(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))) # include #endif /* The include_next requires a split double-inclusion guard. */ @@ -97,7 +109,11 @@ _GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...)); # else _GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...)); # endif +/* On HP-UX 11, in C++ mode, open() is defined as an inline function with a + default argument. _GL_CXXALIASWARN does not work in this case. */ +# if !defined __hpux _GL_CXXALIASWARN (open); +# endif #elif defined GNULIB_POSIXCHECK # undef open /* Assume open is always declared. */ diff --git a/gnu/fd-safer.c b/gnu/fd-safer.c index 292f7f8f..20df8003 100644 --- a/gnu/fd-safer.c +++ b/gnu/fd-safer.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Return a safer copy of a file descriptor. - Copyright (C) 2005-2006, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2011 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 diff --git a/gnu/fdopendir.c b/gnu/fdopendir.c index 544bf5d5..5c5ac67a 100644 --- a/gnu/fdopendir.c +++ b/gnu/fdopendir.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* provide a replacement fdopendir function - Copyright (C) 2004-2010 Free Software Foundation, Inc. + Copyright (C) 2004-2011 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 @@ -35,12 +35,16 @@ # include "dirent--.h" # endif -static DIR *fdopendir_with_dup (int, int); -static DIR *fd_clone_opendir (int); +# ifndef REPLACE_FCHDIR +# define REPLACE_FCHDIR 0 +# endif + +static DIR *fdopendir_with_dup (int, int, struct saved_cwd const *); +static DIR *fd_clone_opendir (int, struct saved_cwd const *); /* Replacement for POSIX fdopendir. - First, try to simulate it via opendir ("/proc/self/fd/FD"). Failing + First, try to simulate it via opendir ("/proc/self/fd/..."). Failing that, simulate it by using fchdir metadata, or by doing save_cwd/fchdir/opendir(".")/restore_cwd. If either the save_cwd or the restore_cwd fails (relatively unlikely), @@ -63,7 +67,24 @@ static DIR *fd_clone_opendir (int); DIR * fdopendir (int fd) { - return fdopendir_with_dup (fd, -1); + DIR *dir = fdopendir_with_dup (fd, -1, NULL); + + if (! REPLACE_FCHDIR && ! dir) + { + int saved_errno = errno; + if (EXPECTED_ERRNO (saved_errno)) + { + struct saved_cwd cwd; + if (save_cwd (&cwd) != 0) + openat_save_fail (errno); + dir = fdopendir_with_dup (fd, -1, &cwd); + saved_errno = errno; + free_cwd (&cwd); + errno = saved_errno; + } + } + + return dir; } /* Like fdopendir, except that if OLDER_DUPFD is not -1, it is known @@ -72,9 +93,13 @@ fdopendir (int fd) function makes sure that FD is closed and all file descriptors less than FD are open, and then calls fd_clone_opendir on a dup of FD. That way, barring race conditions, fd_clone_opendir returns a - stream whose file descriptor is FD. */ + stream whose file descriptor is FD. + + If REPLACE_CHDIR or CWD is null, use opendir ("/proc/self/fd/...", + falling back on fchdir metadata. Otherwise, CWD is a saved version + of the working directory; use fchdir/opendir(".")/restore_cwd(CWD). */ static DIR * -fdopendir_with_dup (int fd, int older_dupfd) +fdopendir_with_dup (int fd, int older_dupfd, struct saved_cwd const *cwd) { int dupfd = dup (fd); if (dupfd < 0 && errno == EMFILE) @@ -87,13 +112,13 @@ fdopendir_with_dup (int fd, int older_dupfd) int saved_errno; if (dupfd < fd - 1 && dupfd != older_dupfd) { - dir = fdopendir_with_dup (fd, dupfd); + dir = fdopendir_with_dup (fd, dupfd, cwd); saved_errno = errno; } else { close (fd); - dir = fd_clone_opendir (dupfd); + dir = fd_clone_opendir (dupfd, cwd); saved_errno = errno; if (! dir) { @@ -114,74 +139,45 @@ fdopendir_with_dup (int fd, int older_dupfd) the caller's responsibility both to close FD and (if the result is not null) to closedir the result. */ static DIR * -fd_clone_opendir (int fd) +fd_clone_opendir (int fd, struct saved_cwd const *cwd) { - int saved_errno; - DIR *dir; - - char buf[OPENAT_BUFFER_SIZE]; - char *proc_file = openat_proc_name (buf, fd, "."); - if (proc_file) - { - dir = opendir (proc_file); - saved_errno = errno; - } - else + if (REPLACE_FCHDIR || ! cwd) { - dir = NULL; - saved_errno = EOPNOTSUPP; - } - - /* If the syscall fails with an expected errno value, resort to - save_cwd/restore_cwd. */ - if (! dir && EXPECTED_ERRNO (saved_errno)) - { -# if REPLACE_FCHDIR - const char *name = _gl_directory_name (fd); - if (name) - dir = opendir (name); - saved_errno = errno; -# else /* !REPLACE_FCHDIR */ - - /* Occupy the destination FD slot, so that save_cwd cannot hijack it. */ - int fd_reserve = dup (fd); - if (fd_reserve < 0) + DIR *dir = NULL; + int saved_errno = EOPNOTSUPP; + char buf[OPENAT_BUFFER_SIZE]; + char *proc_file = openat_proc_name (buf, fd, "."); + if (proc_file) { + dir = opendir (proc_file); saved_errno = errno; - dir = NULL; - goto fail; + if (proc_file != buf) + free (proc_file); } - - struct saved_cwd saved_cwd; - if (save_cwd (&saved_cwd) != 0) - openat_save_fail (errno); - - /* Liberate the target file descriptor, so that opendir uses it. */ - close (fd_reserve); - - if (fchdir (fd) != 0) +# if REPLACE_FCHDIR + if (! dir && EXPECTED_ERRNO (saved_errno)) { - dir = NULL; - saved_errno = errno; + char const *name = _gl_directory_name (fd); + return (name ? opendir (name) : NULL); } +# endif + errno = saved_errno; + return dir; + } + else + { + if (fchdir (fd) != 0) + return NULL; else { - dir = opendir ("."); - saved_errno = errno; - - if (restore_cwd (&saved_cwd) != 0) + DIR *dir = opendir ("."); + int saved_errno = errno; + if (restore_cwd (cwd) != 0) openat_restore_fail (errno); + errno = saved_errno; + return dir; } - - free_cwd (&saved_cwd); -# endif /* !REPLACE_FCHDIR */ } - - fail: - if (proc_file != buf) - free (proc_file); - errno = saved_errno; - return dir; } #else /* HAVE_FDOPENDIR */ diff --git a/gnu/fdutimensat.c b/gnu/fdutimensat.c index 6df7b562..b42d8cc1 100644 --- a/gnu/fdutimensat.c +++ b/gnu/fdutimensat.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Set file access and modification times. - Copyright (C) 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2009-2011 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 diff --git a/gnu/fileblocks.c b/gnu/fileblocks.c index 77717c8c..44e0e9b4 100644 --- a/gnu/fileblocks.c +++ b/gnu/fileblocks.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Convert file size to number of blocks on System V-like machines. - Copyright (C) 1990, 1997-1999, 2004-2006, 2009-2010 Free Software + Copyright (C) 1990, 1997-1999, 2004-2006, 2009-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/filenamecat-lgpl.c b/gnu/filenamecat-lgpl.c index 819f27bc..1969e216 100644 --- a/gnu/filenamecat-lgpl.c +++ b/gnu/filenamecat-lgpl.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Concatenate two arbitrary file names. - Copyright (C) 1996-2007, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 1996-2007, 2009-2011 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 diff --git a/gnu/filenamecat.h b/gnu/filenamecat.h index 40a26d34..b3d876a5 100644 --- a/gnu/filenamecat.h +++ b/gnu/filenamecat.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Concatenate two arbitrary file names. - Copyright (C) 1996-1997, 2003, 2005, 2007, 2009-2010 Free Software + Copyright (C) 1996-1997, 2003, 2005, 2007, 2009-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/float+.h b/gnu/float+.h index 08b9bce8..6aab058d 100644 --- a/gnu/float+.h +++ b/gnu/float+.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Supplemental information about the floating-point formats. - Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc. Written by Bruno Haible , 2007. This program is free software; you can redistribute it and/or modify diff --git a/gnu/float.in.h b/gnu/float.in.h index cc2dbdf0..ddc3b6c1 100644 --- a/gnu/float.in.h +++ b/gnu/float.in.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A correct . - Copyright (C) 2007-2010 Free Software Foundation, Inc. + Copyright (C) 2007-2011 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 diff --git a/gnu/fnmatch.c b/gnu/fnmatch.c index 178fdaff..ecfc8fb0 100644 --- a/gnu/fnmatch.c +++ b/gnu/fnmatch.c @@ -1,7 +1,6 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ -/* Copyright (C) 1991, 1992, 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, - 2003, 2004, 2005, 2006, 2007, 2009, 2010 Free Software Foundation, Inc. +/* Copyright (C) 1991-1993, 1996-2007, 2009-2011 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 diff --git a/gnu/fnmatch.in.h b/gnu/fnmatch.in.h index 54e48bba..6f60fcf7 100644 --- a/gnu/fnmatch.in.h +++ b/gnu/fnmatch.in.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ -/* Copyright (C) 1991, 1992, 1993, 1996, 1997, 1998, 1999, 2001, 2002, 2003, - 2005, 2007, 2009, 2010 Free Software Foundation, Inc. +/* Copyright (C) 1991-1993, 1996-1999, 2001-2003, 2005, 2007, 2009-2011 Free + Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/gnu/fnmatch_loop.c b/gnu/fnmatch_loop.c index c46099a8..f083cc2c 100644 --- a/gnu/fnmatch_loop.c +++ b/gnu/fnmatch_loop.c @@ -1,7 +1,6 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ -/* Copyright (C) 1991, 1992, 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, - 2003, 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc. +/* Copyright (C) 1991-1993, 1996-2006, 2009-2011 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software; you can redistribute it and/or modify diff --git a/gnu/fpending.c b/gnu/fpending.c index f0ca18c5..2792807c 100644 --- a/gnu/fpending.c +++ b/gnu/fpending.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* fpending.c -- return the number of pending output bytes on a stream - Copyright (C) 2000, 2004, 2006-2007, 2009-2010 Free Software Foundation, + Copyright (C) 2000, 2004, 2006-2007, 2009-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/fpending.h b/gnu/fpending.h index 5ffebc87..e3fc1c31 100644 --- a/gnu/fpending.h +++ b/gnu/fpending.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Declare __fpending. - Copyright (C) 2000, 2003, 2005-2006, 2009-2010 Free Software Foundation, + Copyright (C) 2000, 2003, 2005-2006, 2009-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/fseeko.c b/gnu/fseeko.c index 5eb256a6..93e400d4 100644 --- a/gnu/fseeko.c +++ b/gnu/fseeko.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* An fseeko() function that, together with fflush(), is POSIX compliant. - Copyright (C) 2007-2010 Free Software Foundation, Inc. + Copyright (C) 2007-2011 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 @@ -71,7 +71,7 @@ fseeko (FILE *fp, off_t offset, int whence) && fp->_rcount == 0 && fp->_wcount == 0 && fp->_ungetc_count == 0) -#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw */ +#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */ if (fp_->_ptr == fp_->_base && (fp_->_ptr == NULL || fp_->_cnt == 0)) #elif defined __UCLIBC__ /* uClibc */ @@ -133,7 +133,7 @@ fseeko (FILE *fp, off_t offset, int whence) fp_->_flags &= ~__SEOF; #elif defined __EMX__ /* emx+gcc */ fp->_flags &= ~_IOEOF; -#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw */ +#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */ fp->_flag &= ~_IOEOF; #elif defined __MINT__ /* Atari FreeMiNT */ fp->__offset = pos; diff --git a/gnu/fstatat.c b/gnu/fstatat.c index cc8a635a..37c38f0a 100644 --- a/gnu/fstatat.c +++ b/gnu/fstatat.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Work around an fstatat bug on Solaris 9. - Copyright (C) 2006, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2011 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 diff --git a/gnu/full-write.c b/gnu/full-write.c index 9b5ad2ec..9b325a72 100644 --- a/gnu/full-write.c +++ b/gnu/full-write.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* An interface to read and write that retries (if necessary) until complete. - Copyright (C) 1993-1994, 1997-2006, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 1993-1994, 1997-2006, 2009-2011 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 diff --git a/gnu/full-write.h b/gnu/full-write.h index 1b858158..840b37ef 100644 --- a/gnu/full-write.h +++ b/gnu/full-write.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* An interface to write() that writes all it is asked to write. - Copyright (C) 2002-2003, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2009-2011 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 diff --git a/gnu/futimens.c b/gnu/futimens.c index 4e8f894d..ac30b035 100644 --- a/gnu/futimens.c +++ b/gnu/futimens.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Set the access and modification time of an open fd. - Copyright (C) 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2009-2011 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 diff --git a/gnu/getcwd.c b/gnu/getcwd.c index 2ccca796..011d6417 100644 --- a/gnu/getcwd.c +++ b/gnu/getcwd.c @@ -1,6 +1,6 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ -/* Copyright (C) 1991-1999, 2004-2010 Free Software Foundation, Inc. +/* Copyright (C) 1991-1999, 2004-2011 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software: you can redistribute it and/or modify diff --git a/gnu/getdelim.c b/gnu/getdelim.c index f9b0cee6..852eb03e 100644 --- a/gnu/getdelim.c +++ b/gnu/getdelim.c @@ -1,8 +1,8 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* getdelim.c --- Implementation of replacement getdelim function. - Copyright (C) 1994, 1996, 1997, 1998, 2001, 2003, 2005, 2006, 2007, 2008, - 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1994, 1996-1998, 2001, 2003, 2005-2011 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 diff --git a/gnu/getdtablesize.c b/gnu/getdtablesize.c index b0af77b1..3258ae10 100644 --- a/gnu/getdtablesize.c +++ b/gnu/getdtablesize.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* getdtablesize() function for platforms that don't have it. - Copyright (C) 2008-2010 Free Software Foundation, Inc. + Copyright (C) 2008-2011 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify diff --git a/gnu/getline.c b/gnu/getline.c index 3e5653e4..ab25df8c 100644 --- a/gnu/getline.c +++ b/gnu/getline.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* getline.c --- Implementation of replacement getline function. - Copyright (C) 2005, 2006, 2007, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2005-2007, 2009-2011 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 diff --git a/gnu/getopt.c b/gnu/getopt.c index 6eae49e0..91d17dd3 100644 --- a/gnu/getopt.c +++ b/gnu/getopt.c @@ -4,7 +4,7 @@ NOTE: getopt is 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-1996, 1998-2004, 2006, 2008-2010 Free Software + Copyright (C) 1987-1996, 1998-2004, 2006, 2008-2011 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/gnu/getopt.in.h b/gnu/getopt.in.h index d077edc0..b2f2922d 100644 --- a/gnu/getopt.in.h +++ b/gnu/getopt.in.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Declarations for getopt. - Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2010 Free Software + Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2011 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -183,6 +183,7 @@ extern int optopt; one). For long options that have a zero `flag' field, `getopt' returns the contents of the `val' field. */ +# if !GNULIB_defined_struct_option struct option { const char *name; @@ -192,6 +193,8 @@ struct option int *flag; int val; }; +# define GNULIB_defined_struct_option 1 +# endif /* Names for the values of the `has_arg' field of `struct option'. */ diff --git a/gnu/getopt1.c b/gnu/getopt1.c index fbef7754..c7fe745d 100644 --- a/gnu/getopt1.c +++ b/gnu/getopt1.c @@ -1,8 +1,8 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* getopt_long and getopt_long_only entry points for GNU getopt. - Copyright (C) 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, - 1998, 2004, 2006, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1987-1994, 1996-1998, 2004, 2006, 2009-2011 Free Software + Foundation, Inc. This file is part of the GNU C Library. This program is free software: you can redistribute it and/or modify diff --git a/gnu/getopt_int.h b/gnu/getopt_int.h index 697689c2..2ec3a476 100644 --- a/gnu/getopt_int.h +++ b/gnu/getopt_int.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Internal declarations for getopt. - Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2004, 2009-2010 Free Software + Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2004, 2009-2011 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -110,7 +110,7 @@ struct _getopt_data #if defined _LIBC && defined USE_NONOPTION_FLAGS int __nonoption_flags_max_len; int __nonoption_flags_len; -# endif +#endif }; /* The initializer is necessary to set OPTIND and OPTERR to their diff --git a/gnu/getpagesize.c b/gnu/getpagesize.c index 41f0cfb5..377375bf 100644 --- a/gnu/getpagesize.c +++ b/gnu/getpagesize.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* getpagesize emulation for systems where it cannot be done in a C macro. - Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2011 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 diff --git a/gnu/gettext.h b/gnu/gettext.h index 0b054db7..ef044431 100644 --- a/gnu/gettext.h +++ b/gnu/gettext.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Convenience header for conditional use of GNU . - Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2010 Free Software + Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2011 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -56,7 +56,7 @@ it now, to make later inclusions of a NOP. */ #if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3) # include -# if (__GLIBC__ >= 2) || _GLIBCXX_HAVE_LIBINTL_H +# if (__GLIBC__ >= 2 && !defined __UCLIBC__) || _GLIBCXX_HAVE_LIBINTL_H # include # endif #endif @@ -95,6 +95,12 @@ #endif +/* Prefer gnulib's setlocale override over libintl's setlocale override. */ +#ifdef GNULIB_defined_setlocale +# undef setlocale +# define setlocale rpl_setlocale +#endif + /* A pseudo function call that serves as a marker for the automated extraction of messages, but does not call gettext(). The run-time translation is done at a different place in the code. diff --git a/gnu/gettime.c b/gnu/gettime.c index 542d79e1..44af4967 100644 --- a/gnu/gettime.c +++ b/gnu/gettime.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* gettime -- get the system clock - Copyright (C) 2002, 2004-2007, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2002, 2004-2007, 2009-2011 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 diff --git a/gnu/gettimeofday.c b/gnu/gettimeofday.c index cdd84663..7532c0c0 100644 --- a/gnu/gettimeofday.c +++ b/gnu/gettimeofday.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Provide gettimeofday for systems that don't have it or for which it's broken. - Copyright (C) 2001-2003, 2005-2007, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2007, 2009-2011 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 @@ -42,10 +42,10 @@ static struct tm tm_zero_buffer; static struct tm *localtime_buffer_addr = &tm_zero_buffer; -#undef localtime +# undef localtime extern struct tm *localtime (time_t const *); -#undef gmtime +# undef gmtime extern struct tm *gmtime (time_t const *); /* This is a wrapper for localtime. It is used only on systems for which @@ -81,7 +81,7 @@ rpl_gmtime (time_t const *timep) #if TZSET_CLOBBERS_LOCALTIME -#undef tzset +# undef tzset extern void tzset (void); /* This is a wrapper for tzset, for systems on which tzset may clobber diff --git a/gnu/hash.c b/gnu/hash.c index c49d34d3..1b4474ff 100644 --- a/gnu/hash.c +++ b/gnu/hash.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* hash - hashing table processing. - Copyright (C) 1998-2004, 2006-2007, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 1998-2004, 2006-2007, 2009-2011 Free Software Foundation, Inc. Written by Jim Meyering, 1992. diff --git a/gnu/hash.h b/gnu/hash.h index 98f965d0..afe8dd31 100644 --- a/gnu/hash.h +++ b/gnu/hash.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* hash - hashing table processing. - Copyright (C) 1998-1999, 2001, 2003, 2009-2010 Free Software Foundation, + Copyright (C) 1998-1999, 2001, 2003, 2009-2011 Free Software Foundation, Inc. Written by Jim Meyering , 1998. @@ -29,15 +29,12 @@ # include # include -/* The warn_unused_result attribute appeared first in gcc-3.4.0 */ -# ifndef __attribute__ -# if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 4) -# define __attribute__(x) -# endif -# endif - -# ifndef ATTRIBUTE_WUR -# define ATTRIBUTE_WUR __attribute__ ((__warn_unused_result__)) +/* The __attribute__ feature is available in gcc versions 2.5 and later. + The warn_unused_result attribute appeared first in gcc-3.4.0. */ +# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) +# define _GL_ATTRIBUTE_WUR __attribute__ ((__warn_unused_result__)) +# else +# define _GL_ATTRIBUTE_WUR /* empty */ # endif typedef size_t (*Hash_hasher) (const void *, size_t); @@ -83,13 +80,13 @@ size_t hash_string (const char *, size_t); void hash_reset_tuning (Hash_tuning *); Hash_table *hash_initialize (size_t, const Hash_tuning *, Hash_hasher, Hash_comparator, - Hash_data_freer) ATTRIBUTE_WUR; + Hash_data_freer) _GL_ATTRIBUTE_WUR; void hash_clear (Hash_table *); void hash_free (Hash_table *); /* Insertion and deletion. */ -bool hash_rehash (Hash_table *, size_t) ATTRIBUTE_WUR; -void *hash_insert (Hash_table *, const void *) ATTRIBUTE_WUR; +bool hash_rehash (Hash_table *, size_t) _GL_ATTRIBUTE_WUR; +void *hash_insert (Hash_table *, const void *) _GL_ATTRIBUTE_WUR; int hash_insert0 (Hash_table *table, const void *entry, const void **matched_ent); void *hash_delete (Hash_table *, const void *); diff --git a/gnu/human.c b/gnu/human.c index 04c8f9c1..b2ef3ea8 100644 --- a/gnu/human.c +++ b/gnu/human.c @@ -2,8 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* human.c -- print human readable file size - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, - 2006, 2007, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1996-2007, 2009-2011 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 diff --git a/gnu/human.h b/gnu/human.h index 5d3f0c6d..a46aaaa3 100644 --- a/gnu/human.h +++ b/gnu/human.h @@ -2,8 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* human.h -- print human readable file size - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, - 2006, 2007, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1996-2007, 2009-2011 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 diff --git a/gnu/imaxtostr.c b/gnu/imaxtostr.c index 86fd3aa8..68c18a53 100644 --- a/gnu/imaxtostr.c +++ b/gnu/imaxtostr.c @@ -2,5 +2,4 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ #define anytostr imaxtostr #define inttype intmax_t -#define inttype_is_signed 1 #include "anytostr.c" diff --git a/gnu/intprops.h b/gnu/intprops.h index 6f3e575a..45776063 100644 --- a/gnu/intprops.h +++ b/gnu/intprops.h @@ -2,8 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* intprops.h -- properties of integer types - Copyright (C) 2001, 2002, 2003, 2004, 2005, 2009, 2010 Free Software - Foundation, Inc. + Copyright (C) 2001-2005, 2009-2011 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 @@ -52,11 +51,11 @@ ? (t) 0 \ : TYPE_SIGNED_MAGNITUDE (t) \ ? ~ (t) 0 \ - : ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1))) + : ~ TYPE_MAXIMUM (t))) # define TYPE_MAXIMUM(t) \ ((t) (! TYPE_SIGNED (t) \ ? (t) -1 \ - : ~ (~ (t) 0 << (sizeof (t) * CHAR_BIT - 1)))) + : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1))) /* Return zero if T can be determined to be an unsigned type. Otherwise, return 1. @@ -70,13 +69,17 @@ # define signed_type_or_expr__(t) 1 # endif +/* Bound on length of the string representing an unsigned integer + value representable in B bits. log10 (2.0) < 146/485. The + smallest value of B where this bound is not tight is 2621. */ +# define INT_BITS_STRLEN_BOUND(b) (((b) * 146 + 484) / 485) + /* Bound on length of the string representing an integer type or expression T. - Subtract 1 for the sign bit if T is signed; log10 (2.0) < 146/485; - add 1 for integer division truncation; add 1 more for a minus sign - if needed. */ + Subtract 1 for the sign bit if T is signed, and then add 1 more for + a minus sign if needed. */ # define INT_STRLEN_BOUND(t) \ - ((sizeof (t) * CHAR_BIT - signed_type_or_expr__ (t)) * 146 / 485 \ - + signed_type_or_expr__ (t) + 1) + (INT_BITS_STRLEN_BOUND (sizeof (t) * CHAR_BIT - signed_type_or_expr__ (t)) \ + + signed_type_or_expr__ (t)) /* Bound on buffer size needed to represent an integer type or expression T, including the terminating null. */ diff --git a/gnu/inttostr.c b/gnu/inttostr.c index 1bba4a08..696b03c7 100644 --- a/gnu/inttostr.c +++ b/gnu/inttostr.c @@ -2,5 +2,4 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ #define anytostr inttostr #define inttype int -#define inttype_is_signed 1 #include "anytostr.c" diff --git a/gnu/inttostr.h b/gnu/inttostr.h index edd01457..937ec365 100644 --- a/gnu/inttostr.h +++ b/gnu/inttostr.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* inttostr.h -- convert integers to printable strings - Copyright (C) 2001-2006, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2001-2006, 2009-2011 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 diff --git a/gnu/inttypes.in.h b/gnu/inttypes.in.h index ce8fab32..6f05803c 100644 --- a/gnu/inttypes.in.h +++ b/gnu/inttypes.in.h @@ -1,6 +1,6 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ -/* Copyright (C) 2006-2010 Free Software Foundation, Inc. +/* Copyright (C) 2006-2011 Free Software Foundation, Inc. Written by Paul Eggert, Bruno Haible, Derek Price. This file is part of gnulib. @@ -1062,7 +1062,10 @@ _GL_WARN_ON_USE (imaxabs, "imaxabs is unportable - " #if @GNULIB_IMAXDIV@ # if !@HAVE_DECL_IMAXDIV@ +# if !GNULIB_defined_imaxdiv_t typedef struct { intmax_t quot; intmax_t rem; } imaxdiv_t; +# define GNULIB_defined_imaxdiv_t 1 +# endif extern imaxdiv_t imaxdiv (intmax_t, intmax_t); # endif #elif defined GNULIB_POSIXCHECK diff --git a/gnu/iswblank.c b/gnu/iswblank.c new file mode 100644 index 00000000..38d53637 --- /dev/null +++ b/gnu/iswblank.c @@ -0,0 +1,29 @@ +/* -*- buffer-read-only: t -*- vi: set ro: */ +/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ +/* Test wide character for being blank. + Copyright (C) 2008-2011 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 3, 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. */ + +#include + +/* Specification. */ +#include + +int +iswblank (wint_t wc) +{ + return wc == ' ' || wc == '\t'; +} diff --git a/gnu/langinfo.in.h b/gnu/langinfo.in.h index 95b8d571..cd94d251 100644 --- a/gnu/langinfo.in.h +++ b/gnu/langinfo.in.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Substitute for and wrapper around . - Copyright (C) 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2009-2011 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 @@ -43,7 +43,10 @@ /* A platform that lacks . */ /* Assume that it also lacks and the nl_item type. */ +# if !GNULIB_defined_nl_item typedef int nl_item; +# define GNULIB_defined_nl_item 1 +# endif /* nl_langinfo items of the LC_CTYPE category */ # define CODESET 10000 diff --git a/gnu/lchown.c b/gnu/lchown.c index 8daaa2b9..fae44964 100644 --- a/gnu/lchown.c +++ b/gnu/lchown.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Provide a stub lchown function for systems that lack it. - Copyright (C) 1998-1999, 2002, 2004, 2006-2007, 2009-2010 Free Software + Copyright (C) 1998-1999, 2002, 2004, 2006-2007, 2009-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/link.c b/gnu/link.c index 9b988bc8..acbaec44 100644 --- a/gnu/link.c +++ b/gnu/link.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Emulate link on platforms that lack it, namely native Windows platforms. - Copyright (C) 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2009-2011 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 diff --git a/gnu/linkat.c b/gnu/linkat.c index 1f855cb0..a8e3a4e8 100644 --- a/gnu/linkat.c +++ b/gnu/linkat.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Create a hard link relative to open directories. - Copyright (C) 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2009-2011 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 @@ -168,6 +168,36 @@ link_follow (char const *file1, char const *file2) } # endif /* 0 < LINK_FOLLOWS_SYMLINKS */ +/* On Solaris, link() doesn't follow symlinks by default, but does so as soon + as a library or executable takes part in the program that has been compiled + with "c99" or "cc -xc99=all" or "cc ... /usr/lib/values-xpg4.o ...". */ +# if LINK_FOLLOWS_SYMLINKS == -1 + +/* Reduce the penalty of link_immediate and link_follow by incorporating the + knowledge that link()'s behaviour depends on the __xpg4 variable. */ +extern int __xpg4; + +static int +solaris_optimized_link_immediate (char const *file1, char const *file2) +{ + if (__xpg4 == 0) + return link (file1, file2); + return link_immediate (file1, file2); +} + +static int +solaris_optimized_link_follow (char const *file1, char const *file2) +{ + if (__xpg4 != 0) + return link (file1, file2); + return link_follow (file1, file2); +} + +# define link_immediate solaris_optimized_link_immediate +# define link_follow solaris_optimized_link_follow + +# endif + /* Create a link to FILE1, in the directory open on descriptor FD1, to FILE2, in the directory open on descriptor FD2. If FILE1 is a symlink, FLAG controls whether to dereference FILE1 first. If possible, do it without @@ -270,7 +300,7 @@ rpl_linkat (int fd1, char const *file1, int fd2, char const *file2, int flag) return -1; } -#if LINKAT_TRAILING_SLASH_BUG +# if LINKAT_TRAILING_SLASH_BUG /* Reject trailing slashes on non-directories. */ { size_t len1 = strlen (file1); @@ -291,7 +321,7 @@ rpl_linkat (int fd1, char const *file1, int fd2, char const *file2, int flag) } } } -#endif +# endif if (!flag) return linkat (fd1, file1, fd2, file2, flag); diff --git a/gnu/localcharset.c b/gnu/localcharset.c index 794fec6b..d8b5953c 100644 --- a/gnu/localcharset.c +++ b/gnu/localcharset.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Determine a canonical name for the current locale's character encoding. - Copyright (C) 2000-2006, 2008-2010 Free Software Foundation, Inc. + Copyright (C) 2000-2006, 2008-2011 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 @@ -230,8 +230,7 @@ get_charset_aliases (void) { /* Out of memory. */ res_size = 0; - if (old_res_ptr != NULL) - free (old_res_ptr); + free (old_res_ptr); break; } strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1); diff --git a/gnu/localcharset.h b/gnu/localcharset.h index 9a67c0de..53c8a948 100644 --- a/gnu/localcharset.h +++ b/gnu/localcharset.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Determine a canonical name for the current locale's character encoding. - Copyright (C) 2000-2003, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2000-2003, 2009-2011 Free Software Foundation, Inc. This file is part of the GNU CHARSET Library. This program is free software; you can redistribute it and/or modify diff --git a/gnu/lseek.c b/gnu/lseek.c index 831e5383..b33a7568 100644 --- a/gnu/lseek.c +++ b/gnu/lseek.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* An lseek() function that detects pipes. - Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2011 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 diff --git a/gnu/lstat.c b/gnu/lstat.c index 4d9e28a4..1e0499f0 100644 --- a/gnu/lstat.c +++ b/gnu/lstat.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Work around a bug of lstat on some systems - Copyright (C) 1997-2006, 2008-2010 Free Software Foundation, Inc. + Copyright (C) 1997-2006, 2008-2011 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 diff --git a/gnu/malloc.c b/gnu/malloc.c index 3daa8582..f4c36e24 100644 --- a/gnu/malloc.c +++ b/gnu/malloc.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* malloc() function that is glibc compatible. - Copyright (C) 1997-1998, 2006-2007, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 1997-1998, 2006-2007, 2009-2011 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 diff --git a/gnu/malloca.c b/gnu/malloca.c index 8992000d..64ca9875 100644 --- a/gnu/malloca.c +++ b/gnu/malloca.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Safe automatic memory allocation. - Copyright (C) 2003, 2006-2007, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2003, 2006-2007, 2009-2011 Free Software Foundation, Inc. Written by Bruno Haible , 2003. This program is free software; you can redistribute it and/or modify diff --git a/gnu/malloca.h b/gnu/malloca.h index b0c78a3f..933fa7ec 100644 --- a/gnu/malloca.h +++ b/gnu/malloca.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Safe automatic memory allocation. - Copyright (C) 2003-2007, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2003-2007, 2009-2011 Free Software Foundation, Inc. Written by Bruno Haible , 2003. This program is free software; you can redistribute it and/or modify diff --git a/gnu/mbchar.c b/gnu/mbchar.c index b140b341..0abf8cc1 100644 --- a/gnu/mbchar.c +++ b/gnu/mbchar.c @@ -1,6 +1,6 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ -/* Copyright (C) 2001, 2006, 2009, 2010 Free Software Foundation, Inc. +/* Copyright (C) 2001, 2006, 2009-2011 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 diff --git a/gnu/mbchar.h b/gnu/mbchar.h index bbefddb7..2a8140f5 100644 --- a/gnu/mbchar.h +++ b/gnu/mbchar.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Multibyte character data type. - Copyright (C) 2001, 2005-2007, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2001, 2005-2007, 2009-2011 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 diff --git a/gnu/mbrtowc.c b/gnu/mbrtowc.c index 7768ce93..19f51591 100644 --- a/gnu/mbrtowc.c +++ b/gnu/mbrtowc.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Convert multibyte character to wide character. - Copyright (C) 1999-2002, 2005-2010 Free Software Foundation, Inc. + Copyright (C) 1999-2002, 2005-2011 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify @@ -42,9 +42,6 @@ mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps) { char *pstate = (char *)ps; - if (pstate == NULL) - pstate = internal_state; - if (s == NULL) { pwc = NULL; @@ -56,6 +53,10 @@ mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps) return (size_t)(-2); /* Here n > 0. */ + + if (pstate == NULL) + pstate = internal_state; + { size_t nstate = pstate[0]; char buf[4]; @@ -93,7 +94,7 @@ mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps) /* Here m > 0. */ -# if __GLIBC__ +# if __GLIBC__ || defined __UCLIBC__ /* Work around bug */ mbtowc (NULL, NULL, 0); # endif @@ -323,7 +324,7 @@ mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps) size_t rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps) { -# if MBRTOWC_NULL_ARG_BUG || MBRTOWC_RETVAL_BUG +# if MBRTOWC_NULL_ARG2_BUG || MBRTOWC_RETVAL_BUG if (s == NULL) { pwc = NULL; @@ -381,7 +382,16 @@ rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps) return ret; } # else - return mbrtowc (pwc, s, n, ps); + { +# if MBRTOWC_NULL_ARG1_BUG + wchar_t dummy; + + if (pwc == NULL) + pwc = &dummy; +# endif + + return mbrtowc (pwc, s, n, ps); + } # endif } diff --git a/gnu/mbscasecmp.c b/gnu/mbscasecmp.c index 285554b3..88441295 100644 --- a/gnu/mbscasecmp.c +++ b/gnu/mbscasecmp.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Case-insensitive string comparison function. - Copyright (C) 1998-1999, 2005-2010 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2011 Free Software Foundation, Inc. Written by Bruno Haible , 2005, based on earlier glibc code. diff --git a/gnu/mbsinit.c b/gnu/mbsinit.c index 78f113b5..d3b3f200 100644 --- a/gnu/mbsinit.c +++ b/gnu/mbsinit.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Test for initial conversion state. - Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2008-2011 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify @@ -24,6 +24,18 @@ #include "verify.h" +#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ + +/* On native Windows, 'mbstate_t' is defined as 'int'. */ + +int +mbsinit (const mbstate_t *ps) +{ + return ps == NULL || *ps == 0; +} + +#else + /* Platforms that lack mbsinit() also lack mbrlen(), mbrtowc(), mbsrtowcs() and wcrtomb(), wcsrtombs(). We assume that @@ -45,5 +57,7 @@ mbsinit (const mbstate_t *ps) { const char *pstate = (const char *)ps; - return pstate[0] == 0; + return pstate == NULL || pstate[0] == 0; } + +#endif diff --git a/gnu/mbsrtowcs-impl.h b/gnu/mbsrtowcs-impl.h new file mode 100644 index 00000000..a68df83b --- /dev/null +++ b/gnu/mbsrtowcs-impl.h @@ -0,0 +1,124 @@ +/* -*- buffer-read-only: t -*- vi: set ro: */ +/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ +/* Convert string to wide string. + Copyright (C) 2008-2011 Free Software Foundation, Inc. + Written by Bruno Haible , 2008. + + 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 3 of the License, 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, see . */ + +size_t +mbsrtowcs (wchar_t *dest, const char **srcp, size_t len, mbstate_t *ps) +{ + if (ps == NULL) + ps = &_gl_mbsrtowcs_state; + { + const char *src = *srcp; + + if (dest != NULL) + { + wchar_t *destptr = dest; + + for (; len > 0; destptr++, len--) + { + size_t src_avail; + size_t ret; + + /* An optimized variant of + src_avail = strnlen1 (src, MB_LEN_MAX); */ + if (src[0] == '\0') + src_avail = 1; + else if (src[1] == '\0') + src_avail = 2; + else if (src[2] == '\0') + src_avail = 3; + else if (MB_LEN_MAX <= 4 || src[3] == '\0') + src_avail = 4; + else + src_avail = 4 + strnlen1 (src + 4, MB_LEN_MAX - 4); + + /* Parse the next multibyte character. */ + ret = mbrtowc (destptr, src, src_avail, ps); + + if (ret == (size_t)(-2)) + /* Encountered a multibyte character that extends past a '\0' byte + or that is longer than MB_LEN_MAX bytes. Cannot happen. */ + abort (); + + if (ret == (size_t)(-1)) + goto bad_input; + if (ret == 0) + { + src = NULL; + /* Here mbsinit (ps). */ + break; + } + src += ret; + } + + *srcp = src; + return destptr - dest; + } + else + { + /* Ignore dest and len, don't store *srcp at the end, and + don't clobber *ps. */ + mbstate_t state = *ps; + size_t totalcount = 0; + + for (;; totalcount++) + { + size_t src_avail; + size_t ret; + + /* An optimized variant of + src_avail = strnlen1 (src, MB_LEN_MAX); */ + if (src[0] == '\0') + src_avail = 1; + else if (src[1] == '\0') + src_avail = 2; + else if (src[2] == '\0') + src_avail = 3; + else if (MB_LEN_MAX <= 4 || src[3] == '\0') + src_avail = 4; + else + src_avail = 4 + strnlen1 (src + 4, MB_LEN_MAX - 4); + + /* Parse the next multibyte character. */ + ret = mbrtowc (NULL, src, src_avail, &state); + + if (ret == (size_t)(-2)) + /* Encountered a multibyte character that extends past a '\0' byte + or that is longer than MB_LEN_MAX bytes. Cannot happen. */ + abort (); + + if (ret == (size_t)(-1)) + goto bad_input2; + if (ret == 0) + { + /* Here mbsinit (&state). */ + break; + } + src += ret; + } + + return totalcount; + } + + bad_input: + *srcp = src; + bad_input2: + errno = EILSEQ; + return (size_t)(-1); + } +} diff --git a/gnu/mbsrtowcs-state.c b/gnu/mbsrtowcs-state.c index e84dcbe4..7d29674b 100644 --- a/gnu/mbsrtowcs-state.c +++ b/gnu/mbsrtowcs-state.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Convert string to wide string. - Copyright (C) 2008-2010 Free Software Foundation, Inc. + Copyright (C) 2008-2011 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify diff --git a/gnu/mbsrtowcs.c b/gnu/mbsrtowcs.c index ced29420..108c7812 100644 --- a/gnu/mbsrtowcs.c +++ b/gnu/mbsrtowcs.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Convert string to wide string. - Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2008-2011 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify @@ -31,108 +31,4 @@ extern mbstate_t _gl_mbsrtowcs_state; -size_t -mbsrtowcs (wchar_t *dest, const char **srcp, size_t len, mbstate_t *ps) -{ - if (ps == NULL) - ps = &_gl_mbsrtowcs_state; - { - const char *src = *srcp; - - if (dest != NULL) - { - wchar_t *destptr = dest; - - for (; len > 0; destptr++, len--) - { - size_t src_avail; - size_t ret; - - /* An optimized variant of - src_avail = strnlen1 (src, MB_LEN_MAX); */ - if (src[0] == '\0') - src_avail = 1; - else if (src[1] == '\0') - src_avail = 2; - else if (src[2] == '\0') - src_avail = 3; - else if (MB_LEN_MAX <= 4 || src[3] == '\0') - src_avail = 4; - else - src_avail = 4 + strnlen1 (src + 4, MB_LEN_MAX - 4); - - /* Parse the next multibyte character. */ - ret = mbrtowc (destptr, src, src_avail, ps); - - if (ret == (size_t)(-2)) - /* Encountered a multibyte character that extends past a '\0' byte - or that is longer than MB_LEN_MAX bytes. Cannot happen. */ - abort (); - - if (ret == (size_t)(-1)) - goto bad_input; - if (ret == 0) - { - src = NULL; - /* Here mbsinit (ps). */ - break; - } - src += ret; - } - - *srcp = src; - return destptr - dest; - } - else - { - /* Ignore dest and len, don't store *srcp at the end, and - don't clobber *ps. */ - mbstate_t state = *ps; - size_t totalcount = 0; - - for (;; totalcount++) - { - size_t src_avail; - size_t ret; - - /* An optimized variant of - src_avail = strnlen1 (src, MB_LEN_MAX); */ - if (src[0] == '\0') - src_avail = 1; - else if (src[1] == '\0') - src_avail = 2; - else if (src[2] == '\0') - src_avail = 3; - else if (MB_LEN_MAX <= 4 || src[3] == '\0') - src_avail = 4; - else - src_avail = 4 + strnlen1 (src + 4, MB_LEN_MAX - 4); - - /* Parse the next multibyte character. */ - ret = mbrtowc (NULL, src, src_avail, &state); - - if (ret == (size_t)(-2)) - /* Encountered a multibyte character that extends past a '\0' byte - or that is longer than MB_LEN_MAX bytes. Cannot happen. */ - abort (); - - if (ret == (size_t)(-1)) - goto bad_input2; - if (ret == 0) - { - /* Here mbsinit (&state). */ - break; - } - src += ret; - } - - return totalcount; - } - - bad_input: - *srcp = src; - bad_input2: - errno = EILSEQ; - return (size_t)(-1); - } -} +#include "mbsrtowcs-impl.h" diff --git a/gnu/mbtowc-impl.h b/gnu/mbtowc-impl.h new file mode 100644 index 00000000..3e6653f3 --- /dev/null +++ b/gnu/mbtowc-impl.h @@ -0,0 +1,46 @@ +/* -*- buffer-read-only: t -*- vi: set ro: */ +/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ +/* Convert multibyte character to wide character. + Copyright (C) 2011 Free Software Foundation, Inc. + Written by Bruno Haible , 2011. + + 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 3 of the License, 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, see . */ + +/* We don't need a static internal state, because the encoding is not state + dependent, and when mbrtowc returns (size_t)(-2). we throw the result + away. */ + +int +mbtowc (wchar_t *pwc, const char *s, size_t n) +{ + if (s == NULL) + return 0; + else + { + mbstate_t state; + wchar_t wc; + size_t result; + + memset (&state, 0, sizeof (mbstate_t)); + result = mbrtowc (&wc, s, n, &state); + if (result == (size_t)-1 || result == (size_t)-2) + { + errno = EILSEQ; + return -1; + } + if (pwc != NULL) + *pwc = wc; + return (wc == 0 ? 0 : result); + } +} diff --git a/gnu/mbtowc.c b/gnu/mbtowc.c new file mode 100644 index 00000000..06a29d07 --- /dev/null +++ b/gnu/mbtowc.c @@ -0,0 +1,28 @@ +/* -*- buffer-read-only: t -*- vi: set ro: */ +/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ +/* Convert multibyte character to wide character. + Copyright (C) 2011 Free Software Foundation, Inc. + Written by Bruno Haible , 2011. + + 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 3 of the License, 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, see . */ + +#include + +#include + +#include +#include +#include + +#include "mbtowc-impl.h" diff --git a/gnu/mbuiter.h b/gnu/mbuiter.h index a81e6ade..7897d12a 100644 --- a/gnu/mbuiter.h +++ b/gnu/mbuiter.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Iterating through multibyte strings: macros for multi-byte encodings. - Copyright (C) 2001, 2005, 2007, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2001, 2005, 2007, 2009-2011 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 diff --git a/gnu/memchr.c b/gnu/memchr.c index 91178cf5..1bc3f998 100644 --- a/gnu/memchr.c +++ b/gnu/memchr.c @@ -1,6 +1,6 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ -/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2010 +/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2011 Free Software Foundation, Inc. Based on strlen implementation by Torbjorn Granlund (tege@sics.se), diff --git a/gnu/mempcpy.c b/gnu/mempcpy.c index c6031406..02ed5662 100644 --- a/gnu/mempcpy.c +++ b/gnu/mempcpy.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Copy memory area and return pointer after last written byte. - Copyright (C) 2003, 2007, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2003, 2007, 2009-2011 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 diff --git a/gnu/memrchr.c b/gnu/memrchr.c index a42f2a1e..98b60802 100644 --- a/gnu/memrchr.c +++ b/gnu/memrchr.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* memrchr -- find the last occurrence of a byte in a memory block - Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2010 Free Software + Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2011 Free Software Foundation, Inc. Based on strlen implementation by Torbjorn Granlund (tege@sics.se), diff --git a/gnu/mkdir.c b/gnu/mkdir.c index d2d618e0..69d253a8 100644 --- a/gnu/mkdir.c +++ b/gnu/mkdir.c @@ -3,7 +3,7 @@ /* On some systems, mkdir ("foo/", 0700) fails because of the trailing slash. On those systems, this wrapper removes the trailing slash. - Copyright (C) 2001, 2003, 2006, 2008-2010 Free Software Foundation, Inc. + Copyright (C) 2001, 2003, 2006, 2008-2011 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 diff --git a/gnu/mkdirat.c b/gnu/mkdirat.c index 3e05db82..08ab19f7 100644 --- a/gnu/mkdirat.c +++ b/gnu/mkdirat.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* fd-relative mkdir - Copyright (C) 2005-2006, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2011 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 diff --git a/gnu/mkdtemp.c b/gnu/mkdtemp.c index 27fdd076..d4b7d82b 100644 --- a/gnu/mkdtemp.c +++ b/gnu/mkdtemp.c @@ -1,6 +1,6 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ -/* Copyright (C) 1999, 2001-2003, 2006-2007, 2009-2010 Free Software +/* Copyright (C) 1999, 2001-2003, 2006-2007, 2009-2011 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/gnu/mkfifo.c b/gnu/mkfifo.c index 2bd92458..1c27a257 100644 --- a/gnu/mkfifo.c +++ b/gnu/mkfifo.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Create a named fifo. - Copyright (C) 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2009-2011 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 diff --git a/gnu/mkfifoat.c b/gnu/mkfifoat.c index 814351dc..3ae8aef1 100644 --- a/gnu/mkfifoat.c +++ b/gnu/mkfifoat.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Create a named fifo relative to an open directory. - Copyright (C) 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2009-2011 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 diff --git a/gnu/mknod.c b/gnu/mknod.c index 01e5cc48..7d811a35 100644 --- a/gnu/mknod.c +++ b/gnu/mknod.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Create a device inode. - Copyright (C) 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2009-2011 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 diff --git a/gnu/mknodat.c b/gnu/mknodat.c index 19a2fcd3..384315a4 100644 --- a/gnu/mknodat.c +++ b/gnu/mknodat.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Create an inode relative to an open directory. - Copyright (C) 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2009-2011 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 diff --git a/gnu/mktime.c b/gnu/mktime.c index 6adf3abe..9b4d1f14 100644 --- a/gnu/mktime.c +++ b/gnu/mktime.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Convert a `struct tm' to a time_t value. - Copyright (C) 1993-1999, 2002-2007, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 1993-1999, 2002-2007, 2009-2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Paul Eggert . @@ -27,6 +27,24 @@ # include #endif +/* Some of the code in this file assumes that signed integer overflow + silently wraps around. This assumption can't easily be programmed + around, nor can it be checked for portably at compile-time or + easily eliminated at run-time. + + Define WRAPV to 1 if the assumption is valid. Otherwise, define it + to 0; this forces the use of slower code that, while not guaranteed + by the C Standard, works on all production platforms that we know + about. */ +#ifndef WRAPV +# if (__GNUC__ == 4 && 4 <= __GNUC_MINOR__) || 4 < __GNUC__ +# pragma GCC optimize ("wrapv") +# define WRAPV 1 +# else +# define WRAPV 0 +# endif +#endif + /* Assume that leap seconds are possible, unless told otherwise. If the host has a `zic' command with a `-L leapsecondfilename' option, then it supports leap seconds; otherwise it probably doesn't. */ @@ -44,9 +62,21 @@ # include # include /* Make it work even if the system's libc has its own mktime routine. */ +# undef mktime # define mktime my_mktime #endif /* DEBUG */ +/* Verify a requirement at compile-time (unlike assert, which is runtime). */ +#define verify(name, assertion) struct name { char a[(assertion) ? 1 : -1]; } + +/* A signed type that is at least one bit wider than int. */ +#if INT_MAX <= LONG_MAX / 2 +typedef long int long_int; +#else +typedef long long int long_int; +#endif +verify (long_int_is_wide_enough, INT_MAX == INT_MAX * (long_int) 2 / 2); + /* Shift A right by B bits portably, by dividing A by 2**B and truncating towards minus infinity. A and B should be free of side effects, and B should be in the range 0 <= B <= INT_BITS - 2, where @@ -57,9 +87,11 @@ implementations (e.g., UNICOS 9.0 on a Cray Y-MP EL) don't shift right in the usual way when A < 0, so SHR falls back on division if ordinary A >> B doesn't seem to be the usual signed shift. */ -#define SHR(a, b) \ - (-1 >> 1 == -1 \ - ? (a) >> (b) \ +#define SHR(a, b) \ + ((-1 >> 1 == -1 \ + && (long_int) -1 >> 1 == -1 \ + && ((time_t) -1 >> 1 == -1 || ! TYPE_SIGNED (time_t))) \ + ? (a) >> (b) \ : (a) / (1 << (b)) - ((a) % (1 << (b)) < 0)) /* The extra casts in the following macros work around compiler bugs, @@ -70,12 +102,8 @@ #define TYPE_IS_INTEGER(t) ((t) 1.5 == 1) /* True if negative values of the signed integer type T use two's - complement, ones' complement, or signed magnitude representation, - respectively. Much GNU code assumes two's complement, but some - people like to be portable to all possible C hosts. */ + complement, or if T is an unsigned integer type. */ #define TYPE_TWOS_COMPLEMENT(t) ((t) ~ (t) 0 == (t) -1) -#define TYPE_ONES_COMPLEMENT(t) ((t) ~ (t) 0 == 0) -#define TYPE_SIGNED_MAGNITUDE(t) ((t) ~ (t) 0 < (t) -1) /* True if the arithmetic type T is signed. */ #define TYPE_SIGNED(t) (! ((t) 0 < (t) -1)) @@ -87,13 +115,11 @@ #define TYPE_MINIMUM(t) \ ((t) (! TYPE_SIGNED (t) \ ? (t) 0 \ - : TYPE_SIGNED_MAGNITUDE (t) \ - ? ~ (t) 0 \ - : ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1))) + : ~ TYPE_MAXIMUM (t))) #define TYPE_MAXIMUM(t) \ ((t) (! TYPE_SIGNED (t) \ ? (t) -1 \ - : ~ (~ (t) 0 << (sizeof (t) * CHAR_BIT - 1)))) + : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1))) #ifndef TIME_T_MIN # define TIME_T_MIN TYPE_MINIMUM (time_t) @@ -103,14 +129,11 @@ #endif #define TIME_T_MIDPOINT (SHR (TIME_T_MIN + TIME_T_MAX, 1) + 1) -/* Verify a requirement at compile-time (unlike assert, which is runtime). */ -#define verify(name, assertion) struct name { char a[(assertion) ? 1 : -1]; } - verify (time_t_is_integer, TYPE_IS_INTEGER (time_t)); -verify (twos_complement_arithmetic, TYPE_TWOS_COMPLEMENT (int)); -/* The code also assumes that signed integer overflow silently wraps - around, but this assumption can't be stated without causing a - diagnostic on some hosts. */ +verify (twos_complement_arithmetic, + (TYPE_TWOS_COMPLEMENT (int) + && TYPE_TWOS_COMPLEMENT (long_int) + && TYPE_TWOS_COMPLEMENT (time_t))); #define EPOCH_YEAR 1970 #define TM_YEAR_BASE 1900 @@ -118,7 +141,7 @@ verify (base_year_is_a_multiple_of_100, TM_YEAR_BASE % 100 == 0); /* Return 1 if YEAR + TM_YEAR_BASE is a leap year. */ static inline int -leapyear (long int year) +leapyear (long_int year) { /* Don't add YEAR to TM_YEAR_BASE, as that might overflow. Also, work even if YEAR is negative. */ @@ -152,6 +175,14 @@ const unsigned short int __mon_yday[2][13] = # include "mktime-internal.h" #endif +/* Return 1 if the values A and B differ according to the rules for + tm_isdst: A and B differ if one is zero and the other positive. */ +static int +isdst_differ (int a, int b) +{ + return (!a != !b) & (0 <= a) & (0 <= b); +} + /* Return an integer value measuring (YEAR1-YDAY1 HOUR1:MIN1:SEC1) - (YEAR0-YDAY0 HOUR0:MIN0:SEC0) in seconds, assuming that the clocks were not adjusted between the time stamps. @@ -164,15 +195,10 @@ const unsigned short int __mon_yday[2][13] = detect overflow. */ static inline time_t -ydhms_diff (long int year1, long int yday1, int hour1, int min1, int sec1, +ydhms_diff (long_int year1, long_int yday1, int hour1, int min1, int sec1, int year0, int yday0, int hour0, int min0, int sec0) { verify (C99_integer_division, -1 / 2 == 0); -#if 0 /* This assertion fails on 32-bit systems with 64-bit time_t, such as - NetBSD 5 on i386. */ - verify (long_int_year_and_yday_are_wide_enough, - INT_MAX <= LONG_MAX / 2 || TIME_T_MAX <= UINT_MAX); -#endif /* Compute intervening leap days correctly even if year is negative. Take care to avoid integer overflow here. */ @@ -195,6 +221,53 @@ ydhms_diff (long int year1, long int yday1, int hour1, int min1, int sec1, return seconds; } +/* Return the average of A and B, even if A + B would overflow. */ +static time_t +time_t_avg (time_t a, time_t b) +{ + return SHR (a, 1) + SHR (b, 1) + (a & b & 1); +} + +/* Return 1 if A + B does not overflow. If time_t is unsigned and if + B's top bit is set, assume that the sum represents A - -B, and + return 1 if the subtraction does not wrap around. */ +static int +time_t_add_ok (time_t a, time_t b) +{ + if (! TYPE_SIGNED (time_t)) + { + time_t sum = a + b; + return (sum < a) == (TIME_T_MIDPOINT <= b); + } + else if (WRAPV) + { + time_t sum = a + b; + return (sum < a) == (b < 0); + } + else + { + time_t avg = time_t_avg (a, b); + return TIME_T_MIN / 2 <= avg && avg <= TIME_T_MAX / 2; + } +} + +/* Return 1 if A + B does not overflow. */ +static int +time_t_int_add_ok (time_t a, int b) +{ + verify (int_no_wider_than_time_t, INT_MAX <= TIME_T_MAX); + if (WRAPV) + { + time_t sum = a + b; + return (sum < a) == (b < 0); + } + else + { + int a_odd = a & 1; + time_t avg = SHR (a, 1) + (SHR (b, 1) + (a_odd & b)); + return TIME_T_MIN / 2 <= avg && avg <= TIME_T_MAX / 2; + } +} /* Return a time_t value corresponding to (YEAR-YDAY HOUR:MIN:SEC), assuming that *T corresponds to *TP and that no clock adjustments @@ -203,7 +276,7 @@ ydhms_diff (long int year1, long int yday1, int hour1, int min1, int sec1, If overflow occurs, yield the minimal or maximal value, except do not yield a value equal to *T. */ static time_t -guess_time_tm (long int year, long int yday, int hour, int min, int sec, +guess_time_tm (long_int year, long_int yday, int hour, int min, int sec, const time_t *t, const struct tm *tp) { if (tp) @@ -211,9 +284,8 @@ guess_time_tm (long int year, long int yday, int hour, int min, int sec, time_t d = ydhms_diff (year, yday, hour, min, sec, tp->tm_year, tp->tm_yday, tp->tm_hour, tp->tm_min, tp->tm_sec); - time_t t1 = *t + d; - if ((t1 < *t) == (TYPE_SIGNED (time_t) ? d < 0 : TIME_T_MAX / 2 < d)) - return t1; + if (time_t_add_ok (*t, d)) + return *t + d; } /* Overflow occurred one way or another. Return the nearest result @@ -245,9 +317,7 @@ ranged_convert (struct tm *(*convert) (const time_t *, struct tm *), they differ by 1. */ while (bad != ok + (bad < 0 ? -1 : 1)) { - time_t mid = *t = (bad < 0 - ? bad + ((ok - bad) >> 1) - : ok + ((bad - ok) >> 1)); + time_t mid = *t = time_t_avg (ok, bad); r = convert (t, tp); if (r) ok = mid; @@ -296,9 +366,7 @@ __mktime_internal (struct tm *tp, int mday = tp->tm_mday; int mon = tp->tm_mon; int year_requested = tp->tm_year; - /* Normalize the value. */ - int isdst = ((tp->tm_isdst >> (8 * sizeof (tp->tm_isdst) - 1)) - | (tp->tm_isdst != 0)); + int isdst = tp->tm_isdst; /* 1 if the previous probe was DST. */ int dst2; @@ -307,8 +375,8 @@ __mktime_internal (struct tm *tp, int mon_remainder = mon % 12; int negative_mon_remainder = mon_remainder < 0; int mon_years = mon / 12 - negative_mon_remainder; - long int lyear_requested = year_requested; - long int year = lyear_requested + mon_years; + long_int lyear_requested = year_requested; + long_int year = lyear_requested + mon_years; /* The other values need not be in range: the remaining code handles minor overflows correctly, @@ -320,8 +388,8 @@ __mktime_internal (struct tm *tp, int mon_yday = ((__mon_yday[leapyear (year)] [mon_remainder + 12 * negative_mon_remainder]) - 1); - long int lmday = mday; - long int yday = mon_yday + lmday; + long_int lmday = mday; + long_int yday = mon_yday + lmday; time_t guessed_offset = *offset; @@ -375,9 +443,9 @@ __mktime_internal (struct tm *tp, int approx_biennia = SHR (t0, ALOG2_SECONDS_PER_BIENNIUM); int diff = approx_biennia - approx_requested_biennia; - int abs_diff = diff < 0 ? - diff : diff; + int abs_diff = diff < 0 ? -1 - diff : diff; - /* IRIX 4.0.5 cc miscaculates TIME_T_MIN / 3: it erroneously + /* IRIX 4.0.5 cc miscalculates TIME_T_MIN / 3: it erroneously gives a positive value of 715827882. Setting a variable first then doing math on it seems to work. (ghazi@caip.rutgers.edu) */ @@ -393,7 +461,7 @@ __mktime_internal (struct tm *tp, time_t repaired_t0 = -1 - t0; approx_biennia = SHR (repaired_t0, ALOG2_SECONDS_PER_BIENNIUM); diff = approx_biennia - approx_requested_biennia; - abs_diff = diff < 0 ? - diff : diff; + abs_diff = diff < 0 ? -1 - diff : diff; if (overflow_threshold < abs_diff) return -1; guessed_offset += repaired_t0 - t0; @@ -428,7 +496,7 @@ __mktime_internal (struct tm *tp, /* We have a match. Check whether tm.tm_isdst has the requested value, if any. */ - if (isdst != tm.tm_isdst && 0 <= isdst && 0 <= tm.tm_isdst) + if (isdst_differ (isdst, tm.tm_isdst)) { /* tm.tm_isdst has the wrong value. Look for a neighboring time with the right value, and use its UTC offset. @@ -461,22 +529,20 @@ __mktime_internal (struct tm *tp, for (delta = stride; delta < delta_bound; delta += stride) for (direction = -1; direction <= 1; direction += 2) - { - time_t ot = t + delta * direction; - if ((ot < t) == (direction < 0)) - { - struct tm otm; - ranged_convert (convert, &ot, &otm); - if (otm.tm_isdst == isdst) - { - /* We found the desired tm_isdst. - Extrapolate back to the desired time. */ - t = guess_time_tm (year, yday, hour, min, sec, &ot, &otm); - ranged_convert (convert, &t, &tm); - goto offset_found; - } - } - } + if (time_t_int_add_ok (t, delta * direction)) + { + time_t ot = t + delta * direction; + struct tm otm; + ranged_convert (convert, &ot, &otm); + if (! isdst_differ (isdst, otm.tm_isdst)) + { + /* We found the desired tm_isdst. + Extrapolate back to the desired time. */ + t = guess_time_tm (year, yday, hour, min, sec, &ot, &otm); + ranged_convert (convert, &t, &tm); + goto offset_found; + } + } } offset_found: @@ -487,11 +553,13 @@ __mktime_internal (struct tm *tp, /* Adjust time to reflect the tm_sec requested, not the normalized value. Also, repair any damage from a false match due to a leap second. */ int sec_adjustment = (sec == 0 && tm.tm_sec == 60) - sec; + if (! time_t_int_add_ok (t, sec_requested)) + return -1; t1 = t + sec_requested; + if (! time_t_int_add_ok (t1, sec_adjustment)) + return -1; t2 = t1 + sec_adjustment; - if (((t1 < t) != (sec_requested < 0)) - | ((t2 < t1) != (sec_adjustment < 0)) - | ! convert (&t2, &tm)) + if (! convert (&t2, &tm)) return -1; t = t2; } @@ -542,7 +610,7 @@ not_equal_tm (const struct tm *a, const struct tm *b) | (a->tm_mon ^ b->tm_mon) | (a->tm_year ^ b->tm_year) | (a->tm_yday ^ b->tm_yday) - | (a->tm_isdst ^ b->tm_isdst)); + | isdst_differ (a->tm_isdst, b->tm_isdst)); } static void @@ -666,6 +734,6 @@ main (int argc, char **argv) /* Local Variables: -compile-command: "gcc -DDEBUG -Wall -W -O -g mktime.c -o mktime" +compile-command: "gcc -DDEBUG -I. -Wall -W -O2 -g mktime.c -o mktime" End: */ diff --git a/gnu/modechange.c b/gnu/modechange.c index b70c30a8..97a8d1a5 100644 --- a/gnu/modechange.c +++ b/gnu/modechange.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* modechange.c -- file mode manipulation - Copyright (C) 1989-1990, 1997-1999, 2001, 2003-2006, 2009-2010 Free Software + Copyright (C) 1989-1990, 1997-1999, 2001, 2003-2006, 2009-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/modechange.h b/gnu/modechange.h index 58500cd3..bad2e474 100644 --- a/gnu/modechange.h +++ b/gnu/modechange.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* modechange.h -- definitions for file mode manipulation - Copyright (C) 1989-1990, 1997, 2003-2006, 2009-2010 Free Software + Copyright (C) 1989-1990, 1997, 2003-2006, 2009-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/nl_langinfo.c b/gnu/nl_langinfo.c index 4fcb76f3..aef5e202 100644 --- a/gnu/nl_langinfo.c +++ b/gnu/nl_langinfo.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* nl_langinfo() replacement: query locale dependent information. - Copyright (C) 2007-2010 Free Software Foundation, Inc. + Copyright (C) 2007-2011 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 @@ -99,7 +99,7 @@ rpl_nl_langinfo (nl_item item) strings, appended in memory. */ return "\0\0\0\0\0\0\0\0\0\0"; # endif -# if GNULIB_defined_YESEXPR +# if GNULIB_defined_YESEXPR || !FUNC_NL_LANGINFO_YESEXPR_WORKS case YESEXPR: return "^[yY]"; case NOEXPR: diff --git a/gnu/obstack.c b/gnu/obstack.c index 7f1aa6b8..dea57e15 100644 --- a/gnu/obstack.c +++ b/gnu/obstack.c @@ -2,9 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* obstack.c - subroutines used implicitly by object stack macros - Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998, - 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, 2010 Free Software - Foundation, Inc. + Copyright (C) 1988-1994, 1996-2006, 2009-2011 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 diff --git a/gnu/obstack.h b/gnu/obstack.h index f225a523..19d4429a 100644 --- a/gnu/obstack.h +++ b/gnu/obstack.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* obstack.h - object stack macros - Copyright (C) 1988-1994, 1996-1999, 2003-2006, 2009-2010 Free Software + Copyright (C) 1988-1994, 1996-1999, 2003-2006, 2009-2011 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/gnu/offtostr.c b/gnu/offtostr.c index e3e11fc3..8190d7a7 100644 --- a/gnu/offtostr.c +++ b/gnu/offtostr.c @@ -2,5 +2,4 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ #define anytostr offtostr #define inttype off_t -#define inttype_is_signed 1 #include "anytostr.c" diff --git a/gnu/open.c b/gnu/open.c index 1d066962..98c20fcb 100644 --- a/gnu/open.c +++ b/gnu/open.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Open a descriptor to a file. - Copyright (C) 2007-2010 Free Software Foundation, Inc. + Copyright (C) 2007-2011 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 diff --git a/gnu/openat-die.c b/gnu/openat-die.c index 022dbd4b..5f642ac6 100644 --- a/gnu/openat-die.c +++ b/gnu/openat-die.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Report a save- or restore-cwd failure in our openat replacement and then exit. - Copyright (C) 2005-2006, 2008-2010 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2008-2011 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 @@ -23,7 +23,10 @@ #include -#include "error.h" +#ifndef GNULIB_LIBPOSIX +# include "error.h" +#endif + #include "exitfail.h" #include "gettext.h" @@ -32,9 +35,10 @@ void openat_save_fail (int errnum) { +#ifndef GNULIB_LIBPOSIX error (exit_failure, errnum, _("unable to record current working directory")); - +#endif /* The `noreturn' attribute cannot be applied to error, since it returns when its first argument is 0. To help compilers understand that this function does not return, call abort. Also, the abort is a @@ -50,8 +54,10 @@ openat_save_fail (int errnum) void openat_restore_fail (int errnum) { +#ifndef GNULIB_LIBPOSIX error (exit_failure, errnum, _("failed to return to initial working directory")); +#endif /* As above. */ abort (); diff --git a/gnu/openat-priv.h b/gnu/openat-priv.h index ca4fa50f..71ea882e 100644 --- a/gnu/openat-priv.h +++ b/gnu/openat-priv.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Internals for openat-like functions. - Copyright (C) 2005-2006, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2011 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 @@ -23,9 +23,29 @@ #define _GL_HEADER_OPENAT_PRIV #include +#include #include -#define OPENAT_BUFFER_SIZE 512 +/* Maximum number of bytes that it is safe to allocate as a single + array on the stack, and that is known as a compile-time constant. + The assumption is that we'll touch the array very quickly, or a + temporary very near the array, provoking an out-of-memory trap. On + some operating systems, there is only one guard page for the stack, + and a page size can be as small as 4096 bytes. Subtract 64 in the + hope that this will let the compiler touch a nearby temporary and + provoke a trap. */ +#define SAFER_ALLOCA_MAX (4096 - 64) + +#define SAFER_ALLOCA(m) ((m) < SAFER_ALLOCA_MAX ? (m) : SAFER_ALLOCA_MAX) + +#if defined PATH_MAX +# define OPENAT_BUFFER_SIZE SAFER_ALLOCA (PATH_MAX) +#elif defined _XOPEN_PATH_MAX +# define OPENAT_BUFFER_SIZE SAFER_ALLOCA (_XOPEN_PATH_MAX) +#else +# define OPENAT_BUFFER_SIZE SAFER_ALLOCA (1024) +#endif + char *openat_proc_name (char buf[OPENAT_BUFFER_SIZE], int fd, char const *file); /* Trying to access a BUILD_PROC_NAME file will fail on systems without diff --git a/gnu/openat-proc.c b/gnu/openat-proc.c index 9b4d9578..5e0d9d79 100644 --- a/gnu/openat-proc.c +++ b/gnu/openat-proc.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Create /proc/self/fd-related names for subfiles of open directories. - Copyright (C) 2006, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2011 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 @@ -28,13 +28,12 @@ #include #include +#include #include #include -#include "dirname.h" #include "intprops.h" #include "same-inode.h" -#include "xalloc.h" /* The results of open() in this file are not used with fchdir, and we do not leak fds to any single-threaded code that could use stdio, @@ -54,7 +53,8 @@ /* Set BUF to the expansion of PROC_SELF_FD_FORMAT, using FD and FILE respectively for %d and %s. If successful, return BUF if the result fits in BUF, dynamically allocated memory otherwise. But - return NULL if /proc is not reliable. */ + return NULL if /proc is not reliable, either because the operating + system support is lacking or because memory is low. */ char * openat_proc_name (char buf[OPENAT_BUFFER_SIZE], int fd, char const *file) { @@ -100,7 +100,13 @@ openat_proc_name (char buf[OPENAT_BUFFER_SIZE], int fd, char const *file) else { size_t bufsize = PROC_SELF_FD_NAME_SIZE_BOUND (strlen (file)); - char *result = (bufsize < OPENAT_BUFFER_SIZE ? buf : xmalloc (bufsize)); + char *result = buf; + if (OPENAT_BUFFER_SIZE < bufsize) + { + result = malloc (bufsize); + if (! result) + return NULL; + } sprintf (result, PROC_SELF_FD_FORMAT, fd, file); return result; } diff --git a/gnu/openat.c b/gnu/openat.c index 79e2b65c..b01972a8 100644 --- a/gnu/openat.c +++ b/gnu/openat.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* provide a replacement openat function - Copyright (C) 2004-2010 Free Software Foundation, Inc. + Copyright (C) 2004-2011 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 @@ -27,7 +27,7 @@ #include #include -#include "dirname.h" /* solely for definition of IS_ABSOLUTE_FILE_NAME */ +#include "dosname.h" /* solely for definition of IS_ABSOLUTE_FILE_NAME */ #include "openat-priv.h" #include "save-cwd.h" @@ -55,7 +55,7 @@ rpl_openat (int dfd, char const *filename, int flags, ...) va_end (arg); } -#if OPEN_TRAILING_SLASH_BUG +# if OPEN_TRAILING_SLASH_BUG /* If the filename ends in a slash and one of O_CREAT, O_WRONLY, O_RDWR is specified, then fail. Rationale: POSIX @@ -86,11 +86,11 @@ rpl_openat (int dfd, char const *filename, int flags, ...) return -1; } } -#endif +# endif fd = openat (dfd, filename, flags, mode); -#if OPEN_TRAILING_SLASH_BUG +# if OPEN_TRAILING_SLASH_BUG /* If the filename ends in a slash and fd does not refer to a directory, then fail. Rationale: POSIX @@ -119,7 +119,7 @@ rpl_openat (int dfd, char const *filename, int flags, ...) } } } -#endif +# endif return fd; } diff --git a/gnu/openat.h b/gnu/openat.h index 590e5760..aaf53924 100644 --- a/gnu/openat.h +++ b/gnu/openat.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* provide a replacement openat function - Copyright (C) 2004-2006, 2008-2010 Free Software Foundation, Inc. + Copyright (C) 2004-2006, 2008-2011 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 @@ -29,14 +29,10 @@ #include #include -#ifndef __attribute__ -# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) -# define __attribute__(x) /* empty */ -# endif -#endif - -#ifndef ATTRIBUTE_NORETURN -# define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__)) +#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8) +# define _GL_ATTRIBUTE_NORETURN __attribute__ ((__noreturn__)) +#else +# define _GL_ATTRIBUTE_NORETURN /* empty */ #endif #if !HAVE_OPENAT @@ -53,8 +49,8 @@ bool openat_needs_fchdir (void); #endif -void openat_restore_fail (int) ATTRIBUTE_NORETURN; -void openat_save_fail (int) ATTRIBUTE_NORETURN; +void openat_restore_fail (int) _GL_ATTRIBUTE_NORETURN; +void openat_save_fail (int) _GL_ATTRIBUTE_NORETURN; /* Using these function names makes application code slightly more readable than it would be with diff --git a/gnu/opendir-safer.c b/gnu/opendir-safer.c index f0a1b4c1..3d8007ab 100644 --- a/gnu/opendir-safer.c +++ b/gnu/opendir-safer.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Invoke opendir, but avoid some glitches. - Copyright (C) 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2009-2011 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 diff --git a/gnu/parse-datetime.c b/gnu/parse-datetime.c index 6a204c27..3a77713f 100644 --- a/gnu/parse-datetime.c +++ b/gnu/parse-datetime.c @@ -118,8 +118,7 @@ /* Parse a string into an internal time stamp. - Copyright (C) 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, - 2010 Free Software Foundation, Inc. + Copyright (C) 1999-2000, 2002-2011 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 @@ -417,7 +416,7 @@ set_hhmmss (parser_control *pc, long int hour, long int minutes, #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 293 "parse-datetime.y" +#line 292 "parse-datetime.y" { long int intval; textint textintval; @@ -425,7 +424,7 @@ typedef union YYSTYPE relative_time rel; } /* Line 187 of yacc.c. */ -#line 429 "parse-datetime.c" +#line 428 "parse-datetime.c" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 @@ -438,7 +437,7 @@ typedef union YYSTYPE /* Line 216 of yacc.c. */ -#line 442 "parse-datetime.c" +#line 441 "parse-datetime.c" #ifdef short # undef short @@ -752,15 +751,15 @@ static const yytype_int8 yyrhs[] = /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 319, 319, 320, 324, 331, 333, 337, 339, 341, - 343, 345, 347, 348, 349, 353, 358, 363, 370, 375, - 385, 390, 398, 400, 403, 405, 407, 412, 417, 422, - 427, 435, 440, 460, 467, 475, 483, 488, 494, 499, - 508, 510, 512, 517, 519, 521, 523, 525, 527, 529, - 531, 533, 535, 537, 539, 541, 543, 545, 547, 549, - 551, 553, 555, 557, 561, 563, 565, 567, 569, 571, - 576, 580, 580, 583, 584, 589, 590, 595, 600, 611, - 612, 618, 619 + 0, 318, 318, 319, 323, 330, 332, 336, 338, 340, + 342, 344, 346, 347, 348, 352, 357, 362, 369, 374, + 384, 389, 397, 399, 402, 404, 406, 411, 416, 421, + 426, 434, 439, 459, 466, 474, 482, 487, 493, 498, + 507, 509, 511, 516, 518, 520, 522, 524, 526, 528, + 530, 532, 534, 536, 538, 540, 542, 544, 546, 548, + 550, 552, 554, 556, 560, 562, 564, 566, 568, 570, + 575, 579, 579, 582, 583, 588, 589, 594, 599, 610, + 611, 617, 618 }; #endif @@ -1737,7 +1736,7 @@ yyreduce: switch (yyn) { case 4: -#line 325 "parse-datetime.y" +#line 324 "parse-datetime.y" { pc->seconds = (yyvsp[(2) - (2)].timespec); pc->timespec_seen = true; @@ -1745,32 +1744,32 @@ yyreduce: break; case 7: -#line 338 "parse-datetime.y" +#line 337 "parse-datetime.y" { pc->times_seen++; } break; case 8: -#line 340 "parse-datetime.y" +#line 339 "parse-datetime.y" { pc->local_zones_seen++; } break; case 9: -#line 342 "parse-datetime.y" +#line 341 "parse-datetime.y" { pc->zones_seen++; } break; case 10: -#line 344 "parse-datetime.y" +#line 343 "parse-datetime.y" { pc->dates_seen++; } break; case 11: -#line 346 "parse-datetime.y" +#line 345 "parse-datetime.y" { pc->days_seen++; } break; case 15: -#line 354 "parse-datetime.y" +#line 353 "parse-datetime.y" { set_hhmmss (pc, (yyvsp[(1) - (2)].textintval).value, 0, 0, 0); pc->meridian = (yyvsp[(2) - (2)].intval); @@ -1778,7 +1777,7 @@ yyreduce: break; case 16: -#line 359 "parse-datetime.y" +#line 358 "parse-datetime.y" { set_hhmmss (pc, (yyvsp[(1) - (4)].textintval).value, (yyvsp[(3) - (4)].textintval).value, 0, 0); pc->meridian = (yyvsp[(4) - (4)].intval); @@ -1786,7 +1785,7 @@ yyreduce: break; case 17: -#line 364 "parse-datetime.y" +#line 363 "parse-datetime.y" { set_hhmmss (pc, (yyvsp[(1) - (5)].textintval).value, (yyvsp[(3) - (5)].textintval).value, 0, 0); pc->meridian = MER24; @@ -1796,7 +1795,7 @@ yyreduce: break; case 18: -#line 371 "parse-datetime.y" +#line 370 "parse-datetime.y" { set_hhmmss (pc, (yyvsp[(1) - (6)].textintval).value, (yyvsp[(3) - (6)].textintval).value, (yyvsp[(5) - (6)].timespec).tv_sec, (yyvsp[(5) - (6)].timespec).tv_nsec); pc->meridian = (yyvsp[(6) - (6)].intval); @@ -1804,7 +1803,7 @@ yyreduce: break; case 19: -#line 376 "parse-datetime.y" +#line 375 "parse-datetime.y" { set_hhmmss (pc, (yyvsp[(1) - (7)].textintval).value, (yyvsp[(3) - (7)].textintval).value, (yyvsp[(5) - (7)].timespec).tv_sec, (yyvsp[(5) - (7)].timespec).tv_nsec); pc->meridian = MER24; @@ -1814,7 +1813,7 @@ yyreduce: break; case 20: -#line 386 "parse-datetime.y" +#line 385 "parse-datetime.y" { pc->local_isdst = (yyvsp[(1) - (1)].intval); pc->dsts_seen += (0 < (yyvsp[(1) - (1)].intval)); @@ -1822,7 +1821,7 @@ yyreduce: break; case 21: -#line 391 "parse-datetime.y" +#line 390 "parse-datetime.y" { pc->local_isdst = 1; pc->dsts_seen += (0 < (yyvsp[(1) - (2)].intval)) + 1; @@ -1830,33 +1829,33 @@ yyreduce: break; case 22: -#line 399 "parse-datetime.y" +#line 398 "parse-datetime.y" { pc->time_zone = (yyvsp[(1) - (1)].intval); } break; case 23: -#line 401 "parse-datetime.y" +#line 400 "parse-datetime.y" { pc->time_zone = (yyvsp[(1) - (2)].intval); apply_relative_time (pc, (yyvsp[(2) - (2)].rel), 1); } break; case 24: -#line 404 "parse-datetime.y" +#line 403 "parse-datetime.y" { pc->time_zone = (yyvsp[(1) - (3)].intval) + time_zone_hhmm (pc, (yyvsp[(2) - (3)].textintval), (yyvsp[(3) - (3)].intval)); } break; case 25: -#line 406 "parse-datetime.y" +#line 405 "parse-datetime.y" { pc->time_zone = (yyvsp[(1) - (1)].intval) + 60; } break; case 26: -#line 408 "parse-datetime.y" +#line 407 "parse-datetime.y" { pc->time_zone = (yyvsp[(1) - (2)].intval) + 60; } break; case 27: -#line 413 "parse-datetime.y" +#line 412 "parse-datetime.y" { pc->day_ordinal = 0; pc->day_number = (yyvsp[(1) - (1)].intval); @@ -1864,7 +1863,7 @@ yyreduce: break; case 28: -#line 418 "parse-datetime.y" +#line 417 "parse-datetime.y" { pc->day_ordinal = 0; pc->day_number = (yyvsp[(1) - (2)].intval); @@ -1872,7 +1871,7 @@ yyreduce: break; case 29: -#line 423 "parse-datetime.y" +#line 422 "parse-datetime.y" { pc->day_ordinal = (yyvsp[(1) - (2)].intval); pc->day_number = (yyvsp[(2) - (2)].intval); @@ -1880,7 +1879,7 @@ yyreduce: break; case 30: -#line 428 "parse-datetime.y" +#line 427 "parse-datetime.y" { pc->day_ordinal = (yyvsp[(1) - (2)].textintval).value; pc->day_number = (yyvsp[(2) - (2)].intval); @@ -1888,7 +1887,7 @@ yyreduce: break; case 31: -#line 436 "parse-datetime.y" +#line 435 "parse-datetime.y" { pc->month = (yyvsp[(1) - (3)].textintval).value; pc->day = (yyvsp[(3) - (3)].textintval).value; @@ -1896,7 +1895,7 @@ yyreduce: break; case 32: -#line 441 "parse-datetime.y" +#line 440 "parse-datetime.y" { /* Interpret as YYYY/MM/DD if the first value has 4 or more digits, otherwise as MM/DD/YY. @@ -1919,7 +1918,7 @@ yyreduce: break; case 33: -#line 461 "parse-datetime.y" +#line 460 "parse-datetime.y" { /* ISO 8601 format. YYYY-MM-DD. */ pc->year = (yyvsp[(1) - (3)].textintval); @@ -1929,7 +1928,7 @@ yyreduce: break; case 34: -#line 468 "parse-datetime.y" +#line 467 "parse-datetime.y" { /* e.g. 17-JUN-1992. */ pc->day = (yyvsp[(1) - (3)].textintval).value; @@ -1940,7 +1939,7 @@ yyreduce: break; case 35: -#line 476 "parse-datetime.y" +#line 475 "parse-datetime.y" { /* e.g. JUN-17-1992. */ pc->month = (yyvsp[(1) - (3)].intval); @@ -1951,7 +1950,7 @@ yyreduce: break; case 36: -#line 484 "parse-datetime.y" +#line 483 "parse-datetime.y" { pc->month = (yyvsp[(1) - (2)].intval); pc->day = (yyvsp[(2) - (2)].textintval).value; @@ -1959,7 +1958,7 @@ yyreduce: break; case 37: -#line 489 "parse-datetime.y" +#line 488 "parse-datetime.y" { pc->month = (yyvsp[(1) - (4)].intval); pc->day = (yyvsp[(2) - (4)].textintval).value; @@ -1968,7 +1967,7 @@ yyreduce: break; case 38: -#line 495 "parse-datetime.y" +#line 494 "parse-datetime.y" { pc->day = (yyvsp[(1) - (2)].textintval).value; pc->month = (yyvsp[(2) - (2)].intval); @@ -1976,7 +1975,7 @@ yyreduce: break; case 39: -#line 500 "parse-datetime.y" +#line 499 "parse-datetime.y" { pc->day = (yyvsp[(1) - (3)].textintval).value; pc->month = (yyvsp[(2) - (3)].intval); @@ -1985,172 +1984,172 @@ yyreduce: break; case 40: -#line 509 "parse-datetime.y" +#line 508 "parse-datetime.y" { apply_relative_time (pc, (yyvsp[(1) - (2)].rel), -1); } break; case 41: -#line 511 "parse-datetime.y" +#line 510 "parse-datetime.y" { apply_relative_time (pc, (yyvsp[(1) - (1)].rel), 1); } break; case 42: -#line 513 "parse-datetime.y" +#line 512 "parse-datetime.y" { apply_relative_time (pc, (yyvsp[(1) - (1)].rel), 1); } break; case 43: -#line 518 "parse-datetime.y" +#line 517 "parse-datetime.y" { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = (yyvsp[(1) - (2)].intval); } break; case 44: -#line 520 "parse-datetime.y" +#line 519 "parse-datetime.y" { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = (yyvsp[(1) - (2)].textintval).value; } break; case 45: -#line 522 "parse-datetime.y" +#line 521 "parse-datetime.y" { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = 1; } break; case 46: -#line 524 "parse-datetime.y" +#line 523 "parse-datetime.y" { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = (yyvsp[(1) - (2)].intval); } break; case 47: -#line 526 "parse-datetime.y" +#line 525 "parse-datetime.y" { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = (yyvsp[(1) - (2)].textintval).value; } break; case 48: -#line 528 "parse-datetime.y" +#line 527 "parse-datetime.y" { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = 1; } break; case 49: -#line 530 "parse-datetime.y" +#line 529 "parse-datetime.y" { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[(1) - (2)].intval) * (yyvsp[(2) - (2)].intval); } break; case 50: -#line 532 "parse-datetime.y" +#line 531 "parse-datetime.y" { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[(1) - (2)].textintval).value * (yyvsp[(2) - (2)].intval); } break; case 51: -#line 534 "parse-datetime.y" +#line 533 "parse-datetime.y" { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[(1) - (1)].intval); } break; case 52: -#line 536 "parse-datetime.y" +#line 535 "parse-datetime.y" { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = (yyvsp[(1) - (2)].intval); } break; case 53: -#line 538 "parse-datetime.y" +#line 537 "parse-datetime.y" { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = (yyvsp[(1) - (2)].textintval).value; } break; case 54: -#line 540 "parse-datetime.y" +#line 539 "parse-datetime.y" { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = 1; } break; case 55: -#line 542 "parse-datetime.y" +#line 541 "parse-datetime.y" { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = (yyvsp[(1) - (2)].intval); } break; case 56: -#line 544 "parse-datetime.y" +#line 543 "parse-datetime.y" { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = (yyvsp[(1) - (2)].textintval).value; } break; case 57: -#line 546 "parse-datetime.y" +#line 545 "parse-datetime.y" { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = 1; } break; case 58: -#line 548 "parse-datetime.y" +#line 547 "parse-datetime.y" { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[(1) - (2)].intval); } break; case 59: -#line 550 "parse-datetime.y" +#line 549 "parse-datetime.y" { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[(1) - (2)].textintval).value; } break; case 60: -#line 552 "parse-datetime.y" +#line 551 "parse-datetime.y" { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[(1) - (2)].timespec).tv_sec; (yyval.rel).ns = (yyvsp[(1) - (2)].timespec).tv_nsec; } break; case 61: -#line 554 "parse-datetime.y" +#line 553 "parse-datetime.y" { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[(1) - (2)].timespec).tv_sec; (yyval.rel).ns = (yyvsp[(1) - (2)].timespec).tv_nsec; } break; case 62: -#line 556 "parse-datetime.y" +#line 555 "parse-datetime.y" { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = 1; } break; case 64: -#line 562 "parse-datetime.y" +#line 561 "parse-datetime.y" { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = (yyvsp[(1) - (2)].textintval).value; } break; case 65: -#line 564 "parse-datetime.y" +#line 563 "parse-datetime.y" { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = (yyvsp[(1) - (2)].textintval).value; } break; case 66: -#line 566 "parse-datetime.y" +#line 565 "parse-datetime.y" { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[(1) - (2)].textintval).value * (yyvsp[(2) - (2)].intval); } break; case 67: -#line 568 "parse-datetime.y" +#line 567 "parse-datetime.y" { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = (yyvsp[(1) - (2)].textintval).value; } break; case 68: -#line 570 "parse-datetime.y" +#line 569 "parse-datetime.y" { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = (yyvsp[(1) - (2)].textintval).value; } break; case 69: -#line 572 "parse-datetime.y" +#line 571 "parse-datetime.y" { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[(1) - (2)].textintval).value; } break; case 70: -#line 577 "parse-datetime.y" +#line 576 "parse-datetime.y" { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[(1) - (1)].intval); } break; case 74: -#line 585 "parse-datetime.y" +#line 584 "parse-datetime.y" { (yyval.timespec).tv_sec = (yyvsp[(1) - (1)].textintval).value; (yyval.timespec).tv_nsec = 0; } break; case 76: -#line 591 "parse-datetime.y" +#line 590 "parse-datetime.y" { (yyval.timespec).tv_sec = (yyvsp[(1) - (1)].textintval).value; (yyval.timespec).tv_nsec = 0; } break; case 77: -#line 596 "parse-datetime.y" +#line 595 "parse-datetime.y" { digits_to_date_time (pc, (yyvsp[(1) - (1)].textintval)); } break; case 78: -#line 601 "parse-datetime.y" +#line 600 "parse-datetime.y" { /* Hybrid all-digit and relative offset, so that we accept e.g., "YYYYMMDD +N days" as well as "YYYYMMDD N days". */ @@ -2160,28 +2159,28 @@ yyreduce: break; case 79: -#line 611 "parse-datetime.y" +#line 610 "parse-datetime.y" { (yyval.intval) = -1; } break; case 80: -#line 613 "parse-datetime.y" +#line 612 "parse-datetime.y" { (yyval.intval) = (yyvsp[(2) - (2)].textintval).value; } break; case 81: -#line 618 "parse-datetime.y" +#line 617 "parse-datetime.y" { (yyval.intval) = MER24; } break; case 82: -#line 620 "parse-datetime.y" +#line 619 "parse-datetime.y" { (yyval.intval) = (yyvsp[(1) - (1)].intval); } break; /* Line 1267 of yacc.c. */ -#line 2185 "parse-datetime.c" +#line 2184 "parse-datetime.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2395,7 +2394,7 @@ yyreturn: } -#line 623 "parse-datetime.y" +#line 622 "parse-datetime.y" static table const meridian_table[] = diff --git a/gnu/parse-datetime.h b/gnu/parse-datetime.h index 1081f978..39371429 100644 --- a/gnu/parse-datetime.h +++ b/gnu/parse-datetime.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Parse a string into an internal time stamp. - Copyright (C) 1995, 1997, 1998, 2003, 2004, 2007, 2009, 2010 Free Software + Copyright (C) 1995, 1997-1998, 2003-2004, 2007, 2009-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/parse-datetime.y b/gnu/parse-datetime.y index a760e69a..d77955f4 100644 --- a/gnu/parse-datetime.y +++ b/gnu/parse-datetime.y @@ -1,8 +1,7 @@ %{ /* Parse a string into an internal time stamp. - Copyright (C) 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, - 2010 Free Software Foundation, Inc. + Copyright (C) 1999-2000, 2002-2011 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 diff --git a/gnu/pathmax.h b/gnu/pathmax.h index 5c000608..0445cd92 100644 --- a/gnu/pathmax.h +++ b/gnu/pathmax.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Define PATH_MAX somehow. Requires sys/types.h. - Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2010 Free Software + Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2011 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/gnu/pipe-safer.c b/gnu/pipe-safer.c index f8c3bdb7..03a98ba0 100644 --- a/gnu/pipe-safer.c +++ b/gnu/pipe-safer.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Invoke pipe, but avoid some glitches. - Copyright (C) 2005-2006, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2011 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 diff --git a/gnu/printf-args.c b/gnu/printf-args.c index 452ce405..2e5a39de 100644 --- a/gnu/printf-args.c +++ b/gnu/printf-args.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Decomposed printf argument list. - Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2010 Free Software + Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2011 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/gnu/printf-args.h b/gnu/printf-args.h index 100cbbdf..90c88f83 100644 --- a/gnu/printf-args.h +++ b/gnu/printf-args.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Decomposed printf argument list. - Copyright (C) 1999, 2002-2003, 2006-2007, 2009-2010 Free Software + Copyright (C) 1999, 2002-2003, 2006-2007, 2011 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -138,10 +138,14 @@ typedef struct } argument; +/* Number of directly allocated arguments (no malloc() needed). */ +#define N_DIRECT_ALLOC_ARGUMENTS 7 + typedef struct { size_t count; argument *arg; + argument direct_alloc_arg[N_DIRECT_ALLOC_ARGUMENTS]; } arguments; diff --git a/gnu/printf-parse.c b/gnu/printf-parse.c index 206a62bc..326a0ef4 100644 --- a/gnu/printf-parse.c +++ b/gnu/printf-parse.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Formatted output to strings. - Copyright (C) 1999-2000, 2002-2003, 2006-2010 Free Software Foundation, Inc. + Copyright (C) 1999-2000, 2002-2003, 2006-2011 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 @@ -65,6 +65,9 @@ /* malloc(), realloc(), free(). */ #include +/* memcpy(). */ +#include + /* errno. */ #include @@ -82,23 +85,20 @@ STATIC int PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a) { - const CHAR_T *cp = format; /* pointer into format */ + const CHAR_T *cp = format; /* pointer into format */ size_t arg_posn = 0; /* number of regular arguments consumed */ - size_t d_allocated; /* allocated elements of d->dir */ - size_t a_allocated; /* allocated elements of a->arg */ + size_t d_allocated; /* allocated elements of d->dir */ + size_t a_allocated; /* allocated elements of a->arg */ size_t max_width_length = 0; size_t max_precision_length = 0; d->count = 0; - d_allocated = 1; - d->dir = (DIRECTIVE *) malloc (d_allocated * sizeof (DIRECTIVE)); - if (d->dir == NULL) - /* Out of memory. */ - goto out_of_memory_1; + d_allocated = N_DIRECT_ALLOC_DIRECTIVES; + d->dir = d->direct_alloc_dir; a->count = 0; - a_allocated = 0; - a->arg = NULL; + a_allocated = N_DIRECT_ALLOC_ARGUMENTS; + a->arg = a->direct_alloc_arg; #define REGISTER_ARG(_index_,_type_) \ { \ @@ -115,12 +115,14 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a) if (size_overflow_p (memory_size)) \ /* Overflow, would lead to out of memory. */ \ goto out_of_memory; \ - memory = (argument *) (a->arg \ + memory = (argument *) (a->arg != a->direct_alloc_arg \ ? realloc (a->arg, memory_size) \ : malloc (memory_size)); \ if (memory == NULL) \ /* Out of memory. */ \ goto out_of_memory; \ + if (a->arg == a->direct_alloc_arg) \ + memcpy (memory, a->arg, a->count * sizeof (argument)); \ a->arg = memory; \ } \ while (a->count <= n) \ @@ -208,6 +210,13 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a) dp->flags |= FLAG_ZERO; cp++; } +#if __GLIBC__ >= 2 && !defined __UCLIBC__ + else if (*cp == 'I') + { + dp->flags |= FLAG_LOCALIZED; + cp++; + } +#endif else break; } @@ -583,10 +592,14 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a) if (size_overflow_p (memory_size)) /* Overflow, would lead to out of memory. */ goto out_of_memory; - memory = (DIRECTIVE *) realloc (d->dir, memory_size); + memory = (DIRECTIVE *) (d->dir != d->direct_alloc_dir + ? realloc (d->dir, memory_size) + : malloc (memory_size)); if (memory == NULL) /* Out of memory. */ goto out_of_memory; + if (d->dir == d->direct_alloc_dir) + memcpy (memory, d->dir, d->count * sizeof (DIRECTIVE)); d->dir = memory; } } @@ -605,19 +618,18 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a) return 0; error: - if (a->arg) + if (a->arg != a->direct_alloc_arg) free (a->arg); - if (d->dir) + if (d->dir != d->direct_alloc_dir) free (d->dir); errno = EINVAL; return -1; out_of_memory: - if (a->arg) + if (a->arg != a->direct_alloc_arg) free (a->arg); - if (d->dir) + if (d->dir != d->direct_alloc_dir) free (d->dir); -out_of_memory_1: errno = ENOMEM; return -1; } diff --git a/gnu/printf-parse.h b/gnu/printf-parse.h index 67b79843..6cbe68e7 100644 --- a/gnu/printf-parse.h +++ b/gnu/printf-parse.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Parse printf format string. - Copyright (C) 1999, 2002-2003, 2005, 2007, 2009-2010 Free Software + Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2011 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -25,6 +25,10 @@ ENABLE_UNISTDIO Set to 1 to enable the unistdio extensions. STATIC Set to 'static' to declare the function static. */ +#if HAVE_FEATURES_H +# include /* for __GLIBC__, __UCLIBC__ */ +#endif + #include "printf-args.h" @@ -35,6 +39,9 @@ #define FLAG_SPACE 8 /* space flag */ #define FLAG_ALT 16 /* # flag */ #define FLAG_ZERO 32 +#if __GLIBC__ >= 2 && !defined __UCLIBC__ +# define FLAG_LOCALIZED 64 /* I flag, uses localized digits */ +#endif /* arg_index value indicating that no argument is consumed. */ #define ARG_NONE (~(size_t)0) @@ -42,6 +49,9 @@ /* xxx_directive: A parsed directive. xxx_directives: A parsed format string. */ +/* Number of directly allocated directives (no malloc() needed). */ +#define N_DIRECT_ALLOC_DIRECTIVES 7 + /* A parsed directive. */ typedef struct { @@ -66,6 +76,7 @@ typedef struct char_directive *dir; size_t max_width_length; size_t max_precision_length; + char_directive direct_alloc_dir[N_DIRECT_ALLOC_DIRECTIVES]; } char_directives; @@ -95,6 +106,7 @@ typedef struct u8_directive *dir; size_t max_width_length; size_t max_precision_length; + u8_directive direct_alloc_dir[N_DIRECT_ALLOC_DIRECTIVES]; } u8_directives; @@ -122,6 +134,7 @@ typedef struct u16_directive *dir; size_t max_width_length; size_t max_precision_length; + u16_directive direct_alloc_dir[N_DIRECT_ALLOC_DIRECTIVES]; } u16_directives; @@ -149,6 +162,7 @@ typedef struct u32_directive *dir; size_t max_width_length; size_t max_precision_length; + u32_directive direct_alloc_dir[N_DIRECT_ALLOC_DIRECTIVES]; } u32_directives; diff --git a/gnu/priv-set.c b/gnu/priv-set.c index 6d98a972..064d95c8 100644 --- a/gnu/priv-set.c +++ b/gnu/priv-set.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Query, remove, or restore a Solaris privilege. - Copyright (C) 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2009-2011 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 diff --git a/gnu/priv-set.h b/gnu/priv-set.h index c6988245..574d9a0a 100644 --- a/gnu/priv-set.h +++ b/gnu/priv-set.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Query, remove, or restore a Solaris privilege. - Copyright (C) 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2009-2011 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 diff --git a/gnu/progname.c b/gnu/progname.c index 0bd63fae..fc40d276 100644 --- a/gnu/progname.c +++ b/gnu/progname.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Program name management. - Copyright (C) 2001-2003, 2005-2010 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2011 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software: you can redistribute it and/or modify diff --git a/gnu/progname.h b/gnu/progname.h index 77e782a3..83066cbc 100644 --- a/gnu/progname.h +++ b/gnu/progname.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Program name management. - Copyright (C) 2001-2004, 2006, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2006, 2009-2011 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software: you can redistribute it and/or modify diff --git a/gnu/quote.c b/gnu/quote.c index ae62f3e5..d1ef234f 100644 --- a/gnu/quote.c +++ b/gnu/quote.c @@ -2,8 +2,8 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* quote.c - quote arguments for output - Copyright (C) 1998, 1999, 2000, 2001, 2003, 2005, 2006, 2009, 2010 Free - Software Foundation, Inc. + Copyright (C) 1998-2001, 2003, 2005-2006, 2009-2011 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 diff --git a/gnu/quote.h b/gnu/quote.h index bdf5b276..794fc8b0 100644 --- a/gnu/quote.h +++ b/gnu/quote.h @@ -2,8 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* quote.h - prototypes for quote.c - Copyright (C) 1998, 1999, 2000, 2001, 2003, 2009, 2010 Free Software - Foundation, Inc. + Copyright (C) 1998-2001, 2003, 2009-2011 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 diff --git a/gnu/quotearg.c b/gnu/quotearg.c index 724c0569..a0aa14f8 100644 --- a/gnu/quotearg.c +++ b/gnu/quotearg.c @@ -2,8 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* quotearg.c - quote arguments for output - Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2008, - 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1998-2002, 2004-2011 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 diff --git a/gnu/quotearg.h b/gnu/quotearg.h index ff8154c5..e901914e 100644 --- a/gnu/quotearg.h +++ b/gnu/quotearg.h @@ -2,8 +2,8 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* quotearg.h - quote arguments for output - Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2006, 2008, 2009, 2010 - Free Software Foundation, Inc. + Copyright (C) 1998-2002, 2004, 2006, 2008-2011 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 diff --git a/gnu/rawmemchr.c b/gnu/rawmemchr.c index 61aafcc3..f36cac6d 100644 --- a/gnu/rawmemchr.c +++ b/gnu/rawmemchr.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Searching in a string. - Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2008-2011 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 diff --git a/gnu/readlink.c b/gnu/readlink.c index dcbc0fba..479db3d5 100644 --- a/gnu/readlink.c +++ b/gnu/readlink.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Stub for readlink(). - Copyright (C) 2003-2007, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2003-2007, 2009-2011 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 diff --git a/gnu/readlinkat.c b/gnu/readlinkat.c index a722ec4b..151c76d6 100644 --- a/gnu/readlinkat.c +++ b/gnu/readlinkat.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Read a symlink relative to an open directory. - Copyright (C) 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2009-2011 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 diff --git a/gnu/realloc.c b/gnu/realloc.c index 61d047f6..a035721d 100644 --- a/gnu/realloc.c +++ b/gnu/realloc.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* realloc() function that is glibc compatible. - Copyright (C) 1997, 2003-2004, 2006-2007, 2009-2010 Free Software + Copyright (C) 1997, 2003-2004, 2006-2007, 2009-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/ref-add.sin b/gnu/ref-add.sin index dbb61df3..a57eaef6 100644 --- a/gnu/ref-add.sin +++ b/gnu/ref-add.sin @@ -1,6 +1,6 @@ # Add this package to a list of references stored in a text file. # -# Copyright (C) 2000, 2009, 2010 Free Software Foundation, Inc. +# Copyright (C) 2000, 2009-2011 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 diff --git a/gnu/ref-del.sin b/gnu/ref-del.sin index 4c31a6ea..e23097db 100644 --- a/gnu/ref-del.sin +++ b/gnu/ref-del.sin @@ -1,6 +1,6 @@ # Remove this package from a list of references stored in a text file. # -# Copyright (C) 2000, 2009, 2010 Free Software Foundation, Inc. +# Copyright (C) 2000, 2009-2011 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 diff --git a/gnu/regcomp.c b/gnu/regcomp.c index fd9272f2..f39d3298 100644 --- a/gnu/regcomp.c +++ b/gnu/regcomp.c @@ -1,8 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Extended regular expression matching and search library. - Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free - Software Foundation, Inc. + Copyright (C) 2002-2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa . diff --git a/gnu/regex.c b/gnu/regex.c index 5415c8f1..fc46c0ba 100644 --- a/gnu/regex.c +++ b/gnu/regex.c @@ -1,8 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Extended regular expression matching and search library. - Copyright (C) 2002, 2003, 2005, 2006, 2009, 2010 Free Software Foundation, - Inc. + Copyright (C) 2002-2003, 2005-2006, 2009-2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa . diff --git a/gnu/regex.h b/gnu/regex.h index 14ba6d27..52b8598c 100644 --- a/gnu/regex.h +++ b/gnu/regex.h @@ -2,9 +2,8 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Definitions for data structures and routines for the regular expression library. - Copyright (C) 1985, 1989, 1990, 1991, 1992, 1993, 1995, 1996, 1997, 1998, - 2000, 2001, 2002, 2003, 2005, 2006, 2009, 2010 Free Software Foundation, - Inc. + Copyright (C) 1985, 1989-1993, 1995-1998, 2000-2003, 2005-2006, 2009-2011 + Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software; you can redistribute it and/or modify diff --git a/gnu/regex_internal.c b/gnu/regex_internal.c index 910424c4..b67ab3d1 100644 --- a/gnu/regex_internal.c +++ b/gnu/regex_internal.c @@ -1,8 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Extended regular expression matching and search library. - Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free - Software Foundation, Inc. + Copyright (C) 2002-2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa . diff --git a/gnu/regex_internal.h b/gnu/regex_internal.h index c8c37c32..a15e8ace 100644 --- a/gnu/regex_internal.h +++ b/gnu/regex_internal.h @@ -1,8 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Extended regular expression matching and search library. - Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free - Software Foundation, Inc. + Copyright (C) 2002-2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa . @@ -34,9 +33,7 @@ #ifndef _LIBC # include "localcharset.h" #endif -#if defined HAVE_LOCALE_H || defined _LIBC -# include -#endif +#include #include #include @@ -86,7 +83,7 @@ # define SIZE_MAX ((size_t) -1) #endif -#if (defined MB_CUR_MAX && HAVE_LOCALE_H && HAVE_WCTYPE_H && HAVE_ISWCTYPE && HAVE_WCSCOLL) || _LIBC +#if (defined MB_CUR_MAX && HAVE_WCTYPE_H && HAVE_ISWCTYPE && HAVE_WCSCOLL) || _LIBC # define RE_ENABLE_I18N #endif diff --git a/gnu/regexec.c b/gnu/regexec.c index 9c21f129..0f7b48c4 100644 --- a/gnu/regexec.c +++ b/gnu/regexec.c @@ -1,8 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Extended regular expression matching and search library. - Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free - Software Foundation, Inc. + Copyright (C) 2002-2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa . @@ -3404,6 +3403,8 @@ build_trtable (const re_dfa_t *dfa, re_dfastate_t *state) { state->trtable = (re_dfastate_t **) calloc (sizeof (re_dfastate_t *), SBC_MAX); + if (BE (state->trtable == NULL, 0)) + return false; return true; } return false; diff --git a/gnu/rename.c b/gnu/rename.c index 4ecf64f5..7eccde54 100644 --- a/gnu/rename.c +++ b/gnu/rename.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Work around rename bugs in some systems. - Copyright (C) 2001-2003, 2005-2006, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2006, 2009-2011 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 diff --git a/gnu/renameat.c b/gnu/renameat.c index ddec0dd8..3e242b28 100644 --- a/gnu/renameat.c +++ b/gnu/renameat.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Rename a file relative to open directories. - Copyright (C) 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2009-2011 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 diff --git a/gnu/rmdir.c b/gnu/rmdir.c index c052d346..b4aa6357 100644 --- a/gnu/rmdir.c +++ b/gnu/rmdir.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Work around rmdir bugs. - Copyright (C) 1988, 1990, 1999, 2003-2006, 2009-2010 Free Software + Copyright (C) 1988, 1990, 1999, 2003-2006, 2009-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -25,6 +25,8 @@ #include #include +#include "dosname.h" + #undef rmdir /* Remove directory DIR. diff --git a/gnu/rpmatch.c b/gnu/rpmatch.c index d002a03e..80dde7c5 100644 --- a/gnu/rpmatch.c +++ b/gnu/rpmatch.c @@ -3,7 +3,7 @@ /* Determine whether string value is affirmation or negative response according to current locale's data. - Copyright (C) 1996, 1998, 2000, 2002-2003, 2006-2010 Free Software + Copyright (C) 1996, 1998, 2000, 2002-2003, 2006-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/safe-read.c b/gnu/safe-read.c index 6cfec244..b30a3dea 100644 --- a/gnu/safe-read.c +++ b/gnu/safe-read.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* An interface to read and write that retries after interrupts. - Copyright (C) 1993-1994, 1998, 2002-2006, 2009-2010 Free Software + Copyright (C) 1993-1994, 1998, 2002-2006, 2009-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/safe-read.h b/gnu/safe-read.h index a6dddf4b..6f3a75a3 100644 --- a/gnu/safe-read.h +++ b/gnu/safe-read.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* An interface to read() that retries after interrupts. - Copyright (C) 2002, 2006, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2002, 2006, 2009-2011 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 diff --git a/gnu/safe-write.c b/gnu/safe-write.c index d5e05c88..b1c8b073 100644 --- a/gnu/safe-write.c +++ b/gnu/safe-write.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* An interface to write that retries after interrupts. - Copyright (C) 2002, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2002, 2009-2011 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 diff --git a/gnu/safe-write.h b/gnu/safe-write.h index 3e74442d..3d76c1af 100644 --- a/gnu/safe-write.h +++ b/gnu/safe-write.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* An interface to write() that retries after interrupts. - Copyright (C) 2002, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2002, 2009-2011 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 diff --git a/gnu/same-inode.h b/gnu/same-inode.h index 3db599a0..34645b91 100644 --- a/gnu/same-inode.h +++ b/gnu/same-inode.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Determine whether two stat buffers refer to the same file. - Copyright (C) 2006, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2011 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 diff --git a/gnu/save-cwd.c b/gnu/save-cwd.c index c6b63429..603426ac 100644 --- a/gnu/save-cwd.c +++ b/gnu/save-cwd.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* save-cwd.c -- Save and restore current working directory. - Copyright (C) 1995, 1997-1998, 2003-2006, 2009-2010 Free Software + Copyright (C) 1995, 1997-1998, 2003-2006, 2009-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -32,7 +32,6 @@ #include "chdir-long.h" #include "unistd--.h" -#include "xgetcwd.h" #include "cloexec.h" #if GNULIB_FCNTL_SAFER @@ -41,22 +40,10 @@ # define GNULIB_FCNTL_SAFER 0 #endif -/* On systems without the fchdir function (WOE), pretend that open - always returns -1 so that save_cwd resorts to using xgetcwd. - Since chdir_long requires fchdir, use chdir instead. */ -#if !HAVE_FCHDIR -# undef open -# define open(File, Flags) (-1) -# undef fchdir -# define fchdir(Fd) (abort (), -1) -# undef chdir_long -# define chdir_long(Dir) chdir (Dir) -#endif - /* Record the location of the current working directory in CWD so that the program may change to other directories and later use restore_cwd to return to the recorded location. This function may allocate - space using malloc (via xgetcwd) or leave a file descriptor open; + space using malloc (via getcwd) or leave a file descriptor open; use free_cwd to perform the necessary free or close. Upon failure, no memory is allocated, any locally opened file descriptors are closed; return non-zero -- in that case, free_cwd need not be @@ -83,7 +70,7 @@ save_cwd (struct saved_cwd *cwd) cwd->desc = fd_safer (cwd->desc); if (cwd->desc < 0) { - cwd->name = xgetcwd (); + cwd->name = getcwd (NULL, 0); return cwd->name ? 0 : -1; } diff --git a/gnu/save-cwd.h b/gnu/save-cwd.h index a3a03073..2f2e4bb6 100644 --- a/gnu/save-cwd.h +++ b/gnu/save-cwd.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Save and restore current working directory. - Copyright (C) 1995, 1997-1998, 2003, 2009-2010 Free Software Foundation, + Copyright (C) 1995, 1997-1998, 2003, 2009-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/savedir.c b/gnu/savedir.c index 59843413..ada0bdfb 100644 --- a/gnu/savedir.c +++ b/gnu/savedir.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* savedir.c -- save the list of files in a directory in a string - Copyright (C) 1990, 1997-2001, 2003-2006, 2009-2010 Free Software + Copyright (C) 1990, 1997-2001, 2003-2006, 2009-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/savedir.h b/gnu/savedir.h index 7ba19439..d0f5707f 100644 --- a/gnu/savedir.h +++ b/gnu/savedir.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Save the list of files in a directory in a string. - Copyright (C) 1997, 1999, 2001, 2003, 2005, 2009-2010 Free Software + Copyright (C) 1997, 1999, 2001, 2003, 2005, 2009-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/setenv.c b/gnu/setenv.c index a1c1df84..a130b26c 100644 --- a/gnu/setenv.c +++ b/gnu/setenv.c @@ -1,6 +1,6 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ -/* Copyright (C) 1992, 1995-2003, 2005-2010 Free Software Foundation, Inc. +/* Copyright (C) 1992, 1995-2003, 2005-2011 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software: you can redistribute it and/or modify diff --git a/gnu/size_max.h b/gnu/size_max.h index 58443ab6..fdefb824 100644 --- a/gnu/size_max.h +++ b/gnu/size_max.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* size_max.h -- declare SIZE_MAX through system headers - Copyright (C) 2005-2006, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2011 Free Software Foundation, Inc. Written by Simon Josefsson. This program is free software; you can redistribute it and/or modify diff --git a/gnu/sleep.c b/gnu/sleep.c index 4303d47a..305e02d0 100644 --- a/gnu/sleep.c +++ b/gnu/sleep.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Pausing execution of the current thread. - Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc. Written by Bruno Haible , 2007. This program is free software: you can redistribute it and/or modify @@ -52,13 +52,14 @@ sleep (unsigned int seconds) /* Guarantee unlimited sleep and a reasonable return value. Cygwin 1.5.x rejects attempts to sleep more than 49.7 days (2**32 milliseconds), but uses uninitialized memory which results in a - garbage answer. */ + garbage answer. Similarly, Linux 2.6.9 with glibc 2.3.4 has a too + small return value when asked to sleep more than 24.85 days. */ unsigned int rpl_sleep (unsigned int seconds) { /* This requires int larger than 16 bits. */ - verify (UINT_MAX / 49 / 24 / 60 / 60); - const unsigned int limit = 49 * 24 * 60 * 60; + verify (UINT_MAX / 24 / 24 / 60 / 60); + const unsigned int limit = 24 * 24 * 60 * 60; while (limit < seconds) { unsigned int result; diff --git a/gnu/snprintf.c b/gnu/snprintf.c index 2fb5c319..885880f0 100644 --- a/gnu/snprintf.c +++ b/gnu/snprintf.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Formatted output to strings. - Copyright (C) 2004, 2006-2010 Free Software Foundation, Inc. + Copyright (C) 2004, 2006-2011 Free Software Foundation, Inc. Written by Simon Josefsson and Paul Eggert. This program is free software; you can redistribute it and/or modify diff --git a/gnu/stat-time.h b/gnu/stat-time.h index 3587fc24..1dc4098f 100644 --- a/gnu/stat-time.h +++ b/gnu/stat-time.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* stat-related time functions. - Copyright (C) 2005, 2007, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2005, 2007, 2009-2011 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 diff --git a/gnu/stat.c b/gnu/stat.c index 8db01a49..65835741 100644 --- a/gnu/stat.c +++ b/gnu/stat.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Work around platform bugs in stat. - Copyright (C) 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2009-2011 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 @@ -39,6 +39,7 @@ orig_stat (const char *filename, struct stat *buf) #include #include #include +#include "dosname.h" /* Store information about NAME into ST. Work around bugs with trailing slashes. Mingw has other bugs (such as st_ino always diff --git a/gnu/stdarg.in.h b/gnu/stdarg.in.h index 84d3e323..080bb8e9 100644 --- a/gnu/stdarg.in.h +++ b/gnu/stdarg.in.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Substitute for and wrapper around . - Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2008-2011 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 diff --git a/gnu/stdbool.in.h b/gnu/stdbool.in.h index ea7ead5c..27a15169 100644 --- a/gnu/stdbool.in.h +++ b/gnu/stdbool.in.h @@ -1,6 +1,6 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ -/* Copyright (C) 2001-2003, 2006-2010 Free Software Foundation, Inc. +/* Copyright (C) 2001-2003, 2006-2011 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software; you can redistribute it and/or modify diff --git a/gnu/stddef.in.h b/gnu/stddef.in.h index d67a019c..2e204220 100644 --- a/gnu/stddef.in.h +++ b/gnu/stddef.in.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A substitute for POSIX 2008 , for platforms that have issues. - Copyright (C) 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2009-2011 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 diff --git a/gnu/stdint.in.h b/gnu/stdint.in.h index 97759691..4e5af698 100644 --- a/gnu/stdint.in.h +++ b/gnu/stdint.in.h @@ -1,6 +1,6 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ -/* Copyright (C) 2001-2002, 2004-2010 Free Software Foundation, Inc. +/* Copyright (C) 2001-2002, 2004-2011 Free Software Foundation, Inc. Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood. This file is part of gnulib. @@ -110,6 +110,8 @@ warnings in the signed case. */ \ ((((zero) + 1) << ((bits) ? (bits) - 1 - (signed) : 0)) - 1) * 2 + 1) +#if !GNULIB_defined_stdint_types + /* 7.18.1.1. Exact-width integer types */ /* Here we assume a standard architecture where the hardware integer @@ -136,40 +138,54 @@ typedef unsigned int gl_uint32_t; #define int32_t gl_int32_t #define uint32_t gl_uint32_t +/* If the system defines INT64_MAX, assume int64_t works. That way, + if the underlying platform defines int64_t to be a 64-bit long long + int, the code below won't mistakenly define it to be a 64-bit long + int, which would mess up C++ name mangling. We must use #ifdef + rather than #if, to avoid an error with HP-UX 10.20 cc. */ + +#ifdef INT64_MAX +# define GL_INT64_T +#else /* Do not undefine int64_t if gnulib is not being used with 64-bit types, since otherwise it breaks platforms like Tandem/NSK. */ -#if LONG_MAX >> 31 >> 31 == 1 -# undef int64_t +# if LONG_MAX >> 31 >> 31 == 1 +# undef int64_t typedef long int gl_int64_t; -# define int64_t gl_int64_t -# define GL_INT64_T -#elif defined _MSC_VER -# undef int64_t +# define int64_t gl_int64_t +# define GL_INT64_T +# elif defined _MSC_VER +# undef int64_t typedef __int64 gl_int64_t; -# define int64_t gl_int64_t -# define GL_INT64_T -#elif @HAVE_LONG_LONG_INT@ -# undef int64_t +# define int64_t gl_int64_t +# define GL_INT64_T +# elif @HAVE_LONG_LONG_INT@ +# undef int64_t typedef long long int gl_int64_t; -# define int64_t gl_int64_t -# define GL_INT64_T +# define int64_t gl_int64_t +# define GL_INT64_T +# endif #endif -#if ULONG_MAX >> 31 >> 31 >> 1 == 1 -# undef uint64_t -typedef unsigned long int gl_uint64_t; -# define uint64_t gl_uint64_t +#ifdef UINT64_MAX # define GL_UINT64_T -#elif defined _MSC_VER -# undef uint64_t +#else +# if ULONG_MAX >> 31 >> 31 >> 1 == 1 +# undef uint64_t +typedef unsigned long int gl_uint64_t; +# define uint64_t gl_uint64_t +# define GL_UINT64_T +# elif defined _MSC_VER +# undef uint64_t typedef unsigned __int64 gl_uint64_t; -# define uint64_t gl_uint64_t -# define GL_UINT64_T -#elif @HAVE_UNSIGNED_LONG_LONG_INT@ -# undef uint64_t +# define uint64_t gl_uint64_t +# define GL_UINT64_T +# elif @HAVE_UNSIGNED_LONG_LONG_INT@ +# undef uint64_t typedef unsigned long long int gl_uint64_t; -# define uint64_t gl_uint64_t -# define GL_UINT64_T +# define uint64_t gl_uint64_t +# define GL_UINT64_T +# endif #endif /* Avoid collision with Solaris 2.5.1 etc. */ @@ -284,6 +300,9 @@ typedef unsigned long int gl_uintmax_t; typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t) ? 1 : -1]; +#define GNULIB_defined_stdint_types 1 +#endif /* !GNULIB_defined_stdint_types */ + /* 7.18.2. Limits of specified-width integer types */ #if ! defined __cplusplus || defined __STDC_LIMIT_MACROS @@ -314,17 +333,14 @@ typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t) #define INT32_MAX 2147483647 #define UINT32_MAX 4294967295U -#undef INT64_MIN -#undef INT64_MAX -#ifdef GL_INT64_T +#if defined GL_INT64_T && ! defined INT64_MAX /* Prefer (- INTMAX_C (1) << 63) over (~ INT64_MAX) because SunPRO C 5.0 evaluates the latter incorrectly in preprocessor expressions. */ # define INT64_MIN (- INTMAX_C (1) << 63) # define INT64_MAX INTMAX_C (9223372036854775807) #endif -#undef UINT64_MAX -#ifdef GL_UINT64_T +#if defined GL_UINT64_T && ! defined UINT64_MAX # define UINT64_MAX UINTMAX_C (18446744073709551615) #endif @@ -483,7 +499,12 @@ typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t) sequence of nested includes -> -> -> , and the latter includes and assumes its types are already defined. */ -#if ! (defined WCHAR_MIN && defined WCHAR_MAX) +#if @HAVE_WCHAR_H@ && ! (defined WCHAR_MIN && defined WCHAR_MAX) + /* BSD/OS 4.0.1 has a bug: , and must be + included before . */ +# include +# include +# include # define _GL_JUST_INCLUDE_SYSTEM_WCHAR_H # include # undef _GL_JUST_INCLUDE_SYSTEM_WCHAR_H diff --git a/gnu/stdio-impl.h b/gnu/stdio-impl.h index f3fbbc52..c64553c7 100644 --- a/gnu/stdio-impl.h +++ b/gnu/stdio-impl.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Implementation details of FILE streams. - Copyright (C) 2007-2008, 2010 Free Software Foundation, Inc. + Copyright (C) 2007-2008, 2010-2011 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 @@ -77,6 +77,17 @@ /* SystemV derived implementations. */ +#ifdef __TANDEM /* NonStop Kernel */ +# ifndef _IOERR +/* These values were determined by the program 'stdioext-flags' at + . */ +# define _IOERR 0x40 +# define _IOREAD 0x80 +# define _IOWRT 0x4 +# define _IORW 0x100 +# endif +#endif + #if defined _IOERR # if defined __sun && defined _LP64 /* Solaris/{SPARC,AMD64} 64-bit */ diff --git a/gnu/stdio.in.h b/gnu/stdio.in.h index 02df65a5..465a9c9f 100644 --- a/gnu/stdio.in.h +++ b/gnu/stdio.in.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A GNU-like . - Copyright (C) 2004, 2007-2010 Free Software Foundation, Inc. + Copyright (C) 2004, 2007-2011 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 @@ -23,8 +23,14 @@ #endif @PRAGMA_COLUMNS@ -#if defined __need_FILE || defined __need___FILE -/* Special invocation convention inside glibc header files. */ +#if defined __need_FILE || defined __need___FILE || defined _GL_ALREADY_INCLUDING_STDIO_H +/* Special invocation convention: + - Inside glibc header files. + - On OSF/1 5.1 we have a sequence of nested includes + -> -> -> -> + -> -> -> . + In this situation, the functions are not yet declared, therefore we cannot + provide the C++ aliases. */ #@INCLUDE_NEXT@ @NEXT_STDIO_H@ @@ -33,9 +39,13 @@ #ifndef _GL_STDIO_H +#define _GL_ALREADY_INCLUDING_STDIO_H + /* The include_next requires a split double-inclusion guard. */ #@INCLUDE_NEXT@ @NEXT_STDIO_H@ +#undef _GL_ALREADY_INCLUDING_STDIO_H + #ifndef _GL_STDIO_H #define _GL_STDIO_H @@ -44,19 +54,29 @@ #include -/* Get off_t and ssize_t. Needed on many systems, including glibc 2.8. */ +/* Get off_t and ssize_t. Needed on many systems, including glibc 2.8 + and eglibc 2.11.2. */ #include -#ifndef __attribute__ /* The __attribute__ feature is available in gcc versions 2.5 and later. The __-protected variants of the attributes 'format' and 'printf' are accepted by gcc versions 2.6.4 (effectively 2.7) and later. - We enable __attribute__ only if these are supported too, because + We enable _GL_ATTRIBUTE_FORMAT only if these are supported too, because gnulib and libintl do '#define printf __printf__' when they override the 'printf' function. */ -# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) -# define __attribute__(Spec) /* empty */ -# endif +#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) +# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec)) +#else +# define _GL_ATTRIBUTE_FORMAT(spec) /* empty */ +#endif +#define _GL_ATTRIBUTE_FORMAT_PRINTF(formatstring_parameter, first_argument) \ + _GL_ATTRIBUTE_FORMAT ((__printf__, formatstring_parameter, first_argument)) + +/* Solaris 10 declares renameat in , not in . */ +/* But in any case avoid namespace pollution on glibc systems. */ +#if (@GNULIB_RENAMEAT@ || defined GNULIB_POSIXCHECK) && defined __sun \ + && ! defined __GLIBC__ +# include #endif @@ -77,13 +97,13 @@ # define dprintf rpl_dprintf # endif _GL_FUNCDECL_RPL (dprintf, int, (int fd, const char *format, ...) - __attribute__ ((__format__ (__printf__, 2, 3))) + _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3) _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (dprintf, int, (int fd, const char *format, ...)); # else # if !@HAVE_DPRINTF@ _GL_FUNCDECL_SYS (dprintf, int, (int fd, const char *format, ...) - __attribute__ ((__format__ (__printf__, 2, 3))) + _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3) _GL_ARG_NONNULL ((2))); # endif _GL_CXXALIAS_SYS (dprintf, int, (int fd, const char *format, ...)); @@ -174,7 +194,7 @@ _GL_WARN_ON_USE (fopen, "fopen on Win32 platforms is not POSIX compatible - " # endif # define GNULIB_overrides_fprintf 1 _GL_FUNCDECL_RPL (fprintf, int, (FILE *fp, const char *format, ...) - __attribute__ ((__format__ (__printf__, 2, 3))) + _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3) _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (fprintf, int, (FILE *fp, const char *format, ...)); # else @@ -340,7 +360,7 @@ _GL_FUNCDECL_RPL (fseeko, int, (FILE *fp, off_t offset, int whence) _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (fseeko, int, (FILE *fp, off_t offset, int whence)); # else -# if ! @HAVE_FSEEKO@ +# if ! @HAVE_DECL_FSEEKO@ _GL_FUNCDECL_SYS (fseeko, int, (FILE *fp, off_t offset, int whence) _GL_ARG_NONNULL ((1))); # endif @@ -351,17 +371,20 @@ _GL_CXXALIASWARN (fseeko); /* Provide an fseek function that is consistent with fseeko. */ /* In order to avoid that fseek gets defined as a macro here, the developer can request the 'fseek' module. */ -# undef fseek -# define fseek rpl_fseek +# if !GNULIB_defined_fseek_function +# undef fseek +# define fseek rpl_fseek static inline int _GL_ARG_NONNULL ((1)) rpl_fseek (FILE *fp, long offset, int whence) { -# if @REPLACE_FSEEKO@ +# if @REPLACE_FSEEKO@ return rpl_fseeko (fp, offset, whence); -# else +# else return fseeko (fp, offset, whence); -# endif +# endif } +# define GNULIB_defined_fseek_function 1 +# endif # endif #elif defined GNULIB_POSIXCHECK # define _GL_FSEEK_WARN /* Category 1, above. */ @@ -416,7 +439,7 @@ _GL_CXXALIASWARN (ftell); _GL_FUNCDECL_RPL (ftello, off_t, (FILE *fp) _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (ftello, off_t, (FILE *fp)); # else -# if ! @HAVE_FTELLO@ +# if ! @HAVE_DECL_FTELLO@ _GL_FUNCDECL_SYS (ftello, off_t, (FILE *fp) _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (ftello, off_t, (FILE *fp)); @@ -426,17 +449,20 @@ _GL_CXXALIASWARN (ftello); /* Provide an ftell function that is consistent with ftello. */ /* In order to avoid that ftell gets defined as a macro here, the developer can request the 'ftell' module. */ -# undef ftell -# define ftell rpl_ftell +# if !GNULIB_defined_ftell_function +# undef ftell +# define ftell rpl_ftell static inline long _GL_ARG_NONNULL ((1)) rpl_ftell (FILE *f) { -# if @REPLACE_FTELLO@ +# if @REPLACE_FTELLO@ return rpl_ftello (f); -# else +# else return ftello (f); -# endif +# endif } +# define GNULIB_defined_ftell_function 1 +# endif # endif #elif defined GNULIB_POSIXCHECK # define _GL_FTELL_WARN /* Category 1, above. */ @@ -565,7 +591,7 @@ struct obstack; # endif _GL_FUNCDECL_RPL (obstack_printf, int, (struct obstack *obs, const char *format, ...) - __attribute__ ((__format__ (__printf__, 2, 3))) + _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3) _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (obstack_printf, int, (struct obstack *obs, const char *format, ...)); @@ -573,7 +599,7 @@ _GL_CXXALIAS_RPL (obstack_printf, int, # if !@HAVE_DECL_OBSTACK_PRINTF@ _GL_FUNCDECL_SYS (obstack_printf, int, (struct obstack *obs, const char *format, ...) - __attribute__ ((__format__ (__printf__, 2, 3))) + _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3) _GL_ARG_NONNULL ((1, 2))); # endif _GL_CXXALIAS_SYS (obstack_printf, int, @@ -586,7 +612,7 @@ _GL_CXXALIASWARN (obstack_printf); # endif _GL_FUNCDECL_RPL (obstack_vprintf, int, (struct obstack *obs, const char *format, va_list args) - __attribute__ ((__format__ (__printf__, 2, 0))) + _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0) _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (obstack_vprintf, int, (struct obstack *obs, const char *format, va_list args)); @@ -594,7 +620,7 @@ _GL_CXXALIAS_RPL (obstack_vprintf, int, # if !@HAVE_DECL_OBSTACK_PRINTF@ _GL_FUNCDECL_SYS (obstack_vprintf, int, (struct obstack *obs, const char *format, va_list args) - __attribute__ ((__format__ (__printf__, 2, 0))) + _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0) _GL_ARG_NONNULL ((1, 2))); # endif _GL_CXXALIAS_SYS (obstack_vprintf, int, @@ -657,13 +683,16 @@ _GL_FUNCDECL_RPL_1 (__printf__, int, (const char *format, ...) __asm__ (@ASM_SYMBOL_PREFIX@ _GL_STDIO_MACROEXPAND_AND_STRINGIZE(rpl_printf)) - __attribute__ ((__format__ (__printf__, 1, 2))) + _GL_ATTRIBUTE_FORMAT_PRINTF (1, 2) _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL_1 (printf, __printf__, int, (const char *format, ...)); # else +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# define printf rpl_printf +# endif _GL_FUNCDECL_RPL (printf, int, (const char *format, ...) - __attribute__ ((__format__ (__printf__, 1, 2))) + _GL_ATTRIBUTE_FORMAT_PRINTF (1, 2) _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (printf, int, (const char *format, ...)); # endif @@ -803,7 +832,7 @@ _GL_WARN_ON_USE (renameat, "renameat is not portable - " # endif _GL_FUNCDECL_RPL (snprintf, int, (char *str, size_t size, const char *format, ...) - __attribute__ ((__format__ (__printf__, 3, 4))) + _GL_ATTRIBUTE_FORMAT_PRINTF (3, 4) _GL_ARG_NONNULL ((3))); _GL_CXXALIAS_RPL (snprintf, int, (char *str, size_t size, const char *format, ...)); @@ -811,7 +840,7 @@ _GL_CXXALIAS_RPL (snprintf, int, # if !@HAVE_DECL_SNPRINTF@ _GL_FUNCDECL_SYS (snprintf, int, (char *str, size_t size, const char *format, ...) - __attribute__ ((__format__ (__printf__, 3, 4))) + _GL_ATTRIBUTE_FORMAT_PRINTF (3, 4) _GL_ARG_NONNULL ((3))); # endif _GL_CXXALIAS_SYS (snprintf, int, @@ -841,7 +870,7 @@ _GL_WARN_ON_USE (snprintf, "snprintf is unportable - " # define sprintf rpl_sprintf # endif _GL_FUNCDECL_RPL (sprintf, int, (char *str, const char *format, ...) - __attribute__ ((__format__ (__printf__, 2, 3))) + _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3) _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (sprintf, int, (char *str, const char *format, ...)); # else @@ -886,7 +915,7 @@ _GL_WARN_ON_USE (tmpfile, "tmpfile is not usable on mingw - " # endif _GL_FUNCDECL_RPL (asprintf, int, (char **result, const char *format, ...) - __attribute__ ((__format__ (__printf__, 2, 3))) + _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3) _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (asprintf, int, (char **result, const char *format, ...)); @@ -894,7 +923,7 @@ _GL_CXXALIAS_RPL (asprintf, int, # if !@HAVE_VASPRINTF@ _GL_FUNCDECL_SYS (asprintf, int, (char **result, const char *format, ...) - __attribute__ ((__format__ (__printf__, 2, 3))) + _GL_ATTRIBUTE_FORMAT_PRINTF (2, 3) _GL_ARG_NONNULL ((1, 2))); # endif _GL_CXXALIAS_SYS (asprintf, int, @@ -907,7 +936,7 @@ _GL_CXXALIASWARN (asprintf); # endif _GL_FUNCDECL_RPL (vasprintf, int, (char **result, const char *format, va_list args) - __attribute__ ((__format__ (__printf__, 2, 0))) + _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0) _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (vasprintf, int, (char **result, const char *format, va_list args)); @@ -915,7 +944,7 @@ _GL_CXXALIAS_RPL (vasprintf, int, # if !@HAVE_VASPRINTF@ _GL_FUNCDECL_SYS (vasprintf, int, (char **result, const char *format, va_list args) - __attribute__ ((__format__ (__printf__, 2, 0))) + _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0) _GL_ARG_NONNULL ((1, 2))); # endif _GL_CXXALIAS_SYS (vasprintf, int, @@ -930,13 +959,13 @@ _GL_CXXALIASWARN (vasprintf); # define vdprintf rpl_vdprintf # endif _GL_FUNCDECL_RPL (vdprintf, int, (int fd, const char *format, va_list args) - __attribute__ ((__format__ (__printf__, 2, 0))) + _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0) _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (vdprintf, int, (int fd, const char *format, va_list args)); # else # if !@HAVE_VDPRINTF@ _GL_FUNCDECL_SYS (vdprintf, int, (int fd, const char *format, va_list args) - __attribute__ ((__format__ (__printf__, 2, 0))) + _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0) _GL_ARG_NONNULL ((2))); # endif /* Need to cast, because on Solaris, the third parameter will likely be @@ -961,7 +990,7 @@ _GL_WARN_ON_USE (vdprintf, "vdprintf is unportable - " # endif # define GNULIB_overrides_vfprintf 1 _GL_FUNCDECL_RPL (vfprintf, int, (FILE *fp, const char *format, va_list args) - __attribute__ ((__format__ (__printf__, 2, 0))) + _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0) _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (vfprintf, int, (FILE *fp, const char *format, va_list args)); # else @@ -991,7 +1020,7 @@ _GL_WARN_ON_USE (vfprintf, "vfprintf is not always POSIX compliant - " # endif # define GNULIB_overrides_vprintf 1 _GL_FUNCDECL_RPL (vprintf, int, (const char *format, va_list args) - __attribute__ ((__format__ (__printf__, 1, 0))) + _GL_ATTRIBUTE_FORMAT_PRINTF (1, 0) _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (vprintf, int, (const char *format, va_list args)); # else @@ -1019,7 +1048,7 @@ _GL_WARN_ON_USE (vprintf, "vprintf is not always POSIX compliant - " # endif _GL_FUNCDECL_RPL (vsnprintf, int, (char *str, size_t size, const char *format, va_list args) - __attribute__ ((__format__ (__printf__, 3, 0))) + _GL_ATTRIBUTE_FORMAT_PRINTF (3, 0) _GL_ARG_NONNULL ((3))); _GL_CXXALIAS_RPL (vsnprintf, int, (char *str, size_t size, const char *format, va_list args)); @@ -1027,7 +1056,7 @@ _GL_CXXALIAS_RPL (vsnprintf, int, # if !@HAVE_DECL_VSNPRINTF@ _GL_FUNCDECL_SYS (vsnprintf, int, (char *str, size_t size, const char *format, va_list args) - __attribute__ ((__format__ (__printf__, 3, 0))) + _GL_ATTRIBUTE_FORMAT_PRINTF (3, 0) _GL_ARG_NONNULL ((3))); # endif _GL_CXXALIAS_SYS (vsnprintf, int, @@ -1049,7 +1078,7 @@ _GL_WARN_ON_USE (vsnprintf, "vsnprintf is unportable - " # endif _GL_FUNCDECL_RPL (vsprintf, int, (char *str, const char *format, va_list args) - __attribute__ ((__format__ (__printf__, 2, 0))) + _GL_ATTRIBUTE_FORMAT_PRINTF (2, 0) _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (vsprintf, int, (char *str, const char *format, va_list args)); diff --git a/gnu/stdlib.in.h b/gnu/stdlib.in.h index 5b3c4d72..6594cd90 100644 --- a/gnu/stdlib.in.h +++ b/gnu/stdlib.in.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A GNU-like . - Copyright (C) 1995, 2001-2004, 2006-2010 Free Software Foundation, Inc. + Copyright (C) 1995, 2001-2004, 2006-2011 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 @@ -51,21 +51,23 @@ # include #endif +#if @GNULIB_RANDOM_R@ + /* OSF/1 5.1 declares 'struct random_data' in , which is included - from if _REENTRANT is defined. Include it always. */ -#if @HAVE_RANDOM_H@ -# include -#endif + from if _REENTRANT is defined. Include it whenever we need + 'struct random_data'. */ +# if @HAVE_RANDOM_H@ +# include +# endif -#if !@HAVE_STRUCT_RANDOM_DATA@ || (@GNULIB_RANDOM_R@ && !@HAVE_RANDOM_R@) \ - || defined GNULIB_POSIXCHECK -# include -#endif +# if !@HAVE_STRUCT_RANDOM_DATA@ || !@HAVE_RANDOM_R@ +# include +# endif -#if !@HAVE_STRUCT_RANDOM_DATA@ +# if !@HAVE_STRUCT_RANDOM_DATA@ /* Define 'struct random_data'. But allow multiple gnulib generated replacements to coexist. */ -# if !GNULIB_defined_struct_random_data +# if !GNULIB_defined_struct_random_data struct random_data { int32_t *fptr; /* Front pointer. */ @@ -76,7 +78,8 @@ struct random_data int rand_sep; /* Distance between front and rear. */ int32_t *end_ptr; /* Pointer behind state table. */ }; -# define GNULIB_defined_struct_random_data 1 +# define GNULIB_defined_struct_random_data 1 +# endif # endif #endif @@ -87,10 +90,10 @@ struct random_data # include #endif -#ifndef __attribute__ -# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) -# define __attribute__(Spec) /* empty */ -# endif +#if 3 <= __GNUC__ || __GNUC__ == 2 && 8 <= __GNUC_MINOR__ +# define _GL_ATTRIBUTE_NORETURN __attribute__ ((__noreturn__)) +#else +# define _GL_ATTRIBUTE_NORETURN #endif /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ @@ -118,7 +121,7 @@ struct random_data /* Terminate the current process with the given return code, without running the 'atexit' handlers. */ # if !@HAVE__EXIT@ -_GL_FUNCDECL_SYS (_Exit, void, (int status) __attribute__ ((__noreturn__))); +_GL_FUNCDECL_SYS (_Exit, void, (int status) _GL_ATTRIBUTE_NORETURN); # endif _GL_CXXALIAS_SYS (_Exit, void, (int status)); _GL_CXXALIASWARN (_Exit); @@ -273,6 +276,21 @@ _GL_WARN_ON_USE (malloc, "malloc is not POSIX compliant everywhere - " "use gnulib module malloc-posix for portability"); #endif +/* Convert a multibyte character to a wide character. */ +#if @GNULIB_MBTOWC@ +# if @REPLACE_MBTOWC@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef mbtowc +# define mbtowc rpl_mbtowc +# endif +_GL_FUNCDECL_RPL (mbtowc, int, (wchar_t *pwc, const char *s, size_t n)); +_GL_CXXALIAS_RPL (mbtowc, int, (wchar_t *pwc, const char *s, size_t n)); +# else +_GL_CXXALIAS_SYS (mbtowc, int, (wchar_t *pwc, const char *s, size_t n)); +# endif +_GL_CXXALIASWARN (mbtowc); +#endif + #if @GNULIB_MKDTEMP@ /* Create a unique temporary directory from TEMPLATE. The last six characters of TEMPLATE must be "XXXXXX"; @@ -586,7 +604,7 @@ _GL_FUNCDECL_RPL (setenv, int, _GL_CXXALIAS_RPL (setenv, int, (const char *name, const char *value, int replace)); # else -# if !@HAVE_SETENV@ +# if !@HAVE_DECL_SETENV@ _GL_FUNCDECL_SYS (setenv, int, (const char *name, const char *value, int replace) _GL_ARG_NONNULL ((1))); @@ -594,7 +612,9 @@ _GL_FUNCDECL_SYS (setenv, int, _GL_CXXALIAS_SYS (setenv, int, (const char *name, const char *value, int replace)); # endif +# if !(@REPLACE_SETENV@ && !@HAVE_DECL_SETENV@) _GL_CXXALIASWARN (setenv); +# endif #elif defined GNULIB_POSIXCHECK # undef setenv # if HAVE_RAW_DECL_SETENV @@ -704,12 +724,14 @@ _GL_WARN_ON_USE (unlockpt, "unlockpt is not portable - " _GL_FUNCDECL_RPL (unsetenv, int, (const char *name) _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (unsetenv, int, (const char *name)); # else -# if !@HAVE_UNSETENV@ +# if !@HAVE_DECL_UNSETENV@ _GL_FUNCDECL_SYS (unsetenv, int, (const char *name) _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (unsetenv, int, (const char *name)); # endif +# if !(@REPLACE_UNSETENV@ && !@HAVE_DECL_UNSETENV@) _GL_CXXALIASWARN (unsetenv); +# endif #elif defined GNULIB_POSIXCHECK # undef unsetenv # if HAVE_RAW_DECL_UNSETENV @@ -718,6 +740,21 @@ _GL_WARN_ON_USE (unsetenv, "unsetenv is unportable - " # endif #endif +/* Convert a wide character to a multibyte character. */ +#if @GNULIB_WCTOMB@ +# if @REPLACE_WCTOMB@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef wctomb +# define wctomb rpl_wctomb +# endif +_GL_FUNCDECL_RPL (wctomb, int, (char *s, wchar_t wc)); +_GL_CXXALIAS_RPL (wctomb, int, (char *s, wchar_t wc)); +# else +_GL_CXXALIAS_SYS (wctomb, int, (char *s, wchar_t wc)); +# endif +_GL_CXXALIASWARN (wctomb); +#endif + #endif /* _GL_STDLIB_H */ #endif /* _GL_STDLIB_H */ diff --git a/gnu/stpcpy.c b/gnu/stpcpy.c index cd7fad03..b2beb29e 100644 --- a/gnu/stpcpy.c +++ b/gnu/stpcpy.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* stpcpy.c -- copy a string and return pointer to end of new string - Copyright (C) 1992, 1995, 1997-1998, 2006, 2009-2010 Free Software + Copyright (C) 1992, 1995, 1997-1998, 2006, 2009-2011 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with the GNU C Library. diff --git a/gnu/strcasecmp.c b/gnu/strcasecmp.c index d9547142..b030fa8f 100644 --- a/gnu/strcasecmp.c +++ b/gnu/strcasecmp.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Case-insensitive string comparison function. - Copyright (C) 1998-1999, 2005-2007, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2007, 2009-2011 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 diff --git a/gnu/strchrnul.c b/gnu/strchrnul.c index eb431da4..83ef294a 100644 --- a/gnu/strchrnul.c +++ b/gnu/strchrnul.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Searching in a string. - Copyright (C) 2003, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2003, 2007-2011 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 diff --git a/gnu/strdup.c b/gnu/strdup.c index 223ac7f5..3395e6c1 100644 --- a/gnu/strdup.c +++ b/gnu/strdup.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ -/* Copyright (C) 1991, 1996, 1997, 1998, 2002, 2003, 2004, 2006, 2007, 2009, - 2010 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1996-1998, 2002-2004, 2006-2007, 2009-2011 Free Software + Foundation, Inc. This file is part of the GNU C Library. diff --git a/gnu/streq.h b/gnu/streq.h index 97ebcbe0..067732dd 100644 --- a/gnu/streq.h +++ b/gnu/streq.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Optimized string comparison. - Copyright (C) 2001-2002, 2007, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2007, 2009-2011 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 @@ -11,7 +11,7 @@ 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 - Lesser General Public License for more details. + General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . */ diff --git a/gnu/strerror.c b/gnu/strerror.c index ad29c711..29cdee32 100644 --- a/gnu/strerror.c +++ b/gnu/strerror.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* strerror.c --- POSIX compatible system error routine - Copyright (C) 2007-2010 Free Software Foundation, Inc. + Copyright (C) 2007-2011 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 diff --git a/gnu/string.in.h b/gnu/string.in.h index 22de096e..895c6ba2 100644 --- a/gnu/string.in.h +++ b/gnu/string.in.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A GNU-like . - Copyright (C) 1995-1996, 2001-2010 Free Software Foundation, Inc. + Copyright (C) 1995-1996, 2001-2011 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 @@ -39,13 +39,8 @@ # include #endif -#ifndef __attribute__ -/* This feature is available in gcc versions 2.5 and later. */ -# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) -# define __attribute__(Spec) /* empty */ -# endif -#endif -/* The attribute __pure__ was added in gcc 2.96. */ +/* The __attribute__ feature is available in gcc versions 2.5 and later. + The attribute __pure__ was added in gcc 2.96. */ #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) # define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__)) #else @@ -89,7 +84,7 @@ _GL_CXXALIAS_SYS_CAST2 (memchr, void *, (void const *__s, int __c, size_t __n), void const *, (void const *__s, int __c, size_t __n)); # endif -# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \ +# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) _GL_CXXALIASWARN1 (memchr, void *, (void *__s, int __c, size_t __n)); _GL_CXXALIASWARN1 (memchr, void const *, @@ -174,7 +169,7 @@ _GL_FUNCDECL_SYS (memrchr, void *, (void const *, int, size_t) _GL_CXXALIAS_SYS_CAST2 (memrchr, void *, (void const *, int, size_t), void const *, (void const *, int, size_t)); -# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \ +# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) _GL_CXXALIASWARN1 (memrchr, void *, (void *, int, size_t)); _GL_CXXALIASWARN1 (memrchr, void const *, (void const *, int, size_t)); @@ -204,7 +199,7 @@ _GL_FUNCDECL_SYS (rawmemchr, void *, (void const *__s, int __c_in) _GL_CXXALIAS_SYS_CAST2 (rawmemchr, void *, (void const *__s, int __c_in), void const *, (void const *__s, int __c_in)); -# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \ +# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) _GL_CXXALIASWARN1 (rawmemchr, void *, (void *__s, int __c_in)); _GL_CXXALIASWARN1 (rawmemchr, void const *, (void const *__s, int __c_in)); @@ -295,7 +290,7 @@ _GL_FUNCDECL_SYS (strchrnul, char *, (char const *__s, int __c_in) _GL_CXXALIAS_SYS_CAST2 (strchrnul, char *, (char const *__s, int __c_in), char const *, (char const *__s, int __c_in)); -# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \ +# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) _GL_CXXALIASWARN1 (strchrnul, char *, (char *__s, int __c_in)); _GL_CXXALIASWARN1 (strchrnul, char const *, (char const *__s, int __c_in)); @@ -441,7 +436,7 @@ _GL_FUNCDECL_SYS (strpbrk, char *, (char const *__s, char const *__accept) _GL_CXXALIAS_SYS_CAST2 (strpbrk, char *, (char const *__s, char const *__accept), const char *, (char const *__s, char const *__accept)); -# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \ +# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) _GL_CXXALIASWARN1 (strpbrk, char *, (char *__s, char const *__accept)); _GL_CXXALIASWARN1 (strpbrk, char const *, @@ -543,7 +538,7 @@ _GL_CXXALIAS_SYS_CAST2 (strstr, char *, (const char *haystack, const char *needle), const char *, (const char *haystack, const char *needle)); # endif -# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \ +# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) _GL_CXXALIASWARN1 (strstr, char *, (char *haystack, const char *needle)); _GL_CXXALIASWARN1 (strstr, const char *, @@ -592,7 +587,7 @@ _GL_CXXALIAS_SYS_CAST2 (strcasestr, char *, (const char *haystack, const char *needle), const char *, (const char *haystack, const char *needle)); # endif -# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \ +# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) _GL_CXXALIASWARN1 (strcasestr, char *, (char *haystack, const char *needle)); _GL_CXXALIASWARN1 (strcasestr, const char *, @@ -904,6 +899,35 @@ _GL_WARN_ON_USE (strerror, "strerror is unportable - " "use gnulib module strerror to guarantee non-NULL result"); #endif +/* Map any int, typically from errno, into an error message. Multithread-safe. + Uses the POSIX declaration, not the glibc declaration. */ +#if @GNULIB_STRERROR_R@ +# if @REPLACE_STRERROR_R@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef strerror_r +# define strerror_r rpl_strerror_r +# endif +_GL_FUNCDECL_RPL (strerror_r, int, (int errnum, char *buf, size_t buflen) + _GL_ARG_NONNULL ((2))); +_GL_CXXALIAS_RPL (strerror_r, int, (int errnum, char *buf, size_t buflen)); +# else +# if !@HAVE_DECL_STRERROR_R@ +_GL_FUNCDECL_SYS (strerror_r, int, (int errnum, char *buf, size_t buflen) + _GL_ARG_NONNULL ((2))); +# endif +_GL_CXXALIAS_SYS (strerror_r, int, (int errnum, char *buf, size_t buflen)); +# endif +# if @HAVE_DECL_STRERROR_R@ +_GL_CXXALIASWARN (strerror_r); +# endif +#elif defined GNULIB_POSIXCHECK +# undef strerror_r +# if HAVE_RAW_DECL_STRERROR_R +_GL_WARN_ON_USE (strerror_r, "strerror_r is unportable - " + "use gnulib module strerror_r-posix for portability"); +# endif +#endif + #if @GNULIB_STRSIGNAL@ # if @REPLACE_STRSIGNAL@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) diff --git a/gnu/strings.in.h b/gnu/strings.in.h index 35110729..b21e9f7d 100644 --- a/gnu/strings.in.h +++ b/gnu/strings.in.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A substitute . - Copyright (C) 2007-2010 Free Software Foundation, Inc. + Copyright (C) 2007-2011 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 diff --git a/gnu/stripslash.c b/gnu/stripslash.c index c52a910b..bd5bbc18 100644 --- a/gnu/stripslash.c +++ b/gnu/stripslash.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* stripslash.c -- remove redundant trailing slashes from a file name - Copyright (C) 1990, 2001, 2003-2006, 2009-2010 Free Software Foundation, + Copyright (C) 1990, 2001, 2003-2006, 2009-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/strncasecmp.c b/gnu/strncasecmp.c index c0972ab9..8953c3be 100644 --- a/gnu/strncasecmp.c +++ b/gnu/strncasecmp.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* strncasecmp.c -- case insensitive string comparator - Copyright (C) 1998-1999, 2005-2007, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2007, 2009-2011 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 diff --git a/gnu/strndup.c b/gnu/strndup.c index a7e03efb..c5aca3ea 100644 --- a/gnu/strndup.c +++ b/gnu/strndup.c @@ -2,8 +2,8 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A replacement function, for systems that lack strndup. - Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2005, 2006, 2007, 2009, - 2010 Free Software Foundation, Inc. + Copyright (C) 1996-1998, 2001-2003, 2005-2007, 2009-2011 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 diff --git a/gnu/strnlen.c b/gnu/strnlen.c index 2455d5c1..241bb592 100644 --- a/gnu/strnlen.c +++ b/gnu/strnlen.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Find the length of STRING, but scan at most MAXLEN characters. - Copyright (C) 2005, 2006, 2007, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2005-2007, 2009-2011 Free Software Foundation, Inc. Written by Simon Josefsson. This program is free software; you can redistribute it and/or modify diff --git a/gnu/strnlen1.c b/gnu/strnlen1.c index c0fa0625..876a5c8f 100644 --- a/gnu/strnlen1.c +++ b/gnu/strnlen1.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Find the length of STRING + 1, but scan at most MAXLEN bytes. - Copyright (C) 2005-2006, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2011 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 diff --git a/gnu/strnlen1.h b/gnu/strnlen1.h index df1ea80a..ae831cea 100644 --- a/gnu/strnlen1.h +++ b/gnu/strnlen1.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Find the length of STRING + 1, but scan at most MAXLEN bytes. - Copyright (C) 2005, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2005, 2009-2011 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 diff --git a/gnu/strtoimax.c b/gnu/strtoimax.c index bbdb9c61..efdfd58c 100644 --- a/gnu/strtoimax.c +++ b/gnu/strtoimax.c @@ -2,8 +2,8 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Convert string representation of a number into an intmax_t value. - Copyright (C) 1999, 2001, 2002, 2003, 2004, 2006, 2009, 2010 Free Software - Foundation, Inc. + Copyright (C) 1999, 2001-2004, 2006, 2009-2011 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 diff --git a/gnu/strtol.c b/gnu/strtol.c index aee2ece3..058f9b1f 100644 --- a/gnu/strtol.c +++ b/gnu/strtol.c @@ -2,8 +2,8 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Convert string representation of a number into an integer value. - Copyright (C) 1991, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2003, 2005, - 2006, 2007, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1991-1992, 1994-1999, 2003, 2005-2007, 2009-2011 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. @@ -143,11 +143,11 @@ ? (t) 0 \ : TYPE_SIGNED_MAGNITUDE (t) \ ? ~ (t) 0 \ - : ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1))) + : ~ TYPE_MAXIMUM (t))) # define TYPE_MAXIMUM(t) \ ((t) (! TYPE_SIGNED (t) \ ? (t) -1 \ - : ~ (~ (t) 0 << (sizeof (t) * CHAR_BIT - 1)))) + : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1))) # ifndef ULLONG_MAX # define ULLONG_MAX TYPE_MAXIMUM (unsigned long long) diff --git a/gnu/strtoll.c b/gnu/strtoll.c index 09e72727..0eb0190a 100644 --- a/gnu/strtoll.c +++ b/gnu/strtoll.c @@ -1,8 +1,8 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Function to parse a `long long int' from text. - Copyright (C) 1995, 1996, 1997, 1999, 2001, 2009, 2010 Free Software - Foundation, Inc. + Copyright (C) 1995-1997, 1999, 2001, 2009-2011 Free Software Foundation, + Inc. This file is part of the GNU C Library. This program is free software: you can redistribute it and/or modify diff --git a/gnu/strtoul.c b/gnu/strtoul.c index d16d3b93..eb0b6996 100644 --- a/gnu/strtoul.c +++ b/gnu/strtoul.c @@ -1,6 +1,6 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ -/* Copyright (C) 1991, 1997, 2009, 2010 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1997, 2009-2011 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software: you can redistribute it and/or modify diff --git a/gnu/strtoull.c b/gnu/strtoull.c index 5082c312..2de550cf 100644 --- a/gnu/strtoull.c +++ b/gnu/strtoull.c @@ -1,8 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Function to parse an `unsigned long long int' from text. - Copyright (C) 1995, 1996, 1997, 1999, 2009, 2010 Free Software Foundation, - Inc. + Copyright (C) 1995-1997, 1999, 2009-2011 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. diff --git a/gnu/symlink.c b/gnu/symlink.c index ecf646f4..9339e9a4 100644 --- a/gnu/symlink.c +++ b/gnu/symlink.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Stub for symlink(). - Copyright (C) 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2009-2011 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 diff --git a/gnu/symlinkat.c b/gnu/symlinkat.c index fd57e538..a4301de1 100644 --- a/gnu/symlinkat.c +++ b/gnu/symlinkat.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Create a symlink relative to an open directory. - Copyright (C) 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2009-2011 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 diff --git a/gnu/sys_stat.in.h b/gnu/sys_stat.in.h index f2ac370d..70f43e2a 100644 --- a/gnu/sys_stat.in.h +++ b/gnu/sys_stat.in.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Provide a more complete sys/stat header file. - Copyright (C) 2005-2010 Free Software Foundation, Inc. + Copyright (C) 2005-2011 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 @@ -463,11 +463,14 @@ _GL_CXXALIAS_RPL (mkdir, int, (char const *name, mode_t mode)); which are included above. */ # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +# if !GNULIB_defined_rpl_mkdir static inline int rpl_mkdir (char const *name, mode_t mode) { return _mkdir (name); } +# define GNULIB_defined_rpl_mkdir 1 +# endif # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define mkdir rpl_mkdir @@ -552,7 +555,8 @@ _GL_CXXALIAS_RPL (mknod, int, (char const *file, mode_t mode, dev_t dev)); _GL_FUNCDECL_SYS (mknod, int, (char const *file, mode_t mode, dev_t dev) _GL_ARG_NONNULL ((1))); # endif -_GL_CXXALIAS_SYS (mknod, int, (char const *file, mode_t mode, dev_t dev)); +/* Need to cast, because on OSF/1 5.1, the third parameter is '...'. */ +_GL_CXXALIAS_SYS_CAST (mknod, int, (char const *file, mode_t mode, dev_t dev)); # endif _GL_CXXALIASWARN (mknod); #elif defined GNULIB_POSIXCHECK diff --git a/gnu/sys_time.in.h b/gnu/sys_time.in.h index 49ea64f8..3be6faa3 100644 --- a/gnu/sys_time.in.h +++ b/gnu/sys_time.in.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Provide a more complete sys/time.h. - Copyright (C) 2007-2010 Free Software Foundation, Inc. + Copyright (C) 2007-2011 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 @@ -53,11 +53,16 @@ extern "C" { # endif # if ! @HAVE_STRUCT_TIMEVAL@ + +# if !GNULIB_defined_struct_timeval struct timeval { time_t tv_sec; long int tv_usec; }; +# define GNULIB_defined_struct_timeval 1 +# endif + # endif # ifdef __cplusplus diff --git a/gnu/sysexits.in.h b/gnu/sysexits.in.h index c8b1e75a..a57b83b7 100644 --- a/gnu/sysexits.in.h +++ b/gnu/sysexits.in.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* exit() exit codes for some BSD system programs. - Copyright (C) 2003, 2006-2010 Free Software Foundation, Inc. + Copyright (C) 2003, 2006-2011 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 diff --git a/gnu/tempname.c b/gnu/tempname.c index 4686f26c..5be137e3 100644 --- a/gnu/tempname.c +++ b/gnu/tempname.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* tempname.c - generate the name of a temporary file. - Copyright (C) 1991-2003, 2005-2007, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 1991-2003, 2005-2007, 2009-2011 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 diff --git a/gnu/tempname.h b/gnu/tempname.h index 4de561d3..98be5608 100644 --- a/gnu/tempname.h +++ b/gnu/tempname.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Create a temporary file or directory. - Copyright (C) 2006, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2011 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 diff --git a/gnu/time.in.h b/gnu/time.in.h index 75f572a6..5abbdad4 100644 --- a/gnu/time.in.h +++ b/gnu/time.in.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A more-standard . - Copyright (C) 2007-2010 Free Software Foundation, Inc. + Copyright (C) 2007-2011 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 @@ -71,13 +71,16 @@ extern "C" { # endif -# undef timespec -# define timespec rpl_timespec +# if !GNULIB_defined_struct_timespec +# undef timespec +# define timespec rpl_timespec struct timespec { time_t tv_sec; long int tv_nsec; }; +# define GNULIB_defined_struct_timespec 1 +# endif # ifdef __cplusplus } @@ -86,6 +89,7 @@ struct timespec # endif # endif +# if !GNULIB_defined_struct_time_t_must_be_integral /* Per http://austingroupbugs.net/view.php?id=327, POSIX requires time_t to be an integer type, even though C99 permits floating point. We don't know of any implementation that uses floating @@ -94,6 +98,8 @@ struct timespec struct __time_t_must_be_integral { unsigned int __floating_time_t_unsupported : (time_t) 1; }; +# define GNULIB_defined_struct_time_t_must_be_integral 1 +# endif /* Sleep for at least RQTP seconds unless interrupted, If interrupted, return -1 and store the remaining time into RMTP. See @@ -149,7 +155,7 @@ _GL_FUNCDECL_RPL (localtime_r, struct tm *, (time_t const *restrict __timer, _GL_CXXALIAS_RPL (localtime_r, struct tm *, (time_t const *restrict __timer, struct tm *restrict __result)); # else -# if ! @HAVE_LOCALTIME_R@ +# if ! @HAVE_DECL_LOCALTIME_R@ _GL_FUNCDECL_SYS (localtime_r, struct tm *, (time_t const *restrict __timer, struct tm *restrict __result) _GL_ARG_NONNULL ((1, 2))); @@ -157,7 +163,9 @@ _GL_FUNCDECL_SYS (localtime_r, struct tm *, (time_t const *restrict __timer, _GL_CXXALIAS_SYS (localtime_r, struct tm *, (time_t const *restrict __timer, struct tm *restrict __result)); # endif +# if @HAVE_DECL_LOCALTIME_R@ _GL_CXXALIASWARN (localtime_r); +# endif # if @REPLACE_LOCALTIME_R@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # undef gmtime_r @@ -169,7 +177,7 @@ _GL_FUNCDECL_RPL (gmtime_r, struct tm *, (time_t const *restrict __timer, _GL_CXXALIAS_RPL (gmtime_r, struct tm *, (time_t const *restrict __timer, struct tm *restrict __result)); # else -# if ! @HAVE_LOCALTIME_R@ +# if ! @HAVE_DECL_LOCALTIME_R@ _GL_FUNCDECL_SYS (gmtime_r, struct tm *, (time_t const *restrict __timer, struct tm *restrict __result) _GL_ARG_NONNULL ((1, 2))); @@ -177,7 +185,9 @@ _GL_FUNCDECL_SYS (gmtime_r, struct tm *, (time_t const *restrict __timer, _GL_CXXALIAS_SYS (gmtime_r, struct tm *, (time_t const *restrict __timer, struct tm *restrict __result)); # endif +# if @HAVE_DECL_LOCALTIME_R@ _GL_CXXALIASWARN (gmtime_r); +# endif # endif /* Parse BUF as a time stamp, assuming FORMAT specifies its layout, and store diff --git a/gnu/time_r.c b/gnu/time_r.c index ff0a5277..ad0a4085 100644 --- a/gnu/time_r.c +++ b/gnu/time_r.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Reentrant time functions like localtime_r. - Copyright (C) 2003, 2006-2007, 2010 Free Software Foundation, Inc. + Copyright (C) 2003, 2006-2007, 2010-2011 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 diff --git a/gnu/timespec.h b/gnu/timespec.h index 4605a09b..bd6951d8 100644 --- a/gnu/timespec.h +++ b/gnu/timespec.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* timespec -- System time interface - Copyright (C) 2000, 2002, 2004-2005, 2007, 2009-2010 Free Software + Copyright (C) 2000, 2002, 2004-2005, 2007, 2009-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/uinttostr.c b/gnu/uinttostr.c index 052e6b91..70458ecc 100644 --- a/gnu/uinttostr.c +++ b/gnu/uinttostr.c @@ -2,5 +2,4 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ #define anytostr uinttostr #define inttype unsigned int -#define inttype_is_signed 0 #include "anytostr.c" diff --git a/gnu/umaxtostr.c b/gnu/umaxtostr.c index ffcc71ac..6dad2166 100644 --- a/gnu/umaxtostr.c +++ b/gnu/umaxtostr.c @@ -2,5 +2,4 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ #define anytostr umaxtostr #define inttype uintmax_t -#define inttype_is_signed 0 #include "anytostr.c" diff --git a/gnu/unistd--.h b/gnu/unistd--.h index 27a12b78..68a23077 100644 --- a/gnu/unistd--.h +++ b/gnu/unistd--.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Like unistd.h, but redefine some names to avoid glitches. - Copyright (C) 2005, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2005, 2009-2011 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 diff --git a/gnu/unistd-safer.h b/gnu/unistd-safer.h index 93475f64..35b2f9d7 100644 --- a/gnu/unistd-safer.h +++ b/gnu/unistd-safer.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Invoke unistd-like functions, but avoid some glitches. - Copyright (C) 2001, 2003, 2005, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2001, 2003, 2005, 2009-2011 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 diff --git a/gnu/unistd.in.h b/gnu/unistd.in.h index 493d6772..e01ffbcb 100644 --- a/gnu/unistd.in.h +++ b/gnu/unistd.in.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Substitute for and wrapper around . - Copyright (C) 2003-2010 Free Software Foundation, Inc. + Copyright (C) 2003-2011 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 @@ -63,14 +63,16 @@ /* Cygwin 1.7.1 declares symlinkat in , not in . */ /* But avoid namespace pollution on glibc systems. */ #if (!(defined SEEK_CUR && defined SEEK_END && defined SEEK_SET) \ - || (@GNULIB_SYMLINKAT@ || defined GNULIB_POSIXCHECK)) \ + || ((@GNULIB_SYMLINKAT@ || defined GNULIB_POSIXCHECK) \ + && defined __CYGWIN__)) \ && ! defined __GLIBC__ # include #endif /* Cygwin 1.7.1 declares unlinkat in , not in . */ /* But avoid namespace pollution on glibc systems. */ -#if (@GNULIB_UNLINKAT@ || defined GNULIB_POSIXCHECK) && ! defined __GLIBC__ +#if (@GNULIB_UNLINKAT@ || defined GNULIB_POSIXCHECK) && defined __CYGWIN__ \ + && ! defined __GLIBC__ # include #endif @@ -88,6 +90,15 @@ # include #endif +/* AIX and OSF/1 5.1 declare getdomainname in , not in . + NonStop Kernel declares gethostname in , not in . */ +/* But avoid namespace pollution on glibc systems. */ +#if ((@GNULIB_GETDOMAINNAME@ && (defined _AIX || defined __osf__)) \ + || (@GNULIB_GETHOSTNAME@ && defined __TANDEM)) \ + && !defined __GLIBC__ +# include +#endif + #if (@GNULIB_WRITE@ || @GNULIB_READLINK@ || @GNULIB_READLINKAT@ \ || @GNULIB_PREAD@ || @GNULIB_PWRITE@ || defined GNULIB_POSIXCHECK) /* Get ssize_t. */ @@ -428,6 +439,10 @@ _GL_EXTERN_C void _gl_unregister_fd (int fd); _GL_EXTERN_C int _gl_register_dup (int oldfd, int newfd); _GL_EXTERN_C const char *_gl_directory_name (int fd); +# else +# if !@HAVE_DECL_FCHDIR@ +_GL_FUNCDECL_SYS (fchdir, int, (int /*fd*/)); +# endif # endif _GL_CXXALIAS_SYS (fchdir, int, (int /*fd*/)); _GL_CXXALIASWARN (fchdir); @@ -551,13 +566,21 @@ _GL_WARN_ON_USE (getcwd, "getcwd is unportable - " Null terminate it if the name is shorter than LEN. If the NIS domain name is longer than LEN, set errno = EINVAL and return -1. Return 0 if successful, otherwise set errno and return -1. */ -# if !@HAVE_GETDOMAINNAME@ +# if @REPLACE_GETDOMAINNAME@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef getdomainname +# define getdomainname rpl_getdomainname +# endif +_GL_FUNCDECL_RPL (getdomainname, int, (char *name, size_t len) + _GL_ARG_NONNULL ((1))); +_GL_CXXALIAS_RPL (getdomainname, int, (char *name, size_t len)); +# else +# if !@HAVE_DECL_GETDOMAINNAME@ _GL_FUNCDECL_SYS (getdomainname, int, (char *name, size_t len) _GL_ARG_NONNULL ((1))); +# endif +_GL_CXXALIAS_SYS (getdomainname, int, (char *name, size_t len)); # endif -/* Need to cast, because on MacOS X 10.5 systems, the second parameter is - int len. */ -_GL_CXXALIAS_SYS_CAST (getdomainname, int, (char *name, size_t len)); _GL_CXXALIASWARN (getdomainname); #elif defined GNULIB_POSIXCHECK # undef getdomainname @@ -635,7 +658,8 @@ _GL_CXXALIAS_RPL (gethostname, int, (char *name, size_t len)); _GL_FUNCDECL_SYS (gethostname, int, (char *name, size_t len) _GL_ARG_NONNULL ((1))); # endif -/* Need to cast, because on Solaris 10 systems, the second parameter is +/* Need to cast, because on Solaris 10 and OSF/1 5.1 systems, the second + parameter is int len. */ _GL_CXXALIAS_SYS_CAST (gethostname, int, (char *name, size_t len)); # endif @@ -692,13 +716,22 @@ _GL_WARN_ON_USE (getlogin, "getlogin is unportable - " ${LOGNAME-$USER} on Unix platforms, $USERNAME on native Windows platforms. */ -# if !@HAVE_DECL_GETLOGIN_R@ +# if @REPLACE_GETLOGIN_R@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# define getlogin_r rpl_getlogin_r +# endif +_GL_FUNCDECL_RPL (getlogin_r, int, (char *name, size_t size) + _GL_ARG_NONNULL ((1))); +_GL_CXXALIAS_RPL (getlogin_r, int, (char *name, size_t size)); +# else +# if !@HAVE_DECL_GETLOGIN_R@ _GL_FUNCDECL_SYS (getlogin_r, int, (char *name, size_t size) _GL_ARG_NONNULL ((1))); -# endif +# endif /* Need to cast, because on Solaris 10 systems, the second argument is int size. */ _GL_CXXALIAS_SYS_CAST (getlogin_r, int, (char *name, size_t size)); +# endif _GL_CXXALIASWARN (getlogin_r); #elif defined GNULIB_POSIXCHECK # undef getlogin_r @@ -765,11 +798,14 @@ _GL_CXXALIAS_RPL (getpagesize, int, (void)); # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define getpagesize() _gl_getpagesize () # else +# if !GNULIB_defined_getpagesize_function static inline int getpagesize () { return _gl_getpagesize (); } +# define GNULIB_defined_getpagesize_function 1 +# endif # endif # endif # endif @@ -957,6 +993,24 @@ _GL_WARN_ON_USE (lseek, "lseek does not fail with ESPIPE on pipes on some " #endif +#if @GNULIB_PIPE@ +/* Create a pipe, defaulting to O_BINARY mode. + Store the read-end as fd[0] and the write-end as fd[1]. + Return 0 upon success, or -1 with errno set upon failure. */ +# if !@HAVE_PIPE@ +_GL_FUNCDECL_SYS (pipe, int, (int fd[2]) _GL_ARG_NONNULL ((1))); +# endif +_GL_CXXALIAS_SYS (pipe, int, (int fd[2])); +_GL_CXXALIASWARN (pipe); +#elif defined GNULIB_POSIXCHECK +# undef pipe +# if HAVE_RAW_DECL_PIPE +_GL_WARN_ON_USE (pipe, "pipe is unportable - " + "use gnulib module pipe-posix for portability"); +# endif +#endif + + #if @GNULIB_PIPE2@ /* Create a pipe, applying the given flags when opening the read-end of the pipe and the write-end of the pipe. @@ -1211,7 +1265,7 @@ _GL_FUNCDECL_RPL (ttyname_r, int, _GL_CXXALIAS_RPL (ttyname_r, int, (int fd, char *buf, size_t buflen)); # else -# if !@HAVE_TTYNAME_R@ +# if !@HAVE_DECL_TTYNAME_R@ _GL_FUNCDECL_SYS (ttyname_r, int, (int fd, char *buf, size_t buflen) _GL_ARG_NONNULL ((2))); # endif diff --git a/gnu/unitypes.in.h b/gnu/unitypes.in.h index 61571c3c..f1db9d9c 100644 --- a/gnu/unitypes.in.h +++ b/gnu/unitypes.in.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Elementary types for the GNU UniString library. - Copyright (C) 2002, 2005-2006, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2002, 2005-2006, 2009-2011 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 @@ -11,7 +11,7 @@ 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 - Lesser General Public License for more details. + General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . */ diff --git a/gnu/uniwidth.in.h b/gnu/uniwidth.in.h index 30e19235..1a01e2cf 100644 --- a/gnu/uniwidth.in.h +++ b/gnu/uniwidth.in.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Display width functions. - Copyright (C) 2001-2002, 2005, 2007, 2009-2010 Free Software Foundation, + Copyright (C) 2001-2002, 2005, 2007, 2009-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it @@ -12,7 +12,7 @@ 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 - Lesser General Public License for more details. + General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . */ diff --git a/gnu/uniwidth/cjk.h b/gnu/uniwidth/cjk.h index c2b69cc6..5f7b3b31 100644 --- a/gnu/uniwidth/cjk.h +++ b/gnu/uniwidth/cjk.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Test for CJK encoding. - Copyright (C) 2001-2002, 2005-2007, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2005-2007, 2009-2011 Free Software Foundation, Inc. Written by Bruno Haible , 2002. This program is free software: you can redistribute it and/or modify it @@ -12,7 +12,7 @@ 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 - Lesser General Public License for more details. + General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . */ diff --git a/gnu/uniwidth/width.c b/gnu/uniwidth/width.c index a2fa2f75..3fab5eaa 100644 --- a/gnu/uniwidth/width.c +++ b/gnu/uniwidth/width.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Determine display width of Unicode character. - Copyright (C) 2001-2002, 2006-2010 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2006-2011 Free Software Foundation, Inc. Written by Bruno Haible , 2002. This program is free software: you can redistribute it and/or modify it @@ -12,7 +12,7 @@ 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 - Lesser General Public License for more details. + General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . */ @@ -34,7 +34,7 @@ * - Zero width characters; generated from * "grep '^[^;]*;ZERO WIDTH ' UnicodeData.txt" */ -static const unsigned char nonspacing_table_data[26*64] = { +static const unsigned char nonspacing_table_data[27*64] = { /* 0x0000-0x01ff */ 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, /* 0x0000-0x003f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, /* 0x0040-0x007f */ @@ -64,20 +64,20 @@ static const unsigned char nonspacing_table_data[26*64] = { 0xb6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x05c0-0x05ff */ /* 0x0600-0x07ff */ 0x0f, 0x00, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, /* 0x0600-0x063f */ - 0x00, 0xf8, 0xff, 0x7f, 0x00, 0x00, 0x01, 0x00, /* 0x0640-0x067f */ + 0x00, 0xf8, 0xff, 0xff, 0x00, 0x00, 0x01, 0x00, /* 0x0640-0x067f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0680-0x06bf */ - 0x00, 0x00, 0xc0, 0xff, 0x9f, 0x3d, 0x00, 0x00, /* 0x06c0-0x06ff */ + 0x00, 0x00, 0xc0, 0xbf, 0x9f, 0x3d, 0x00, 0x00, /* 0x06c0-0x06ff */ 0x00, 0x80, 0x02, 0x00, 0x00, 0x00, 0xff, 0xff, /* 0x0700-0x073f */ 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0740-0x077f */ 0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0x01, 0x00, /* 0x0780-0x07bf */ 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x0f, 0x00, /* 0x07c0-0x07ff */ /* 0x0800-0x09ff */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0800-0x083f */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0840-0x087f */ + 0x00, 0x00, 0xc0, 0xfb, 0xef, 0x3e, 0x00, 0x00, /* 0x0800-0x083f */ + 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, /* 0x0840-0x087f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0880-0x08bf */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x08c0-0x08ff */ - 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0900-0x093f */ - 0xfe, 0x21, 0x1e, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0940-0x097f */ + 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, /* 0x0900-0x093f */ + 0xfe, 0x21, 0xfe, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0940-0x097f */ 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0980-0x09bf */ 0x1e, 0x20, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x09c0-0x09ff */ /* 0x0a00-0x0bff */ @@ -105,12 +105,12 @@ static const unsigned char nonspacing_table_data[26*64] = { 0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0ec0-0x0eff */ 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0xa0, 0x02, /* 0x0f00-0x0f3f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x7f, /* 0x0f40-0x0f7f */ - 0xdf, 0x00, 0xff, 0xfe, 0xff, 0xff, 0xff, 0x1f, /* 0x0f80-0x0fbf */ + 0xdf, 0xe0, 0xff, 0xfe, 0xff, 0xff, 0xff, 0x1f, /* 0x0f80-0x0fbf */ 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0fc0-0x0fff */ /* 0x1000-0x11ff */ 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xfd, 0x66, /* 0x1000-0x103f */ 0x00, 0x00, 0x00, 0xc3, 0x01, 0x00, 0x1e, 0x00, /* 0x1040-0x107f */ - 0x64, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1080-0x10bf */ + 0x64, 0x20, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, /* 0x1080-0x10bf */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10c0-0x10ff */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1100-0x113f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1140-0x117f */ @@ -122,7 +122,7 @@ static const unsigned char nonspacing_table_data[26*64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1280-0x12bf */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x12c0-0x12ff */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1300-0x133f */ - 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, /* 0x1340-0x137f */ + 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x00, /* 0x1340-0x137f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1380-0x13bf */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x13c0-0x13ff */ /* 0x1600-0x17ff */ @@ -145,22 +145,22 @@ static const unsigned char nonspacing_table_data[26*64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x19c0-0x19ff */ /* 0x1a00-0x1bff */ 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, /* 0x1a00-0x1a3f */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1a40-0x1a7f */ + 0x00, 0x00, 0x40, 0x7f, 0xe5, 0x1f, 0xf8, 0x9f, /* 0x1a40-0x1a7f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1a80-0x1abf */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1ac0-0x1aff */ 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x17, /* 0x1b00-0x1b3f */ 0x04, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x0f, 0x00, /* 0x1b40-0x1b7f */ 0x03, 0x00, 0x00, 0x00, 0x3c, 0x03, 0x00, 0x00, /* 0x1b80-0x1bbf */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1bc0-0x1bff */ + 0x00, 0x00, 0x00, 0x00, 0x40, 0xa3, 0x03, 0x00, /* 0x1bc0-0x1bff */ /* 0x1c00-0x1dff */ 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xcf, 0x00, /* 0x1c00-0x1c3f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1c40-0x1c7f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1c80-0x1cbf */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1cc0-0x1cff */ + 0x00, 0x00, 0xf7, 0xff, 0xfd, 0x21, 0x00, 0x00, /* 0x1cc0-0x1cff */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d00-0x1d3f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d40-0x1d7f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d80-0x1dbf */ - 0xff, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0xc0, /* 0x1dc0-0x1dff */ + 0xff, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0xf0, /* 0x1dc0-0x1dff */ /* 0x2000-0x21ff */ 0x00, 0xf8, 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, /* 0x2000-0x203f */ 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 0x00, /* 0x2040-0x207f */ @@ -174,9 +174,9 @@ static const unsigned char nonspacing_table_data[26*64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2c00-0x2c3f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2c40-0x2c7f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2c80-0x2cbf */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2cc0-0x2cff */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0x00, /* 0x2cc0-0x2cff */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2d00-0x2d3f */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2d40-0x2d7f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, /* 0x2d40-0x2d7f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2d80-0x2dbf */ 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, /* 0x2dc0-0x2dff */ /* 0x3000-0x31ff */ @@ -192,7 +192,7 @@ static const unsigned char nonspacing_table_data[26*64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa600-0xa63f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x07, 0x30, /* 0xa640-0xa67f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa680-0xa6bf */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa6c0-0xa6ff */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, /* 0xa6c0-0xa6ff */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa700-0xa73f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa740-0xa77f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa780-0xa7bf */ @@ -201,20 +201,20 @@ static const unsigned char nonspacing_table_data[26*64] = { 0x44, 0x08, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, /* 0xa800-0xa83f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa840-0xa87f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa880-0xa8bf */ - 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa8c0-0xa8ff */ + 0x10, 0x00, 0x00, 0x00, 0xff, 0xff, 0x03, 0x00, /* 0xa8c0-0xa8ff */ 0x00, 0x00, 0x00, 0x00, 0xc0, 0x3f, 0x00, 0x00, /* 0xa900-0xa93f */ 0x80, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa940-0xa97f */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa980-0xa9bf */ + 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x13, /* 0xa980-0xa9bf */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa9c0-0xa9ff */ /* 0xaa00-0xabff */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x66, 0x00, /* 0xaa00-0xaa3f */ 0x08, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xaa40-0xaa7f */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xaa80-0xaabf */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xaac0-0xaaff */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9d, 0xc1, /* 0xaa80-0xaabf */ + 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xaac0-0xaaff */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xab00-0xab3f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xab40-0xab7f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xab80-0xabbf */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xabc0-0xabff */ + 0x00, 0x00, 0x00, 0x00, 0x20, 0x21, 0x00, 0x00, /* 0xabc0-0xabff */ /* 0xfa00-0xfbff */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfa00-0xfa3f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfa40-0xfa7f */ @@ -251,13 +251,22 @@ static const unsigned char nonspacing_table_data[26*64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10b40-0x10b7f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10b80-0x10bbf */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10bc0-0x10bff */ + /* 0x11000-0x111ff */ + 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, /* 0x11000-0x1103f */ + 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11040-0x1107f */ + 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x26, /* 0x11080-0x110bf */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x110c0-0x110ff */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11100-0x1113f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11140-0x1117f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11180-0x111bf */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x111c0-0x111ff */ /* 0x1d000-0x1d1ff */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d000-0x1d03f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d040-0x1d07f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d080-0x1d0bf */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d0c0-0x1d0ff */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d100-0x1d13f */ - 0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0x00, 0xf8, /* 0x1d140-0x1d17f */ + 0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0xf8, 0xff, /* 0x1d140-0x1d17f */ 0xe7, 0x0f, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, /* 0x1d180-0x1d1bf */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d1c0-0x1d1ff */ /* 0x1d200-0x1d3ff */ @@ -288,7 +297,7 @@ static const signed char nonspacing_table_ind[240] = { -1, -1, -1, -1, -1, -1, -1, -1, /* 0xe000-0xefff */ -1, -1, -1, -1, -1, 20, -1, 21, /* 0xf000-0xffff */ 22, -1, -1, -1, -1, 23, -1, -1, /* 0x10000-0x10fff */ - -1, -1, -1, -1, -1, -1, -1, -1, /* 0x11000-0x11fff */ + 24, -1, -1, -1, -1, -1, -1, -1, /* 0x11000-0x11fff */ -1, -1, -1, -1, -1, -1, -1, -1, /* 0x12000-0x12fff */ -1, -1, -1, -1, -1, -1, -1, -1, /* 0x13000-0x13fff */ -1, -1, -1, -1, -1, -1, -1, -1, /* 0x14000-0x14fff */ @@ -300,7 +309,7 @@ static const signed char nonspacing_table_ind[240] = { -1, -1, -1, -1, -1, -1, -1, -1, /* 0x1a000-0x1afff */ -1, -1, -1, -1, -1, -1, -1, -1, /* 0x1b000-0x1bfff */ -1, -1, -1, -1, -1, -1, -1, -1, /* 0x1c000-0x1cfff */ - 24, 25, -1, -1, -1, -1, -1, -1 /* 0x1d000-0x1dfff */ + 25, 26, -1, -1, -1, -1, -1, -1 /* 0x1d000-0x1dfff */ }; /* Determine number of column positions required for UC. */ @@ -348,8 +357,8 @@ uc_width (ucs4_t uc, const char *encoding) || (uc >= 0xfe30 && uc < 0xfe70) /* CJK Compatibility Forms */ || (uc >= 0xff00 && uc < 0xff61) /* Fullwidth Forms */ || (uc >= 0xffe0 && uc < 0xffe7) /* Fullwidth Signs */ - || (uc >= 0x20000 && uc <= 0x2a6d6) /* CJK */ - || (uc >= 0x2f800 && uc <= 0x2fa1d) /* CJK Compatibility Ideographs */ + || (uc >= 0x20000 && uc <= 0x2ffff) /* Supplementary Ideographic Plane */ + || (uc >= 0x30000 && uc <= 0x3ffff) /* Tertiary Ideographic Plane */ ) ) return 2; /* In ancient CJK encodings, Cyrillic and most other characters are diff --git a/gnu/unlink.c b/gnu/unlink.c index 827ea875..a861d307 100644 --- a/gnu/unlink.c +++ b/gnu/unlink.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Work around unlink bugs. - Copyright (C) 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2009-2011 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 @@ -26,6 +26,8 @@ #include #include +#include "dosname.h" + #undef unlink /* Remove file NAME. diff --git a/gnu/unlinkat.c b/gnu/unlinkat.c index 0d68213e..148f8af3 100644 --- a/gnu/unlinkat.c +++ b/gnu/unlinkat.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Work around unlinkat bugs on Solaris 9. - Copyright (C) 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2009-2011 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 @@ -28,6 +28,7 @@ #include #include +#include "dosname.h" #include "openat.h" #if HAVE_UNLINKAT diff --git a/gnu/unlinkdir.c b/gnu/unlinkdir.c index 1473b3c4..200a9c5f 100644 --- a/gnu/unlinkdir.c +++ b/gnu/unlinkdir.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* unlinkdir.c - determine whether we can unlink directories - Copyright (C) 2005-2006, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2011 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 diff --git a/gnu/unlinkdir.h b/gnu/unlinkdir.h index 5c64afe5..ded6461f 100644 --- a/gnu/unlinkdir.h +++ b/gnu/unlinkdir.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* unlinkdir.h - determine (and maybe change) whether we can unlink directories - Copyright (C) 2005, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2005, 2009-2011 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 diff --git a/gnu/unlocked-io.h b/gnu/unlocked-io.h index cf11ece3..abd45712 100644 --- a/gnu/unlocked-io.h +++ b/gnu/unlocked-io.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Prefer faster, non-thread-safe stdio functions if available. - Copyright (C) 2001-2004, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2009-2011 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 diff --git a/gnu/unsetenv.c b/gnu/unsetenv.c index d22a29a2..5e028be7 100644 --- a/gnu/unsetenv.c +++ b/gnu/unsetenv.c @@ -1,6 +1,6 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ -/* Copyright (C) 1992, 1995-2002, 2005-2010 Free Software Foundation, Inc. +/* Copyright (C) 1992, 1995-2002, 2005-2011 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software: you can redistribute it and/or modify diff --git a/gnu/utimens.c b/gnu/utimens.c index 0cf26714..6582706e 100644 --- a/gnu/utimens.c +++ b/gnu/utimens.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Set file access and modification times. - Copyright (C) 2003-2010 Free Software Foundation, Inc. + Copyright (C) 2003-2011 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 @@ -332,12 +332,53 @@ fdutimens (int fd, char const *file, struct timespec const timespec[2]) worth optimizing, and who knows what other messed-up systems are out there? So play it safe and fall back on the code below. */ -# if HAVE_FUTIMESAT && !FUTIMESAT_NULL_BUG - if (futimesat (fd, NULL, t) == 0) - return 0; -# elif HAVE_FUTIMES + +# if (HAVE_FUTIMESAT && !FUTIMESAT_NULL_BUG) || HAVE_FUTIMES +# if HAVE_FUTIMESAT && !FUTIMESAT_NULL_BUG +# undef futimes +# define futimes(fd, t) futimesat (fd, NULL, t) +# endif if (futimes (fd, t) == 0) - return 0; + { +# if __linux__ && __GLIBC__ + /* Work around a longstanding glibc bug, still present as + of 2010-12-27. On older Linux kernels that lack both + utimensat and utimes, glibc's futimes rounds instead of + truncating when falling back on utime. The same bug + occurs in futimesat with a null 2nd arg. */ + if (t) + { + bool abig = 500000 <= t[0].tv_usec; + bool mbig = 500000 <= t[1].tv_usec; + if ((abig | mbig) && fstat (fd, &st) == 0) + { + /* If these two subtractions overflow, they'll + track the overflows inside the buggy glibc. */ + time_t adiff = st.st_atime - t[0].tv_sec; + time_t mdiff = st.st_mtime - t[1].tv_sec; + + struct timeval *tt = NULL; + struct timeval truncated_timeval[2]; + truncated_timeval[0] = t[0]; + truncated_timeval[1] = t[1]; + if (abig && adiff == 1 && get_stat_atime_ns (&st) == 0) + { + tt = truncated_timeval; + tt[0].tv_usec = 0; + } + if (mbig && mdiff == 1 && get_stat_mtime_ns (&st) == 0) + { + tt = truncated_timeval; + tt[1].tv_usec = 0; + } + if (tt) + futimes (fd, tt); + } + } +# endif + + return 0; + } # endif } #endif /* HAVE_FUTIMESAT || HAVE_WORKING_UTIMES */ diff --git a/gnu/utimensat.c b/gnu/utimensat.c index 005214c5..29889eb2 100644 --- a/gnu/utimensat.c +++ b/gnu/utimensat.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Set the access and modification time of a file relative to directory fd. - Copyright (C) 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2009-2011 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 diff --git a/gnu/vasnprintf.c b/gnu/vasnprintf.c index e9bbd43c..350e7a90 100644 --- a/gnu/vasnprintf.c +++ b/gnu/vasnprintf.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* vsprintf with automatic memory allocation. - Copyright (C) 1999, 2002-2010 Free Software Foundation, Inc. + Copyright (C) 1999, 2002-2011 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 @@ -281,7 +281,7 @@ decimal_point_char (void) multithread-safe on glibc systems and MacOS X systems, but is not required to be multithread-safe by POSIX. sprintf(), however, is multithread-safe. localeconv() is rarely multithread-safe. */ -# if HAVE_NL_LANGINFO && (__GLIBC__ || (defined __APPLE__ && defined __MACH__)) +# if HAVE_NL_LANGINFO && (__GLIBC__ || defined __UCLIBC__ || (defined __APPLE__ && defined __MACH__)) point = nl_langinfo (RADIXCHAR); # elif 1 char pointbuf[5]; @@ -937,11 +937,11 @@ decode_long_double (long double x, int *ep, mpn_t *mp) abort (); m.limbs[--i] = (hi << (GMP_LIMB_BITS / 2)) | lo; } -#if 0 /* On FreeBSD 6.1/x86, 'long double' numbers sometimes have excess - precision. */ +# if 0 /* On FreeBSD 6.1/x86, 'long double' numbers sometimes have excess + precision. */ if (!(y == 0.0L)) abort (); -#endif +# endif /* Normalise. */ while (m.nlimbs > 0 && m.limbs[m.nlimbs - 1] == 0) m.nlimbs--; @@ -1755,8 +1755,9 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, return NULL; #define CLEANUP() \ - free (d.dir); \ - if (a.arg) \ + if (d.dir != d.direct_alloc_dir) \ + free (d.dir); \ + if (a.arg != a.direct_alloc_arg) \ free (a.arg); if (PRINTF_FETCHARGS (args, &a) < 0) @@ -4756,6 +4757,10 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, *fbp++ = ' '; if (flags & FLAG_ALT) *fbp++ = '#'; +#if __GLIBC__ >= 2 && !defined __UCLIBC__ + if (flags & FLAG_LOCALIZED) + *fbp++ = 'I'; +#endif if (!pad_ourselves) { if (flags & FLAG_ZERO) @@ -4839,14 +4844,15 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, #endif *fbp = dp->conversion; #if USE_SNPRINTF -# if !(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) +# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) fbp[1] = '%'; fbp[2] = 'n'; fbp[3] = '\0'; # else /* On glibc2 systems from glibc >= 2.3 - probably also older - ones - we know that snprintf's returns value conforms to - ISO C 99: the gl_SNPRINTF_DIRECTIVE_N test passes. + ones - we know that snprintf's return value conforms to + ISO C 99: the tests gl_SNPRINTF_RETVAL_C99 and + gl_SNPRINTF_TRUNCATION_C99 pass. Therefore we can avoid using %n in this situation. On glibc2 systems from 2004-10-18 or newer, the use of %n in format strings in writable memory may crash the program diff --git a/gnu/vasnprintf.h b/gnu/vasnprintf.h index 701678c2..d6b0497b 100644 --- a/gnu/vasnprintf.h +++ b/gnu/vasnprintf.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* vsprintf with automatic memory allocation. - Copyright (C) 2002-2004, 2007-2010 Free Software Foundation, Inc. + Copyright (C) 2002-2004, 2007-2011 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 @@ -26,16 +26,16 @@ /* Get size_t. */ #include -#ifndef __attribute__ /* The __attribute__ feature is available in gcc versions 2.5 and later. The __-protected variants of the attributes 'format' and 'printf' are accepted by gcc versions 2.6.4 (effectively 2.7) and later. - We enable __attribute__ only if these are supported too, because + We enable _GL_ATTRIBUTE_FORMAT only if these are supported too, because gnulib and libintl do '#define printf __printf__' when they override the 'printf' function. */ -# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) -# define __attribute__(Spec) /* empty */ -# endif +#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) +# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec)) +#else +# define _GL_ATTRIBUTE_FORMAT(spec) /* empty */ #endif #ifdef __cplusplus @@ -71,9 +71,9 @@ extern "C" { # define vasnprintf rpl_vasnprintf #endif extern char * asnprintf (char *resultbuf, size_t *lengthp, const char *format, ...) - __attribute__ ((__format__ (__printf__, 3, 4))); + _GL_ATTRIBUTE_FORMAT ((__printf__, 3, 4)); extern char * vasnprintf (char *resultbuf, size_t *lengthp, const char *format, va_list args) - __attribute__ ((__format__ (__printf__, 3, 0))); + _GL_ATTRIBUTE_FORMAT ((__printf__, 3, 0)); #ifdef __cplusplus } diff --git a/gnu/vasprintf.c b/gnu/vasprintf.c index 3692b0de..2ddc0b7a 100644 --- a/gnu/vasprintf.c +++ b/gnu/vasprintf.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006-2010 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2006-2011 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 diff --git a/gnu/verify.h b/gnu/verify.h index 1acad202..6819abcc 100644 --- a/gnu/verify.h +++ b/gnu/verify.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Compile-time assert-like macros. - Copyright (C) 2005-2006, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2011 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 diff --git a/gnu/version-etc-fsf.c b/gnu/version-etc-fsf.c index 99895431..6cedf535 100644 --- a/gnu/version-etc-fsf.c +++ b/gnu/version-etc-fsf.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Variable with FSF copyright information, for version-etc. - Copyright (C) 1999-2006, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 1999-2006, 2009-2011 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 diff --git a/gnu/version-etc.c b/gnu/version-etc.c index 175e2cef..7228bf0f 100644 --- a/gnu/version-etc.c +++ b/gnu/version-etc.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Print --version and bug-reporting information in a consistent format. - Copyright (C) 1999-2010 Free Software Foundation, Inc. + Copyright (C) 1999-2011 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 @@ -40,7 +40,7 @@ # define PACKAGE PACKAGE_TARNAME #endif -enum { COPYRIGHT_YEAR = 2010 }; +enum { COPYRIGHT_YEAR = 2011 }; /* The three functions below display the --version information the standard way. diff --git a/gnu/version-etc.h b/gnu/version-etc.h index 86b203f6..f243ec7a 100644 --- a/gnu/version-etc.h +++ b/gnu/version-etc.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Print --version and bug-reporting information in a consistent format. - Copyright (C) 1999, 2003, 2005, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 1999, 2003, 2005, 2009-2011 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 @@ -25,11 +25,11 @@ # include /* The `sentinel' attribute was added in gcc 4.0. */ -#ifndef ATTRIBUTE_SENTINEL +#ifndef _GL_ATTRIBUTE_SENTINEL # if 4 <= __GNUC__ -# define ATTRIBUTE_SENTINEL __attribute__ ((__sentinel__)) +# define _GL_ATTRIBUTE_SENTINEL __attribute__ ((__sentinel__)) # else -# define ATTRIBUTE_SENTINEL /* empty */ +# define _GL_ATTRIBUTE_SENTINEL /* empty */ # endif #endif @@ -72,7 +72,7 @@ extern void version_etc (FILE *stream, const char *command_name, const char *package, const char *version, /* const char *author1, ..., NULL */ ...) - ATTRIBUTE_SENTINEL; + _GL_ATTRIBUTE_SENTINEL; /* Display the usual `Report bugs to' stanza */ extern void emit_bug_reporting_address (void); diff --git a/gnu/vsnprintf.c b/gnu/vsnprintf.c index 996ecbf9..7ae00798 100644 --- a/gnu/vsnprintf.c +++ b/gnu/vsnprintf.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Formatted output to strings. - Copyright (C) 2004, 2006-2010 Free Software Foundation, Inc. + Copyright (C) 2004, 2006-2011 Free Software Foundation, Inc. Written by Simon Josefsson and Yoann Vandoorselaere . This program is free software; you can redistribute it and/or modify diff --git a/gnu/wchar.in.h b/gnu/wchar.in.h index 0600e3ba..492ea15f 100644 --- a/gnu/wchar.in.h +++ b/gnu/wchar.in.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A substitute for ISO C99 , for platforms that have issues. - Copyright (C) 2007-2010 Free Software Foundation, Inc. + Copyright (C) 2007-2011 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 @@ -55,6 +55,10 @@ #define _GL_ALREADY_INCLUDING_WCHAR_H +#if @HAVE_FEATURES_H@ +# include /* for __GLIBC__ */ +#endif + /* Tru64 with Desktop Toolkit C has a bug: must be included before . BSD/OS 4.0.1 has a bug: , and must be @@ -102,10 +106,12 @@ On IRIX 6.5, sizeof (mbstate_t) == 1, which is not sufficient for implementing mbrtowc for encodings like UTF-8. */ #if !(@HAVE_MBSINIT@ && @HAVE_MBRTOWC@) || @REPLACE_MBSTATE_T@ +# if !GNULIB_defined_mbstate_t typedef int rpl_mbstate_t; -# undef mbstate_t -# define mbstate_t rpl_mbstate_t -# define GNULIB_defined_mbstate_t 1 +# undef mbstate_t +# define mbstate_t rpl_mbstate_t +# define GNULIB_defined_mbstate_t 1 +# endif #endif @@ -426,6 +432,493 @@ _GL_WARN_ON_USE (wcwidth, "wcwidth is unportable - " #endif +/* Search N wide characters of S for C. */ +#if @GNULIB_WMEMCHR@ +# if !@HAVE_WMEMCHR@ +_GL_FUNCDECL_SYS (wmemchr, wchar_t *, (const wchar_t *s, wchar_t c, size_t n)); +# endif +_GL_CXXALIAS_SYS (wmemchr, wchar_t *, (const wchar_t *s, wchar_t c, size_t n)); +_GL_CXXALIASWARN (wmemchr); +#elif defined GNULIB_POSIXCHECK +# undef wmemchr +# if HAVE_RAW_DECL_WMEMCHR +_GL_WARN_ON_USE (wmemchr, "wmemchr is unportable - " + "use gnulib module wmemchr for portability"); +# endif +#endif + + +/* Compare N wide characters of S1 and S2. */ +#if @GNULIB_WMEMCMP@ +# if !@HAVE_WMEMCMP@ +_GL_FUNCDECL_SYS (wmemcmp, int, + (const wchar_t *s1, const wchar_t *s2, size_t n)); +# endif +_GL_CXXALIAS_SYS (wmemcmp, int, + (const wchar_t *s1, const wchar_t *s2, size_t n)); +_GL_CXXALIASWARN (wmemcmp); +#elif defined GNULIB_POSIXCHECK +# undef wmemcmp +# if HAVE_RAW_DECL_WMEMCMP +_GL_WARN_ON_USE (wmemcmp, "wmemcmp is unportable - " + "use gnulib module wmemcmp for portability"); +# endif +#endif + + +/* Copy N wide characters of SRC to DEST. */ +#if @GNULIB_WMEMCPY@ +# if !@HAVE_WMEMCPY@ +_GL_FUNCDECL_SYS (wmemcpy, wchar_t *, + (wchar_t *dest, const wchar_t *src, size_t n)); +# endif +_GL_CXXALIAS_SYS (wmemcpy, wchar_t *, + (wchar_t *dest, const wchar_t *src, size_t n)); +_GL_CXXALIASWARN (wmemcpy); +#elif defined GNULIB_POSIXCHECK +# undef wmemcpy +# if HAVE_RAW_DECL_WMEMCPY +_GL_WARN_ON_USE (wmemcpy, "wmemcpy is unportable - " + "use gnulib module wmemcpy for portability"); +# endif +#endif + + +/* Copy N wide characters of SRC to DEST, guaranteeing correct behavior for + overlapping memory areas. */ +#if @GNULIB_WMEMMOVE@ +# if !@HAVE_WMEMMOVE@ +_GL_FUNCDECL_SYS (wmemmove, wchar_t *, + (wchar_t *dest, const wchar_t *src, size_t n)); +# endif +_GL_CXXALIAS_SYS (wmemmove, wchar_t *, + (wchar_t *dest, const wchar_t *src, size_t n)); +_GL_CXXALIASWARN (wmemmove); +#elif defined GNULIB_POSIXCHECK +# undef wmemmove +# if HAVE_RAW_DECL_WMEMMOVE +_GL_WARN_ON_USE (wmemmove, "wmemmove is unportable - " + "use gnulib module wmemmove for portability"); +# endif +#endif + + +/* Set N wide characters of S to C. */ +#if @GNULIB_WMEMSET@ +# if !@HAVE_WMEMSET@ +_GL_FUNCDECL_SYS (wmemset, wchar_t *, (wchar_t *s, wchar_t c, size_t n)); +# endif +_GL_CXXALIAS_SYS (wmemset, wchar_t *, (wchar_t *s, wchar_t c, size_t n)); +_GL_CXXALIASWARN (wmemset); +#elif defined GNULIB_POSIXCHECK +# undef wmemset +# if HAVE_RAW_DECL_WMEMSET +_GL_WARN_ON_USE (wmemset, "wmemset is unportable - " + "use gnulib module wmemset for portability"); +# endif +#endif + + +/* Return the number of wide characters in S. */ +#if @GNULIB_WCSLEN@ +# if !@HAVE_WCSLEN@ +_GL_FUNCDECL_SYS (wcslen, size_t, (const wchar_t *s)); +# endif +_GL_CXXALIAS_SYS (wcslen, size_t, (const wchar_t *s)); +_GL_CXXALIASWARN (wcslen); +#elif defined GNULIB_POSIXCHECK +# undef wcslen +# if HAVE_RAW_DECL_WCSLEN +_GL_WARN_ON_USE (wcslen, "wcslen is unportable - " + "use gnulib module wcslen for portability"); +# endif +#endif + + +/* Return the number of wide characters in S, but at most MAXLEN. */ +#if @GNULIB_WCSNLEN@ +# if !@HAVE_WCSNLEN@ +_GL_FUNCDECL_SYS (wcsnlen, size_t, (const wchar_t *s, size_t maxlen)); +# endif +_GL_CXXALIAS_SYS (wcsnlen, size_t, (const wchar_t *s, size_t maxlen)); +_GL_CXXALIASWARN (wcsnlen); +#elif defined GNULIB_POSIXCHECK +# undef wcsnlen +# if HAVE_RAW_DECL_WCSNLEN +_GL_WARN_ON_USE (wcsnlen, "wcsnlen is unportable - " + "use gnulib module wcsnlen for portability"); +# endif +#endif + + +/* Copy SRC to DEST. */ +#if @GNULIB_WCSCPY@ +# if !@HAVE_WCSCPY@ +_GL_FUNCDECL_SYS (wcscpy, wchar_t *, (wchar_t *dest, const wchar_t *src)); +# endif +_GL_CXXALIAS_SYS (wcscpy, wchar_t *, (wchar_t *dest, const wchar_t *src)); +_GL_CXXALIASWARN (wcscpy); +#elif defined GNULIB_POSIXCHECK +# undef wcscpy +# if HAVE_RAW_DECL_WCSCPY +_GL_WARN_ON_USE (wcscpy, "wcscpy is unportable - " + "use gnulib module wcscpy for portability"); +# endif +#endif + + +/* Copy SRC to DEST, returning the address of the terminating L'\0' in DEST. */ +#if @GNULIB_WCPCPY@ +# if !@HAVE_WCPCPY@ +_GL_FUNCDECL_SYS (wcpcpy, wchar_t *, (wchar_t *dest, const wchar_t *src)); +# endif +_GL_CXXALIAS_SYS (wcpcpy, wchar_t *, (wchar_t *dest, const wchar_t *src)); +_GL_CXXALIASWARN (wcpcpy); +#elif defined GNULIB_POSIXCHECK +# undef wcpcpy +# if HAVE_RAW_DECL_WCPCPY +_GL_WARN_ON_USE (wcpcpy, "wcpcpy is unportable - " + "use gnulib module wcpcpy for portability"); +# endif +#endif + + +/* Copy no more than N wide characters of SRC to DEST. */ +#if @GNULIB_WCSNCPY@ +# if !@HAVE_WCSNCPY@ +_GL_FUNCDECL_SYS (wcsncpy, wchar_t *, + (wchar_t *dest, const wchar_t *src, size_t n)); +# endif +_GL_CXXALIAS_SYS (wcsncpy, wchar_t *, + (wchar_t *dest, const wchar_t *src, size_t n)); +_GL_CXXALIASWARN (wcsncpy); +#elif defined GNULIB_POSIXCHECK +# undef wcsncpy +# if HAVE_RAW_DECL_WCSNCPY +_GL_WARN_ON_USE (wcsncpy, "wcsncpy is unportable - " + "use gnulib module wcsncpy for portability"); +# endif +#endif + + +/* Copy no more than N characters of SRC to DEST, returning the address of + the last character written into DEST. */ +#if @GNULIB_WCPNCPY@ +# if !@HAVE_WCPNCPY@ +_GL_FUNCDECL_SYS (wcpncpy, wchar_t *, + (wchar_t *dest, const wchar_t *src, size_t n)); +# endif +_GL_CXXALIAS_SYS (wcpncpy, wchar_t *, + (wchar_t *dest, const wchar_t *src, size_t n)); +_GL_CXXALIASWARN (wcpncpy); +#elif defined GNULIB_POSIXCHECK +# undef wcpncpy +# if HAVE_RAW_DECL_WCPNCPY +_GL_WARN_ON_USE (wcpncpy, "wcpncpy is unportable - " + "use gnulib module wcpncpy for portability"); +# endif +#endif + + +/* Append SRC onto DEST. */ +#if @GNULIB_WCSCAT@ +# if !@HAVE_WCSCAT@ +_GL_FUNCDECL_SYS (wcscat, wchar_t *, (wchar_t *dest, const wchar_t *src)); +# endif +_GL_CXXALIAS_SYS (wcscat, wchar_t *, (wchar_t *dest, const wchar_t *src)); +_GL_CXXALIASWARN (wcscat); +#elif defined GNULIB_POSIXCHECK +# undef wcscat +# if HAVE_RAW_DECL_WCSCAT +_GL_WARN_ON_USE (wcscat, "wcscat is unportable - " + "use gnulib module wcscat for portability"); +# endif +#endif + + +/* Append no more than N wide characters of SRC onto DEST. */ +#if @GNULIB_WCSNCAT@ +# if !@HAVE_WCSNCAT@ +_GL_FUNCDECL_SYS (wcsncat, wchar_t *, + (wchar_t *dest, const wchar_t *src, size_t n)); +# endif +_GL_CXXALIAS_SYS (wcsncat, wchar_t *, + (wchar_t *dest, const wchar_t *src, size_t n)); +_GL_CXXALIASWARN (wcsncat); +#elif defined GNULIB_POSIXCHECK +# undef wcsncat +# if HAVE_RAW_DECL_WCSNCAT +_GL_WARN_ON_USE (wcsncat, "wcsncat is unportable - " + "use gnulib module wcsncat for portability"); +# endif +#endif + + +/* Compare S1 and S2. */ +#if @GNULIB_WCSCMP@ +# if !@HAVE_WCSCMP@ +_GL_FUNCDECL_SYS (wcscmp, int, (const wchar_t *s1, const wchar_t *s2)); +# endif +_GL_CXXALIAS_SYS (wcscmp, int, (const wchar_t *s1, const wchar_t *s2)); +_GL_CXXALIASWARN (wcscmp); +#elif defined GNULIB_POSIXCHECK +# undef wcscmp +# if HAVE_RAW_DECL_WCSCMP +_GL_WARN_ON_USE (wcscmp, "wcscmp is unportable - " + "use gnulib module wcscmp for portability"); +# endif +#endif + + +/* Compare no more than N wide characters of S1 and S2. */ +#if @GNULIB_WCSNCMP@ +# if !@HAVE_WCSNCMP@ +_GL_FUNCDECL_SYS (wcsncmp, int, + (const wchar_t *s1, const wchar_t *s2, size_t n)); +# endif +_GL_CXXALIAS_SYS (wcsncmp, int, + (const wchar_t *s1, const wchar_t *s2, size_t n)); +_GL_CXXALIASWARN (wcsncmp); +#elif defined GNULIB_POSIXCHECK +# undef wcsncmp +# if HAVE_RAW_DECL_WCSNCMP +_GL_WARN_ON_USE (wcsncmp, "wcsncmp is unportable - " + "use gnulib module wcsncmp for portability"); +# endif +#endif + + +/* Compare S1 and S2, ignoring case. */ +#if @GNULIB_WCSCASECMP@ +# if !@HAVE_WCSCASECMP@ +_GL_FUNCDECL_SYS (wcscasecmp, int, (const wchar_t *s1, const wchar_t *s2)); +# endif +_GL_CXXALIAS_SYS (wcscasecmp, int, (const wchar_t *s1, const wchar_t *s2)); +_GL_CXXALIASWARN (wcscasecmp); +#elif defined GNULIB_POSIXCHECK +# undef wcscasecmp +# if HAVE_RAW_DECL_WCSCASECMP +_GL_WARN_ON_USE (wcscasecmp, "wcscasecmp is unportable - " + "use gnulib module wcscasecmp for portability"); +# endif +#endif + + +/* Compare no more than N chars of S1 and S2, ignoring case. */ +#if @GNULIB_WCSNCASECMP@ +# if !@HAVE_WCSNCASECMP@ +_GL_FUNCDECL_SYS (wcsncasecmp, int, + (const wchar_t *s1, const wchar_t *s2, size_t n)); +# endif +_GL_CXXALIAS_SYS (wcsncasecmp, int, + (const wchar_t *s1, const wchar_t *s2, size_t n)); +_GL_CXXALIASWARN (wcsncasecmp); +#elif defined GNULIB_POSIXCHECK +# undef wcsncasecmp +# if HAVE_RAW_DECL_WCSNCASECMP +_GL_WARN_ON_USE (wcsncasecmp, "wcsncasecmp is unportable - " + "use gnulib module wcsncasecmp for portability"); +# endif +#endif + + +/* Compare S1 and S2, both interpreted as appropriate to the LC_COLLATE + category of the current locale. */ +#if @GNULIB_WCSCOLL@ +# if !@HAVE_WCSCOLL@ +_GL_FUNCDECL_SYS (wcscoll, int, (const wchar_t *s1, const wchar_t *s2)); +# endif +_GL_CXXALIAS_SYS (wcscoll, int, (const wchar_t *s1, const wchar_t *s2)); +_GL_CXXALIASWARN (wcscoll); +#elif defined GNULIB_POSIXCHECK +# undef wcscoll +# if HAVE_RAW_DECL_WCSCOLL +_GL_WARN_ON_USE (wcscoll, "wcscoll is unportable - " + "use gnulib module wcscoll for portability"); +# endif +#endif + + +/* Transform S2 into array pointed to by S1 such that if wcscmp is applied + to two transformed strings the result is the as applying 'wcscoll' to the + original strings. */ +#if @GNULIB_WCSXFRM@ +# if !@HAVE_WCSXFRM@ +_GL_FUNCDECL_SYS (wcsxfrm, size_t, (wchar_t *s1, const wchar_t *s2, size_t n)); +# endif +_GL_CXXALIAS_SYS (wcsxfrm, size_t, (wchar_t *s1, const wchar_t *s2, size_t n)); +_GL_CXXALIASWARN (wcsxfrm); +#elif defined GNULIB_POSIXCHECK +# undef wcsxfrm +# if HAVE_RAW_DECL_WCSXFRM +_GL_WARN_ON_USE (wcsxfrm, "wcsxfrm is unportable - " + "use gnulib module wcsxfrm for portability"); +# endif +#endif + + +/* Duplicate S, returning an identical malloc'd string. */ +#if @GNULIB_WCSDUP@ +# if !@HAVE_WCSDUP@ +_GL_FUNCDECL_SYS (wcsdup, wchar_t *, (const wchar_t *s)); +# endif +_GL_CXXALIAS_SYS (wcsdup, wchar_t *, (const wchar_t *s)); +_GL_CXXALIASWARN (wcsdup); +#elif defined GNULIB_POSIXCHECK +# undef wcsdup +# if HAVE_RAW_DECL_WCSDUP +_GL_WARN_ON_USE (wcsdup, "wcsdup is unportable - " + "use gnulib module wcsdup for portability"); +# endif +#endif + + +/* Find the first occurrence of WC in WCS. */ +#if @GNULIB_WCSCHR@ +# if !@HAVE_WCSCHR@ +_GL_FUNCDECL_SYS (wcschr, wchar_t *, (const wchar_t *wcs, wchar_t wc)); +# endif +_GL_CXXALIAS_SYS (wcschr, wchar_t *, (const wchar_t *wcs, wchar_t wc)); +_GL_CXXALIASWARN (wcschr); +#elif defined GNULIB_POSIXCHECK +# undef wcschr +# if HAVE_RAW_DECL_WCSCHR +_GL_WARN_ON_USE (wcschr, "wcschr is unportable - " + "use gnulib module wcschr for portability"); +# endif +#endif + + +/* Find the last occurrence of WC in WCS. */ +#if @GNULIB_WCSRCHR@ +# if !@HAVE_WCSRCHR@ +_GL_FUNCDECL_SYS (wcsrchr, wchar_t *, (const wchar_t *wcs, wchar_t wc)); +# endif +_GL_CXXALIAS_SYS (wcsrchr, wchar_t *, (const wchar_t *wcs, wchar_t wc)); +_GL_CXXALIASWARN (wcsrchr); +#elif defined GNULIB_POSIXCHECK +# undef wcsrchr +# if HAVE_RAW_DECL_WCSRCHR +_GL_WARN_ON_USE (wcsrchr, "wcsrchr is unportable - " + "use gnulib module wcsrchr for portability"); +# endif +#endif + + +/* Return the length of the initial segmet of WCS which consists entirely + of wide characters not in REJECT. */ +#if @GNULIB_WCSCSPN@ +# if !@HAVE_WCSCSPN@ +_GL_FUNCDECL_SYS (wcscspn, size_t, (const wchar_t *wcs, const wchar_t *reject)); +# endif +_GL_CXXALIAS_SYS (wcscspn, size_t, (const wchar_t *wcs, const wchar_t *reject)); +_GL_CXXALIASWARN (wcscspn); +#elif defined GNULIB_POSIXCHECK +# undef wcscspn +# if HAVE_RAW_DECL_WCSCSPN +_GL_WARN_ON_USE (wcscspn, "wcscspn is unportable - " + "use gnulib module wcscspn for portability"); +# endif +#endif + + +/* Return the length of the initial segmet of WCS which consists entirely + of wide characters in ACCEPT. */ +#if @GNULIB_WCSSPN@ +# if !@HAVE_WCSSPN@ +_GL_FUNCDECL_SYS (wcsspn, size_t, (const wchar_t *wcs, const wchar_t *accept)); +# endif +_GL_CXXALIAS_SYS (wcsspn, size_t, (const wchar_t *wcs, const wchar_t *accept)); +_GL_CXXALIASWARN (wcsspn); +#elif defined GNULIB_POSIXCHECK +# undef wcsspn +# if HAVE_RAW_DECL_WCSSPN +_GL_WARN_ON_USE (wcsspn, "wcsspn is unportable - " + "use gnulib module wcsspn for portability"); +# endif +#endif + + +/* Find the first occurrence in WCS of any character in ACCEPT. */ +#if @GNULIB_WCSPBRK@ +# if !@HAVE_WCSPBRK@ +_GL_FUNCDECL_SYS (wcspbrk, wchar_t *, + (const wchar_t *wcs, const wchar_t *accept)); +# endif +_GL_CXXALIAS_SYS (wcspbrk, wchar_t *, + (const wchar_t *wcs, const wchar_t *accept)); +_GL_CXXALIASWARN (wcspbrk); +#elif defined GNULIB_POSIXCHECK +# undef wcspbrk +# if HAVE_RAW_DECL_WCSPBRK +_GL_WARN_ON_USE (wcspbrk, "wcspbrk is unportable - " + "use gnulib module wcspbrk for portability"); +# endif +#endif + + +/* Find the first occurrence of NEEDLE in HAYSTACK. */ +#if @GNULIB_WCSSTR@ +# if !@HAVE_WCSSTR@ +_GL_FUNCDECL_SYS (wcsstr, wchar_t *, + (const wchar_t *haystack, const wchar_t *needle)); +# endif +_GL_CXXALIAS_SYS (wcsstr, wchar_t *, + (const wchar_t *haystack, const wchar_t *needle)); +_GL_CXXALIASWARN (wcsstr); +#elif defined GNULIB_POSIXCHECK +# undef wcsstr +# if HAVE_RAW_DECL_WCSSTR +_GL_WARN_ON_USE (wcsstr, "wcsstr is unportable - " + "use gnulib module wcsstr for portability"); +# endif +#endif + + +/* Divide WCS into tokens separated by characters in DELIM. */ +#if @GNULIB_WCSTOK@ +# if !@HAVE_WCSTOK@ +_GL_FUNCDECL_SYS (wcstok, wchar_t *, + (wchar_t *wcs, const wchar_t *delim, wchar_t **ptr)); +# endif +_GL_CXXALIAS_SYS (wcstok, wchar_t *, + (wchar_t *wcs, const wchar_t *delim, wchar_t **ptr)); +_GL_CXXALIASWARN (wcstok); +#elif defined GNULIB_POSIXCHECK +# undef wcstok +# if HAVE_RAW_DECL_WCSTOK +_GL_WARN_ON_USE (wcstok, "wcstok is unportable - " + "use gnulib module wcstok for portability"); +# endif +#endif + + +/* Determine number of column positions required for first N wide + characters (or fewer if S ends before this) in S. */ +#if @GNULIB_WCSWIDTH@ +# if @REPLACE_WCSWIDTH@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef wcswidth +# define wcswidth rpl_wcswidth +# endif +_GL_FUNCDECL_RPL (wcswidth, int, (const wchar_t *s, size_t n)); +_GL_CXXALIAS_RPL (wcswidth, int, (const wchar_t *s, size_t n)); +# else +# if !@HAVE_WCSWIDTH@ +_GL_FUNCDECL_SYS (wcswidth, int, (const wchar_t *s, size_t n)); +# endif +_GL_CXXALIAS_SYS (wcswidth, int, (const wchar_t *s, size_t n)); +# endif +_GL_CXXALIASWARN (wcswidth); +#elif defined GNULIB_POSIXCHECK +# undef wcswidth +# if HAVE_RAW_DECL_WCSWIDTH +_GL_WARN_ON_USE (wcswidth, "wcswidth is unportable - " + "use gnulib module wcswidth for portability"); +# endif +#endif + + #endif /* _GL_WCHAR_H */ #endif /* _GL_WCHAR_H */ #endif diff --git a/gnu/wcrtomb.c b/gnu/wcrtomb.c index 7dd86768..002a781c 100644 --- a/gnu/wcrtomb.c +++ b/gnu/wcrtomb.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Convert wide character to multibyte character. - Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2008-2011 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify diff --git a/gnu/wctype.in.h b/gnu/wctype.in.h index 6ed34a6d..a01403e4 100644 --- a/gnu/wctype.in.h +++ b/gnu/wctype.in.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A substitute for ISO C99 , for platforms that lack it. - Copyright (C) 2006-2010 Free Software Foundation, Inc. + Copyright (C) 2006-2011 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 @@ -74,58 +74,60 @@ #endif +#if !GNULIB_defined_wctype_functions + /* FreeBSD 4.4 to 4.11 has but lacks the functions. Linux libc5 has and the functions but they are broken. Assume all 11 functions (all isw* except iswblank) are implemented the same way, or not at all. */ -#if ! @HAVE_ISWCNTRL@ || @REPLACE_ISWCNTRL@ +# if ! @HAVE_ISWCNTRL@ || @REPLACE_ISWCNTRL@ /* IRIX 5.3 has macros but no functions, its isw* macros refer to an undefined variable _ctmp_ and to macros like _P, and they refer to system functions like _iswctype that are not in the standard C library. Rather than try to get ancient buggy implementations like this to work, just disable them. */ -# undef iswalnum -# undef iswalpha -# undef iswblank -# undef iswcntrl -# undef iswdigit -# undef iswgraph -# undef iswlower -# undef iswprint -# undef iswpunct -# undef iswspace -# undef iswupper -# undef iswxdigit -# undef towlower -# undef towupper +# undef iswalnum +# undef iswalpha +# undef iswblank +# undef iswcntrl +# undef iswdigit +# undef iswgraph +# undef iswlower +# undef iswprint +# undef iswpunct +# undef iswspace +# undef iswupper +# undef iswxdigit +# undef towlower +# undef towupper /* Linux libc5 has and the functions but they are broken. */ -# if @REPLACE_ISWCNTRL@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# define iswalnum rpl_iswalnum -# define iswalpha rpl_iswalpha -# define iswblank rpl_iswblank -# define iswcntrl rpl_iswcntrl -# define iswdigit rpl_iswdigit -# define iswgraph rpl_iswgraph -# define iswlower rpl_iswlower -# define iswprint rpl_iswprint -# define iswpunct rpl_iswpunct -# define iswspace rpl_iswspace -# define iswupper rpl_iswupper -# define iswxdigit rpl_iswxdigit -# define towlower rpl_towlower -# define towupper rpl_towupper +# if @REPLACE_ISWCNTRL@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# define iswalnum rpl_iswalnum +# define iswalpha rpl_iswalpha +# define iswblank rpl_iswblank +# define iswcntrl rpl_iswcntrl +# define iswdigit rpl_iswdigit +# define iswgraph rpl_iswgraph +# define iswlower rpl_iswlower +# define iswprint rpl_iswprint +# define iswpunct rpl_iswpunct +# define iswspace rpl_iswspace +# define iswupper rpl_iswupper +# define iswxdigit rpl_iswxdigit +# define towlower rpl_towlower +# define towupper rpl_towupper +# endif # endif -# endif static inline int -# if @REPLACE_ISWCNTRL@ +# if @REPLACE_ISWCNTRL@ rpl_iswalnum -# else +# else iswalnum -# endif +# endif (wint_t wc) { return ((wc >= '0' && wc <= '9') @@ -133,88 +135,88 @@ iswalnum } static inline int -# if @REPLACE_ISWCNTRL@ +# if @REPLACE_ISWCNTRL@ rpl_iswalpha -# else +# else iswalpha -# endif +# endif (wint_t wc) { return (wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z'; } static inline int -# if @REPLACE_ISWCNTRL@ +# if @REPLACE_ISWCNTRL@ rpl_iswblank -# else +# else iswblank -# endif +# endif (wint_t wc) { return wc == ' ' || wc == '\t'; } static inline int -# if @REPLACE_ISWCNTRL@ +# if @REPLACE_ISWCNTRL@ rpl_iswcntrl -# else +# else iswcntrl -# endif +# endif (wint_t wc) { return (wc & ~0x1f) == 0 || wc == 0x7f; } static inline int -# if @REPLACE_ISWCNTRL@ +# if @REPLACE_ISWCNTRL@ rpl_iswdigit -# else +# else iswdigit -# endif +# endif (wint_t wc) { return wc >= '0' && wc <= '9'; } static inline int -# if @REPLACE_ISWCNTRL@ +# if @REPLACE_ISWCNTRL@ rpl_iswgraph -# else +# else iswgraph -# endif +# endif (wint_t wc) { return wc >= '!' && wc <= '~'; } static inline int -# if @REPLACE_ISWCNTRL@ +# if @REPLACE_ISWCNTRL@ rpl_iswlower -# else +# else iswlower -# endif +# endif (wint_t wc) { return wc >= 'a' && wc <= 'z'; } static inline int -# if @REPLACE_ISWCNTRL@ +# if @REPLACE_ISWCNTRL@ rpl_iswprint -# else +# else iswprint -# endif +# endif (wint_t wc) { return wc >= ' ' && wc <= '~'; } static inline int -# if @REPLACE_ISWCNTRL@ +# if @REPLACE_ISWCNTRL@ rpl_iswpunct -# else +# else iswpunct -# endif +# endif (wint_t wc) { return (wc >= '!' && wc <= '~' @@ -223,11 +225,11 @@ iswpunct } static inline int -# if @REPLACE_ISWCNTRL@ +# if @REPLACE_ISWCNTRL@ rpl_iswspace -# else +# else iswspace -# endif +# endif (wint_t wc) { return (wc == ' ' || wc == '\t' @@ -235,22 +237,22 @@ iswspace } static inline int -# if @REPLACE_ISWCNTRL@ +# if @REPLACE_ISWCNTRL@ rpl_iswupper -# else +# else iswupper -# endif +# endif (wint_t wc) { return wc >= 'A' && wc <= 'Z'; } static inline int -# if @REPLACE_ISWCNTRL@ +# if @REPLACE_ISWCNTRL@ rpl_iswxdigit -# else +# else iswxdigit -# endif +# endif (wint_t wc) { return ((wc >= '0' && wc <= '9') @@ -258,50 +260,42 @@ iswxdigit } static inline wint_t -# if @REPLACE_ISWCNTRL@ +# if @REPLACE_ISWCNTRL@ rpl_towlower -# else +# else towlower -# endif +# endif (wint_t wc) { return (wc >= 'A' && wc <= 'Z' ? wc - 'A' + 'a' : wc); } static inline wint_t -# if @REPLACE_ISWCNTRL@ +# if @REPLACE_ISWCNTRL@ rpl_towupper -# else +# else towupper -# endif +# endif (wint_t wc) { return (wc >= 'a' && wc <= 'z' ? wc - 'a' + 'A' : wc); } -#elif ! @HAVE_ISWBLANK@ || @REPLACE_ISWBLANK@ +# elif @GNULIB_ISWBLANK@ && (! @HAVE_ISWBLANK@ || @REPLACE_ISWBLANK@) /* Only the iswblank function is missing. */ -# if @REPLACE_ISWBLANK@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# define iswblank rpl_iswblank +# if @REPLACE_ISWBLANK@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# define iswblank rpl_iswblank +# endif +_GL_FUNCDECL_RPL (iswblank, int, (wint_t wc)); +# else +_GL_FUNCDECL_SYS (iswblank, int, (wint_t wc)); # endif -# endif -static inline int -# if @REPLACE_ISWBLANK@ -rpl_iswblank -# else -iswblank # endif - (wint_t wc) -{ - return wc == ' ' || wc == '\t'; -} - -#endif -#if defined __MINGW32__ +# if defined __MINGW32__ /* On native Windows, wchar_t is uint16_t, and wint_t is uint32_t. The functions towlower and towupper are implemented in the MSVCRT library @@ -321,25 +315,27 @@ rpl_towlower (wint_t wc) { return (wint_t) (wchar_t) towlower (wc); } -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# define towlower rpl_towlower -# endif +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# define towlower rpl_towlower +# endif static inline wint_t rpl_towupper (wint_t wc) { return (wint_t) (wchar_t) towupper (wc); } -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# define towupper rpl_towupper -# endif +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# define towupper rpl_towupper +# endif -#endif /* __MINGW32__ */ +# endif /* __MINGW32__ */ + +# define GNULIB_defined_wctype_functions 1 +#endif #if @REPLACE_ISWCNTRL@ _GL_CXXALIAS_RPL (iswalnum, int, (wint_t wc)); _GL_CXXALIAS_RPL (iswalpha, int, (wint_t wc)); -_GL_CXXALIAS_RPL (iswblank, int, (wint_t wc)); _GL_CXXALIAS_RPL (iswcntrl, int, (wint_t wc)); _GL_CXXALIAS_RPL (iswdigit, int, (wint_t wc)); _GL_CXXALIAS_RPL (iswgraph, int, (wint_t wc)); @@ -352,11 +348,6 @@ _GL_CXXALIAS_RPL (iswxdigit, int, (wint_t wc)); #else _GL_CXXALIAS_SYS (iswalnum, int, (wint_t wc)); _GL_CXXALIAS_SYS (iswalpha, int, (wint_t wc)); -# if @REPLACE_ISWBLANK@ -_GL_CXXALIAS_RPL (iswblank, int, (wint_t wc)); -# else -_GL_CXXALIAS_SYS (iswblank, int, (wint_t wc)); -# endif _GL_CXXALIAS_SYS (iswcntrl, int, (wint_t wc)); _GL_CXXALIAS_SYS (iswdigit, int, (wint_t wc)); _GL_CXXALIAS_SYS (iswgraph, int, (wint_t wc)); @@ -369,7 +360,6 @@ _GL_CXXALIAS_SYS (iswxdigit, int, (wint_t wc)); #endif _GL_CXXALIASWARN (iswalnum); _GL_CXXALIASWARN (iswalpha); -_GL_CXXALIASWARN (iswblank); _GL_CXXALIASWARN (iswcntrl); _GL_CXXALIASWARN (iswdigit); _GL_CXXALIASWARN (iswgraph); @@ -380,6 +370,54 @@ _GL_CXXALIASWARN (iswspace); _GL_CXXALIASWARN (iswupper); _GL_CXXALIASWARN (iswxdigit); +#if @GNULIB_ISWBLANK@ +# if @REPLACE_ISWCNTRL@ || @REPLACE_ISWBLANK@ +_GL_CXXALIAS_RPL (iswblank, int, (wint_t wc)); +# else +_GL_CXXALIAS_SYS (iswblank, int, (wint_t wc)); +# endif +_GL_CXXALIASWARN (iswblank); +#endif + +#if !@HAVE_WCTYPE_T@ +# if !GNULIB_defined_wctype_t +typedef void * wctype_t; +# define GNULIB_defined_wctype_t 1 +# endif +#endif + +/* Get a descriptor for a wide character property. */ +#if @GNULIB_WCTYPE@ +# if !@HAVE_WCTYPE_T@ +_GL_FUNCDECL_SYS (wctype, wctype_t, (const char *name)); +# endif +_GL_CXXALIAS_SYS (wctype, wctype_t, (const char *name)); +_GL_CXXALIASWARN (wctype); +#elif defined GNULIB_POSIXCHECK +# undef wctype +# if HAVE_RAW_DECL_WCTYPE +_GL_WARN_ON_USE (wctype, "wctype is unportable - " + "use gnulib module wctype for portability"); +# endif +#endif + +/* Test whether a wide character has a given property. + The argument WC must be either a wchar_t value or WEOF. + The argument DESC must have been returned by the wctype() function. */ +#if @GNULIB_ISWCTYPE@ +# if !@HAVE_WCTYPE_T@ +_GL_FUNCDECL_SYS (iswctype, int, (wint_t wc, wctype_t desc)); +# endif +_GL_CXXALIAS_SYS (iswctype, int, (wint_t wc, wctype_t desc)); +_GL_CXXALIASWARN (iswctype); +#elif defined GNULIB_POSIXCHECK +# undef iswctype +# if HAVE_RAW_DECL_ISWCTYPE +_GL_WARN_ON_USE (iswctype, "iswctype is unportable - " + "use gnulib module iswctype for portability"); +# endif +#endif + #if @REPLACE_ISWCNTRL@ || defined __MINGW32__ _GL_CXXALIAS_RPL (towlower, wint_t, (wint_t wc)); _GL_CXXALIAS_RPL (towupper, wint_t, (wint_t wc)); @@ -390,6 +428,45 @@ _GL_CXXALIAS_SYS (towupper, wint_t, (wint_t wc)); _GL_CXXALIASWARN (towlower); _GL_CXXALIASWARN (towupper); +#if !@HAVE_WCTRANS_T@ +# if !GNULIB_defined_wctrans_t +typedef void * wctrans_t; +# define GNULIB_defined_wctrans_t 1 +# endif +#endif + +/* Get a descriptor for a wide character case conversion. */ +#if @GNULIB_WCTRANS@ +# if !@HAVE_WCTRANS_T@ +_GL_FUNCDECL_SYS (wctrans, wctrans_t, (const char *name)); +# endif +_GL_CXXALIAS_SYS (wctrans, wctrans_t, (const char *name)); +_GL_CXXALIASWARN (wctrans); +#elif defined GNULIB_POSIXCHECK +# undef wctrans +# if HAVE_RAW_DECL_WCTRANS +_GL_WARN_ON_USE (wctrans, "wctrans is unportable - " + "use gnulib module wctrans for portability"); +# endif +#endif + +/* Perform a given case conversion on a wide character. + The argument WC must be either a wchar_t value or WEOF. + The argument DESC must have been returned by the wctrans() function. */ +#if @GNULIB_TOWCTRANS@ +# if !@HAVE_WCTRANS_T@ +_GL_FUNCDECL_SYS (towctrans, wint_t, (wint_t wc, wctrans_t desc)); +# endif +_GL_CXXALIAS_SYS (towctrans, wint_t, (wint_t wc, wctrans_t desc)); +_GL_CXXALIASWARN (towctrans); +#elif defined GNULIB_POSIXCHECK +# undef towctrans +# if HAVE_RAW_DECL_TOWCTRANS +_GL_WARN_ON_USE (towctrans, "towctrans is unportable - " + "use gnulib module towctrans for portability"); +# endif +#endif + #endif /* _GL_WCTYPE_H */ #endif /* _GL_WCTYPE_H */ diff --git a/gnu/wcwidth.c b/gnu/wcwidth.c index 1cfe8f25..336b7888 100644 --- a/gnu/wcwidth.c +++ b/gnu/wcwidth.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Determine the number of screen columns needed for a character. - Copyright (C) 2006-2007, 2010 Free Software Foundation, Inc. + Copyright (C) 2006-2007, 2010-2011 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 diff --git a/gnu/write.c b/gnu/write.c index 702c8e6d..1eee7bdb 100644 --- a/gnu/write.c +++ b/gnu/write.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* POSIX compatible write() function. - Copyright (C) 2008-2010 Free Software Foundation, Inc. + Copyright (C) 2008-2011 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify diff --git a/gnu/xalloc-die.c b/gnu/xalloc-die.c index 4760baba..4128ec13 100644 --- a/gnu/xalloc-die.c +++ b/gnu/xalloc-die.c @@ -2,8 +2,8 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Report a memory allocation failure and exit. - Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004, 2006, 2009, 2010 - Free Software Foundation, Inc. + Copyright (C) 1997-2000, 2002-2004, 2006, 2009-2011 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 diff --git a/gnu/xalloc.h b/gnu/xalloc.h index 400019c6..e1da0627 100644 --- a/gnu/xalloc.h +++ b/gnu/xalloc.h @@ -2,9 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* xalloc.h -- malloc with out-of-memory checking - Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - 2000, 2003, 2004, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, - Inc. + Copyright (C) 1990-2000, 2003-2004, 2006-2011 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 @@ -30,30 +28,22 @@ extern "C" { # endif -# ifndef __attribute__ -# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) -# define __attribute__(x) -# endif -# endif - -# ifndef ATTRIBUTE_NORETURN -# define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__)) +# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8) +# define _GL_ATTRIBUTE_NORETURN __attribute__ ((__noreturn__)) +# else +# define _GL_ATTRIBUTE_NORETURN /* empty */ # endif -# ifndef ATTRIBUTE_MALLOC -# if __GNUC__ >= 3 -# define ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) -# else -# define ATTRIBUTE_MALLOC -# endif +# if __GNUC__ >= 3 +# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) +# else +# define _GL_ATTRIBUTE_MALLOC # endif -# ifndef ATTRIBUTE_ALLOC_SIZE -# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) -# define ATTRIBUTE_ALLOC_SIZE(args) __attribute__ ((__alloc_size__ args)) -# else -# define ATTRIBUTE_ALLOC_SIZE(args) -# endif +# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) +# define _GL_ATTRIBUTE_ALLOC_SIZE(args) __attribute__ ((__alloc_size__ args)) +# else +# define _GL_ATTRIBUTE_ALLOC_SIZE(args) # endif /* This function is always triggered when memory is exhausted. @@ -61,21 +51,21 @@ extern "C" { or by using gnulib's xalloc-die module. This is the function to call when one wants the program to die because of a memory allocation failure. */ -extern void xalloc_die (void) ATTRIBUTE_NORETURN; +extern void xalloc_die (void) _GL_ATTRIBUTE_NORETURN; void *xmalloc (size_t s) - ATTRIBUTE_MALLOC ATTRIBUTE_ALLOC_SIZE ((1)); + _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((1)); void *xzalloc (size_t s) - ATTRIBUTE_MALLOC ATTRIBUTE_ALLOC_SIZE ((1)); + _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((1)); void *xcalloc (size_t n, size_t s) - ATTRIBUTE_MALLOC ATTRIBUTE_ALLOC_SIZE ((1, 2)); + _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((1, 2)); void *xrealloc (void *p, size_t s) - ATTRIBUTE_ALLOC_SIZE ((2)); + _GL_ATTRIBUTE_ALLOC_SIZE ((2)); void *x2realloc (void *p, size_t *pn); void *xmemdup (void const *p, size_t s) - ATTRIBUTE_MALLOC ATTRIBUTE_ALLOC_SIZE ((2)); + _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((2)); char *xstrdup (char const *str) - ATTRIBUTE_MALLOC; + _GL_ATTRIBUTE_MALLOC; /* Return 1 if an array of N objects, each of size S, cannot exist due to size arithmetic overflow. S must be positive and N must be @@ -123,12 +113,12 @@ char *xstrdup (char const *str) # define static_inline static inline # else void *xnmalloc (size_t n, size_t s) - ATTRIBUTE_MALLOC ATTRIBUTE_ALLOC_SIZE ((1, 2)); + _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((1, 2)); void *xnrealloc (void *p, size_t n, size_t s) - ATTRIBUTE_ALLOC_SIZE ((2, 3)); + _GL_ATTRIBUTE_ALLOC_SIZE ((2, 3)); void *x2nrealloc (void *p, size_t *pn, size_t s); char *xcharalloc (size_t n) - ATTRIBUTE_MALLOC ATTRIBUTE_ALLOC_SIZE ((1)); + _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((1)); # endif # ifdef static_inline @@ -137,7 +127,7 @@ char *xcharalloc (size_t n) dynamically, with error checking. S must be nonzero. */ static_inline void *xnmalloc (size_t n, size_t s) - ATTRIBUTE_MALLOC ATTRIBUTE_ALLOC_SIZE ((1, 2)); + _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((1, 2)); static_inline void * xnmalloc (size_t n, size_t s) { @@ -150,7 +140,7 @@ xnmalloc (size_t n, size_t s) objects each of S bytes, with error checking. S must be nonzero. */ static_inline void *xnrealloc (void *p, size_t n, size_t s) - ATTRIBUTE_ALLOC_SIZE ((2, 3)); + _GL_ATTRIBUTE_ALLOC_SIZE ((2, 3)); static_inline void * xnrealloc (void *p, size_t n, size_t s) { @@ -252,7 +242,7 @@ x2nrealloc (void *p, size_t *pn, size_t s) except it returns char *. */ static_inline char *xcharalloc (size_t n) - ATTRIBUTE_MALLOC ATTRIBUTE_ALLOC_SIZE ((1)); + _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_ALLOC_SIZE ((1)); static_inline char * xcharalloc (size_t n) { diff --git a/gnu/xasprintf.c b/gnu/xasprintf.c index 198589db..29edc279 100644 --- a/gnu/xasprintf.c +++ b/gnu/xasprintf.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* vasprintf and asprintf with out-of-memory checking. - Copyright (C) 1999, 2002-2004, 2006, 2009-2010 Free Software Foundation, + Copyright (C) 1999, 2002-2004, 2006, 2009-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/xgetcwd.c b/gnu/xgetcwd.c index f70011b9..2f1da894 100644 --- a/gnu/xgetcwd.c +++ b/gnu/xgetcwd.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* xgetcwd.c -- return current directory with unlimited length - Copyright (C) 2001, 2003-2004, 2006-2007, 2009-2010 Free Software + Copyright (C) 2001, 2003-2004, 2006-2007, 2009-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/xgetcwd.h b/gnu/xgetcwd.h index 8f2f4ab6..073917a1 100644 --- a/gnu/xgetcwd.h +++ b/gnu/xgetcwd.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* prototype for xgetcwd - Copyright (C) 1995, 2001, 2003, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 1995, 2001, 2003, 2009-2011 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 diff --git a/gnu/xmalloc.c b/gnu/xmalloc.c index 1ec5f88e..b9451a4c 100644 --- a/gnu/xmalloc.c +++ b/gnu/xmalloc.c @@ -2,9 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* xmalloc.c -- malloc with out of memory checking - Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - 2000, 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010 Free Software - Foundation, Inc. + Copyright (C) 1990-2000, 2002-2006, 2008-2011 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 @@ -33,7 +31,7 @@ /* 1 if calloc is known to be compatible with GNU calloc. This matters if we are not also using the calloc module, which defines HAVE_CALLOC_GNU and supports the GNU API even on non-GNU platforms. */ -#if defined HAVE_CALLOC_GNU || defined __GLIBC__ +#if defined HAVE_CALLOC_GNU || (defined __GLIBC__ && !defined __UCLIBC__) enum { HAVE_GNU_CALLOC = 1 }; #else enum { HAVE_GNU_CALLOC = 0 }; diff --git a/gnu/xsize.h b/gnu/xsize.h index e238635a..5f980ca6 100644 --- a/gnu/xsize.h +++ b/gnu/xsize.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* xsize.h -- Checked size_t computations. - Copyright (C) 2003, 2008, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2003, 2008-2011 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 diff --git a/gnu/xstrndup.c b/gnu/xstrndup.c index 3fa3e314..531bd7fc 100644 --- a/gnu/xstrndup.c +++ b/gnu/xstrndup.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Duplicate a bounded initial segment of a string, with out-of-memory checking. - Copyright (C) 2003, 2006, 2007, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2003, 2006-2007, 2009-2011 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 diff --git a/gnu/xstrndup.h b/gnu/xstrndup.h index 1d7ec807..b255843f 100644 --- a/gnu/xstrndup.h +++ b/gnu/xstrndup.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Duplicate a bounded initial segment of a string, with out-of-memory checking. - Copyright (C) 2003, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2003, 2009-2011 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 diff --git a/gnu/xstrtol-error.c b/gnu/xstrtol-error.c index f6b2e958..4f2b64c8 100644 --- a/gnu/xstrtol-error.c +++ b/gnu/xstrtol-error.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A more useful interface to strtol. - Copyright (C) 1995-1996, 1998-1999, 2001-2004, 2006-2010 Free Software + Copyright (C) 1995-1996, 1998-1999, 2001-2004, 2006-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/xstrtol.c b/gnu/xstrtol.c index 558e04d8..00ed20cd 100644 --- a/gnu/xstrtol.c +++ b/gnu/xstrtol.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A more useful interface to strtol. - Copyright (C) 1995-1996, 1998-2001, 2003-2007, 2009-2010 Free Software + Copyright (C) 1995-1996, 1998-2001, 2003-2007, 2009-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/xstrtol.h b/gnu/xstrtol.h index 98d566ca..dbd2d453 100644 --- a/gnu/xstrtol.h +++ b/gnu/xstrtol.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A more useful interface to strtol. - Copyright (C) 1995-1996, 1998-1999, 2001-2004, 2006-2010 Free Software + Copyright (C) 1995-1996, 1998-1999, 2001-2004, 2006-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -53,14 +53,10 @@ _DECLARE_XSTRTOL (xstrtoll, long long int) _DECLARE_XSTRTOL (xstrtoull, unsigned long long int) #endif -#ifndef __attribute__ -# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) -# define __attribute__(x) -# endif -#endif - -#ifndef ATTRIBUTE_NORETURN -# define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__)) +#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8) +# define _GL_ATTRIBUTE_NORETURN __attribute__ ((__noreturn__)) +#else +# define _GL_ATTRIBUTE_NORETURN /* empty */ #endif /* Report an error for an invalid integer in an option argument. @@ -80,6 +76,6 @@ _DECLARE_XSTRTOL (xstrtoull, unsigned long long int) void xstrtol_fatal (enum strtol_error, int, char, struct option const *, - char const *) ATTRIBUTE_NORETURN; + char const *) _GL_ATTRIBUTE_NORETURN; #endif /* not XSTRTOL_H_ */ diff --git a/gnu/xvasprintf.c b/gnu/xvasprintf.c index 448de071..f5ef3c59 100644 --- a/gnu/xvasprintf.c +++ b/gnu/xvasprintf.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* vasprintf and asprintf with out-of-memory checking. - Copyright (C) 1999, 2002-2004, 2006-2010 Free Software Foundation, Inc. + Copyright (C) 1999, 2002-2004, 2006-2011 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 diff --git a/gnu/xvasprintf.h b/gnu/xvasprintf.h index 835828af..6f44b8f6 100644 --- a/gnu/xvasprintf.h +++ b/gnu/xvasprintf.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* vasprintf and asprintf with out-of-memory checking. - Copyright (C) 2002-2004, 2006-2010 Free Software Foundation, Inc. + Copyright (C) 2002-2004, 2006-2011 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 @@ -22,16 +22,16 @@ /* Get va_list. */ #include -#ifndef __attribute__ /* The __attribute__ feature is available in gcc versions 2.5 and later. The __-protected variants of the attributes 'format' and 'printf' are accepted by gcc versions 2.6.4 (effectively 2.7) and later. - We enable __attribute__ only if these are supported too, because + We enable _GL_ATTRIBUTE_FORMAT only if these are supported too, because gnulib and libintl do '#define printf __printf__' when they override the 'printf' function. */ -# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) -# define __attribute__(Spec) /* empty */ -# endif +#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) +# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec)) +#else +# define _GL_ATTRIBUTE_FORMAT(spec) /* empty */ #endif #ifdef __cplusplus @@ -46,9 +46,9 @@ extern "C" { - [EILSEQ] error during conversion between wide and multibyte characters, return NULL. */ extern char *xasprintf (const char *format, ...) - __attribute__ ((__format__ (__printf__, 1, 2))); + _GL_ATTRIBUTE_FORMAT ((__printf__, 1, 2)); extern char *xvasprintf (const char *format, va_list args) - __attribute__ ((__format__ (__printf__, 1, 0))); + _GL_ATTRIBUTE_FORMAT ((__printf__, 1, 0)); #ifdef __cplusplus } diff --git a/lib/Makefile.am b/lib/Makefile.am index 5380128c..efd6826b 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -30,7 +30,7 @@ INCLUDES = -I$(top_srcdir)/gnu -I../ -I../gnu noinst_HEADERS = system.h system-ioctl.h rmt.h paxlib.h stdopen.h libtar_a_SOURCES = \ - paxerror.c paxexit.c paxlib.h paxnames.c \ + paxerror.c paxexit-status.c paxlib.h paxnames.c \ prepargs.c prepargs.h \ rtapelib.c \ rmt.h \ diff --git a/lib/Makefile.in b/lib/Makefile.in index 5304c0cb..f0304c5a 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -39,7 +39,6 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -60,16 +59,16 @@ DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/argmatch.m4 \ - $(top_srcdir)/m4/argp.m4 $(top_srcdir)/m4/asm-underscore.m4 \ - $(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/bison.m4 \ - $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/canonicalize.m4 \ + $(top_srcdir)/m4/argp.m4 $(top_srcdir)/m4/backupfile.m4 \ + $(top_srcdir)/m4/bison.m4 $(top_srcdir)/m4/btowc.m4 \ + $(top_srcdir)/m4/canonicalize.m4 \ $(top_srcdir)/m4/chdir-long.m4 $(top_srcdir)/m4/chown.m4 \ $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/cloexec.m4 \ $(top_srcdir)/m4/close-stream.m4 $(top_srcdir)/m4/close.m4 \ $(top_srcdir)/m4/closeout.m4 $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/d-ino.m4 $(top_srcdir)/m4/dirent-safer.m4 \ - $(top_srcdir)/m4/dirent_h.m4 $(top_srcdir)/m4/dirfd.m4 \ - $(top_srcdir)/m4/dirname.m4 $(top_srcdir)/m4/dos.m4 \ + $(top_srcdir)/m4/configmake.m4 $(top_srcdir)/m4/d-ino.m4 \ + $(top_srcdir)/m4/dirent-safer.m4 $(top_srcdir)/m4/dirent_h.m4 \ + $(top_srcdir)/m4/dirfd.m4 $(top_srcdir)/m4/dirname.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup2.m4 \ $(top_srcdir)/m4/eealloc.m4 $(top_srcdir)/m4/environ.m4 \ $(top_srcdir)/m4/errno_h.m4 $(top_srcdir)/m4/error.m4 \ @@ -94,9 +93,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax_t.m4 \ $(top_srcdir)/m4/inttostr.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ - $(top_srcdir)/m4/langinfo_h.m4 $(top_srcdir)/m4/lchown.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/iswblank.m4 $(top_srcdir)/m4/langinfo_h.m4 \ + $(top_srcdir)/m4/lchown.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ $(top_srcdir)/m4/libunistring-base.m4 \ $(top_srcdir)/m4/link-follow.m4 $(top_srcdir)/m4/link.m4 \ $(top_srcdir)/m4/linkat.m4 $(top_srcdir)/m4/localcharset.m4 \ @@ -107,61 +106,62 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \ $(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \ - $(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdir.m4 \ - $(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mkfifo.m4 \ - $(top_srcdir)/m4/mkfifoat.m4 $(top_srcdir)/m4/mknod.m4 \ - $(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/mmap-anon.m4 \ - $(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/modechange.m4 \ - $(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/nl_langinfo.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/open.m4 \ - $(top_srcdir)/m4/openat.m4 $(top_srcdir)/m4/parse-datetime.m4 \ - $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/paxutils.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf.m4 \ - $(top_srcdir)/m4/priv-set.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ - $(top_srcdir)/m4/rawmemchr.m4 $(top_srcdir)/m4/readlink.m4 \ - $(top_srcdir)/m4/readlinkat.m4 $(top_srcdir)/m4/realloc.m4 \ - $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/rename.m4 \ - $(top_srcdir)/m4/renameat.m4 $(top_srcdir)/m4/rmdir.m4 \ - $(top_srcdir)/m4/rmt.m4 $(top_srcdir)/m4/rpmatch.m4 \ - $(top_srcdir)/m4/rtapelib.m4 $(top_srcdir)/m4/safe-read.m4 \ - $(top_srcdir)/m4/safe-write.m4 $(top_srcdir)/m4/save-cwd.m4 \ - $(top_srcdir)/m4/savedir.m4 $(top_srcdir)/m4/setenv.m4 \ - $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/sleep.m4 \ - $(top_srcdir)/m4/snprintf.m4 $(top_srcdir)/m4/ssize_t.m4 \ - $(top_srcdir)/m4/stat-time.m4 $(top_srcdir)/m4/stat.m4 \ - $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \ - $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio_h.m4 \ - $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/stpcpy.m4 \ - $(top_srcdir)/m4/strcase.m4 $(top_srcdir)/m4/strchrnul.m4 \ - $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ - $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strings_h.m4 \ - $(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \ - $(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \ - $(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \ - $(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \ - $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/symlinkat.m4 \ - $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ - $(top_srcdir)/m4/sysexits.m4 $(top_srcdir)/m4/system.m4 \ - $(top_srcdir)/m4/tempname.m4 $(top_srcdir)/m4/time_h.m4 \ - $(top_srcdir)/m4/time_r.m4 $(top_srcdir)/m4/timespec.m4 \ - $(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/unistd-safer.m4 \ - $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ - $(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/unlocked-io.m4 \ - $(top_srcdir)/m4/utimbuf.m4 $(top_srcdir)/m4/utimens.m4 \ - $(top_srcdir)/m4/utimensat.m4 $(top_srcdir)/m4/utimes.m4 \ - $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \ - $(top_srcdir)/m4/version-etc.m4 $(top_srcdir)/m4/vsnprintf.m4 \ - $(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/wchar_h.m4 \ - $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wcrtomb.m4 \ - $(top_srcdir)/m4/wctype_h.m4 $(top_srcdir)/m4/wcwidth.m4 \ - $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/write.m4 \ - $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xgetcwd.m4 \ - $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/xstrndup.m4 \ - $(top_srcdir)/m4/xstrtol.m4 $(top_srcdir)/m4/xvasprintf.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \ + $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \ + $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkdtemp.m4 \ + $(top_srcdir)/m4/mkfifo.m4 $(top_srcdir)/m4/mkfifoat.m4 \ + $(top_srcdir)/m4/mknod.m4 $(top_srcdir)/m4/mktime.m4 \ + $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ + $(top_srcdir)/m4/modechange.m4 $(top_srcdir)/m4/multiarch.m4 \ + $(top_srcdir)/m4/nl_langinfo.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/open.m4 $(top_srcdir)/m4/openat.m4 \ + $(top_srcdir)/m4/parse-datetime.m4 $(top_srcdir)/m4/pathmax.m4 \ + $(top_srcdir)/m4/paxutils.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/printf.m4 $(top_srcdir)/m4/priv-set.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/quote.m4 \ + $(top_srcdir)/m4/quotearg.m4 $(top_srcdir)/m4/rawmemchr.m4 \ + $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/readlinkat.m4 \ + $(top_srcdir)/m4/realloc.m4 $(top_srcdir)/m4/regex.m4 \ + $(top_srcdir)/m4/rename.m4 $(top_srcdir)/m4/renameat.m4 \ + $(top_srcdir)/m4/rmdir.m4 $(top_srcdir)/m4/rmt.m4 \ + $(top_srcdir)/m4/rpmatch.m4 $(top_srcdir)/m4/rtapelib.m4 \ + $(top_srcdir)/m4/safe-read.m4 $(top_srcdir)/m4/safe-write.m4 \ + $(top_srcdir)/m4/save-cwd.m4 $(top_srcdir)/m4/savedir.m4 \ + $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/size_max.m4 \ + $(top_srcdir)/m4/sleep.m4 $(top_srcdir)/m4/snprintf.m4 \ + $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \ + $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdarg.m4 \ + $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stddef_h.m4 \ + $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdint_h.m4 \ + $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ + $(top_srcdir)/m4/stpcpy.m4 $(top_srcdir)/m4/strcase.m4 \ + $(top_srcdir)/m4/strchrnul.m4 $(top_srcdir)/m4/strdup.m4 \ + $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/string_h.m4 \ + $(top_srcdir)/m4/strings_h.m4 $(top_srcdir)/m4/strndup.m4 \ + $(top_srcdir)/m4/strnlen.m4 $(top_srcdir)/m4/strtoimax.m4 \ + $(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \ + $(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \ + $(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/symlink.m4 \ + $(top_srcdir)/m4/symlinkat.m4 $(top_srcdir)/m4/sys_stat_h.m4 \ + $(top_srcdir)/m4/sys_time_h.m4 $(top_srcdir)/m4/sysexits.m4 \ + $(top_srcdir)/m4/system.m4 $(top_srcdir)/m4/tempname.m4 \ + $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \ + $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \ + $(top_srcdir)/m4/unistd-safer.m4 $(top_srcdir)/m4/unistd_h.m4 \ + $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlinkdir.m4 \ + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/utimbuf.m4 \ + $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimensat.m4 \ + $(top_srcdir)/m4/utimes.m4 $(top_srcdir)/m4/vasnprintf.m4 \ + $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/version-etc.m4 \ + $(top_srcdir)/m4/vsnprintf.m4 $(top_srcdir)/m4/warn-on-use.m4 \ + $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ + $(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wctype_h.m4 \ + $(top_srcdir)/m4/wcwidth.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/write.m4 $(top_srcdir)/m4/xalloc.m4 \ + $(top_srcdir)/m4/xgetcwd.m4 $(top_srcdir)/m4/xsize.m4 \ + $(top_srcdir)/m4/xstrndup.m4 $(top_srcdir)/m4/xstrtol.m4 \ + $(top_srcdir)/m4/xvasprintf.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -179,7 +179,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ libtar_a_AR = $(AR) $(ARFLAGS) libtar_a_LIBADD = -am_libtar_a_OBJECTS = paxerror.$(OBJEXT) paxexit.$(OBJEXT) \ +am_libtar_a_OBJECTS = paxerror.$(OBJEXT) paxexit-status.$(OBJEXT) \ paxnames.$(OBJEXT) prepargs.$(OBJEXT) rtapelib.$(OBJEXT) \ stdopen.$(OBJEXT) libtar_a_OBJECTS = $(am_libtar_a_OBJECTS) @@ -206,13 +206,13 @@ HEADERS = $(noinst_HEADERS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALLOCA_H = @ALLOCA_H@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ -ASM_SYMBOL_PREFIX = @ASM_SYMBOL_PREFIX@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOM4TE = @AUTOM4TE@ @@ -313,6 +313,8 @@ GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ GNULIB_GRANTPT = @GNULIB_GRANTPT@ GNULIB_IMAXABS = @GNULIB_IMAXABS@ GNULIB_IMAXDIV = @GNULIB_IMAXDIV@ +GNULIB_ISWBLANK = @GNULIB_ISWBLANK@ +GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@ GNULIB_LCHMOD = @GNULIB_LCHMOD@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LINK = @GNULIB_LINK@ @@ -339,6 +341,7 @@ GNULIB_MBSSEP = @GNULIB_MBSSEP@ GNULIB_MBSSPN = @GNULIB_MBSSPN@ GNULIB_MBSSTR = @GNULIB_MBSSTR@ GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@ +GNULIB_MBTOWC = @GNULIB_MBTOWC@ GNULIB_MEMCHR = @GNULIB_MEMCHR@ GNULIB_MEMMEM = @GNULIB_MEMMEM@ GNULIB_MEMPCPY = @GNULIB_MEMPCPY@ @@ -361,6 +364,7 @@ GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ GNULIB_OPEN = @GNULIB_OPEN@ GNULIB_OPENAT = @GNULIB_OPENAT@ GNULIB_PERROR = @GNULIB_PERROR@ +GNULIB_PIPE = @GNULIB_PIPE@ GNULIB_PIPE2 = @GNULIB_PIPE2@ GNULIB_POPEN = @GNULIB_POPEN@ GNULIB_PREAD = @GNULIB_PREAD@ @@ -396,6 +400,7 @@ GNULIB_STRCASESTR = @GNULIB_STRCASESTR@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ +GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ GNULIB_STRNCAT = @GNULIB_STRNCAT@ GNULIB_STRNDUP = @GNULIB_STRNDUP@ GNULIB_STRNLEN = @GNULIB_STRNLEN@ @@ -417,6 +422,7 @@ GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@ GNULIB_TIMEGM = @GNULIB_TIMEGM@ GNULIB_TIME_R = @GNULIB_TIME_R@ GNULIB_TMPFILE = @GNULIB_TMPFILE@ +GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@ GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ @@ -434,11 +440,42 @@ GNULIB_VPRINTF = @GNULIB_VPRINTF@ GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@ GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@ GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@ +GNULIB_WCPCPY = @GNULIB_WCPCPY@ +GNULIB_WCPNCPY = @GNULIB_WCPNCPY@ GNULIB_WCRTOMB = @GNULIB_WCRTOMB@ +GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@ +GNULIB_WCSCAT = @GNULIB_WCSCAT@ +GNULIB_WCSCHR = @GNULIB_WCSCHR@ +GNULIB_WCSCMP = @GNULIB_WCSCMP@ +GNULIB_WCSCOLL = @GNULIB_WCSCOLL@ +GNULIB_WCSCPY = @GNULIB_WCSCPY@ +GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ +GNULIB_WCSDUP = @GNULIB_WCSDUP@ +GNULIB_WCSLEN = @GNULIB_WCSLEN@ +GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ +GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ +GNULIB_WCSNCMP = @GNULIB_WCSNCMP@ +GNULIB_WCSNCPY = @GNULIB_WCSNCPY@ +GNULIB_WCSNLEN = @GNULIB_WCSNLEN@ GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@ +GNULIB_WCSPBRK = @GNULIB_WCSPBRK@ +GNULIB_WCSRCHR = @GNULIB_WCSRCHR@ GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@ +GNULIB_WCSSPN = @GNULIB_WCSSPN@ +GNULIB_WCSSTR = @GNULIB_WCSSTR@ +GNULIB_WCSTOK = @GNULIB_WCSTOK@ +GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@ +GNULIB_WCSXFRM = @GNULIB_WCSXFRM@ GNULIB_WCTOB = @GNULIB_WCTOB@ +GNULIB_WCTOMB = @GNULIB_WCTOMB@ +GNULIB_WCTRANS = @GNULIB_WCTRANS@ +GNULIB_WCTYPE = @GNULIB_WCTYPE@ GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ +GNULIB_WMEMCHR = @GNULIB_WMEMCHR@ +GNULIB_WMEMCMP = @GNULIB_WMEMCMP@ +GNULIB_WMEMCPY = @GNULIB_WMEMCPY@ +GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@ +GNULIB_WMEMSET = @GNULIB_WMEMSET@ GNULIB_WRITE = @GNULIB_WRITE@ GNULIB__EXIT = @GNULIB__EXIT@ GREP = @GREP@ @@ -449,9 +486,13 @@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ +HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ HAVE_DECL_FDOPENDIR = @HAVE_DECL_FDOPENDIR@ HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@ +HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@ +HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ +HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ @@ -459,11 +500,14 @@ HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ +HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ +HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ +HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ HAVE_DECL_STRNCASECMP = @HAVE_DECL_STRNCASECMP@ HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@ HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@ @@ -471,6 +515,8 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ +HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ @@ -484,13 +530,13 @@ HAVE_FCHMODAT = @HAVE_FCHMODAT@ HAVE_FCHOWNAT = @HAVE_FCHOWNAT@ HAVE_FCNTL = @HAVE_FCNTL@ HAVE_FDOPENDIR = @HAVE_FDOPENDIR@ +HAVE_FEATURES_H = @HAVE_FEATURES_H@ HAVE_FSEEKO = @HAVE_FSEEKO@ HAVE_FSTATAT = @HAVE_FSTATAT@ HAVE_FSYNC = @HAVE_FSYNC@ HAVE_FTELLO = @HAVE_FTELLO@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ HAVE_FUTIMENS = @HAVE_FUTIMENS@ -HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@ HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ HAVE_GETGROUPS = @HAVE_GETGROUPS@ HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@ @@ -512,7 +558,6 @@ HAVE_LCHMOD = @HAVE_LCHMOD@ HAVE_LCHOWN = @HAVE_LCHOWN@ HAVE_LINK = @HAVE_LINK@ HAVE_LINKAT = @HAVE_LINKAT@ -HAVE_LOCALTIME_R = @HAVE_LOCALTIME_R@ HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MBRLEN = @HAVE_MBRLEN@ @@ -537,6 +582,7 @@ HAVE_NANOSLEEP = @HAVE_NANOSLEEP@ HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@ HAVE_OPENAT = @HAVE_OPENAT@ HAVE_OS_H = @HAVE_OS_H@ +HAVE_PIPE = @HAVE_PIPE@ HAVE_PIPE2 = @HAVE_PIPE2@ HAVE_PREAD = @HAVE_PREAD@ HAVE_PTSNAME = @HAVE_PTSNAME@ @@ -580,11 +626,9 @@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ -HAVE_TTYNAME_R = @HAVE_TTYNAME_R@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ -HAVE_UNSETENV = @HAVE_UNSETENV@ HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_USLEEP = @HAVE_USLEEP@ HAVE_UTIMENSAT = @HAVE_UTIMENSAT@ @@ -592,11 +636,41 @@ HAVE_VASPRINTF = @HAVE_VASPRINTF@ HAVE_VDPRINTF = @HAVE_VDPRINTF@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ HAVE_WCHAR_T = @HAVE_WCHAR_T@ +HAVE_WCPCPY = @HAVE_WCPCPY@ +HAVE_WCPNCPY = @HAVE_WCPNCPY@ HAVE_WCRTOMB = @HAVE_WCRTOMB@ +HAVE_WCSCASECMP = @HAVE_WCSCASECMP@ +HAVE_WCSCAT = @HAVE_WCSCAT@ +HAVE_WCSCHR = @HAVE_WCSCHR@ +HAVE_WCSCMP = @HAVE_WCSCMP@ +HAVE_WCSCOLL = @HAVE_WCSCOLL@ +HAVE_WCSCPY = @HAVE_WCSCPY@ +HAVE_WCSCSPN = @HAVE_WCSCSPN@ +HAVE_WCSDUP = @HAVE_WCSDUP@ +HAVE_WCSLEN = @HAVE_WCSLEN@ +HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ +HAVE_WCSNCAT = @HAVE_WCSNCAT@ +HAVE_WCSNCMP = @HAVE_WCSNCMP@ +HAVE_WCSNCPY = @HAVE_WCSNCPY@ +HAVE_WCSNLEN = @HAVE_WCSNLEN@ HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@ +HAVE_WCSPBRK = @HAVE_WCSPBRK@ +HAVE_WCSRCHR = @HAVE_WCSRCHR@ HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@ +HAVE_WCSSPN = @HAVE_WCSSPN@ +HAVE_WCSSTR = @HAVE_WCSSTR@ +HAVE_WCSTOK = @HAVE_WCSTOK@ +HAVE_WCSWIDTH = @HAVE_WCSWIDTH@ +HAVE_WCSXFRM = @HAVE_WCSXFRM@ +HAVE_WCTRANS_T = @HAVE_WCTRANS_T@ HAVE_WCTYPE_H = @HAVE_WCTYPE_H@ +HAVE_WCTYPE_T = @HAVE_WCTYPE_T@ HAVE_WINT_T = @HAVE_WINT_T@ +HAVE_WMEMCHR = @HAVE_WMEMCHR@ +HAVE_WMEMCMP = @HAVE_WMEMCMP@ +HAVE_WMEMCPY = @HAVE_WMEMCPY@ +HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ +HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE__BOOL = @HAVE__BOOL@ HAVE__EXIT = @HAVE__EXIT@ INCLUDE_NEXT = @INCLUDE_NEXT@ @@ -721,8 +795,10 @@ REPLACE_FTELLO = @REPLACE_FTELLO@ REPLACE_FUTIMENS = @REPLACE_FUTIMENS@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETDELIM = @REPLACE_GETDELIM@ +REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETLINE = @REPLACE_GETLINE@ +REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ @@ -740,6 +816,7 @@ REPLACE_MBSINIT = @REPLACE_MBSINIT@ REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@ REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@ REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@ +REPLACE_MBTOWC = @REPLACE_MBTOWC@ REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ REPLACE_MKDIR = @REPLACE_MKDIR@ @@ -777,6 +854,7 @@ REPLACE_STPNCPY = @REPLACE_STPNCPY@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ +REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ REPLACE_STRNCAT = @REPLACE_STRNCAT@ REPLACE_STRNDUP = @REPLACE_STRNDUP@ REPLACE_STRNLEN = @REPLACE_STRNLEN@ @@ -802,7 +880,9 @@ REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ +REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ +REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ SET_MAKE = @SET_MAKE@ @@ -869,6 +949,7 @@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +lispdir = @lispdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ @@ -892,7 +973,7 @@ CLEANFILES = rmt-command.h rmt-command.h-t INCLUDES = -I$(top_srcdir)/gnu -I../ -I../gnu noinst_HEADERS = system.h system-ioctl.h rmt.h paxlib.h stdopen.h libtar_a_SOURCES = \ - paxerror.c paxexit.c paxlib.h paxnames.c \ + paxerror.c paxexit-status.c paxlib.h paxnames.c \ prepargs.c prepargs.h \ rtapelib.c \ rmt.h \ @@ -949,7 +1030,7 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/paxerror.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/paxexit.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/paxexit-status.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/paxnames.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prepargs.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtapelib.Po@am__quote@ diff --git a/lib/paxexit-status.c b/lib/paxexit-status.c new file mode 100644 index 00000000..3c244abd --- /dev/null +++ b/lib/paxexit-status.c @@ -0,0 +1,3 @@ +#include +#include +int exit_status = PAXEXIT_SUCCESS; diff --git a/lib/paxlib.h b/lib/paxlib.h index eeb445e8..d0ba45ba 100644 --- a/lib/paxlib.h +++ b/lib/paxlib.h @@ -21,7 +21,6 @@ #ifndef _paxlib_h_ #define _paxlib_h_ -#include #include /* Error reporting functions and definitions */ @@ -107,9 +106,6 @@ void fatal_exit (void) __attribute__ ((noreturn)); /* Name-related functions */ -bool hash_string_insert (Hash_table **table, char const *string); -bool hash_string_lookup (Hash_table const *table, char const *string); - bool removed_prefixes_p (void); char *safer_name_suffix (char const *file_name, bool link_target, bool absolute_names); diff --git a/lib/paxnames.c b/lib/paxnames.c index 80fa83eb..5766d4cc 100644 --- a/lib/paxnames.c +++ b/lib/paxnames.c @@ -1,5 +1,5 @@ /* This file is part of GNU paxutils - Copyright (C) 2005, 2007 Free Software Foundation, Inc. + Copyright (C) 2005, 2007, 2010 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 @@ -56,7 +56,7 @@ hash_string_insert_prefix (Hash_table **table, char const *string, size_t len, } else s = xstrdup (string); - + if (! ((t || (*table = t = hash_initialize (0, 0, hash_string_hasher, hash_string_compare, 0))) @@ -76,21 +76,6 @@ hash_string_insert_prefix (Hash_table **table, char const *string, size_t len, } } -/* Return zero if TABLE contains a copy of STRING; otherwise, insert a - copy of STRING to TABLE and return 1. */ -bool -hash_string_insert (Hash_table **table, char const *string) -{ - return hash_string_insert_prefix (table, string, 0, NULL); -} - -/* Return 1 if TABLE contains STRING. */ -bool -hash_string_lookup (Hash_table const *table, char const *string) -{ - return table && hash_lookup (table, string); -} - static Hash_table *prefix_table[2]; diff --git a/m4/00gnulib.m4 b/m4/00gnulib.m4 index 301469b3..7feed466 100644 --- a/m4/00gnulib.m4 +++ b/m4/00gnulib.m4 @@ -1,5 +1,5 @@ # 00gnulib.m4 serial 2 -dnl Copyright (C) 2009-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/alloca.m4 b/m4/alloca.m4 index f3ee3438..e2e8a05a 100644 --- a/m4/alloca.m4 +++ b/m4/alloca.m4 @@ -1,5 +1,5 @@ -# alloca.m4 serial 9 -dnl Copyright (C) 2002-2004, 2006-2007, 2009-2010 Free Software Foundation, +# alloca.m4 serial 10 +dnl Copyright (C) 2002-2004, 2006-2007, 2009-2011 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -7,10 +7,6 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_ALLOCA], [ - dnl Work around a bug of AC_EGREP_CPP in autoconf-2.57. - AC_REQUIRE([AC_PROG_CPP]) - AC_REQUIRE([AC_PROG_EGREP]) - AC_REQUIRE([AC_FUNC_ALLOCA]) if test $ac_cv_func_alloca_works = no; then gl_PREREQ_ALLOCA diff --git a/m4/argmatch.m4 b/m4/argmatch.m4 index 510fef9e..eddca3f1 100644 --- a/m4/argmatch.m4 +++ b/m4/argmatch.m4 @@ -1,5 +1,5 @@ #serial 3 -dnl Copyright (C) 2005, 2006, 2009, 2010 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2006, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/argp.m4 b/m4/argp.m4 index d3ca5bac..c274dd10 100644 --- a/m4/argp.m4 +++ b/m4/argp.m4 @@ -1,5 +1,5 @@ # argp.m4 serial 11 -dnl Copyright (C) 2003-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2003-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/backupfile.m4 b/m4/backupfile.m4 index 0725ea92..ac9559eb 100644 --- a/m4/backupfile.m4 +++ b/m4/backupfile.m4 @@ -1,5 +1,5 @@ -# backupfile.m4 serial 12 -dnl Copyright (C) 2002-2006, 2009-2010 Free Software Foundation, Inc. +# backupfile.m4 serial 13 +dnl Copyright (C) 2002-2006, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -10,7 +10,6 @@ AC_DEFUN([gl_BACKUPFILE], dnl Prerequisites of lib/backupfile.c. AC_REQUIRE([gl_CHECK_TYPE_STRUCT_DIRENT_D_INO]) - AC_REQUIRE([gl_AC_DOS]) AC_REQUIRE([AC_SYS_LONG_FILE_NAMES]) AC_CHECK_FUNCS_ONCE([pathconf]) ]) diff --git a/m4/bison.m4 b/m4/bison.m4 index f4a97c3c..87c090ed 100644 --- a/m4/bison.m4 +++ b/m4/bison.m4 @@ -1,6 +1,6 @@ # serial 6 -# Copyright (C) 2002, 2005, 2009, 2010 Free Software Foundation, Inc. +# Copyright (C) 2002, 2005, 2009-2011 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/btowc.m4 b/m4/btowc.m4 index b16b1f02..603298f4 100644 --- a/m4/btowc.m4 +++ b/m4/btowc.m4 @@ -1,5 +1,5 @@ -# btowc.m4 serial 7 -dnl Copyright (C) 2008-2010 Free Software Foundation, Inc. +# btowc.m4 serial 8 +dnl Copyright (C) 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -28,8 +28,14 @@ AC_DEFUN([gl_FUNC_BTOWC], [ AC_RUN_IFELSE( [AC_LANG_SOURCE([[ -#include #include +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include #include int main () { @@ -69,8 +75,14 @@ changequote([,])dnl AC_RUN_IFELSE( [AC_LANG_SOURCE([[ #include -#include #include +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include #include int main () { diff --git a/m4/canonicalize.m4 b/m4/canonicalize.m4 index d418de8f..dcc6039e 100644 --- a/m4/canonicalize.m4 +++ b/m4/canonicalize.m4 @@ -1,6 +1,6 @@ -# canonicalize.m4 serial 16 +# canonicalize.m4 serial 17 -dnl Copyright (C) 2003-2007, 2009-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2003-2007, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -65,10 +65,23 @@ AC_DEFUN([gl_FUNC_REALPATH_WORKS], AC_LANG_PROGRAM([[ #include ]], [[ - char *name1 = realpath ("conftest.a", NULL); - char *name2 = realpath ("conftest.b/../conftest.a", NULL); - char *name3 = realpath ("conftest.a/", NULL); - return !(name1 && *name1 == '/' && !name2 && !name3); + int result = 0; + { + char *name = realpath ("conftest.a", NULL); + if (!(name && *name == '/')) + result |= 1; + } + { + char *name = realpath ("conftest.b/../conftest.a", NULL); + if (name != NULL) + result |= 2; + } + { + char *name = realpath ("conftest.a/", NULL); + if (name != NULL) + result |= 4; + } + return result; ]]) ], [gl_cv_func_realpath_works=yes], [gl_cv_func_realpath_works=no], [gl_cv_func_realpath_works="guessing no"]) diff --git a/m4/chdir-long.m4 b/m4/chdir-long.m4 index 17fe727a..27c61d25 100644 --- a/m4/chdir-long.m4 +++ b/m4/chdir-long.m4 @@ -6,7 +6,7 @@ # never fails with ENAMETOOLONG. # Arrange to compile chdir-long.c only on systems that define PATH_MAX. -dnl Copyright (C) 2004-2007, 2009-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2004-2007, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/chown.m4 b/m4/chown.m4 index ea3fe4c4..f664e7c5 100644 --- a/m4/chown.m4 +++ b/m4/chown.m4 @@ -1,7 +1,7 @@ -# serial 23 +# serial 24 # Determine whether we need the chown wrapper. -dnl Copyright (C) 1997-2001, 2003-2005, 2007, 2009-2010 Free Software +dnl Copyright (C) 1997-2001, 2003-2005, 2007, 2009-2011 Free Software dnl Foundation, Inc. dnl This file is free software; the Free Software Foundation @@ -114,6 +114,7 @@ AC_DEFUN_ONCE([gl_FUNC_CHOWN_FOLLOWS_SYMLINK], int main () { + int result = 0; char const *dangling_symlink = "conftest.dangle"; unlink (dangling_symlink); @@ -122,8 +123,11 @@ AC_DEFUN_ONCE([gl_FUNC_CHOWN_FOLLOWS_SYMLINK], /* Exit successfully on a conforming system, i.e., where chown must fail with ENOENT. */ - exit ( ! (chown (dangling_symlink, getuid (), getgid ()) != 0 - && errno == ENOENT)); + if (chown (dangling_symlink, getuid (), getgid ()) == 0) + result |= 1; + if (errno != ENOENT) + result |= 2; + return result; } ]])], [gl_cv_func_chown_follows_symlink=yes], diff --git a/m4/clock_time.m4 b/m4/clock_time.m4 index 8be179db..3c085129 100644 --- a/m4/clock_time.m4 +++ b/m4/clock_time.m4 @@ -1,5 +1,5 @@ # clock_time.m4 serial 10 -dnl Copyright (C) 2002-2006, 2009-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/cloexec.m4 b/m4/cloexec.m4 index c75595ca..c936f438 100644 --- a/m4/cloexec.m4 +++ b/m4/cloexec.m4 @@ -1,5 +1,5 @@ #serial 6 -dnl Copyright (C) 2004-2006, 2009-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2004-2006, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/close-stream.m4 b/m4/close-stream.m4 index 40d999dc..2a7349cf 100644 --- a/m4/close-stream.m4 +++ b/m4/close-stream.m4 @@ -1,5 +1,5 @@ #serial 3 -dnl Copyright (C) 2006-2007, 2009-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2007, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/close.m4 b/m4/close.m4 index 1ee3add9..fc131381 100644 --- a/m4/close.m4 +++ b/m4/close.m4 @@ -1,5 +1,5 @@ # close.m4 serial 5 -dnl Copyright (C) 2008-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/closeout.m4 b/m4/closeout.m4 index 946944ec..0586b32a 100644 --- a/m4/closeout.m4 +++ b/m4/closeout.m4 @@ -1,5 +1,5 @@ # closeout.m4 serial 5 -dnl Copyright (C) 2002-2003, 2005-2006, 2009-2010 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2011 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/codeset.m4 b/m4/codeset.m4 index f722b2e8..da735522 100644 --- a/m4/codeset.m4 +++ b/m4/codeset.m4 @@ -1,5 +1,5 @@ # codeset.m4 serial 5 (gettext-0.18.2) -dnl Copyright (C) 2000-2002, 2006, 2008-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2000-2002, 2006, 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/configmake.m4 b/m4/configmake.m4 new file mode 100644 index 00000000..a0298235 --- /dev/null +++ b/m4/configmake.m4 @@ -0,0 +1,50 @@ +# configmake.m4 serial 1 +dnl Copyright (C) 2010-2011 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +# gl_CONFIGMAKE_PREP +# ------------------ +# Guarantee all of the standard directory variables, even when used with +# autoconf 2.59 (datarootdir wasn't supported until 2.59c) or automake +# 1.9.6 (pkglibexecdir wasn't supported until 1.10b.). +AC_DEFUN([gl_CONFIGMAKE_PREP], +[ + dnl Technically, datadir should default to datarootdir. But if + dnl autoconf is too old to provide datarootdir, then reversing the + dnl definition is a reasonable compromise. Only AC_SUBST a variable + dnl if it was not already defined earlier by autoconf. + if test "x$datarootdir" = x; then + AC_SUBST([datarootdir], ['${datadir}']) + fi + dnl Copy the approach used in autoconf 2.60. + if test "x$docdir" = x; then + AC_SUBST([docdir], [m4_ifset([AC_PACKAGE_TARNAME], + ['${datarootdir}/doc/${PACKAGE_TARNAME}'], + ['${datarootdir}/doc/${PACKAGE}'])]) + fi + dnl The remaining variables missing from autoconf 2.59 are easier. + if test "x$htmldir" = x; then + AC_SUBST([htmldir], ['${docdir}']) + fi + if test "x$dvidir" = x; then + AC_SUBST([dvidir], ['${docdir}']) + fi + if test "x$pdfdir" = x; then + AC_SUBST([pdfdir], ['${docdir}']) + fi + if test "x$psdir" = x; then + AC_SUBST([psdir], ['${docdir}']) + fi + if test "x$lispdir" = x; then + AC_SUBST([lispdir], ['${datarootdir}/emacs/site-lisp']) + fi + if test "x$localedir" = x; then + AC_SUBST([localedir], ['${datarootdir}/locale']) + fi + + dnl Automake 1.9.6 only lacks pkglibexecdir; and since 1.11 merely + dnl provides it without AC_SUBST, this blind use of AC_SUBST is safe. + AC_SUBST([pkglibexecdir], ['${libexecdir}/${PACKAGE}']) +]) diff --git a/m4/d-ino.m4 b/m4/d-ino.m4 index b019ae58..baf0dcc9 100644 --- a/m4/d-ino.m4 +++ b/m4/d-ino.m4 @@ -1,11 +1,11 @@ -# serial 11 +# serial 12 dnl From Jim Meyering. dnl dnl Check whether struct dirent has a member named d_ino. dnl -# Copyright (C) 1997, 1999-2001, 2003-2004, 2006-2007, 2009-2010 Free Software +# Copyright (C) 1997, 1999-2001, 2003-2004, 2006-2007, 2009-2011 Free Software # Foundation, Inc. # This file is free software; the Free Software Foundation @@ -27,12 +27,17 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_INO], if (! dp) return 1; e = readdir (dp); - return ! (e - && stat (e->d_name, &st) == 0 - && e->d_ino == st.st_ino);]])], - [gl_cv_struct_dirent_d_ino=yes], - [gl_cv_struct_dirent_d_ino=no], - [gl_cv_struct_dirent_d_ino=no])]) + if (! e) + return 2; + if (stat (e->d_name, &st) != 0) + return 3; + if (e->d_ino != st.st_ino) + return 4; + return 0; + ]])], + [gl_cv_struct_dirent_d_ino=yes], + [gl_cv_struct_dirent_d_ino=no], + [gl_cv_struct_dirent_d_ino=no])]) if test $gl_cv_struct_dirent_d_ino = yes; then AC_DEFINE([D_INO_IN_DIRENT], [1], [Define if struct dirent has a member d_ino that actually works.]) diff --git a/m4/dirent-safer.m4 b/m4/dirent-safer.m4 index c48f3dc8..0b557ca7 100644 --- a/m4/dirent-safer.m4 +++ b/m4/dirent-safer.m4 @@ -1,5 +1,5 @@ #serial 1 -dnl Copyright (C) 2009, 2010 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/dirent_h.m4 b/m4/dirent_h.m4 index 8d9d5654..853ac7da 100644 --- a/m4/dirent_h.m4 +++ b/m4/dirent_h.m4 @@ -1,5 +1,5 @@ # dirent_h.m4 serial 13 -dnl Copyright (C) 2008-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/dirfd.m4 b/m4/dirfd.m4 index 48b7bae1..b8789c2e 100644 --- a/m4/dirfd.m4 +++ b/m4/dirfd.m4 @@ -1,8 +1,8 @@ -# serial 18 -*- Autoconf -*- +# serial 19 -*- Autoconf -*- dnl Find out how to get the file descriptor associated with an open DIR*. -# Copyright (C) 2001-2006, 2008-2010 Free Software Foundation, Inc. +# Copyright (C) 2001-2006, 2008-2011 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,10 +17,6 @@ AC_DEFUN([gl_FUNC_DIRFD], dnl Persuade glibc to declare dirfd(). AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) - dnl Work around a bug of AC_EGREP_CPP in autoconf-2.57. - AC_REQUIRE([AC_PROG_CPP]) - AC_REQUIRE([AC_PROG_EGREP]) - AC_CHECK_FUNCS([dirfd]) AC_CHECK_DECLS([dirfd], , , [#include diff --git a/m4/dirname.m4 b/m4/dirname.m4 index 576b5bea..9d5f40d1 100644 --- a/m4/dirname.m4 +++ b/m4/dirname.m4 @@ -1,5 +1,5 @@ -#serial 8 -*- autoconf -*- -dnl Copyright (C) 2002-2006, 2009-2010 Free Software Foundation, Inc. +#serial 9 -*- autoconf -*- +dnl Copyright (C) 2002-2006, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -18,7 +18,6 @@ AC_DEFUN([gl_DIRNAME_LGPL], AC_LIBOBJ([stripslash]) dnl Prerequisites of lib/dirname.h. - AC_REQUIRE([gl_AC_DOS]) AC_REQUIRE([gl_DOUBLE_SLASH_ROOT]) dnl No prerequisites of lib/basename-lgpl.c, lib/dirname-lgpl.c, diff --git a/m4/double-slash-root.m4 b/m4/double-slash-root.m4 index 66a79c0f..16a4e3ec 100644 --- a/m4/double-slash-root.m4 +++ b/m4/double-slash-root.m4 @@ -1,5 +1,5 @@ # double-slash-root.m4 serial 4 -*- Autoconf -*- -dnl Copyright (C) 2006, 2008-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/dup2.m4 b/m4/dup2.m4 index 998d66f8..def263b8 100644 --- a/m4/dup2.m4 +++ b/m4/dup2.m4 @@ -1,5 +1,5 @@ -#serial 10 -dnl Copyright (C) 2002, 2005, 2007, 2009-2010 Free Software Foundation, Inc. +#serial 12 +dnl Copyright (C) 2002, 2005, 2007, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -8,7 +8,7 @@ AC_DEFUN([gl_FUNC_DUP2], [ AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) AC_REQUIRE([AC_CANONICAL_HOST]) - AC_CHECK_FUNCS_ONCE([dup2]) + AC_CHECK_FUNCS_ONCE([dup2 fcntl]) if test $ac_cv_func_dup2 = no; then HAVE_DUP2=0 AC_LIBOBJ([dup2]) @@ -16,16 +16,26 @@ AC_DEFUN([gl_FUNC_DUP2], AC_CACHE_CHECK([whether dup2 works], [gl_cv_func_dup2_works], [AC_RUN_IFELSE([ AC_LANG_PROGRAM([[#include +#include #include ]], - [if (dup2 (1, 1) == 0) - return 1; + [int result = 0; +#if HAVE_FCNTL + if (fcntl (1, F_SETFD, FD_CLOEXEC) == -1) + result |= 1; +#endif HAVE_FCNTL + if (dup2 (1, 1) == 0) + result |= 2; +#if HAVE_FCNTL + if (fcntl (1, F_GETFD) != FD_CLOEXEC) + result |= 4; +#endif close (0); if (dup2 (0, 0) != -1) - return 2; + result |= 8; /* Many gnulib modules require POSIX conformance of EBADF. */ - if (dup2 (1, 1000000) == -1 && errno != EBADF) - return 3; - return 0; + if (dup2 (2, 1000000) == -1 && errno != EBADF) + result |= 16; + return result; ]) ], [gl_cv_func_dup2_works=yes], [gl_cv_func_dup2_works=no], @@ -39,6 +49,8 @@ AC_DEFUN([gl_FUNC_DUP2], gl_cv_func_dup2_works=no;; freebsd*) # on FreeBSD 6.1, dup2(1,1000000) gives EMFILE, not EBADF. gl_cv_func_dup2_works=no;; + haiku*) # on Haiku alpha 2, dup2(1, 1) resets FD_CLOEXEC. + gl_cv_func_dup2_works=no;; *) gl_cv_func_dup2_works=yes;; esac]) ]) diff --git a/m4/eealloc.m4 b/m4/eealloc.m4 index 63dd9202..3006c484 100644 --- a/m4/eealloc.m4 +++ b/m4/eealloc.m4 @@ -1,5 +1,5 @@ # eealloc.m4 serial 2 -dnl Copyright (C) 2003, 2009, 2010 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/environ.m4 b/m4/environ.m4 index b9dc2ef2..7457ad13 100644 --- a/m4/environ.m4 +++ b/m4/environ.m4 @@ -1,5 +1,5 @@ # environ.m4 serial 5 -dnl Copyright (C) 2001-2004, 2006-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2004, 2006-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/errno_h.m4 b/m4/errno_h.m4 index e4325ac6..687bafff 100644 --- a/m4/errno_h.m4 +++ b/m4/errno_h.m4 @@ -1,5 +1,5 @@ -# errno_h.m4 serial 7 -dnl Copyright (C) 2004, 2006, 2008-2010 Free Software Foundation, Inc. +# errno_h.m4 serial 8 +dnl Copyright (C) 2004, 2006, 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -50,7 +50,7 @@ booboo if test $gl_cv_header_errno_h_complete = yes; then ERRNO_H='' else - gl_CHECK_NEXT_HEADERS([errno.h]) + gl_NEXT_HEADERS([errno.h]) ERRNO_H='errno.h' fi AC_SUBST([ERRNO_H]) diff --git a/m4/error.m4 b/m4/error.m4 index dd5a197b..6ea75ac0 100644 --- a/m4/error.m4 +++ b/m4/error.m4 @@ -1,6 +1,6 @@ #serial 13 -# Copyright (C) 1996-1998, 2001-2004, 2009-2010 Free Software Foundation, Inc. +# Copyright (C) 1996-1998, 2001-2004, 2009-2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/exclude.m4 b/m4/exclude.m4 index 72328ca2..e6fee8e0 100644 --- a/m4/exclude.m4 +++ b/m4/exclude.m4 @@ -1,5 +1,5 @@ # exclude.m4 serial 7 -dnl Copyright (C) 2002, 2003, 2005, 2006, 2009, 2010 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2011 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/extensions.m4 b/m4/extensions.m4 index 7d9458a8..1330503f 100644 --- a/m4/extensions.m4 +++ b/m4/extensions.m4 @@ -1,7 +1,7 @@ # serial 9 -*- Autoconf -*- # Enable extensions on systems that normally disable them. -# Copyright (C) 2003, 2006-2010 Free Software Foundation, Inc. +# Copyright (C) 2003, 2006-2011 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/fchdir.m4 b/m4/fchdir.m4 index 7bc691de..49d89d18 100644 --- a/m4/fchdir.m4 +++ b/m4/fchdir.m4 @@ -1,5 +1,5 @@ -# fchdir.m4 serial 14 -dnl Copyright (C) 2006-2010 Free Software Foundation, Inc. +# fchdir.m4 serial 15 +dnl Copyright (C) 2006-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -9,6 +9,12 @@ AC_DEFUN([gl_FUNC_FCHDIR], AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) AC_REQUIRE([gl_DIRENT_H_DEFAULTS]) AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) + + AC_CHECK_DECLS_ONCE([fchdir]) + if test $ac_cv_have_decl_fchdir = no; then + HAVE_DECL_FCHDIR=0 + fi + AC_CHECK_FUNCS_ONCE([fchdir]) if test $ac_cv_func_fchdir = no; then HAVE_FCHDIR=0 diff --git a/m4/fclose.m4 b/m4/fclose.m4 index 85de6294..278859c6 100644 --- a/m4/fclose.m4 +++ b/m4/fclose.m4 @@ -1,5 +1,5 @@ # fclose.m4 serial 2 -dnl Copyright (C) 2008-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fcntl-o.m4 b/m4/fcntl-o.m4 index 1adacc8a..88db07ec 100644 --- a/m4/fcntl-o.m4 +++ b/m4/fcntl-o.m4 @@ -1,5 +1,5 @@ -# fcntl-o.m4 serial 2 -dnl Copyright (C) 2006, 2009-2010 Free Software Foundation, Inc. +# fcntl-o.m4 serial 3 +dnl Copyright (C) 2006, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -37,34 +37,61 @@ AC_DEFUN([gl_FCNTL_O_FLAGS], }; ]], [[ - int status = !constants; + int result = !constants; { static char const sym[] = "conftest.sym"; - if (symlink (".", sym) != 0 - || close (open (sym, O_RDONLY | O_NOFOLLOW)) == 0) - status |= 32; + if (symlink (".", sym) != 0) + result |= 2; + else + { + int fd = open (sym, O_RDONLY | O_NOFOLLOW); + if (fd >= 0) + { + close (fd); + result |= 4; + } + } unlink (sym); } { static char const file[] = "confdefs.h"; int fd = open (file, O_RDONLY | O_NOATIME); - char c; - struct stat st0, st1; - if (fd < 0 - || fstat (fd, &st0) != 0 - || sleep (1) != 0 - || read (fd, &c, 1) != 1 - || close (fd) != 0 - || stat (file, &st1) != 0 - || st0.st_atime != st1.st_atime) - status |= 64; + if (fd < 0) + result |= 8; + else + { + struct stat st0; + if (fstat (fd, &st0) != 0) + result |= 16; + else + { + char c; + sleep (1); + if (read (fd, &c, 1) != 1) + result |= 24; + else + { + if (close (fd) != 0) + result |= 32; + else + { + struct stat st1; + if (stat (file, &st1) != 0) + result |= 40; + else + if (st0.st_atime != st1.st_atime) + result |= 64; + } + } + } + } } - return status;]])], + return result;]])], [gl_cv_header_working_fcntl_h=yes], [case $? in #( - 32) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #( + 4) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #( 64) gl_cv_header_working_fcntl_h='no (bad O_NOATIME)';; #( - 96) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #( + 68) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #( *) gl_cv_header_working_fcntl_h='no';; esac], [gl_cv_header_working_fcntl_h=cross-compiling])]) diff --git a/m4/fcntl.m4 b/m4/fcntl.m4 index fcb5f447..a93ed85a 100644 --- a/m4/fcntl.m4 +++ b/m4/fcntl.m4 @@ -1,5 +1,5 @@ -# fcntl.m4 serial 3 -dnl Copyright (C) 2009, 2010 Free Software Foundation, Inc. +# fcntl.m4 serial 4 +dnl Copyright (C) 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -24,11 +24,16 @@ AC_DEFUN([gl_FUNC_FCNTL], gl_REPLACE_FCNTL else dnl cygwin 1.5.x F_DUPFD has wrong errno, and allows negative target + dnl haiku alpha 2 F_DUPFD has wrong errno AC_CACHE_CHECK([whether fcntl handles F_DUPFD correctly], [gl_cv_func_fcntl_f_dupfd_works], [AC_RUN_IFELSE([AC_LANG_PROGRAM([[ #include -]], [[return fcntl (0, F_DUPFD, -1) != -1; +#include +]], [[int result = 0; + if (fcntl (0, F_DUPFD, -1) != -1) result |= 1; + if (errno != EINVAL) result |= 2; + return result; ]])], [gl_cv_func_fcntl_f_dupfd_works=yes], [gl_cv_func_fcntl_f_dupfd_works=no], diff --git a/m4/fcntl_h.m4 b/m4/fcntl_h.m4 index e41915c3..1ef4f455 100644 --- a/m4/fcntl_h.m4 +++ b/m4/fcntl_h.m4 @@ -1,6 +1,6 @@ -# serial 12 +# serial 13 # Configure fcntl.h. -dnl Copyright (C) 2006, 2007, 2009, 2010 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2007, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ AC_DEFUN([gl_FCNTL_H], [ AC_REQUIRE([gl_FCNTL_H_DEFAULTS]) AC_REQUIRE([gl_FCNTL_O_FLAGS]) - gl_CHECK_NEXT_HEADERS([fcntl.h]) + gl_NEXT_HEADERS([fcntl.h]) dnl Check for declarations of anything we want to poison if the dnl corresponding gnulib module is not in use, if it is not common diff --git a/m4/fdopendir.m4 b/m4/fdopendir.m4 index 0908e1f8..f192a628 100644 --- a/m4/fdopendir.m4 +++ b/m4/fdopendir.m4 @@ -1,7 +1,7 @@ -# serial 4 +# serial 5 # See if we need to provide fdopendir. -dnl Copyright (C) 2009-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -27,12 +27,16 @@ AC_DEFUN([gl_FUNC_FDOPENDIR], [AC_RUN_IFELSE([AC_LANG_PROGRAM([[ #include #include +#include #if !HAVE_DECL_FDOPENDIR extern DIR *fdopendir (int); #endif -]], [int fd = open ("conftest.c", O_RDONLY); - if (fd < 0) return 2; - return !!fdopendir (fd);])], +]], [int result = 0; + int fd = open ("conftest.c", O_RDONLY); + if (fd < 0) result |= 1; + if (fdopendir (fd)) result |= 2; + if (close (fd)) result |= 4; + return result;])], [gl_cv_func_fdopendir_works=yes], [gl_cv_func_fdopendir_works=no], [gl_cv_func_fdopendir_works="guessing no"])]) diff --git a/m4/fileblocks.m4 b/m4/fileblocks.m4 index 7b74ca1a..c8f99621 100644 --- a/m4/fileblocks.m4 +++ b/m4/fileblocks.m4 @@ -1,5 +1,5 @@ # fileblocks.m4 serial 5 -dnl Copyright (C) 2002, 2005-2006, 2009-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2005-2006, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/filenamecat.m4 b/m4/filenamecat.m4 index 236e5b05..b90cf9e8 100644 --- a/m4/filenamecat.m4 +++ b/m4/filenamecat.m4 @@ -1,5 +1,5 @@ # filenamecat.m4 serial 10 -dnl Copyright (C) 2002-2006, 2009-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/float_h.m4 b/m4/float_h.m4 index f6099db4..265a4c1a 100644 --- a/m4/float_h.m4 +++ b/m4/float_h.m4 @@ -1,5 +1,5 @@ -# float_h.m4 serial 4 -dnl Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc. +# float_h.m4 serial 5 +dnl Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -12,7 +12,7 @@ AC_DEFUN([gl_FLOAT_H], case "$host_os" in beos* | openbsd* | mirbsd*) FLOAT_H=float.h - gl_CHECK_NEXT_HEADERS([float.h]) + gl_NEXT_HEADERS([float.h]) ;; esac AC_SUBST([FLOAT_H]) diff --git a/m4/fnmatch.m4 b/m4/fnmatch.m4 index 84bcabd9..9b537a7e 100644 --- a/m4/fnmatch.m4 +++ b/m4/fnmatch.m4 @@ -1,6 +1,6 @@ -# Check for fnmatch - serial 4. +# Check for fnmatch - serial 5. -# Copyright (C) 2000-2007, 2009-2010 Free Software Foundation, Inc. +# Copyright (C) 2000-2007, 2009-2011 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -60,33 +60,60 @@ AC_DEFUN([gl_FUNC_FNMATCH_POSIX], static char const a01[] = { 'a' + 1, 0 }; static char const bs_1[] = { '\\\\' - 1, 0 }; static char const bs01[] = { '\\\\' + 1, 0 }; - return - !(n ("a*", "", 0) - && y ("a*", "abc", 0) - && n ("d*/*1", "d/s/1", FNM_PATHNAME) - && y ("a\\\\bc", "abc", 0) - && n ("a\\\\bc", "abc", FNM_NOESCAPE) - && y ("*x", ".x", 0) - && n ("*x", ".x", FNM_PERIOD) - && y (Apat, "\\\\", 0) && y (Apat, "A", 0) - && y (apat, "\\\\", 0) && y (apat, "a", 0) - && n (Apat, A_1, 0) == ('A' < '\\\\') - && n (apat, a_1, 0) == ('a' < '\\\\') - && y (Apat, A01, 0) == ('A' < '\\\\') - && y (apat, a01, 0) == ('a' < '\\\\') - && y (Apat, bs_1, 0) == ('A' < '\\\\') - && y (apat, bs_1, 0) == ('a' < '\\\\') - && n (Apat, bs01, 0) == ('A' < '\\\\') - && n (apat, bs01, 0) == ('a' < '\\\\') - $gl_fnmatch_gnu_start - && y ("xxXX", "xXxX", FNM_CASEFOLD) - && y ("a++(x|yy)b", "a+xyyyyxb", FNM_EXTMATCH) - && n ("d*/*1", "d/s/1", FNM_FILE_NAME) - && y ("*", "x", FNM_FILE_NAME | FNM_LEADING_DIR) - && y ("x*", "x/y/z", FNM_FILE_NAME | FNM_LEADING_DIR) - && y ("*c*", "c/x", FNM_FILE_NAME | FNM_LEADING_DIR) - $gl_fnmatch_gnu_end - ); + int result = 0; + if (!n ("a*", "", 0)) + return 1; + if (!y ("a*", "abc", 0)) + return 1; + if (!n ("d*/*1", "d/s/1", FNM_PATHNAME)) + return 2; + if (!y ("a\\\\bc", "abc", 0)) + return 3; + if (!n ("a\\\\bc", "abc", FNM_NOESCAPE)) + return 3; + if (!y ("*x", ".x", 0)) + return 4; + if (!n ("*x", ".x", FNM_PERIOD)) + return 4; + if (!y (Apat, "\\\\", 0)) + return 5; + if (!y (Apat, "A", 0)) + return 5; + if (!y (apat, "\\\\", 0)) + return 5; + if (!y (apat, "a", 0)) + return 5; + if (!(n (Apat, A_1, 0) == ('A' < '\\\\'))) + return 5; + if (!(n (apat, a_1, 0) == ('a' < '\\\\'))) + return 5; + if (!(y (Apat, A01, 0) == ('A' < '\\\\'))) + return 5; + if (!(y (apat, a01, 0) == ('a' < '\\\\'))) + return 5; + if (!(y (Apat, bs_1, 0) == ('A' < '\\\\'))) + return 5; + if (!(y (apat, bs_1, 0) == ('a' < '\\\\'))) + return 5; + if (!(n (Apat, bs01, 0) == ('A' < '\\\\'))) + return 5; + if (!(n (apat, bs01, 0) == ('a' < '\\\\'))) + return 5; + $gl_fnmatch_gnu_start + if (!y ("xxXX", "xXxX", FNM_CASEFOLD)) + result |= 8; + if (!y ("a++(x|yy)b", "a+xyyyyxb", FNM_EXTMATCH)) + result |= 16; + if (!n ("d*/*1", "d/s/1", FNM_FILE_NAME)) + result |= 32; + if (!y ("*", "x", FNM_FILE_NAME | FNM_LEADING_DIR)) + result |= 64; + if (!y ("x*", "x/y/z", FNM_FILE_NAME | FNM_LEADING_DIR)) + result |= 64; + if (!y ("*c*", "c/x", FNM_FILE_NAME | FNM_LEADING_DIR)) + result |= 64; + $gl_fnmatch_gnu_end + return result; ]])], [eval "$gl_fnmatch_cache_var=yes"], [eval "$gl_fnmatch_cache_var=no"], diff --git a/m4/fpending.m4 b/m4/fpending.m4 index 09ae7e3f..314e0031 100644 --- a/m4/fpending.m4 +++ b/m4/fpending.m4 @@ -1,6 +1,6 @@ # serial 15 -# Copyright (C) 2000-2001, 2004-2010 Free Software Foundation, Inc. +# Copyright (C) 2000-2001, 2004-2011 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/fseeko.m4 b/m4/fseeko.m4 index b97df533..76507d12 100644 --- a/m4/fseeko.m4 +++ b/m4/fseeko.m4 @@ -1,5 +1,5 @@ -# fseeko.m4 serial 9 -dnl Copyright (C) 2007-2010 Free Software Foundation, Inc. +# fseeko.m4 serial 11 +dnl Copyright (C) 2007-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -10,6 +10,11 @@ AC_DEFUN([gl_FUNC_FSEEKO], AC_REQUIRE([gl_HAVE_FSEEKO]) AC_REQUIRE([gl_STDIN_LARGE_OFFSET]) + AC_CHECK_DECLS_ONCE([fseeko]) + if test $ac_cv_have_decl_fseeko = no; then + HAVE_DECL_FSEEKO=0 + fi + if test $gl_cv_func_fseeko = no; then HAVE_FSEEKO=0 gl_REPLACE_FSEEKO @@ -48,3 +53,23 @@ AC_DEFUN([gl_REPLACE_FSEEKO], dnl If we are also using the fseek module, then fseek needs replacing, too. m4_ifdef([gl_REPLACE_FSEEK], [gl_REPLACE_FSEEK]) ]) + +dnl Code shared by fseeko and ftello. Determine if large files are supported, +dnl but stdin does not start as a large file by default. +AC_DEFUN([gl_STDIN_LARGE_OFFSET], + [ + AC_CACHE_CHECK([whether stdin defaults to large file offsets], + [gl_cv_var_stdin_large_offset], + [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], +[[#if defined __SL64 && defined __SCLE /* cygwin */ + /* Cygwin 1.5.24 and earlier fail to put stdin in 64-bit mode, making + fseeko/ftello needlessly fail. This bug was fixed in 1.5.25, and + it is easier to do a version check than building a runtime test. */ +# include +# if CYGWIN_VERSION_DLL_COMBINED < CYGWIN_VERSION_DLL_MAKE_COMBINED (1005, 25) + choke me +# endif +#endif]])], + [gl_cv_var_stdin_large_offset=yes], + [gl_cv_var_stdin_large_offset=no])]) +]) diff --git a/m4/futimens.m4 b/m4/futimens.m4 index 1212fb90..72c6f25c 100644 --- a/m4/futimens.m4 +++ b/m4/futimens.m4 @@ -1,7 +1,7 @@ # serial 5 # See if we need to provide futimens replacement. -dnl Copyright (C) 2009, 2010 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/getcwd-abort-bug.m4 b/m4/getcwd-abort-bug.m4 index 59c3daaa..21be828b 100644 --- a/m4/getcwd-abort-bug.m4 +++ b/m4/getcwd-abort-bug.m4 @@ -3,7 +3,7 @@ # name is unusually large. Any length between 4k and 16k trigger the bug # when using glibc-2.4.90-9 or older. -# Copyright (C) 2006, 2009, 2010 Free Software Foundation, Inc. +# Copyright (C) 2006, 2009-2011 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/getcwd-path-max.m4 b/m4/getcwd-path-max.m4 index 04ff1419..2ab26450 100644 --- a/m4/getcwd-path-max.m4 +++ b/m4/getcwd-path-max.m4 @@ -1,4 +1,4 @@ -# serial 14 +# serial 15 # Check for several getcwd bugs with long file names. # If so, arrange to compile the wrapper function. @@ -6,7 +6,7 @@ # I've heard that this is due to a Linux kernel bug, and that it has # been fixed between 2.4.21-pre3 and 2.4.21-pre4. */ -# Copyright (C) 2003-2007, 2009-2010 Free Software Foundation, Inc. +# Copyright (C) 2003-2007, 2009-2011 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -85,7 +85,7 @@ main () size_t n_chdirs = 0; if (cwd == NULL) - exit (1); + exit (10); cwd_len = initial_cwd_len = strlen (cwd); @@ -103,7 +103,7 @@ main () if (mkdir (DIR_NAME, S_IRWXU) < 0 || chdir (DIR_NAME) < 0) { if (! (errno == ERANGE || is_ENAMETOOLONG (errno))) - fail = 2; + fail = 20; break; } @@ -112,12 +112,12 @@ main () c = getcwd (buf, PATH_MAX); if (!c && errno == ENOENT) { - fail = 1; + fail = 11; break; } if (c || ! (errno == ERANGE || is_ENAMETOOLONG (errno))) { - fail = 2; + fail = 21; break; } } @@ -132,12 +132,12 @@ main () if (! (errno == ERANGE || errno == ENOENT || is_ENAMETOOLONG (errno))) { - fail = 2; + fail = 22; break; } if (AT_FDCWD || errno == ERANGE || errno == ENOENT) { - fail = 1; + fail = 12; break; } } @@ -145,7 +145,7 @@ main () if (c && strlen (c) != cwd_len) { - fail = 2; + fail = 23; break; } ++n_chdirs; @@ -174,7 +174,7 @@ main () ]])], [gl_cv_func_getcwd_path_max=yes], [case $? in - 1) gl_cv_func_getcwd_path_max='no, but it is partly working';; + 10|11|12) gl_cv_func_getcwd_path_max='no, but it is partly working';; *) gl_cv_func_getcwd_path_max=no;; esac], [gl_cv_func_getcwd_path_max=no]) diff --git a/m4/getcwd.m4 b/m4/getcwd.m4 index df9c9686..70980567 100644 --- a/m4/getcwd.m4 +++ b/m4/getcwd.m4 @@ -1,13 +1,12 @@ # getcwd.m4 - check for working getcwd that is compatible with glibc -# Copyright (C) 2001, 2003, 2004, 2005, 2006, 2007, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 2001, 2003-2007, 2009-2011 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. # Written by Paul Eggert. -# serial 2 +# serial 3 AC_DEFUN([gl_FUNC_GETCWD_NULL], [ @@ -27,7 +26,13 @@ AC_DEFUN([gl_FUNC_GETCWD_NULL], else { char *f = getcwd (NULL, 0); - return ! (f && f[0] == '/' && !f[1]); + if (! f) + return 2; + if (f[0] != '/') + return 3; + if (f[1] != '\0') + return 4; + return 0; } #endif ]])], diff --git a/m4/getdelim.m4 b/m4/getdelim.m4 index 4beb1501..ef127366 100644 --- a/m4/getdelim.m4 +++ b/m4/getdelim.m4 @@ -1,6 +1,6 @@ -# getdelim.m4 serial 6 +# getdelim.m4 serial 8 -dnl Copyright (C) 2005-2007, 2009-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2007, 2009-2011 Free Software Foundation, Inc. dnl dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -38,7 +38,7 @@ AC_DEFUN([gl_FUNC_GETDELIM], size_t siz = 0; int len = getdelim (&line, &siz, '\n', in); if (!(len == 4 && line && strcmp (line, "foo\n") == 0)) - return 1; + return 2; } { /* Test result for a NULL buffer and a non-zero size. @@ -46,7 +46,7 @@ AC_DEFUN([gl_FUNC_GETDELIM], char *line = NULL; size_t siz = (size_t)(~0) / 4; if (getdelim (&line, &siz, '\n', in) == -1) - return 1; + return 3; } return 0; } @@ -57,7 +57,7 @@ AC_DEFUN([gl_FUNC_GETDELIM], [ #include #ifdef __GNU_LIBRARY__ - #if (__GLIBC__ >= 2) + #if (__GLIBC__ >= 2) && !defined __UCLIBC__ Lucky GNU user #endif #endif diff --git a/m4/getdtablesize.m4 b/m4/getdtablesize.m4 index d2386284..55bda5a3 100644 --- a/m4/getdtablesize.m4 +++ b/m4/getdtablesize.m4 @@ -1,5 +1,5 @@ # getdtablesize.m4 serial 1 -dnl Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/getline.m4 b/m4/getline.m4 index 83005600..ec001b91 100644 --- a/m4/getline.m4 +++ b/m4/getline.m4 @@ -1,6 +1,6 @@ -# getline.m4 serial 21 +# getline.m4 serial 23 -dnl Copyright (C) 1998-2003, 2005-2007, 2009-2010 Free Software Foundation, +dnl Copyright (C) 1998-2003, 2005-2007, 2009-2011 Free Software Foundation, dnl Inc. dnl dnl This file is free software; the Free Software Foundation @@ -46,7 +46,7 @@ AC_DEFUN([gl_FUNC_GETLINE], size_t siz = 0; int len = getline (&line, &siz, in); if (!(len == 4 && line && strcmp (line, "foo\n") == 0)) - return 1; + return 2; } { /* Test result for a NULL buffer and a non-zero size. @@ -54,7 +54,7 @@ AC_DEFUN([gl_FUNC_GETLINE], char *line = NULL; size_t siz = (size_t)(~0) / 4; if (getline (&line, &siz, in) == -1) - return 1; + return 3; } return 0; } @@ -65,7 +65,7 @@ AC_DEFUN([gl_FUNC_GETLINE], [ #include #ifdef __GNU_LIBRARY__ - #if (__GLIBC__ >= 2) + #if (__GLIBC__ >= 2) && !defined __UCLIBC__ Lucky GNU user #endif #endif diff --git a/m4/getopt.m4 b/m4/getopt.m4 index d05e9d91..035a530d 100644 --- a/m4/getopt.m4 +++ b/m4/getopt.m4 @@ -1,5 +1,5 @@ -# getopt.m4 serial 31 -dnl Copyright (C) 2002-2006, 2008-2010 Free Software Foundation, Inc. +# getopt.m4 serial 34 +dnl Copyright (C) 2002-2006, 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -56,7 +56,6 @@ AC_DEFUN([gl_GETOPT_CHECK_HEADERS], AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) gl_CHECK_NEXT_HEADERS([getopt.h]) - AC_CHECK_HEADERS_ONCE([getopt.h]) if test $ac_cv_header_getopt_h = yes; then HAVE_GETOPT_H=1 else @@ -76,20 +75,6 @@ AC_DEFUN([gl_GETOPT_CHECK_HEADERS], AC_CHECK_FUNCS([getopt_long_only], [], [gl_replace_getopt=yes]) fi - dnl BSD getopt_long uses an incompatible method to reset option processing. - dnl Existence of the variable, in and of itself, is not a reason to replace - dnl getopt, but knowledge of the variable is needed to determine how to - dnl reset and whether a reset reparses the environment. - dnl Solaris supports neither optreset nor optind=0, but keeps no state that - dnl needs a reset beyond setting optind=1; detect Solaris by getopt_clip. - if test -z "$gl_replace_getopt"; then - AC_CHECK_DECLS([optreset], [], - [AC_CHECK_DECLS([getopt_clip], [], [], - [[#include ]]) - ], - [[#include ]]) - fi - dnl mingw's getopt (in libmingwex.a) does weird things when the options dnl strings starts with '+' and it's not the first call. Some internal state dnl is left over from earlier calls, and neither setting optind = 0 nor @@ -103,18 +88,34 @@ AC_DEFUN([gl_GETOPT_CHECK_HEADERS], AC_CACHE_CHECK([whether getopt is POSIX compatible], [gl_cv_func_getopt_posix], [ + dnl BSD getopt_long uses an incompatible method to reset + dnl option processing. Existence of the variable, in and of + dnl itself, is not a reason to replace getopt, but knowledge + dnl of the variable is needed to determine how to reset and + dnl whether a reset reparses the environment. Solaris + dnl supports neither optreset nor optind=0, but keeps no state + dnl that needs a reset beyond setting optind=1; detect Solaris + dnl by getopt_clip. + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], + [[int *p = &optreset; return optreset;]])], + [gl_optind_min=1], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], + [[return !getopt_clip;]])], + [gl_optind_min=1], + [gl_optind_min=0])]) + dnl This test fails on mingw and succeeds on many other platforms. + gl_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -DOPTIND_MIN=$gl_optind_min" AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include #include #include -#if !HAVE_DECL_OPTRESET && !HAVE_DECL_GETOPT_CLIP -# define OPTIND_MIN 0 -#else -# define OPTIND_MIN 1 -#endif - int main () { @@ -202,6 +203,7 @@ main () *) gl_cv_func_getopt_posix="guessing yes";; esac ]) + CPPFLAGS=$gl_save_CPPFLAGS ]) case "$gl_cv_func_getopt_posix" in *no) gl_replace_getopt=yes ;; @@ -231,6 +233,7 @@ dnl is ambiguous with environment values that contain newlines. #include #include ]], [[ + int result = 0; /* This code succeeds on glibc 2.8, OpenBSD 4.0, Cygwin, mingw, and fails on MacOS X 10.5, AIX 5.2, HP-UX 11, IRIX 6.5, OSF/1 5.1, Solaris 10. */ @@ -241,7 +244,7 @@ dnl is ambiguous with environment values that contain newlines. myargv[2] = 0; opterr = 0; if (getopt (2, myargv, "+a") != '?') - return 1; + result |= 1; } /* This code succeeds on glibc 2.8, mingw, and fails on MacOS X 10.5, OpenBSD 4.0, AIX 5.2, HP-UX 11, @@ -251,33 +254,33 @@ dnl is ambiguous with environment values that contain newlines. optind = 1; if (getopt (4, argv, "p::") != 'p') - return 2; - if (optarg != NULL) - return 3; - if (getopt (4, argv, "p::") != -1) - return 4; - if (optind != 2) - return 5; + result |= 2; + else if (optarg != NULL) + result |= 4; + else if (getopt (4, argv, "p::") != -1) + result |= 6; + else if (optind != 2) + result |= 8; } /* This code succeeds on glibc 2.8 and fails on Cygwin 1.7.0. */ { char *argv[] = { "program", "foo", "-p", NULL }; optind = 0; if (getopt (3, argv, "-p") != 1) - return 6; - if (getopt (3, argv, "-p") != 'p') - return 7; + result |= 16; + else if (getopt (3, argv, "-p") != 'p') + result |= 32; } /* This code fails on glibc 2.11. */ { char *argv[] = { "program", "-b", "-a", NULL }; optind = opterr = 0; if (getopt (3, argv, "+:a:b") != 'b') - return 8; - if (getopt (3, argv, "+:a:b") != ':') - return 9; + result |= 64; + else if (getopt (3, argv, "+:a:b") != ':') + result |= 64; } - return 0; + return result; ]])], [gl_cv_func_getopt_gnu=yes], [gl_cv_func_getopt_gnu=no], diff --git a/m4/getpagesize.m4 b/m4/getpagesize.m4 index 313ad7fa..79dfbbe4 100644 --- a/m4/getpagesize.m4 +++ b/m4/getpagesize.m4 @@ -1,5 +1,5 @@ # getpagesize.m4 serial 8 -dnl Copyright (C) 2002, 2004-2005, 2007, 2009-2010 Free Software Foundation, +dnl Copyright (C) 2002, 2004-2005, 2007, 2009-2011 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/gettext.m4 b/m4/gettext.m4 index 98289d84..089058e4 100644 --- a/m4/gettext.m4 +++ b/m4/gettext.m4 @@ -1,5 +1,5 @@ # gettext.m4 serial 64 (gettext-0.18.2) -dnl Copyright (C) 1995-2010 Free Software Foundation, Inc. +dnl Copyright (C) 1995-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/gettime.m4 b/m4/gettime.m4 index 9e7fde42..2b148abb 100644 --- a/m4/gettime.m4 +++ b/m4/gettime.m4 @@ -1,5 +1,5 @@ # gettime.m4 serial 7 -dnl Copyright (C) 2002, 2004-2006, 2009-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2004-2006, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/gettimeofday.m4 b/m4/gettimeofday.m4 index 709a4d4f..84acadf2 100644 --- a/m4/gettimeofday.m4 +++ b/m4/gettimeofday.m4 @@ -1,6 +1,6 @@ # serial 15 -# Copyright (C) 2001-2003, 2005, 2007, 2009-2010 Free Software Foundation, Inc. +# Copyright (C) 2001-2003, 2005, 2007, 2009-2011 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/glibc21.m4 b/m4/glibc21.m4 index 68ada9d4..bc81c110 100644 --- a/m4/glibc21.m4 +++ b/m4/glibc21.m4 @@ -1,23 +1,27 @@ -# glibc21.m4 serial 4 -dnl Copyright (C) 2000-2002, 2004, 2008-2010 Free Software Foundation, Inc. +# glibc21.m4 serial 5 +dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2011 Free Software Foundation, +dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. -# Test for the GNU C Library, version 2.1 or newer. +# Test for the GNU C Library, version 2.1 or newer, or uClibc. # From Bruno Haible. AC_DEFUN([gl_GLIBC21], [ - AC_CACHE_CHECK([whether we are using the GNU C Library 2.1 or newer], + AC_CACHE_CHECK([whether we are using the GNU C Library >= 2.1 or uClibc], [ac_cv_gnu_library_2_1], - [AC_EGREP_CPP([Lucky GNU user], + [AC_EGREP_CPP([Lucky], [ #include #ifdef __GNU_LIBRARY__ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) Lucky GNU user #endif +#endif +#ifdef __UCLIBC__ + Lucky user #endif ], [ac_cv_gnu_library_2_1=yes], diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4 index 4c7ac30d..ecbf3369 100644 --- a/m4/gnulib-common.m4 +++ b/m4/gnulib-common.m4 @@ -1,5 +1,5 @@ -# gnulib-common.m4 serial 20 -dnl Copyright (C) 2007-2010 Free Software Foundation, Inc. +# gnulib-common.m4 serial 23 +dnl Copyright (C) 2007-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -102,6 +102,39 @@ AC_DEFUN([gl_MODULE_INDICATOR_FOR_TESTS], [Define to 1 when the gnulib module $1 should be tested.]) ]) +# gl_ASSERT_NO_GNULIB_POSIXCHECK +# asserts that there will never be a need to #define GNULIB_POSIXCHECK. +# and thereby enables an optimization of configure and config.h. +# Used by Emacs. +AC_DEFUN([gl_ASSERT_NO_GNULIB_POSIXCHECK], +[ + dnl Override gl_WARN_ON_USE_PREPARE. + AC_DEFUN([gl_WARN_ON_USE_PREPARE], []) +]) + +# gl_ASSERT_NO_GNULIB_TESTS +# asserts that there will be no gnulib tests in the scope of the configure.ac +# and thereby enables an optimization of config.h. +# Used by Emacs. +AC_DEFUN([gl_ASSERT_NO_GNULIB_TESTS], +[ + dnl Override gl_MODULE_INDICATOR_FOR_TESTS. + AC_DEFUN([gl_MODULE_INDICATOR_FOR_TESTS], []) +]) + +# Test whether exists. +# Set HAVE_FEATURES_H. +AC_DEFUN([gl_FEATURES_H], +[ + AC_CHECK_HEADERS_ONCE([features.h]) + if test $ac_cv_header_features_h = yes; then + HAVE_FEATURES_H=1 + else + HAVE_FEATURES_H=0 + fi + AC_SUBST([HAVE_FEATURES_H]) +]) + # m4_foreach_w # is a backport of autoconf-2.59c's m4_foreach_w. # Remove this macro when we can assume autoconf >= 2.60. diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 index 554fa54e..837538e4 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 @@ -1,7 +1,7 @@ # -*- buffer-read-only: t -*- vi: set ro: # DO NOT EDIT! GENERATED AUTOMATICALLY! # DO NOT EDIT! GENERATED AUTOMATICALLY! -# Copyright (C) 2002-2010 Free Software Foundation, Inc. +# Copyright (C) 2002-2011 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 @@ -58,6 +58,7 @@ AC_DEFUN([gl_EARLY], # Code from module dirfd: # Code from module dirname: # Code from module dirname-lgpl: + # Code from module dosname: # Code from module double-slash-root: # Code from module dup2: # Code from module environ: @@ -103,6 +104,7 @@ AC_DEFUN([gl_EARLY], # Code from module intprops: # Code from module inttostr: # Code from module inttypes: + # Code from module iswblank: # Code from module langinfo: # Code from module lchown: # Code from module link: @@ -119,6 +121,7 @@ AC_DEFUN([gl_EARLY], # Code from module mbscasecmp: # Code from module mbsinit: # Code from module mbsrtowcs: + # Code from module mbtowc: # Code from module mbuiter: # Code from module memchr: # Code from module mempcpy: @@ -222,7 +225,7 @@ AC_DEFUN([gl_EARLY], # Code from module warn-on-use: # Code from module wchar: # Code from module wcrtomb: - # Code from module wctype: + # Code from module wctype-h: # Code from module wcwidth: # Code from module write: # Code from module xalloc: @@ -300,6 +303,7 @@ AC_DEFUN([gl_INIT], # Code from module closeout: gl_CLOSEOUT # Code from module configmake: + gl_CONFIGMAKE_PREP # Code from module d-ino: gl_CHECK_TYPE_STRUCT_DIRENT_D_INO # Code from module dirent: @@ -315,6 +319,7 @@ AC_DEFUN([gl_INIT], gl_MODULE_INDICATOR([dirname]) # Code from module dirname-lgpl: gl_DIRNAME_LGPL + # Code from module dosname: # Code from module double-slash-root: gl_DOUBLE_SLASH_ROOT # Code from module dup2: @@ -416,6 +421,9 @@ AC_DEFUN([gl_INIT], gl_INTTOSTR # Code from module inttypes: gl_INTTYPES_H + # Code from module iswblank: + gl_FUNC_ISWBLANK + gl_WCTYPE_MODULE_INDICATOR([iswblank]) # Code from module langinfo: gl_LANGINFO_H # Code from module lchown: @@ -460,6 +468,9 @@ AC_DEFUN([gl_INIT], # Code from module mbsrtowcs: gl_FUNC_MBSRTOWCS gl_WCHAR_MODULE_INDICATOR([mbsrtowcs]) + # Code from module mbtowc: + gl_FUNC_MBTOWC + gl_STDLIB_MODULE_INDICATOR([mbtowc]) # Code from module mbuiter: gl_MBITER # Code from module memchr: @@ -565,6 +576,7 @@ AC_DEFUN([gl_INIT], # Code from module snprintf: gl_FUNC_SNPRINTF gl_STDIO_MODULE_INDICATOR([snprintf]) + gl_MODULE_INDICATOR([snprintf]) # Code from module ssize_t: gt_TYPE_SSIZE_T # Code from module stat: @@ -660,7 +672,7 @@ AC_DEFUN([gl_INIT], # Code from module uniwidth/base: gl_LIBUNISTRING_LIBHEADER([0.9], [uniwidth.h]) # Code from module uniwidth/width: - gl_LIBUNISTRING_MODULE([0.9], [uniwidth/width]) + gl_LIBUNISTRING_MODULE([0.9.4], [uniwidth/width]) # Code from module unlink: gl_FUNC_UNLINK gl_UNISTD_MODULE_INDICATOR([unlink]) @@ -697,7 +709,7 @@ AC_DEFUN([gl_INIT], # Code from module wcrtomb: gl_FUNC_WCRTOMB gl_WCHAR_MODULE_INDICATOR([wcrtomb]) - # Code from module wctype: + # Code from module wctype-h: gl_WCTYPE_H # Code from module wcwidth: gl_FUNC_WCWIDTH @@ -923,6 +935,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/dirname-lgpl.c lib/dirname.c lib/dirname.h + lib/dosname.h lib/dup-safer.c lib/dup2.c lib/errno.in.h @@ -978,6 +991,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/inttostr.c lib/inttostr.h lib/inttypes.in.h + lib/iswblank.c lib/langinfo.in.h lib/lchown.c lib/link.c @@ -995,8 +1009,11 @@ AC_DEFUN([gl_FILE_LIST], [ lib/mbrtowc.c lib/mbscasecmp.c lib/mbsinit.c + lib/mbsrtowcs-impl.h lib/mbsrtowcs-state.c lib/mbsrtowcs.c + lib/mbtowc-impl.h + lib/mbtowc.c lib/mbuiter.h lib/memchr.c lib/memchr.valgrind @@ -1078,7 +1095,6 @@ AC_DEFUN([gl_FILE_LIST], [ lib/stddef.in.h lib/stdint.in.h lib/stdio-impl.h - lib/stdio-write.c lib/stdio.in.h lib/stdlib.in.h lib/stpcpy.c @@ -1163,7 +1179,6 @@ AC_DEFUN([gl_FILE_LIST], [ m4/alloca.m4 m4/argmatch.m4 m4/argp.m4 - m4/asm-underscore.m4 m4/backupfile.m4 m4/bison.m4 m4/btowc.m4 @@ -1176,12 +1191,12 @@ AC_DEFUN([gl_FILE_LIST], [ m4/close.m4 m4/closeout.m4 m4/codeset.m4 + m4/configmake.m4 m4/d-ino.m4 m4/dirent-safer.m4 m4/dirent_h.m4 m4/dirfd.m4 m4/dirname.m4 - m4/dos.m4 m4/double-slash-root.m4 m4/dup2.m4 m4/eealloc.m4 @@ -1232,6 +1247,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/inttypes-pri.m4 m4/inttypes.m4 m4/inttypes_h.m4 + m4/iswblank.m4 m4/langinfo_h.m4 m4/lchown.m4 m4/lcmessage.m4 @@ -1258,6 +1274,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/mbsinit.m4 m4/mbsrtowcs.m4 m4/mbstate_t.m4 + m4/mbtowc.m4 m4/memchr.m4 m4/mempcpy.m4 m4/memrchr.m4 diff --git a/m4/hash.m4 b/m4/hash.m4 index 414a2137..167c0830 100644 --- a/m4/hash.m4 +++ b/m4/hash.m4 @@ -1,5 +1,5 @@ # hash.m4 serial 6 -dnl Copyright (C) 2002-2003, 2005-2006, 2009-2010 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2011 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/human.m4 b/m4/human.m4 index eda47da5..21c12f56 100644 --- a/m4/human.m4 +++ b/m4/human.m4 @@ -1,6 +1,5 @@ #serial 10 -dnl Copyright (C) 2002, 2003, 2004, 2005, 2006, 2009, 2010 Free Software -dnl Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/iconv.m4 b/m4/iconv.m4 index 425145c0..085cd068 100644 --- a/m4/iconv.m4 +++ b/m4/iconv.m4 @@ -1,5 +1,5 @@ -# iconv.m4 serial 15 (gettext-0.18.2) -dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc. +# iconv.m4 serial 17 (gettext-0.18.2) +dnl Copyright (C) 2000-2002, 2007-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -78,6 +78,7 @@ AC_DEFUN([AM_ICONV_LINK], #include int main () { + int result = 0; /* Test against AIX 5.1 bug: Failures are not distinguishable from successful returns. */ { @@ -94,7 +95,8 @@ int main () (char **) &inptr, &inbytesleft, &outptr, &outbytesleft); if (res == 0) - return 1; + result |= 1; + iconv_close (cd_utf8_to_88591); } } /* Test against Solaris 10 bug: Failures are not distinguishable from @@ -113,7 +115,8 @@ int main () (char **) &inptr, &inbytesleft, &outptr, &outbytesleft); if (res == 0) - return 1; + result |= 2; + iconv_close (cd_ascii_to_88591); } } /* Test against AIX 6.1..7.1 bug: Buffer overrun. */ @@ -131,7 +134,8 @@ int main () (char **) &inptr, &inbytesleft, &outptr, &outbytesleft); if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD) - return 1; + result |= 4; + iconv_close (cd_88591_to_utf8); } } #if 0 /* This bug could be worked around by the caller. */ @@ -150,7 +154,8 @@ int main () (char **) &inptr, &inbytesleft, &outptr, &outbytesleft); if ((int)res > 0) - return 1; + result |= 8; + iconv_close (cd_88591_to_utf8); } } #endif @@ -164,8 +169,8 @@ int main () && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) /* Try HP-UX names. */ && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) - return 1; - return 0; + result |= 16; + return result; }]])], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no], @@ -252,5 +257,12 @@ size_t iconv(); $am_cv_proto_iconv]) AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1], [Define as const if the declaration of iconv() needs const.]) + dnl Also substitute ICONV_CONST in the gnulib generated . + m4_ifdef([gl_ICONV_H_DEFAULTS], + [AC_REQUIRE([gl_ICONV_H_DEFAULTS]) + if test -n "$am_cv_proto_iconv_arg1"; then + ICONV_CONST="const" + fi + ]) fi ]) diff --git a/m4/include_next.m4 b/m4/include_next.m4 index e37eb056..b3c78491 100644 --- a/m4/include_next.m4 +++ b/m4/include_next.m4 @@ -1,5 +1,5 @@ -# include_next.m4 serial 16 -dnl Copyright (C) 2006-2010 Free Software Foundation, Inc. +# include_next.m4 serial 18 +dnl Copyright (C) 2006-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -147,11 +147,33 @@ choke me # Note: This macro assumes that the header file is not empty after # preprocessing, i.e. it does not only define preprocessor macros but also # provides some type/enum definitions or function/variable declarations. +# +# This macro also checks whether each header exists, by invoking +# AC_CHECK_HEADERS_ONCE or AC_CHECK_HEADERS on each argument. AC_DEFUN([gl_CHECK_NEXT_HEADERS], +[ + gl_NEXT_HEADERS_INTERNAL([$1], [check]) +]) + +# gl_NEXT_HEADERS(HEADER1 HEADER2 ...) +# ------------------------------------ +# Like gl_CHECK_NEXT_HEADERS, except do not check whether the headers exist. +# This is suitable for headers like that are standardized by C89 +# and therefore can be assumed to exist. +AC_DEFUN([gl_NEXT_HEADERS], +[ + gl_NEXT_HEADERS_INTERNAL([$1], [assume]) +]) + +# The guts of gl_CHECK_NEXT_HEADERS and gl_NEXT_HEADERS. +AC_DEFUN([gl_NEXT_HEADERS_INTERNAL], [ AC_REQUIRE([gl_INCLUDE_NEXT]) AC_REQUIRE([AC_CANONICAL_HOST]) - AC_CHECK_HEADERS_ONCE([$1]) + + m4_if([$2], [check], + [AC_CHECK_HEADERS_ONCE([$1]) + ]) m4_foreach_w([gl_HEADER_NAME], [$1], [AS_VAR_PUSHDEF([gl_next_header], @@ -162,39 +184,44 @@ AC_DEFUN([gl_CHECK_NEXT_HEADERS], AC_CACHE_CHECK( [absolute name of <]m4_defn([gl_HEADER_NAME])[>], m4_defn([gl_next_header]), - [AS_VAR_PUSHDEF([gl_header_exists], - [ac_cv_header_]m4_defn([gl_HEADER_NAME])) - if test AS_VAR_GET(gl_header_exists) = yes; then - AC_LANG_CONFTEST( - [AC_LANG_SOURCE( - [[#include <]]m4_dquote(m4_defn([gl_HEADER_NAME]))[[>]] - )]) - dnl AIX "xlc -E" and "cc -E" omit #line directives for header files - dnl that contain only a #include of other header files and no - dnl non-comment tokens of their own. This leads to a failure to - dnl detect the absolute name of , , - dnl and others. The workaround is to force preservation of comments - dnl through option -C. This ensures all necessary #line directives - dnl are present. GCC supports option -C as well. - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - dnl eval is necessary to expand gl_absname_cpp. - dnl Ultrix and Pyramid sh refuse to redirect output of eval, - dnl so use subshell. - AS_VAR_SET([gl_next_header], - ['"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD | - sed -n '\#/]m4_defn([gl_HEADER_NAME])[#{ - s#.*"\(.*/]m4_defn([gl_HEADER_NAME])[\)".*#\1# - s#^/[^/]#//&# - p - q - }'`'"']) - else - AS_VAR_SET([gl_next_header], ['<'gl_HEADER_NAME'>']) - fi - AS_VAR_POPDEF([gl_header_exists])]) + [m4_if([$2], [check], + [AS_VAR_PUSHDEF([gl_header_exists], + [ac_cv_header_]m4_defn([gl_HEADER_NAME])) + if test AS_VAR_GET(gl_header_exists) = yes; then + AS_VAR_POPDEF([gl_header_exists]) + ]) + AC_LANG_CONFTEST( + [AC_LANG_SOURCE( + [[#include <]]m4_dquote(m4_defn([gl_HEADER_NAME]))[[>]] + )]) + dnl AIX "xlc -E" and "cc -E" omit #line directives for header + dnl files that contain only a #include of other header files and + dnl no non-comment tokens of their own. This leads to a failure + dnl to detect the absolute name of , , + dnl and others. The workaround is to force preservation + dnl of comments through option -C. This ensures all necessary + dnl #line directives are present. GCC supports option -C as well. + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + dnl eval is necessary to expand gl_absname_cpp. + dnl Ultrix and Pyramid sh refuse to redirect output of eval, + dnl so use subshell. + AS_VAR_SET([gl_next_header], + ['"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD | + sed -n '\#/]m4_defn([gl_HEADER_NAME])[#{ + s#.*"\(.*/]m4_defn([gl_HEADER_NAME])[\)".*#\1# + s#^/[^/]#//&# + p + q + }'`'"']) + m4_if([$2], [check], + [else + AS_VAR_SET([gl_next_header], ['<'gl_HEADER_NAME'>']) + fi + ]) + ]) fi AC_SUBST( AS_TR_CPP([NEXT_]m4_defn([gl_HEADER_NAME])), diff --git a/m4/inline.m4 b/m4/inline.m4 index 4ef768de..a4590809 100644 --- a/m4/inline.m4 +++ b/m4/inline.m4 @@ -1,5 +1,5 @@ # inline.m4 serial 4 -dnl Copyright (C) 2006, 2009, 2010 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/intlmacosx.m4 b/m4/intlmacosx.m4 index f0f7c987..51f85477 100644 --- a/m4/intlmacosx.m4 +++ b/m4/intlmacosx.m4 @@ -1,5 +1,5 @@ # intlmacosx.m4 serial 4 (gettext-0.18.2) -dnl Copyright (C) 2004-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2004-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/intmax_t.m4 b/m4/intmax_t.m4 index 493e4a93..7341054b 100644 --- a/m4/intmax_t.m4 +++ b/m4/intmax_t.m4 @@ -1,5 +1,5 @@ # intmax_t.m4 serial 8 -dnl Copyright (C) 1997-2004, 2006-2007, 2009-2010 Free Software Foundation, +dnl Copyright (C) 1997-2004, 2006-2007, 2009-2011 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/inttostr.m4 b/m4/inttostr.m4 index ff64ddbd..b9875c91 100644 --- a/m4/inttostr.m4 +++ b/m4/inttostr.m4 @@ -1,5 +1,5 @@ #serial 8 -dnl Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc. +dnl Copyright (C) 2004-2006, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/inttypes-pri.m4 b/m4/inttypes-pri.m4 index ee96bcd9..e252b27e 100644 --- a/m4/inttypes-pri.m4 +++ b/m4/inttypes-pri.m4 @@ -1,5 +1,5 @@ # inttypes-pri.m4 serial 7 (gettext-0.18.2) -dnl Copyright (C) 1997-2002, 2006, 2008-2010 Free Software Foundation, Inc. +dnl Copyright (C) 1997-2002, 2006, 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/inttypes.m4 b/m4/inttypes.m4 index e1be6e9a..92a4ac01 100644 --- a/m4/inttypes.m4 +++ b/m4/inttypes.m4 @@ -1,5 +1,5 @@ # inttypes.m4 serial 18 -dnl Copyright (C) 2006-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/inttypes_h.m4 b/m4/inttypes_h.m4 index 9d8f9269..f10fd54f 100644 --- a/m4/inttypes_h.m4 +++ b/m4/inttypes_h.m4 @@ -1,5 +1,5 @@ # inttypes_h.m4 serial 10 -dnl Copyright (C) 1997-2004, 2006, 2008-2010 Free Software Foundation, Inc. +dnl Copyright (C) 1997-2004, 2006, 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/iswblank.m4 b/m4/iswblank.m4 new file mode 100644 index 00000000..38641ffb --- /dev/null +++ b/m4/iswblank.m4 @@ -0,0 +1,31 @@ +# iswblank.m4 serial 2 +dnl Copyright (C) 2011 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([gl_FUNC_ISWBLANK], +[ + AC_REQUIRE([gl_WCTYPE_H_DEFAULTS]) + AC_REQUIRE([gl_WCTYPE_H]) + dnl Persuade glibc to declare iswblank(). + AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) + AC_CHECK_FUNCS_ONCE([iswblank]) + AC_CHECK_DECLS_ONCE([iswblank]) + if test $ac_cv_func_iswblank = no; then + HAVE_ISWBLANK=0 + if test $ac_cv_have_decl_iswblank = yes; then + REPLACE_ISWBLANK=1 + fi + fi + if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then + dnl Redefine all of iswcntrl, ..., towupper in . + : + else + if test $HAVE_ISWBLANK = 0 || test $REPLACE_ISWBLANK = 1; then + dnl Redefine only iswblank. + AC_LIBOBJ([iswblank]) + fi + fi + +]) diff --git a/m4/langinfo_h.m4 b/m4/langinfo_h.m4 index adc445e8..4cced8a5 100644 --- a/m4/langinfo_h.m4 +++ b/m4/langinfo_h.m4 @@ -1,5 +1,5 @@ # langinfo_h.m4 serial 7 -dnl Copyright (C) 2009-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/lchown.m4 b/m4/lchown.m4 index 646dd9f3..b567d81b 100644 --- a/m4/lchown.m4 +++ b/m4/lchown.m4 @@ -1,7 +1,7 @@ # serial 15 # Determine whether we need the lchown wrapper. -dnl Copyright (C) 1998, 2001, 2003-2007, 2009-2010 Free Software Foundation, +dnl Copyright (C) 1998, 2001, 2003-2007, 2009-2011 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4 index 294db72e..ae003f7c 100644 --- a/m4/lib-ld.m4 +++ b/m4/lib-ld.m4 @@ -1,5 +1,5 @@ # lib-ld.m4 serial 5 (gettext-0.18.2) -dnl Copyright (C) 1996-2003, 2009-2010 Free Software Foundation, Inc. +dnl Copyright (C) 1996-2003, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/lib-link.m4 b/m4/lib-link.m4 index 2ea9d6d0..e7c9ba9d 100644 --- a/m4/lib-link.m4 +++ b/m4/lib-link.m4 @@ -1,5 +1,5 @@ -# lib-link.m4 serial 25 (gettext-0.18.2) -dnl Copyright (C) 2001-2010 Free Software Foundation, Inc. +# lib-link.m4 serial 26 (gettext-0.18.2) +dnl Copyright (C) 2001-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -116,6 +116,8 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], dnl Determine the platform dependent parameters needed to use rpath: dnl acl_libext, dnl acl_shlibext, +dnl acl_libname_spec, +dnl acl_library_names_spec, dnl acl_hardcode_libdir_flag_spec, dnl acl_hardcode_libdir_separator, dnl acl_hardcode_direct, diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4 index 1601ceae..7e5f0bde 100644 --- a/m4/lib-prefix.m4 +++ b/m4/lib-prefix.m4 @@ -1,5 +1,5 @@ # lib-prefix.m4 serial 7 (gettext-0.18) -dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2005, 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/libunistring-base.m4 b/m4/libunistring-base.m4 index 8335ec54..9831448a 100644 --- a/m4/libunistring-base.m4 +++ b/m4/libunistring-base.m4 @@ -1,5 +1,5 @@ # libunistring-base.m4 serial 5 -dnl Copyright (C) 2010 Free Software Foundation, Inc. +dnl Copyright (C) 2010-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/link-follow.m4 b/m4/link-follow.m4 index 256b2a99..3f1127aa 100644 --- a/m4/link-follow.m4 +++ b/m4/link-follow.m4 @@ -1,8 +1,8 @@ -# serial 15 +# serial 16 dnl Run a program to determine whether link(2) follows symlinks. dnl Set LINK_FOLLOWS_SYMLINKS accordingly. -# Copyright (C) 1999-2001, 2004-2006, 2009-2010 Free Software Foundation, Inc. +# Copyright (C) 1999-2001, 2004-2006, 2009-2011 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -12,7 +12,8 @@ dnl LINK_FOLLOWS_SYMLINKS is 0, link matches linkat(,0), and dnl linkat(,AT_SYMLINK_FOLLOW) requires a readlink. If it is 1, dnl link matches linkat(,AT_SYMLINK_FOLLOW), and there is no way dnl to do linkat(,0) on symlinks (on all other file types, -dnl link() is sufficient). If it is -1, use a runtime test. +dnl link() is sufficient). If it is -1, use a Solaris specific +dnl runtime test. If it is -2, use a generic runtime test. AC_DEFUN([gl_FUNC_LINK_FOLLOWS_SYMLINK], [dnl AC_CHECK_FUNCS_ONCE([readlink]) @@ -22,12 +23,27 @@ AC_DEFUN([gl_FUNC_LINK_FOLLOWS_SYMLINK], dnl linkat variants. So, we set LINK_FOLLOWS_SYMLINKS to 0. gl_link_follows_symlinks=0 # assume GNU behavior if test $ac_cv_func_readlink = yes; then - AC_CACHE_CHECK([whether link(2) dereferences a symlink], - gl_cv_func_link_follows_symlink, - [ - # Create a regular file. - echo > conftest.file - AC_RUN_IFELSE([AC_LANG_SOURCE([[ + dnl Solaris has an __xpg4 variable in libc, and it determines the + dnl behaviour of link(): It dereferences a symlink if and only if + dnl __xpg4 != 0. + AC_CACHE_CHECK([for __xpg4], [gl_cv_have___xpg4], + [AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[extern int __xpg4;]], + [[return __xpg4;]])], + [gl_cv_have___xpg4=yes], + [gl_cv_have___xpg4=no]) + ]) + if test $gl_cv_have___xpg4 = yes; then + gl_link_follows_symlinks=-1 + else + AC_CACHE_CHECK([whether link(2) dereferences a symlink], + [gl_cv_func_link_follows_symlink], + [ + # Create a regular file. + echo > conftest.file + AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ # include # include # include @@ -62,20 +78,22 @@ AC_DEFUN([gl_FUNC_LINK_FOLLOWS_SYMLINK], the link call followed the symlink. */ return SAME_INODE (sb_hard, sb_file) ? 1 : 0; } - ]])], - [gl_cv_func_link_follows_symlink=no], dnl GNU behavior - [gl_cv_func_link_follows_symlink=yes], dnl Followed link/compile failed - [gl_cv_func_link_follows_symlink=unknown] dnl We're cross compiling. - ) - rm -f conftest.file conftest.sym conftest.hard - ]) - case $gl_cv_func_link_follows_symlink in - yes) gl_link_follows_symlinks=1 ;; - no) ;; # already defaulted to 0 - *) gl_link_follows_symlinks=-1 ;; - esac + ]])], + [gl_cv_func_link_follows_symlink=no], dnl GNU behavior + [gl_cv_func_link_follows_symlink=yes], dnl Followed link/compile failed + [gl_cv_func_link_follows_symlink=unknown] dnl We're cross compiling. + ) + rm -f conftest.file conftest.sym conftest.hard + ]) + case $gl_cv_func_link_follows_symlink in + yes) gl_link_follows_symlinks=1 ;; + no) ;; # already defaulted to 0 + *) gl_link_follows_symlinks=-2 ;; + esac + fi fi AC_DEFINE_UNQUOTED([LINK_FOLLOWS_SYMLINKS], [$gl_link_follows_symlinks], [Define to 1 if `link(2)' dereferences symbolic links, 0 if it - creates hard links to symlinks, and -1 if unknown.]) + creates hard links to symlinks, -1 if it depends on the variable __xpg4, + and -2 if unknown.]) ]) diff --git a/m4/link.m4 b/m4/link.m4 index 0ca85d3a..479083cb 100644 --- a/m4/link.m4 +++ b/m4/link.m4 @@ -1,5 +1,5 @@ -# link.m4 serial 4 -dnl Copyright (C) 2009, 2010 Free Software Foundation, Inc. +# link.m4 serial 5 +dnl Copyright (C) 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -22,10 +22,15 @@ AC_DEFUN([gl_FUNC_LINK], AC_RUN_IFELSE( [AC_LANG_PROGRAM( [[#include -]], [[if (!link ("conftest.a", "conftest.b/")) return 1; + ]], + [[int result = 0; + if (!link ("conftest.a", "conftest.b/")) + result |= 1; #if HAVE_LSTAT - if (!link ("conftest.lnk/", "conftest.b")) return 2; + if (!link ("conftest.lnk/", "conftest.b")) + result |= 2; #endif + return result; ]])], [gl_cv_func_link_works=yes], [gl_cv_func_link_works=no], [gl_cv_func_link_works="guessing no"]) diff --git a/m4/linkat.m4 b/m4/linkat.m4 index c0b2729b..1a1a6b46 100644 --- a/m4/linkat.m4 +++ b/m4/linkat.m4 @@ -1,7 +1,7 @@ -# serial 3 +# serial 4 # See if we need to provide linkat replacement. -dnl Copyright (C) 2009-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -50,9 +50,8 @@ choke me #include #include ]], - [[int fd; - int err; - int ret; + [[int result; + int fd; /* Create a regular file. */ fd = open ("conftest.a", O_CREAT | O_EXCL | O_WRONLY, 0600); if (fd < 0) @@ -66,14 +65,15 @@ choke me if (linkat (AT_FDCWD, "conftest.a", AT_FDCWD, "conftest.b", AT_SYMLINK_FOLLOW) < 0) return 0; + result = 0; /* Test whether a trailing "/" is treated like "/.". */ if (linkat (AT_FDCWD, "conftest.a/", AT_FDCWD, "conftest.c", AT_SYMLINK_FOLLOW) == 0) - return 4; + result |= 4; if (linkat (AT_FDCWD, "conftest.a", AT_FDCWD, "conftest.d/", AT_SYMLINK_FOLLOW) == 0) - return 5; - return 0; + result |= 8; + return result; ]])], [gl_cv_func_linkat_slash=yes], [gl_cv_func_linkat_slash=no], diff --git a/m4/localcharset.m4 b/m4/localcharset.m4 index ee2e801b..6801ca95 100644 --- a/m4/localcharset.m4 +++ b/m4/localcharset.m4 @@ -1,5 +1,5 @@ # localcharset.m4 serial 7 -dnl Copyright (C) 2002, 2004, 2006, 2009, 2010 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2004, 2006, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/locale-fr.m4 b/m4/locale-fr.m4 index e3534321..3f4f954e 100644 --- a/m4/locale-fr.m4 +++ b/m4/locale-fr.m4 @@ -1,5 +1,5 @@ -# locale-fr.m4 serial 12 -dnl Copyright (C) 2003, 2005-2010 Free Software Foundation, Inc. +# locale-fr.m4 serial 13 +dnl Copyright (C) 2003, 2005-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -25,7 +25,17 @@ struct tm t; char buf[16]; int main () { /* Check whether the given locale name is recognized by the system. */ +#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ + /* On native Win32, setlocale(category, "") looks at the system settings, + not at the environment variables. Also, when an encoding suffix such + as ".65001" or ".54936" is speficied, it succeeds but sets the LC_CTYPE + category of the locale to "C". */ + if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL + || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0) + return 1; +#else if (setlocale (LC_ALL, "") == NULL) return 1; +#endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. @@ -62,37 +72,56 @@ int main () { changequote([,])dnl ])]) if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then - # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the - # configure script would override the LC_ALL setting. Likewise for - # LC_CTYPE, which is also set at the beginning of the configure script. - # Test for the usual locale name. - if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_fr=fr_FR - else - # Test for the locale name with explicit encoding suffix. - if (LC_ALL=fr_FR.ISO-8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_fr=fr_FR.ISO-8859-1 - else - # Test for the AIX, OSF/1, FreeBSD, NetBSD, OpenBSD locale name. - if (LC_ALL=fr_FR.ISO8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_fr=fr_FR.ISO8859-1 + case "$host_os" in + # Handle native Windows specially, because there setlocale() interprets + # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256", + # "fr" or "fra" as "French" or "French_France.1252", + # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252", + # "ja" as "Japanese" or "Japanese_Japan.932", + # and similar. + mingw*) + # Test for the native Win32 locale name. + if (LC_ALL=French_France.1252 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr=French_France.1252 + else + # None found. + gt_cv_locale_fr=none + fi + ;; + *) + # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because + # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # configure script would override the LC_ALL setting. Likewise for + # LC_CTYPE, which is also set at the beginning of the configure script. + # Test for the usual locale name. + if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr=fr_FR else - # Test for the HP-UX locale name. - if (LC_ALL=fr_FR.iso88591 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_fr=fr_FR.iso88591 + # Test for the locale name with explicit encoding suffix. + if (LC_ALL=fr_FR.ISO-8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr=fr_FR.ISO-8859-1 else - # Test for the Solaris 7 locale name. - if (LC_ALL=fr LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_fr=fr + # Test for the AIX, OSF/1, FreeBSD, NetBSD, OpenBSD locale name. + if (LC_ALL=fr_FR.ISO8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr=fr_FR.ISO8859-1 else - # None found. - gt_cv_locale_fr=none + # Test for the HP-UX locale name. + if (LC_ALL=fr_FR.iso88591 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr=fr_FR.iso88591 + else + # Test for the Solaris 7 locale name. + if (LC_ALL=fr LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr=fr + else + # None found. + gt_cv_locale_fr=none + fi + fi fi fi fi - fi - fi + ;; + esac fi rm -fr conftest* ]) @@ -122,7 +151,17 @@ int main () { variables, and all locales use the UTF-8 encoding. */ #if !(defined __BEOS__ || defined __HAIKU__) /* Check whether the given locale name is recognized by the system. */ +# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ + /* On native Win32, setlocale(category, "") looks at the system settings, + not at the environment variables. Also, when an encoding suffix such + as ".65001" or ".54936" is speficied, it succeeds but sets the LC_CTYPE + category of the locale to "C". */ + if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL + || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0) + return 1; +# else if (setlocale (LC_ALL, "") == NULL) return 1; +# endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. @@ -159,27 +198,46 @@ int main () { changequote([,])dnl ])]) if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then - # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the - # configure script would override the LC_ALL setting. Likewise for - # LC_CTYPE, which is also set at the beginning of the configure script. - # Test for the usual locale name. - if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_fr_utf8=fr_FR - else - # Test for the locale name with explicit encoding suffix. - if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_fr_utf8=fr_FR.UTF-8 - else - # Test for the Solaris 7 locale name. - if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_fr_utf8=fr.UTF-8 + case "$host_os" in + # Handle native Windows specially, because there setlocale() interprets + # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256", + # "fr" or "fra" as "French" or "French_France.1252", + # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252", + # "ja" as "Japanese" or "Japanese_Japan.932", + # and similar. + mingw*) + # Test for the hypothetical native Win32 locale name. + if (LC_ALL=French_France.65001 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr_utf8=French_France.65001 else # None found. gt_cv_locale_fr_utf8=none fi - fi - fi + ;; + *) + # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because + # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # configure script would override the LC_ALL setting. Likewise for + # LC_CTYPE, which is also set at the beginning of the configure script. + # Test for the usual locale name. + if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr_utf8=fr_FR + else + # Test for the locale name with explicit encoding suffix. + if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr_utf8=fr_FR.UTF-8 + else + # Test for the Solaris 7 locale name. + if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr_utf8=fr.UTF-8 + else + # None found. + gt_cv_locale_fr_utf8=none + fi + fi + fi + ;; + esac fi rm -fr conftest* ]) diff --git a/m4/locale-ja.m4 b/m4/locale-ja.m4 index 31684002..d44c2c80 100644 --- a/m4/locale-ja.m4 +++ b/m4/locale-ja.m4 @@ -1,5 +1,5 @@ -# locale-ja.m4 serial 8 -dnl Copyright (C) 2003, 2005-2010 Free Software Foundation, Inc. +# locale-ja.m4 serial 9 +dnl Copyright (C) 2003, 2005-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -27,7 +27,17 @@ int main () { const char *p; /* Check whether the given locale name is recognized by the system. */ +#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ + /* On native Win32, setlocale(category, "") looks at the system settings, + not at the environment variables. Also, when an encoding suffix such + as ".65001" or ".54936" is speficied, it succeeds but sets the LC_CTYPE + category of the locale to "C". */ + if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL + || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0) + return 1; +#else if (setlocale (LC_ALL, "") == NULL) return 1; +#endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. @@ -66,42 +76,57 @@ int main () changequote([,])dnl ])]) if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then - # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the - # configure script would override the LC_ALL setting. Likewise for - # LC_CTYPE, which is also set at the beginning of the configure script. - # Test for the AIX locale name. - if (LC_ALL=ja_JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_ja=ja_JP - else - # Test for the locale name with explicit encoding suffix. - if (LC_ALL=ja_JP.EUC-JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_ja=ja_JP.EUC-JP - else - # Test for the HP-UX, OSF/1, NetBSD locale name. - if (LC_ALL=ja_JP.eucJP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_ja=ja_JP.eucJP + case "$host_os" in + # Handle native Windows specially, because there setlocale() interprets + # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256", + # "fr" or "fra" as "French" or "French_France.1252", + # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252", + # "ja" as "Japanese" or "Japanese_Japan.932", + # and similar. + mingw*) + # Note that on native Win32, the Japanese locale is Japanese_Japan.932, + # and CP932 is very different from EUC-JP, so we cannot use it here. + gt_cv_locale_ja=none + ;; + *) + # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because + # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # configure script would override the LC_ALL setting. Likewise for + # LC_CTYPE, which is also set at the beginning of the configure script. + # Test for the AIX locale name. + if (LC_ALL=ja_JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_ja=ja_JP else - # Test for the IRIX, FreeBSD locale name. - if (LC_ALL=ja_JP.EUC LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_ja=ja_JP.EUC + # Test for the locale name with explicit encoding suffix. + if (LC_ALL=ja_JP.EUC-JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_ja=ja_JP.EUC-JP else - # Test for the Solaris 7 locale name. - if (LC_ALL=ja LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_ja=ja + # Test for the HP-UX, OSF/1, NetBSD locale name. + if (LC_ALL=ja_JP.eucJP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_ja=ja_JP.eucJP else - # Special test for NetBSD 1.6. - if test -f /usr/share/locale/ja_JP.eucJP/LC_CTYPE; then - gt_cv_locale_ja=ja_JP.eucJP + # Test for the IRIX, FreeBSD locale name. + if (LC_ALL=ja_JP.EUC LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_ja=ja_JP.EUC else - # None found. - gt_cv_locale_ja=none + # Test for the Solaris 7 locale name. + if (LC_ALL=ja LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_ja=ja + else + # Special test for NetBSD 1.6. + if test -f /usr/share/locale/ja_JP.eucJP/LC_CTYPE; then + gt_cv_locale_ja=ja_JP.eucJP + else + # None found. + gt_cv_locale_ja=none + fi + fi fi fi fi fi - fi - fi + ;; + esac fi rm -fr conftest* ]) diff --git a/m4/locale-zh.m4 b/m4/locale-zh.m4 index be176c15..e03f91f0 100644 --- a/m4/locale-zh.m4 +++ b/m4/locale-zh.m4 @@ -1,5 +1,5 @@ -# locale-zh.m4 serial 7 -dnl Copyright (C) 2003, 2005-2010 Free Software Foundation, Inc. +# locale-zh.m4 serial 8 +dnl Copyright (C) 2003, 2005-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -28,7 +28,17 @@ int main () { const char *p; /* Check whether the given locale name is recognized by the system. */ +#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ + /* On native Win32, setlocale(category, "") looks at the system settings, + not at the environment variables. Also, when an encoding suffix such + as ".65001" or ".54936" is speficied, it succeeds but sets the LC_CTYPE + category of the locale to "C". */ + if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL + || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0) + return 1; +#else if (setlocale (LC_ALL, "") == NULL) return 1; +#endif /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. @@ -67,22 +77,41 @@ int main () changequote([,])dnl ])]) if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then - # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because - # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the - # configure script would override the LC_ALL setting. Likewise for - # LC_CTYPE, which is also set at the beginning of the configure script. - # Test for the locale name without encoding suffix. - if (LC_ALL=zh_CN LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_zh_CN=zh_CN - else - # Test for the locale name with explicit encoding suffix. - if (LC_ALL=zh_CN.GB18030 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then - gt_cv_locale_zh_CN=zh_CN.GB18030 - else - # None found. - gt_cv_locale_zh_CN=none - fi - fi + case "$host_os" in + # Handle native Windows specially, because there setlocale() interprets + # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256", + # "fr" or "fra" as "French" or "French_France.1252", + # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252", + # "ja" as "Japanese" or "Japanese_Japan.932", + # and similar. + mingw*) + # Test for the hypothetical native Win32 locale name. + if (LC_ALL=Chinese_China.54936 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_zh_CN=Chinese_China.54936 + else + # None found. + gt_cv_locale_zh_CN=none + fi + ;; + *) + # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because + # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # configure script would override the LC_ALL setting. Likewise for + # LC_CTYPE, which is also set at the beginning of the configure script. + # Test for the locale name without encoding suffix. + if (LC_ALL=zh_CN LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_zh_CN=zh_CN + else + # Test for the locale name with explicit encoding suffix. + if (LC_ALL=zh_CN.GB18030 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_zh_CN=zh_CN.GB18030 + else + # None found. + gt_cv_locale_zh_CN=none + fi + fi + ;; + esac else # If there was a link error, due to mblen(), the system is so old that # it certainly doesn't have a chinese locale. diff --git a/m4/longlong.m4 b/m4/longlong.m4 index cca3c1a9..aed816cf 100644 --- a/m4/longlong.m4 +++ b/m4/longlong.m4 @@ -1,5 +1,5 @@ -# longlong.m4 serial 14 -dnl Copyright (C) 1999-2007, 2009-2010 Free Software Foundation, Inc. +# longlong.m4 serial 16 +dnl Copyright (C) 1999-2007, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -7,8 +7,8 @@ dnl with or without modifications, as long as this notice is preserved. dnl From Paul Eggert. # Define HAVE_LONG_LONG_INT if 'long long int' works. -# This fixes a bug in Autoconf 2.61, but can be removed once we -# assume 2.62 everywhere. +# This fixes a bug in Autoconf 2.61, and can be faster +# than what's in Autoconf 2.62 through 2.68. # Note: If the type 'long long int' exists but is only 32 bits large # (as on some very old compilers), HAVE_LONG_LONG_INT will not be @@ -16,35 +16,39 @@ dnl From Paul Eggert. AC_DEFUN([AC_TYPE_LONG_LONG_INT], [ + AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT]) AC_CACHE_CHECK([for long long int], [ac_cv_type_long_long_int], - [AC_LINK_IFELSE( - [_AC_TYPE_LONG_LONG_SNIPPET], - [dnl This catches a bug in Tandem NonStop Kernel (OSS) cc -O circa 2004. - dnl If cross compiling, assume the bug isn't important, since - dnl nobody cross compiles for this platform as far as we know. - AC_RUN_IFELSE( - [AC_LANG_PROGRAM( - [[@%:@include - @%:@ifndef LLONG_MAX - @%:@ define HALF \ - (1LL << (sizeof (long long int) * CHAR_BIT - 2)) - @%:@ define LLONG_MAX (HALF - 1 + HALF) - @%:@endif]], - [[long long int n = 1; - int i; - for (i = 0; ; i++) - { - long long int m = n << i; - if (m >> i != n) - return 1; - if (LLONG_MAX / 2 < m) - break; - } - return 0;]])], - [ac_cv_type_long_long_int=yes], - [ac_cv_type_long_long_int=no], - [ac_cv_type_long_long_int=yes])], - [ac_cv_type_long_long_int=no])]) + [ac_cv_type_long_long_int=yes + if test "x${ac_cv_prog_cc_c99-no}" = xno; then + ac_cv_type_long_long_int=$ac_cv_type_unsigned_long_long_int + if test $ac_cv_type_long_long_int = yes; then + dnl Catch a bug in Tandem NonStop Kernel (OSS) cc -O circa 2004. + dnl If cross compiling, assume the bug is not important, since + dnl nobody cross compiles for this platform as far as we know. + AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [[@%:@include + @%:@ifndef LLONG_MAX + @%:@ define HALF \ + (1LL << (sizeof (long long int) * CHAR_BIT - 2)) + @%:@ define LLONG_MAX (HALF - 1 + HALF) + @%:@endif]], + [[long long int n = 1; + int i; + for (i = 0; ; i++) + { + long long int m = n << i; + if (m >> i != n) + return 1; + if (LLONG_MAX / 2 < m) + break; + } + return 0;]])], + [], + [ac_cv_type_long_long_int=no], + [:]) + fi + fi]) if test $ac_cv_type_long_long_int = yes; then AC_DEFINE([HAVE_LONG_LONG_INT], [1], [Define to 1 if the system has the type `long long int'.]) @@ -52,8 +56,8 @@ AC_DEFUN([AC_TYPE_LONG_LONG_INT], ]) # Define HAVE_UNSIGNED_LONG_LONG_INT if 'unsigned long long int' works. -# This fixes a bug in Autoconf 2.61, but can be removed once we -# assume 2.62 everywhere. +# This fixes a bug in Autoconf 2.61, and can be faster +# than what's in Autoconf 2.62 through 2.68. # Note: If the type 'unsigned long long int' exists but is only 32 bits # large (as on some very old compilers), AC_TYPE_UNSIGNED_LONG_LONG_INT @@ -64,10 +68,13 @@ AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT], [ AC_CACHE_CHECK([for unsigned long long int], [ac_cv_type_unsigned_long_long_int], - [AC_LINK_IFELSE( - [_AC_TYPE_LONG_LONG_SNIPPET], - [ac_cv_type_unsigned_long_long_int=yes], - [ac_cv_type_unsigned_long_long_int=no])]) + [ac_cv_type_unsigned_long_long_int=yes + if test "x${ac_cv_prog_cc_c99-no}" = xno; then + AC_LINK_IFELSE( + [_AC_TYPE_LONG_LONG_SNIPPET], + [], + [ac_cv_type_unsigned_long_long_int=no]) + fi]) if test $ac_cv_type_unsigned_long_long_int = yes; then AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], [1], [Define to 1 if the system has the type `unsigned long long int'.]) diff --git a/m4/lseek.m4 b/m4/lseek.m4 index b0612c7e..f6452f6f 100644 --- a/m4/lseek.m4 +++ b/m4/lseek.m4 @@ -1,5 +1,5 @@ # lseek.m4 serial 6 -dnl Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/lstat.m4 b/m4/lstat.m4 index 236af540..b9b22a6b 100644 --- a/m4/lstat.m4 +++ b/m4/lstat.m4 @@ -1,6 +1,6 @@ # serial 21 -# Copyright (C) 1997-2001, 2003-2010 Free Software Foundation, Inc. +# Copyright (C) 1997-2001, 2003-2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/malloc.m4 b/m4/malloc.m4 index 7a749254..80944445 100644 --- a/m4/malloc.m4 +++ b/m4/malloc.m4 @@ -1,5 +1,5 @@ # malloc.m4 serial 12 -dnl Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/malloca.m4 b/m4/malloca.m4 index e07c6d93..aec43f58 100644 --- a/m4/malloca.m4 +++ b/m4/malloca.m4 @@ -1,5 +1,5 @@ # malloca.m4 serial 1 -dnl Copyright (C) 2003-2004, 2006-2007, 2009-2010 Free Software Foundation, +dnl Copyright (C) 2003-2004, 2006-2007, 2009-2011 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/mbchar.m4 b/m4/mbchar.m4 index 116ce7e5..763dd81e 100644 --- a/m4/mbchar.m4 +++ b/m4/mbchar.m4 @@ -1,5 +1,5 @@ # mbchar.m4 serial 8 -dnl Copyright (C) 2005-2007, 2009-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2007, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mbiter.m4 b/m4/mbiter.m4 index 34810507..8582b30b 100644 --- a/m4/mbiter.m4 +++ b/m4/mbiter.m4 @@ -1,5 +1,5 @@ -# mbiter.m4 serial 5 -dnl Copyright (C) 2005, 2008, 2009, 2010 Free Software Foundation, Inc. +# mbiter.m4 serial 6 +dnl Copyright (C) 2005, 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -11,8 +11,5 @@ AC_DEFUN([gl_MBITER], [ AC_REQUIRE([AC_C_INLINE]) AC_REQUIRE([AC_TYPE_MBSTATE_T]) - dnl The following line is that so the user can test HAVE_MBRTOWC before - dnl #include "mbiter.h" or "mbuiter.h". It can be removed in 2010. - AC_REQUIRE([AC_FUNC_MBRTOWC]) : ]) diff --git a/m4/mbrtowc.m4 b/m4/mbrtowc.m4 index 28b9c43b..c3538629 100644 --- a/m4/mbrtowc.m4 +++ b/m4/mbrtowc.m4 @@ -1,5 +1,5 @@ -# mbrtowc.m4 serial 18 -dnl Copyright (C) 2001-2002, 2004-2005, 2008-2010 Free Software Foundation, +# mbrtowc.m4 serial 22 +dnl Copyright (C) 2001-2002, 2004-2005, 2008-2011 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -19,12 +19,20 @@ AC_DEFUN([gl_FUNC_MBRTOWC], if test $REPLACE_MBSTATE_T = 1; then REPLACE_MBRTOWC=1 else - gl_MBRTOWC_NULL_ARG + gl_MBRTOWC_NULL_ARG1 + gl_MBRTOWC_NULL_ARG2 gl_MBRTOWC_RETVAL gl_MBRTOWC_NUL_RETVAL - case "$gl_cv_func_mbrtowc_null_arg" in + case "$gl_cv_func_mbrtowc_null_arg1" in *yes) ;; - *) AC_DEFINE([MBRTOWC_NULL_ARG_BUG], [1], + *) AC_DEFINE([MBRTOWC_NULL_ARG1_BUG], [1], + [Define if the mbrtowc function has the NULL pwc argument bug.]) + REPLACE_MBRTOWC=1 + ;; + esac + case "$gl_cv_func_mbrtowc_null_arg2" in + *yes) ;; + *) AC_DEFINE([MBRTOWC_NULL_ARG2_BUG], [1], [Define if the mbrtowc function has the NULL string argument bug.]) REPLACE_MBRTOWC=1 ;; @@ -112,6 +120,13 @@ changequote([,])dnl [AC_LANG_SOURCE([[ #include #include +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include #include int main () { @@ -162,6 +177,13 @@ changequote([,])dnl #include #include #include +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include #include int main () { @@ -188,25 +210,95 @@ int main () ]) ]) +dnl Test whether mbrtowc supports a NULL pwc argument correctly. +dnl Result is gl_cv_func_mbrtowc_null_arg1. + +AC_DEFUN([gl_MBRTOWC_NULL_ARG1], +[ + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([gt_LOCALE_FR_UTF8]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CACHE_CHECK([whether mbrtowc handles a NULL pwc argument], + [gl_cv_func_mbrtowc_null_arg1], + [ + dnl Initial guess, used when cross-compiling or when no suitable locale + dnl is present. +changequote(,)dnl + case "$host_os" in + # Guess no on Solaris. + solaris*) gl_cv_func_mbrtowc_null_arg1="guessing no" ;; + # Guess yes otherwise. + *) gl_cv_func_mbrtowc_null_arg1="guessing yes" ;; + esac +changequote([,])dnl + if test $LOCALE_FR_UTF8 != none; then + AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ +#include +#include +#include +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include +#include +int main () +{ + int result = 0; + + if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) + { + char input[] = "\303\237er"; + mbstate_t state; + wchar_t wc; + size_t ret; + + memset (&state, '\0', sizeof (mbstate_t)); + wc = (wchar_t) 0xBADFACE; + ret = mbrtowc (&wc, input, 5, &state); + if (ret != 2) + result |= 1; + if (!mbsinit (&state)) + result |= 2; + + memset (&state, '\0', sizeof (mbstate_t)); + ret = mbrtowc (NULL, input, 5, &state); + if (ret != 2) /* Solaris 7 fails here: ret is -1. */ + result |= 4; + if (!mbsinit (&state)) + result |= 8; + } + return result; +}]])], + [gl_cv_func_mbrtowc_null_arg1=yes], + [gl_cv_func_mbrtowc_null_arg1=no], + [:]) + fi + ]) +]) + dnl Test whether mbrtowc supports a NULL string argument correctly. -dnl Result is gl_cv_func_mbrtowc_null_arg. +dnl Result is gl_cv_func_mbrtowc_null_arg2. -AC_DEFUN([gl_MBRTOWC_NULL_ARG], +AC_DEFUN([gl_MBRTOWC_NULL_ARG2], [ AC_REQUIRE([AC_PROG_CC]) AC_REQUIRE([gt_LOCALE_FR_UTF8]) AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles AC_CACHE_CHECK([whether mbrtowc handles a NULL string argument], - [gl_cv_func_mbrtowc_null_arg], + [gl_cv_func_mbrtowc_null_arg2], [ dnl Initial guess, used when cross-compiling or when no suitable locale dnl is present. changequote(,)dnl case "$host_os" in # Guess no on OSF/1. - osf*) gl_cv_func_mbrtowc_null_arg="guessing no" ;; + osf*) gl_cv_func_mbrtowc_null_arg2="guessing no" ;; # Guess yes otherwise. - *) gl_cv_func_mbrtowc_null_arg="guessing yes" ;; + *) gl_cv_func_mbrtowc_null_arg2="guessing yes" ;; esac changequote([,])dnl if test $LOCALE_FR_UTF8 != none; then @@ -214,6 +306,13 @@ changequote([,])dnl [AC_LANG_SOURCE([[ #include #include +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include #include int main () { @@ -232,8 +331,8 @@ int main () } return 0; }]])], - [gl_cv_func_mbrtowc_null_arg=yes], - [gl_cv_func_mbrtowc_null_arg=no], + [gl_cv_func_mbrtowc_null_arg2=yes], + [gl_cv_func_mbrtowc_null_arg2=no], [:]) fi ]) @@ -249,7 +348,7 @@ AC_DEFUN([gl_MBRTOWC_RETVAL], AC_REQUIRE([AC_PROG_CC]) AC_REQUIRE([gt_LOCALE_FR_UTF8]) AC_REQUIRE([gt_LOCALE_JA]) - AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_REQUIRE([AC_CANONICAL_HOST]) AC_CACHE_CHECK([whether mbrtowc has a correct return value], [gl_cv_func_mbrtowc_retval], [ @@ -257,20 +356,30 @@ AC_DEFUN([gl_MBRTOWC_RETVAL], dnl is present. changequote(,)dnl case "$host_os" in - # Guess no on HP-UX and Solaris. - hpux* | solaris*) gl_cv_func_mbrtowc_retval="guessing no" ;; - # Guess yes otherwise. - *) gl_cv_func_mbrtowc_retval="guessing yes" ;; + # Guess no on HP-UX, Solaris, native Windows. + hpux* | solaris* | mingw*) gl_cv_func_mbrtowc_retval="guessing no" ;; + # Guess yes otherwise. + *) gl_cv_func_mbrtowc_retval="guessing yes" ;; esac changequote([,])dnl - if test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none; then + if test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none \ + || { case "$host_os" in mingw*) true;; *) false;; esac; }; then AC_RUN_IFELSE( [AC_LANG_SOURCE([[ #include #include +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include #include int main () { + int result = 0; + int found_some_locale = 0; /* This fails on Solaris. */ if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) { @@ -283,8 +392,9 @@ int main () { input[1] = '\0'; if (mbrtowc (&wc, input + 2, 5, &state) != 1) - return 1; + result |= 1; } + found_some_locale = 1; } /* This fails on HP-UX 11.11. */ if (setlocale (LC_ALL, "$LOCALE_JA") != NULL) @@ -298,13 +408,63 @@ int main () { input[1] = '\0'; if (mbrtowc (&wc, input + 2, 5, &state) != 2) - return 1; + result |= 2; } + found_some_locale = 1; } - return 0; + /* This fails on native Windows. */ + if (setlocale (LC_ALL, "Japanese_Japan.932") != NULL) + { + char input[] = "<\223\372\226\173\214\352>"; /* "<日本語>" */ + mbstate_t state; + wchar_t wc; + + memset (&state, '\0', sizeof (mbstate_t)); + if (mbrtowc (&wc, input + 3, 1, &state) == (size_t)(-2)) + { + input[3] = '\0'; + if (mbrtowc (&wc, input + 4, 4, &state) != 1) + result |= 4; + } + found_some_locale = 1; + } + if (setlocale (LC_ALL, "Chinese_Taiwan.950") != NULL) + { + char input[] = "<\244\351\245\273\273\171>"; /* "<日本語>" */ + mbstate_t state; + wchar_t wc; + + memset (&state, '\0', sizeof (mbstate_t)); + if (mbrtowc (&wc, input + 3, 1, &state) == (size_t)(-2)) + { + input[3] = '\0'; + if (mbrtowc (&wc, input + 4, 4, &state) != 1) + result |= 8; + } + found_some_locale = 1; + } + if (setlocale (LC_ALL, "Chinese_China.936") != NULL) + { + char input[] = "<\310\325\261\276\325\132>"; /* "<日本語>" */ + mbstate_t state; + wchar_t wc; + + memset (&state, '\0', sizeof (mbstate_t)); + if (mbrtowc (&wc, input + 3, 1, &state) == (size_t)(-2)) + { + input[3] = '\0'; + if (mbrtowc (&wc, input + 4, 4, &state) != 1) + result |= 16; + } + found_some_locale = 1; + } + return (found_some_locale ? result : 77); }]])], [gl_cv_func_mbrtowc_retval=yes], - [gl_cv_func_mbrtowc_retval=no], + [if test $? != 77; then + gl_cv_func_mbrtowc_retval=no + fi + ], [:]) fi ]) @@ -336,6 +496,13 @@ changequote([,])dnl [AC_LANG_SOURCE([[ #include #include +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include #include int main () { @@ -366,10 +533,8 @@ AC_DEFUN([gl_PREREQ_MBRTOWC], [ dnl From Paul Eggert -dnl This override of an autoconf macro can be removed when autoconf 2.60 or -dnl newer can be assumed everywhere. +dnl This is an override of an autoconf macro. -m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.60]),[-1],[ AC_DEFUN([AC_FUNC_MBRTOWC], [ dnl Same as AC_FUNC_MBRTOWC in autoconf-2.60. @@ -377,7 +542,14 @@ AC_DEFUN([AC_FUNC_MBRTOWC], gl_cv_func_mbrtowc, [AC_LINK_IFELSE( [AC_LANG_PROGRAM( - [[#include ]], + [[/* Tru64 with Desktop Toolkit C has a bug: must be + included before . + BSD/OS 4.0.1 has a bug: , and + must be included before . */ + #include + #include + #include + #include ]], [[wchar_t wc; char const s[] = ""; size_t n = 1; @@ -390,4 +562,3 @@ AC_DEFUN([AC_FUNC_MBRTOWC], [Define to 1 if mbrtowc and mbstate_t are properly declared.]) fi ]) -]) diff --git a/m4/mbsinit.m4 b/m4/mbsinit.m4 index 46c106fc..47e2d14a 100644 --- a/m4/mbsinit.m4 +++ b/m4/mbsinit.m4 @@ -1,5 +1,5 @@ -# mbsinit.m4 serial 4 -dnl Copyright (C) 2008, 2010 Free Software Foundation, Inc. +# mbsinit.m4 serial 5 +dnl Copyright (C) 2008, 2010-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -7,6 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_MBSINIT], [ AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) + AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([AC_TYPE_MBSTATE_T]) gl_MBSTATE_T_BROKEN @@ -17,6 +18,13 @@ AC_DEFUN([gl_FUNC_MBSINIT], else if test $REPLACE_MBSTATE_T = 1; then REPLACE_MBSINIT=1 + else + dnl On mingw, mbsinit() always returns 1, which is inappropriate for + dnl states produced by mbrtowc() for an incomplete multibyte character + dnl in multibyte locales. + case "$host_os" in + mingw*) REPLACE_MBSINIT=1 ;; + esac fi fi if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then diff --git a/m4/mbsrtowcs.m4 b/m4/mbsrtowcs.m4 index e854337f..1fe8dcf2 100644 --- a/m4/mbsrtowcs.m4 +++ b/m4/mbsrtowcs.m4 @@ -1,5 +1,5 @@ -# mbsrtowcs.m4 serial 7 -dnl Copyright (C) 2008-2010 Free Software Foundation, Inc. +# mbsrtowcs.m4 serial 10 +dnl Copyright (C) 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -39,6 +39,7 @@ dnl Result is gl_cv_func_mbsrtowcs_works. AC_DEFUN([gl_MBSRTOWCS_WORKS], [ AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([gt_LOCALE_FR]) AC_REQUIRE([gt_LOCALE_FR_UTF8]) AC_REQUIRE([gt_LOCALE_JA]) AC_REQUIRE([gt_LOCALE_ZH_CN]) @@ -50,20 +51,41 @@ AC_DEFUN([gl_MBSRTOWCS_WORKS], dnl is present. changequote(,)dnl case "$host_os" in - # Guess no on HP-UX and Solaris. - hpux* | solaris*) gl_cv_func_mbsrtowcs_works="guessing no" ;; - # Guess yes otherwise. - *) gl_cv_func_mbsrtowcs_works="guessing yes" ;; + # Guess no on HP-UX, Solaris, mingw. + hpux* | solaris* | mingw*) gl_cv_func_mbsrtowcs_works="guessing no" ;; + # Guess yes otherwise. + *) gl_cv_func_mbsrtowcs_works="guessing yes" ;; esac changequote([,])dnl - if test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none || test $LOCALE_ZH_CN != none; then + if test $LOCALE_FR != none || test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none || test $LOCALE_ZH_CN != none; then AC_RUN_IFELSE( [AC_LANG_SOURCE([[ #include #include +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include #include int main () { + int result = 0; + /* Test whether the function supports a NULL destination argument. + This fails on native Windows. */ + if (setlocale (LC_ALL, "$LOCALE_FR") != NULL) + { + const char input[] = "\337er"; + const char *src = input; + mbstate_t state; + + memset (&state, '\0', sizeof (mbstate_t)); + if (mbsrtowcs (NULL, &src, 1, &state) != 3 + || src != input) + result |= 1; + } /* Test whether the function works when started with a conversion state in non-initial state. This fails on HP-UX 11.11 and Solaris 10. */ if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) @@ -77,7 +99,7 @@ int main () { const char *src = input + 2; if (mbsrtowcs (NULL, &src, 10, &state) != 4) - return 1; + result |= 2; } } if (setlocale (LC_ALL, "$LOCALE_JA") != NULL) @@ -91,7 +113,7 @@ int main () { const char *src = input + 4; if (mbsrtowcs (NULL, &src, 10, &state) != 3) - return 1; + result |= 4; } } if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL) @@ -105,10 +127,10 @@ int main () { const char *src = input + 2; if (mbsrtowcs (NULL, &src, 10, &state) != 4) - return 1; + result |= 8; } } - return 0; + return result; }]])], [gl_cv_func_mbsrtowcs_works=yes], [gl_cv_func_mbsrtowcs_works=no], diff --git a/m4/mbstate_t.m4 b/m4/mbstate_t.m4 index 3e2df29f..f7c46b8c 100644 --- a/m4/mbstate_t.m4 +++ b/m4/mbstate_t.m4 @@ -1,5 +1,5 @@ -# mbstate_t.m4 serial 12 -dnl Copyright (C) 2000-2002, 2008-2010 Free Software Foundation, Inc. +# mbstate_t.m4 serial 13 +dnl Copyright (C) 2000-2002, 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -20,7 +20,14 @@ AC_DEFUN([AC_TYPE_MBSTATE_T], [AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( [AC_INCLUDES_DEFAULT[ -# include ]], +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include +#include ]], [[mbstate_t x; return sizeof x;]])], [ac_cv_type_mbstate_t=yes], [ac_cv_type_mbstate_t=no])]) diff --git a/m4/mbtowc.m4 b/m4/mbtowc.m4 new file mode 100644 index 00000000..9215892f --- /dev/null +++ b/m4/mbtowc.m4 @@ -0,0 +1,23 @@ +# mbtowc.m4 serial 1 +dnl Copyright (C) 2011 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([gl_FUNC_MBTOWC], +[ + AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) + + if false; then + REPLACE_MBTOWC=1 + fi + if test $REPLACE_MBTOWC = 1; then + AC_LIBOBJ([mbtowc]) + gl_PREREQ_MBTOWC + fi +]) + +# Prerequisites of lib/mbtowc.c. +AC_DEFUN([gl_PREREQ_MBTOWC], [ + : +]) diff --git a/m4/memchr.m4 b/m4/memchr.m4 index b05a79a0..3c2b3139 100644 --- a/m4/memchr.m4 +++ b/m4/memchr.m4 @@ -1,5 +1,5 @@ -# memchr.m4 serial 9 -dnl Copyright (C) 2002-2004, 2009-2010 Free Software Foundation, Inc. +# memchr.m4 serial 10 +dnl Copyright (C) 2002-2004, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -35,6 +35,7 @@ AC_DEFUN_ONCE([gl_FUNC_MEMCHR], # endif #endif ]], [[ + int result = 0; char *fence = NULL; #if HAVE_SYS_MMAN_H && HAVE_MPROTECT # if HAVE_MAP_ANONYMOUS @@ -58,14 +59,14 @@ AC_DEFUN_ONCE([gl_FUNC_MEMCHR], if (fence) { if (memchr (fence, 0, 0)) - return 1; + result |= 1; strcpy (fence - 9, "12345678"); if (memchr (fence - 9, 0, 79) != fence - 1) - return 2; + result |= 2; if (memchr (fence - 1, 0, 3) != fence - 1) - return 3; + result |= 4; } - return 0; + return result; ]])], [gl_cv_func_memchr_works=yes], [gl_cv_func_memchr_works=no], [dnl Be pessimistic for now. gl_cv_func_memchr_works="guessing no"])]) diff --git a/m4/mempcpy.m4 b/m4/mempcpy.m4 index 12df771e..cc36900a 100644 --- a/m4/mempcpy.m4 +++ b/m4/mempcpy.m4 @@ -1,5 +1,5 @@ # mempcpy.m4 serial 10 -dnl Copyright (C) 2003-2004, 2006-2007, 2009-2010 Free Software Foundation, +dnl Copyright (C) 2003-2004, 2006-2007, 2009-2011 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/memrchr.m4 b/m4/memrchr.m4 index 57ed978a..90a89440 100644 --- a/m4/memrchr.m4 +++ b/m4/memrchr.m4 @@ -1,5 +1,5 @@ # memrchr.m4 serial 9 -dnl Copyright (C) 2002-2003, 2005-2007, 2009-2010 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2007, 2009-2011 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/mkdir.m4 b/m4/mkdir.m4 index 87f5f21c..b6fd09de 100644 --- a/m4/mkdir.m4 +++ b/m4/mkdir.m4 @@ -1,6 +1,6 @@ # serial 9 -# Copyright (C) 2001, 2003-2004, 2006, 2008-2010 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003-2004, 2006, 2008-2011 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/mkdtemp.m4 b/m4/mkdtemp.m4 index 6a07e029..0ef7dfb4 100644 --- a/m4/mkdtemp.m4 +++ b/m4/mkdtemp.m4 @@ -1,5 +1,5 @@ # mkdtemp.m4 serial 6 -dnl Copyright (C) 2001-2003, 2006-2007, 2009-2010 Free Software Foundation, +dnl Copyright (C) 2001-2003, 2006-2007, 2009-2011 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/mkfifo.m4 b/m4/mkfifo.m4 index 8d1f634c..4475e2ef 100644 --- a/m4/mkfifo.m4 +++ b/m4/mkfifo.m4 @@ -1,7 +1,7 @@ -# serial 1 +# serial 2 # See if we need to provide mkfifo replacement. -dnl Copyright (C) 2009, 2010 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -27,10 +27,15 @@ AC_DEFUN([gl_FUNC_MKFIFO], AC_RUN_IFELSE( [AC_LANG_PROGRAM( [[#include -]], [[if (!mkfifo ("conftest.tmp/", 0600)) return 1; + ]], + [[int result = 0; + if (!mkfifo ("conftest.tmp/", 0600)) + result |= 1; #if HAVE_LSTAT - if (!mkfifo ("conftest.lnk/", 0600)) return 2; + if (!mkfifo ("conftest.lnk/", 0600)) + result |= 2; #endif + return result; ]])], [gl_cv_func_mkfifo_works=yes], [gl_cv_func_mkfifo_works=no], [gl_cv_func_mkfifo_works="guessing no"]) diff --git a/m4/mkfifoat.m4 b/m4/mkfifoat.m4 index 0b373bbc..fe7fcdff 100644 --- a/m4/mkfifoat.m4 +++ b/m4/mkfifoat.m4 @@ -1,7 +1,7 @@ # serial 2 # See if we need to provide mkfifoat/mknodat replacement. -dnl Copyright (C) 2009-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mknod.m4 b/m4/mknod.m4 index c13644b8..d9f68f4c 100644 --- a/m4/mknod.m4 +++ b/m4/mknod.m4 @@ -1,7 +1,7 @@ -# serial 2 +# serial 3 # See if we need to provide mknod replacement. -dnl Copyright (C) 2009, 2010 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -30,7 +30,7 @@ AC_DEFUN([gl_FUNC_MKNOD], if (!geteuid ()) return 99; if (mknod ("conftest.fifo", S_IFIFO | 0600, 0)) return 2;]])], [gl_cv_func_mknod_works=yes], - [if test $? == 99 && test x"$FORCE_UNSAFE_CONFIGURE" = x; then + [if test $? = 99 && test x"$FORCE_UNSAFE_CONFIGURE" = x; then AC_MSG_FAILURE([you should not run configure as root ]dnl [(set FORCE_UNSAFE_CONFIGURE=1 in environment to bypass this check)]) fi diff --git a/m4/mktime.m4 b/m4/mktime.m4 index 3e3b22d4..56b2416d 100644 --- a/m4/mktime.m4 +++ b/m4/mktime.m4 @@ -1,5 +1,5 @@ -# serial 16 -dnl Copyright (C) 2002-2003, 2005-2007, 2009-2010 Free Software Foundation, +# serial 19 +dnl Copyright (C) 2002-2003, 2005-2007, 2009-2011 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -162,22 +162,26 @@ year_2050_test () int main () { + int result = 0; time_t t, delta; int i, j; + int time_t_signed_magnitude = (time_t) ~ (time_t) 0 < (time_t) -1; + int time_t_signed = ! ((time_t) 0 < (time_t) -1); /* This test makes some buggy mktime implementations loop. Give up after 60 seconds; a mktime slower than that isn't worth using anyway. */ alarm (60); - for (;;) - { - t = (time_t_max << 1) + 1; - if (t <= time_t_max) - break; - time_t_max = t; - } - time_t_min = - ((time_t) ~ (time_t) 0 == (time_t) -1) - time_t_max; + time_t_max = (! time_t_signed + ? (time_t) -1 + : ((((time_t) 1 << (sizeof (time_t) * CHAR_BIT - 2)) - 1) + * 2 + 1)); + time_t_min = (! time_t_signed + ? (time_t) 0 + : time_t_signed_magnitude + ? ~ (time_t) 0 + : ~ time_t_max); delta = time_t_max / 997; /* a suitable prime number */ for (i = 0; i < N_STRINGS; i++) @@ -187,21 +191,27 @@ main () for (t = 0; t <= time_t_max - delta; t += delta) if (! mktime_test (t)) - return 1; + result |= 1; if (! (mktime_test ((time_t) 1) && mktime_test ((time_t) (60 * 60)) && mktime_test ((time_t) (60 * 60 * 24)))) - return 1; + result |= 2; for (j = 1; ; j <<= 1) if (! bigtime_test (j)) - return 1; + result |= 4; else if (INT_MAX / 2 < j) break; if (! bigtime_test (INT_MAX)) - return 1; + result |= 8; } - return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ()); + if (! irix_6_4_bug ()) + result |= 16; + if (! spring_forward_gap ()) + result |= 32; + if (! year_2050_test ()) + result |= 64; + return result; }]])], [ac_cv_func_working_mktime=yes], [ac_cv_func_working_mktime=no], diff --git a/m4/mmap-anon.m4 b/m4/mmap-anon.m4 index a6b7b9ac..7ba7fd26 100644 --- a/m4/mmap-anon.m4 +++ b/m4/mmap-anon.m4 @@ -1,5 +1,5 @@ -# mmap-anon.m4 serial 8 -dnl Copyright (C) 2005, 2007, 2009-2010 Free Software Foundation, Inc. +# mmap-anon.m4 serial 9 +dnl Copyright (C) 2005, 2007, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -15,10 +15,6 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_MMAP_ANON], [ - dnl Work around a bug of AC_EGREP_CPP in autoconf-2.57. - AC_REQUIRE([AC_PROG_CPP]) - AC_REQUIRE([AC_PROG_EGREP]) - dnl Persuade glibc to define MAP_ANONYMOUS. AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) diff --git a/m4/mode_t.m4 b/m4/mode_t.m4 index 3178dfd3..f9cf7047 100644 --- a/m4/mode_t.m4 +++ b/m4/mode_t.m4 @@ -1,5 +1,5 @@ # mode_t.m4 serial 2 -dnl Copyright (C) 2009-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/modechange.m4 b/m4/modechange.m4 index 475649aa..8661ade6 100644 --- a/m4/modechange.m4 +++ b/m4/modechange.m4 @@ -1,5 +1,5 @@ # modechange.m4 serial 6 -dnl Copyright (C) 2002-2003, 2005-2006, 2009-2010 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2011 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/multiarch.m4 b/m4/multiarch.m4 index 389bd2bb..691d8927 100644 --- a/m4/multiarch.m4 +++ b/m4/multiarch.m4 @@ -1,5 +1,5 @@ -# multiarch.m4 serial 5 -dnl Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. +# multiarch.m4 serial 6 +dnl Copyright (C) 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -16,8 +16,7 @@ dnl with or without modifications, as long as this notice is preserved. # CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ # CPP="gcc -E" CXXCPP="g++ -E" # -# Detect this situation and set the macro AA_APPLE_UNIVERSAL_BUILD at the -# beginning of config.h and set APPLE_UNIVERSAL_BUILD accordingly. +# Detect this situation and set APPLE_UNIVERSAL_BUILD accordingly. AC_DEFUN_ONCE([gl_MULTIARCH], [ @@ -55,8 +54,6 @@ AC_DEFUN_ONCE([gl_MULTIARCH], done ]) if test $gl_cv_c_multiarch = yes; then - AC_DEFINE([AA_APPLE_UNIVERSAL_BUILD], [1], - [Define if the compiler is building for multiple architectures of Apple platforms at once.]) APPLE_UNIVERSAL_BUILD=1 else APPLE_UNIVERSAL_BUILD=0 diff --git a/m4/nl_langinfo.m4 b/m4/nl_langinfo.m4 index ad456a26..ca9d28da 100644 --- a/m4/nl_langinfo.m4 +++ b/m4/nl_langinfo.m4 @@ -1,5 +1,5 @@ -# nl_langinfo.m4 serial 3 -dnl Copyright (C) 2009, 2010 Free Software Foundation, Inc. +# nl_langinfo.m4 serial 4 +dnl Copyright (C) 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -9,8 +9,35 @@ AC_DEFUN([gl_FUNC_NL_LANGINFO], AC_REQUIRE([gl_LANGINFO_H_DEFAULTS]) AC_REQUIRE([gl_LANGINFO_H]) AC_CHECK_FUNCS_ONCE([nl_langinfo]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles if test $ac_cv_func_nl_langinfo = yes; then - if test $HAVE_LANGINFO_CODESET = 1 && test $HAVE_LANGINFO_ERA = 1; then + # On Irix 6.5, YESEXPR is defined, but nl_langinfo(YESEXPR) is broken. + AC_CACHE_CHECK([whether YESEXPR works], + [gl_cv_func_nl_langinfo_yesexpr_works], + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM([[#include +]], [[return !*nl_langinfo(YESEXPR); +]])], + [gl_cv_func_nl_langinfo_yesexpr_works=yes], + [gl_cv_func_nl_langinfo_yesexpr_works=no], + [ + case "$host_os" in + # Guess no on irix systems. + irix*) gl_cv_func_nl_langinfo_yesexpr_works="guessing no";; + # Guess yes elsewhere. + *) gl_cv_func_nl_langinfo_yesexpr_works="guessing yes";; + esac + ]) + ]) + case $gl_cv_func_nl_langinfo_yesexpr_works in + *yes) FUNC_NL_LANGINFO_YESEXPR_WORKS=1 ;; + *) FUNC_NL_LANGINFO_YESEXPR_WORKS=0 ;; + esac + AC_DEFINE_UNQUOTED([FUNC_NL_LANGINFO_YESEXPR_WORKS], + [$FUNC_NL_LANGINFO_YESEXPR_WORKS], + [Define to 1 if nl_langinfo (YESEXPR) returns a non-empty string.]) + if test $HAVE_LANGINFO_CODESET = 1 && test $HAVE_LANGINFO_ERA = 1 \ + && test $FUNC_NL_LANGINFO_YESEXPR_WORKS = 1; then : else REPLACE_NL_LANGINFO=1 diff --git a/m4/nls.m4 b/m4/nls.m4 index 003704c4..6a21216d 100644 --- a/m4/nls.m4 +++ b/m4/nls.m4 @@ -1,5 +1,5 @@ # nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2011 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/open.m4 b/m4/open.m4 index d402da99..bfebdab7 100644 --- a/m4/open.m4 +++ b/m4/open.m4 @@ -1,5 +1,5 @@ -# open.m4 serial 9 -dnl Copyright (C) 2007-2010 Free Software Foundation, Inc. +# open.m4 serial 11 +dnl Copyright (C) 2007-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -30,17 +30,21 @@ AC_DEFUN([gl_FUNC_OPEN], #endif int main () { + int result = 0; #if HAVE_LSTAT - if (open ("conftest.lnk/", O_RDONLY) != -1) return 2; + if (open ("conftest.lnk/", O_RDONLY) != -1) + result |= 1; #endif - return open ("conftest.sl/", O_CREAT, 0600) >= 0; + if (open ("conftest.sl/", O_CREAT, 0600) >= 0) + result |= 2; + return result; }]])], [gl_cv_func_open_slash=yes], [gl_cv_func_open_slash=no], [ changequote(,)dnl case "$host_os" in - freebsd* | aix* | hpux* | solaris2.[0-9]*) + freebsd* | aix* | hpux* | solaris2.[0-9] | solaris2.[0-9].*) gl_cv_func_open_slash="guessing no" ;; *) gl_cv_func_open_slash="guessing yes" ;; diff --git a/m4/openat.m4 b/m4/openat.m4 index eec426a4..28c0e1da 100644 --- a/m4/openat.m4 +++ b/m4/openat.m4 @@ -1,7 +1,7 @@ -# serial 30 +# serial 31 # See if we need to use our replacement for Solaris' openat et al functions. -dnl Copyright (C) 2004-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2004-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -63,6 +63,9 @@ AC_DEFUN([gl_FUNC_OPENAT], # gl_FUNC_FCHOWNAT_DEREF_BUG([ACTION-IF-BUGGY[, ACTION-IF-NOT_BUGGY]]) AC_DEFUN([gl_FUNC_FCHOWNAT_DEREF_BUG], [ + dnl Persuade glibc's to declare fchownat(). + AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) + AC_CACHE_CHECK([whether fchownat works with AT_SYMLINK_NOFOLLOW], gl_cv_func_fchownat_nofollow_works, [ @@ -96,6 +99,38 @@ main () AS_IF([test $gl_cv_func_fchownat_nofollow_works = no], [$1], [$2]) ]) +# gl_FUNC_FCHOWNAT_EMPTY_FILENAME_BUG([ACTION-IF-BUGGY[, ACTION-IF-NOT_BUGGY]]) +AC_DEFUN([gl_FUNC_FCHOWNAT_EMPTY_FILENAME_BUG], +[ + dnl Persuade glibc's to declare fchownat(). + AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) + + AC_CACHE_CHECK([whether fchownat works with an empty file name], + [gl_cv_func_fchownat_empty_filename_works], + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [[#include + #include + ]], + [[int fd; + int ret; + if (mkdir ("conftestdir", 0700) < 0) + return 2; + fd = open ("conftestdir", O_RDONLY); + if (fd < 0) + return 3; + ret = fchownat (fd, "", -1, -1, 0); + close (fd); + rmdir ("conftestdir"); + return ret == 0; + ]])], + [gl_cv_func_fchownat_empty_filename_works=yes], + [gl_cv_func_fchownat_empty_filename_works=no], + [gl_cv_func_fchownat_empty_filename_works="guessing no"]) + ]) + AS_IF([test "$gl_cv_func_fchownat_empty_filename_works" != yes], [$1], [$2]) +]) + # If we have the fchownat function, and it has the bug (in glibc-2.4) # that it dereferences symlinks even with AT_SYMLINK_NOFOLLOW, then # use the replacement function. @@ -104,6 +139,7 @@ main () # Also use the replacement function if fchownat is simply not available. AC_DEFUN([gl_FUNC_FCHOWNAT], [ + AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) AC_REQUIRE([gl_FUNC_CHOWN]) AC_CHECK_FUNC([fchownat], [gl_FUNC_FCHOWNAT_DEREF_BUG( @@ -112,6 +148,12 @@ AC_DEFUN([gl_FUNC_FCHOWNAT], [Define to 1 if your platform has fchownat, but it cannot perform lchown tasks.]) ]) + gl_FUNC_FCHOWNAT_EMPTY_FILENAME_BUG( + [REPLACE_FCHOWNAT=1 + AC_DEFINE([FCHOWNAT_EMPTY_FILENAME_BUG], [1], + [Define to 1 if your platform has fchownat, but it does + not reject an empty file name.]) + ]) if test $REPLACE_CHOWN = 1; then REPLACE_FCHOWNAT=1 fi], diff --git a/m4/parse-datetime.m4 b/m4/parse-datetime.m4 index d7812922..e665ef37 100644 --- a/m4/parse-datetime.m4 +++ b/m4/parse-datetime.m4 @@ -1,5 +1,5 @@ -# parse-datetime.m4 serial 18 -dnl Copyright (C) 2002-2006, 2008-2010 Free Software Foundation, Inc. +# parse-datetime.m4 serial 19 +dnl Copyright (C) 2002-2006, 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -41,9 +41,11 @@ AC_DEFUN([gl_PARSE_DATETIME], #include /* for time_t */ #include /* for CHAR_BIT, LONG_MIN, LONG_MAX */ #define TYPE_MINIMUM(t) \ - ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1))) + ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ TYPE_MAXIMUM (t))) #define TYPE_MAXIMUM(t) \ - ((t) ((t) 0 < (t) -1 ? (t) -1 : ~ (~ (t) 0 << (sizeof (t) * CHAR_BIT - 1)))) + ((t) ((t) 0 < (t) -1 \ + ? (t) -1 \ + : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1))) typedef int verify_min[2 * (LONG_MIN <= TYPE_MINIMUM (time_t)) - 1]; typedef int verify_max[2 * (TYPE_MAXIMUM (time_t) <= LONG_MAX) - 1]; ]])], diff --git a/m4/pathmax.m4 b/m4/pathmax.m4 index 6a3f857e..17b3d648 100644 --- a/m4/pathmax.m4 +++ b/m4/pathmax.m4 @@ -1,5 +1,5 @@ # pathmax.m4 serial 8 -dnl Copyright (C) 2002-2003, 2005-2006, 2009-2010 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2011 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/po.m4 b/m4/po.m4 index 47f36a41..a3e99d6e 100644 --- a/m4/po.m4 +++ b/m4/po.m4 @@ -1,5 +1,5 @@ # po.m4 serial 17 (gettext-0.18) -dnl Copyright (C) 1995-2010 Free Software Foundation, Inc. +dnl Copyright (C) 1995-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/printf.m4 b/m4/printf.m4 index e850862c..9c2ed1ef 100644 --- a/m4/printf.m4 +++ b/m4/printf.m4 @@ -1,5 +1,5 @@ -# printf.m4 serial 35 -dnl Copyright (C) 2003, 2007-2010 Free Software Foundation, Inc. +# printf.m4 serial 42 +dnl Copyright (C) 2003, 2007-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -32,25 +32,26 @@ AC_DEFUN([gl_PRINTF_SIZES_C99], static char buf[100]; int main () { + int result = 0; #if HAVE_STDINT_H_WITH_UINTMAX || HAVE_INTTYPES_H_WITH_UINTMAX buf[0] = '\0'; if (sprintf (buf, "%ju %d", (uintmax_t) 12345671, 33, 44, 55) < 0 || strcmp (buf, "12345671 33") != 0) - return 1; + result |= 1; #endif buf[0] = '\0'; if (sprintf (buf, "%zu %d", (size_t) 12345672, 33, 44, 55) < 0 || strcmp (buf, "12345672 33") != 0) - return 1; + result |= 2; buf[0] = '\0'; if (sprintf (buf, "%tu %d", (ptrdiff_t) 12345673, 33, 44, 55) < 0 || strcmp (buf, "12345673 33") != 0) - return 1; + result |= 4; buf[0] = '\0'; if (sprintf (buf, "%Lg %d", (long double) 1.5, 33, 44, 55) < 0 || strcmp (buf, "1.5 33") != 0) - return 1; - return 0; + result |= 8; + return result; }]])], [gl_cv_func_printf_sizes_c99=yes], [gl_cv_func_printf_sizes_c99=no], @@ -70,8 +71,8 @@ changequote(,)dnl gl_cv_func_printf_sizes_c99="guessing no";; openbsd*) gl_cv_func_printf_sizes_c99="guessing yes";; # Guess yes on Solaris >= 2.10. - solaris2.[0-9]*) gl_cv_func_printf_sizes_c99="guessing no";; - solaris*) gl_cv_func_printf_sizes_c99="guessing yes";; + solaris2.[1-9][0-9]*) gl_cv_func_printf_sizes_c99="guessing yes";; + solaris*) gl_cv_func_printf_sizes_c99="guessing no";; # Guess yes on NetBSD >= 3. netbsd[1-2]* | netbsdelf[1-2]* | netbsdaout[1-2]* | netbsdcoff[1-2]*) gl_cv_func_printf_sizes_c99="guessing no";; @@ -102,19 +103,20 @@ AC_DEFUN([gl_PRINTF_LONG_DOUBLE], static char buf[10000]; int main () { + int result = 0; buf[0] = '\0'; if (sprintf (buf, "%Lf %d", 1.75L, 33, 44, 55) < 0 || strcmp (buf, "1.750000 33") != 0) - return 1; + result |= 1; buf[0] = '\0'; if (sprintf (buf, "%Le %d", 1.75L, 33, 44, 55) < 0 || strcmp (buf, "1.750000e+00 33") != 0) - return 1; + result |= 2; buf[0] = '\0'; if (sprintf (buf, "%Lg %d", 1.75L, 33, 44, 55) < 0 || strcmp (buf, "1.75 33") != 0) - return 1; - return 0; + result |= 4; + return result; }]])], [gl_cv_func_printf_long_double=yes], [gl_cv_func_printf_long_double=no], @@ -175,39 +177,40 @@ static char buf[10000]; static double zero = 0.0; int main () { + int result = 0; if (sprintf (buf, "%f", 1.0 / 0.0) < 0 || (strcmp (buf, "inf") != 0 && strcmp (buf, "infinity") != 0)) - return 1; + result |= 1; if (sprintf (buf, "%f", -1.0 / 0.0) < 0 || (strcmp (buf, "-inf") != 0 && strcmp (buf, "-infinity") != 0)) - return 1; + result |= 1; if (sprintf (buf, "%f", zero / zero) < 0 || !strisnan (buf, 0, strlen (buf))) - return 1; + result |= 2; if (sprintf (buf, "%e", 1.0 / 0.0) < 0 || (strcmp (buf, "inf") != 0 && strcmp (buf, "infinity") != 0)) - return 1; + result |= 4; if (sprintf (buf, "%e", -1.0 / 0.0) < 0 || (strcmp (buf, "-inf") != 0 && strcmp (buf, "-infinity") != 0)) - return 1; + result |= 4; if (sprintf (buf, "%e", zero / zero) < 0 || !strisnan (buf, 0, strlen (buf))) - return 1; + result |= 8; if (sprintf (buf, "%g", 1.0 / 0.0) < 0 || (strcmp (buf, "inf") != 0 && strcmp (buf, "infinity") != 0)) - return 1; + result |= 16; if (sprintf (buf, "%g", -1.0 / 0.0) < 0 || (strcmp (buf, "-inf") != 0 && strcmp (buf, "-infinity") != 0)) - return 1; + result |= 16; if (sprintf (buf, "%g", zero / zero) < 0 || !strisnan (buf, 0, strlen (buf))) - return 1; + result |= 32; /* This test fails on HP-UX 10.20. */ if (have_minus_zero ()) if (sprintf (buf, "%g", - zero) < 0 || strcmp (buf, "-0") != 0) - return 1; - return 0; + result |= 64; + return result; }]])], [gl_cv_func_printf_infinite=yes], [gl_cv_func_printf_infinite=no], @@ -289,34 +292,35 @@ static char buf[10000]; static long double zeroL = 0.0L; int main () { + int result = 0; nocrash_init(); if (sprintf (buf, "%Lf", 1.0L / 0.0L) < 0 || (strcmp (buf, "inf") != 0 && strcmp (buf, "infinity") != 0)) - return 1; + result |= 1; if (sprintf (buf, "%Lf", -1.0L / 0.0L) < 0 || (strcmp (buf, "-inf") != 0 && strcmp (buf, "-infinity") != 0)) - return 1; + result |= 1; if (sprintf (buf, "%Lf", zeroL / zeroL) < 0 || !strisnan (buf, 0, strlen (buf))) - return 1; + result |= 1; if (sprintf (buf, "%Le", 1.0L / 0.0L) < 0 || (strcmp (buf, "inf") != 0 && strcmp (buf, "infinity") != 0)) - return 1; + result |= 1; if (sprintf (buf, "%Le", -1.0L / 0.0L) < 0 || (strcmp (buf, "-inf") != 0 && strcmp (buf, "-infinity") != 0)) - return 1; + result |= 1; if (sprintf (buf, "%Le", zeroL / zeroL) < 0 || !strisnan (buf, 0, strlen (buf))) - return 1; + result |= 1; if (sprintf (buf, "%Lg", 1.0L / 0.0L) < 0 || (strcmp (buf, "inf") != 0 && strcmp (buf, "infinity") != 0)) - return 1; + result |= 1; if (sprintf (buf, "%Lg", -1.0L / 0.0L) < 0 || (strcmp (buf, "-inf") != 0 && strcmp (buf, "-infinity") != 0)) - return 1; + result |= 1; if (sprintf (buf, "%Lg", zeroL / zeroL) < 0 || !strisnan (buf, 0, strlen (buf))) - return 1; + result |= 1; #if CHECK_PRINTF_SAFE && ((defined __ia64 && LDBL_MANT_DIG == 64) || (defined __x86_64__ || defined __amd64__) || (defined __i386 || defined __i386__ || defined _I386 || defined _M_IX86 || defined _X86_)) /* Representation of an 80-bit 'long double' as an initializer for a sequence of 'unsigned int' words. */ @@ -335,13 +339,13 @@ int main () { LDBL80_WORDS (0xFFFF, 0xC3333333, 0x00000000) }; if (sprintf (buf, "%Lf", x.value) < 0 || !strisnan (buf, 0, strlen (buf))) - return 1; + result |= 2; if (sprintf (buf, "%Le", x.value) < 0 || !strisnan (buf, 0, strlen (buf))) - return 1; + result |= 2; if (sprintf (buf, "%Lg", x.value) < 0 || !strisnan (buf, 0, strlen (buf))) - return 1; + result |= 2; } { /* Signalling NaN. */ @@ -349,81 +353,81 @@ int main () { LDBL80_WORDS (0xFFFF, 0x83333333, 0x00000000) }; if (sprintf (buf, "%Lf", x.value) < 0 || !strisnan (buf, 0, strlen (buf))) - return 1; + result |= 2; if (sprintf (buf, "%Le", x.value) < 0 || !strisnan (buf, 0, strlen (buf))) - return 1; + result |= 2; if (sprintf (buf, "%Lg", x.value) < 0 || !strisnan (buf, 0, strlen (buf))) - return 1; + result |= 2; } { /* Pseudo-NaN. */ static union { unsigned int word[4]; long double value; } x = { LDBL80_WORDS (0xFFFF, 0x40000001, 0x00000000) }; if (sprintf (buf, "%Lf", x.value) < 0 || !strisnan (buf, 0, strlen (buf))) - return 1; + result |= 4; if (sprintf (buf, "%Le", x.value) < 0 || !strisnan (buf, 0, strlen (buf))) - return 1; + result |= 4; if (sprintf (buf, "%Lg", x.value) < 0 || !strisnan (buf, 0, strlen (buf))) - return 1; + result |= 4; } { /* Pseudo-Infinity. */ static union { unsigned int word[4]; long double value; } x = { LDBL80_WORDS (0xFFFF, 0x00000000, 0x00000000) }; if (sprintf (buf, "%Lf", x.value) < 0 || !strisnan (buf, 0, strlen (buf))) - return 1; + result |= 8; if (sprintf (buf, "%Le", x.value) < 0 || !strisnan (buf, 0, strlen (buf))) - return 1; + result |= 8; if (sprintf (buf, "%Lg", x.value) < 0 || !strisnan (buf, 0, strlen (buf))) - return 1; + result |= 8; } { /* Pseudo-Zero. */ static union { unsigned int word[4]; long double value; } x = { LDBL80_WORDS (0x4004, 0x00000000, 0x00000000) }; if (sprintf (buf, "%Lf", x.value) < 0 || !strisnan (buf, 0, strlen (buf))) - return 1; + result |= 16; if (sprintf (buf, "%Le", x.value) < 0 || !strisnan (buf, 0, strlen (buf))) - return 1; + result |= 16; if (sprintf (buf, "%Lg", x.value) < 0 || !strisnan (buf, 0, strlen (buf))) - return 1; + result |= 16; } { /* Unnormalized number. */ static union { unsigned int word[4]; long double value; } x = { LDBL80_WORDS (0x4000, 0x63333333, 0x00000000) }; if (sprintf (buf, "%Lf", x.value) < 0 || !strisnan (buf, 0, strlen (buf))) - return 1; + result |= 32; if (sprintf (buf, "%Le", x.value) < 0 || !strisnan (buf, 0, strlen (buf))) - return 1; + result |= 32; if (sprintf (buf, "%Lg", x.value) < 0 || !strisnan (buf, 0, strlen (buf))) - return 1; + result |= 32; } { /* Pseudo-Denormal. */ static union { unsigned int word[4]; long double value; } x = { LDBL80_WORDS (0x0000, 0x83333333, 0x00000000) }; if (sprintf (buf, "%Lf", x.value) < 0 || !strisnan (buf, 0, strlen (buf))) - return 1; + result |= 64; if (sprintf (buf, "%Le", x.value) < 0 || !strisnan (buf, 0, strlen (buf))) - return 1; + result |= 64; if (sprintf (buf, "%Lg", x.value) < 0 || !strisnan (buf, 0, strlen (buf))) - return 1; + result |= 64; } #endif - return 0; + return result; }]])], [gl_cv_func_printf_infinite_long_double=yes], [gl_cv_func_printf_infinite_long_double=no], @@ -439,16 +443,9 @@ changequote(,)dnl # Guess yes on FreeBSD >= 6. freebsd[1-5]*) gl_cv_func_printf_infinite_long_double="guessing no";; freebsd* | kfreebsd*) gl_cv_func_printf_infinite_long_double="guessing yes";; - # Guess yes on MacOS X >= 10.3. - darwin[1-6].*) gl_cv_func_printf_infinite_long_double="guessing no";; - darwin*) gl_cv_func_printf_infinite_long_double="guessing yes";; # Guess yes on HP-UX >= 11. hpux[7-9]* | hpux10*) gl_cv_func_printf_infinite_long_double="guessing no";; hpux*) gl_cv_func_printf_infinite_long_double="guessing yes";; - # Guess yes on NetBSD >= 3. - netbsd[1-2]* | netbsdelf[1-2]* | netbsdaout[1-2]* | netbsdcoff[1-2]*) - gl_cv_func_printf_infinite_long_double="guessing no";; - netbsd*) gl_cv_func_printf_infinite_long_double="guessing yes";; # If we don't know, assume the worst. *) gl_cv_func_printf_infinite_long_double="guessing no";; esac @@ -483,37 +480,38 @@ AC_DEFUN([gl_PRINTF_DIRECTIVE_A], static char buf[100]; int main () { + int result = 0; if (sprintf (buf, "%a %d", 3.1416015625, 33, 44, 55) < 0 || (strcmp (buf, "0x1.922p+1 33") != 0 && strcmp (buf, "0x3.244p+0 33") != 0 && strcmp (buf, "0x6.488p-1 33") != 0 && strcmp (buf, "0xc.91p-2 33") != 0)) - return 1; + result |= 1; if (sprintf (buf, "%A %d", -3.1416015625, 33, 44, 55) < 0 || (strcmp (buf, "-0X1.922P+1 33") != 0 && strcmp (buf, "-0X3.244P+0 33") != 0 && strcmp (buf, "-0X6.488P-1 33") != 0 && strcmp (buf, "-0XC.91P-2 33") != 0)) - return 1; + result |= 2; /* This catches a FreeBSD 6.1 bug: it doesn't round. */ if (sprintf (buf, "%.2a %d", 1.51, 33, 44, 55) < 0 || (strcmp (buf, "0x1.83p+0 33") != 0 && strcmp (buf, "0x3.05p-1 33") != 0 && strcmp (buf, "0x6.0ap-2 33") != 0 && strcmp (buf, "0xc.14p-3 33") != 0)) - return 1; + result |= 4; /* This catches a FreeBSD 6.1 bug. See */ if (sprintf (buf, "%010a %d", 1.0 / 0.0, 33, 44, 55) < 0 || buf[0] == '0') - return 1; + result |= 8; /* This catches a MacOS X 10.3.9 (Darwin 7.9) bug. */ if (sprintf (buf, "%.1a", 1.999) < 0 || (strcmp (buf, "0x1.0p+1") != 0 && strcmp (buf, "0x2.0p+0") != 0 && strcmp (buf, "0x4.0p-1") != 0 && strcmp (buf, "0x8.0p-2") != 0)) - return 1; + result |= 16; /* This catches the same MacOS X 10.3.9 (Darwin 7.9) bug and also a glibc 2.4 bug . */ if (sprintf (buf, "%.1La", 1.999L) < 0 @@ -521,8 +519,8 @@ int main () && strcmp (buf, "0x2.0p+0") != 0 && strcmp (buf, "0x4.0p-1") != 0 && strcmp (buf, "0x8.0p-2") != 0)) - return 1; - return 0; + result |= 32; + return result; }]])], [gl_cv_func_printf_directive_a=yes], [gl_cv_func_printf_directive_a=no], @@ -533,7 +531,7 @@ int main () AC_EGREP_CPP([BZ2908], [ #include #ifdef __GNU_LIBRARY__ - #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 5) || (__GLIBC__ > 2) + #if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 5) || (__GLIBC__ > 2)) && !defined __UCLIBC__ BZ2908 #endif #endif @@ -566,17 +564,18 @@ AC_DEFUN([gl_PRINTF_DIRECTIVE_F], static char buf[100]; int main () { + int result = 0; if (sprintf (buf, "%F %d", 1234567.0, 33, 44, 55) < 0 || strcmp (buf, "1234567.000000 33") != 0) - return 1; + result |= 1; if (sprintf (buf, "%F", 1.0 / 0.0) < 0 || (strcmp (buf, "INF") != 0 && strcmp (buf, "INFINITY") != 0)) - return 1; + result |= 2; /* This catches a Cygwin 1.5.x bug. */ if (sprintf (buf, "%.F", 1234.0) < 0 || strcmp (buf, "1234") != 0) - return 1; - return 0; + result |= 4; + return result; }]])], [gl_cv_func_printf_directive_f=yes], [gl_cv_func_printf_directive_f=no], @@ -592,8 +591,8 @@ changequote(,)dnl darwin[1-6].*) gl_cv_func_printf_directive_f="guessing no";; darwin*) gl_cv_func_printf_directive_f="guessing yes";; # Guess yes on Solaris >= 2.10. - solaris2.[0-9]*) gl_cv_func_printf_directive_f="guessing no";; - solaris*) gl_cv_func_printf_directive_f="guessing yes";; + solaris2.[1-9][0-9]*) gl_cv_func_printf_sizes_c99="guessing yes";; + solaris*) gl_cv_func_printf_sizes_c99="guessing no";; # If we don't know, assume the worst. *) gl_cv_func_printf_directive_f="guessing no";; esac @@ -671,6 +670,7 @@ AC_DEFUN([gl_PRINTF_DIRECTIVE_LS], #include int main () { + int result = 0; char buf[100]; /* Test whether %ls works at all. This test fails on OpenBSD 4.0, IRIX 6.5, Solaris 2.6, Haiku, but not on @@ -680,7 +680,7 @@ int main () buf[0] = '\0'; if (sprintf (buf, "%ls", wstring) < 0 || strcmp (buf, "abc") != 0) - return 1; + result |= 1; } /* This test fails on IRIX 6.5, Solaris 2.6, Cygwin 1.5, Haiku (with an assertion failure inside libc), but not on OpenBSD 4.0. */ @@ -689,7 +689,7 @@ int main () buf[0] = '\0'; if (sprintf (buf, "%ls", wstring) < 0 || strcmp (buf, "a") != 0) - return 1; + result |= 2; } /* Test whether precisions in %ls are supported as specified in ISO C 99 section 7.19.6.1: @@ -704,9 +704,9 @@ int main () buf[0] = '\0'; if (sprintf (buf, "%.2ls", wstring) < 0 || strcmp (buf, "ab") != 0) - return 1; + result |= 8; } - return 0; + return result; }]])], [gl_cv_func_printf_directive_ls=yes], [gl_cv_func_printf_directive_ls=no], @@ -889,8 +889,10 @@ changequote([,])dnl dnl Test whether the *printf family of functions supports large precisions. dnl On mingw, precisions larger than 512 are treated like 512, in integer, -dnl floating-point or pointer output. On BeOS, precisions larger than 1044 -dnl crash the program. +dnl floating-point or pointer output. On Solaris 10/x86, precisions larger +dnl than 510 in floating-point output crash the program. On Solaris 10/SPARC, +dnl precisions larger than 510 in floating-point output yield wrong results. +dnl On BeOS, precisions larger than 1044 crash the program. dnl Result is gl_cv_func_printf_precision. AC_DEFUN([gl_PRINTF_PRECISION], @@ -907,20 +909,27 @@ AC_DEFUN([gl_PRINTF_PRECISION], static char buf[5000]; int main () { + int result = 0; #ifdef __BEOS__ /* On BeOS, this would crash and show a dialog box. Avoid the crash. */ return 1; #endif if (sprintf (buf, "%.4000d %d", 1, 33, 44) < 4000 + 3) - return 1; - return 0; + result |= 1; + if (sprintf (buf, "%.4000f %d", 1.0, 33, 44) < 4000 + 5) + result |= 2; + if (sprintf (buf, "%.511f %d", 1.0, 33, 44) < 511 + 5 + || buf[0] != '1') + result |= 4; + return result; }]])], [gl_cv_func_printf_precision=yes], [gl_cv_func_printf_precision=no], [ changequote(,)dnl case "$host_os" in - # Guess no only on native Win32 and BeOS systems. + # Guess no only on Solaris, native Win32, and BeOS systems. + solaris*) gl_cv_func_printf_precision="guessing no" ;; mingw* | pw*) gl_cv_func_printf_precision="guessing no" ;; beos*) gl_cv_func_printf_precision="guessing no" ;; *) gl_cv_func_printf_precision="guessing yes" ;; @@ -1097,7 +1106,8 @@ changequote(,)dnl gl_cv_func_snprintf_truncation_c99="guessing no";; openbsd*) gl_cv_func_snprintf_truncation_c99="guessing yes";; # Guess yes on Solaris >= 2.6. - solaris2.[0-5]*) gl_cv_func_snprintf_truncation_c99="guessing no";; + solaris2.[0-5] | solaris2.[0-5].*) + gl_cv_func_snprintf_truncation_c99="guessing no";; solaris*) gl_cv_func_snprintf_truncation_c99="guessing yes";; # Guess yes on AIX >= 4. aix[1-3]*) gl_cv_func_snprintf_truncation_c99="guessing no";; @@ -1156,6 +1166,10 @@ int main () strcpy (buf, "ABCDEF"); if (snprintf (buf, 3, "%d %d", 4567, 89) != 7) return 1; + if (snprintf (buf, 0, "%d %d", 4567, 89) != 7) + return 2; + if (snprintf (NULL, 0, "%d %d", 4567, 89) != 7) + return 3; return 0; }]])], [gl_cv_func_snprintf_retval_c99=yes], @@ -1175,9 +1189,9 @@ changequote(,)dnl openbsd[1-2].* | openbsd3.[0-8] | openbsd3.[0-8].*) gl_cv_func_snprintf_retval_c99="guessing no";; openbsd*) gl_cv_func_snprintf_retval_c99="guessing yes";; - # Guess yes on Solaris >= 2.6. - solaris2.[0-5]*) gl_cv_func_snprintf_retval_c99="guessing no";; - solaris*) gl_cv_func_snprintf_retval_c99="guessing yes";; + # Guess yes on Solaris >= 2.10. + solaris2.[1-9][0-9]*) gl_cv_func_printf_sizes_c99="guessing yes";; + solaris*) gl_cv_func_printf_sizes_c99="guessing no";; # Guess yes on AIX >= 4. aix[1-3]*) gl_cv_func_snprintf_retval_c99="guessing no";; aix*) gl_cv_func_snprintf_retval_c99="guessing yes";; @@ -1238,7 +1252,8 @@ changequote(,)dnl darwin[1-6].*) gl_cv_func_snprintf_directive_n="guessing no";; darwin*) gl_cv_func_snprintf_directive_n="guessing yes";; # Guess yes on Solaris >= 2.6. - solaris2.[0-5]*) gl_cv_func_snprintf_directive_n="guessing no";; + solaris2.[0-5] | solaris2.[0-5].*) + gl_cv_func_snprintf_directive_n="guessing no";; solaris*) gl_cv_func_snprintf_directive_n="guessing yes";; # Guess yes on AIX >= 4. aix[1-3]*) gl_cv_func_snprintf_directive_n="guessing no";; @@ -1366,7 +1381,8 @@ changequote(,)dnl # Guess yes on Cygwin. cygwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; # Guess yes on Solaris >= 2.6. - solaris2.[0-5]*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";; + solaris2.[0-5] | solaris2.[0-5].*) + gl_cv_func_vsnprintf_zerosize_c99="guessing no";; solaris*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; # Guess yes on AIX >= 4. aix[1-3]*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";; @@ -1439,24 +1455,27 @@ dnl 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 dnl glibc 2.5 . . . . . . . . . . . . . . . . . . . . dnl glibc 2.3.6 . . . . # . . . . . . . . . . . . . . . dnl FreeBSD 5.4, 6.1 . . . . # . . . . . . # . # . . . . . . +dnl MacOS X 10.5.8 . . . # # . . . . . . # . . . . . . . . dnl MacOS X 10.3.9 . . . . # . . . . . . # . # . . . . . . dnl OpenBSD 3.9, 4.0 . . # # # # . # . # . # . # . . . . . . dnl Cygwin 1.7.0 (2009) . . . # . . . ? . . . . . ? . . . . . . dnl Cygwin 1.5.25 (2008) . . . # # . . # . . . . . # . . . . . . dnl Cygwin 1.5.19 (2006) # . . # # # . # . # . # # # . . . . . . -dnl Solaris 10 . . # # # . . # . . . # . . . . . . . . -dnl Solaris 2.6 ... 9 # . # # # # . # . . . # . . . . . . . . +dnl Solaris 11 2010-11 . . # # # . . # . . . # . . . . . . . . +dnl Solaris 10 . . # # # . . # . . . # # . . . . . . . +dnl Solaris 2.6 ... 9 # . # # # # . # . . . # # . . . # . . . dnl Solaris 2.5.1 # . # # # # . # . . . # . . # # # # # # dnl AIX 5.2, 7.1 . . # # # . . . . . . # . . . . . . . . -dnl AIX 4.3.2, 5.1 # . # # # # . . . . . # . . . . . . . . +dnl AIX 4.3.2, 5.1 # . # # # # . . . . . # . . . . # . . . dnl HP-UX 11.31 . . . . # . . . . . . # . . . . # # . . dnl HP-UX 11.{00,11,23} # . . . # # . . . . . # . . . . # # . # dnl HP-UX 10.20 # . # . # # . ? . . # # . . . . # # ? # dnl IRIX 6.5 # . # # # # . # . . . # . . . . # . . . dnl OSF/1 5.1 # . # # # # . . . . . # . . . . # . . # dnl OSF/1 4.0d # . # # # # . . . . . # . . # # # # # # +dnl NetBSD 5.0 . . . # # . . . . . . # . # . . . . . . dnl NetBSD 4.0 . ? ? ? ? ? . ? . ? ? ? ? ? . . . ? ? ? dnl NetBSD 3.0 . . . . # # . ? # # ? # . # . . . . . . -dnl Haiku . . . # # # . # . . . . . ? . . . . . . -dnl BeOS # # . # # # . ? # . ? . # ? . . . . . . +dnl Haiku . . . # # # . # . . . . . ? . . ? . . . +dnl BeOS # # . # # # . ? # . ? . # ? . . ? . . . dnl mingw # # # # # # . . # # . # # ? . # # # . . diff --git a/m4/priv-set.m4 b/m4/priv-set.m4 index aaa18961..1509ba66 100644 --- a/m4/priv-set.m4 +++ b/m4/priv-set.m4 @@ -1,6 +1,6 @@ # serial 7 -# Copyright (C) 2009, 2010 Free Software Foundation, Inc. +# Copyright (C) 2009-2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/progtest.m4 b/m4/progtest.m4 index 9ffa5c02..5130d56a 100644 --- a/m4/progtest.m4 +++ b/m4/progtest.m4 @@ -1,5 +1,5 @@ # progtest.m4 serial 7 (gettext-0.18.2) -dnl Copyright (C) 1996-2003, 2005, 2008-2010 Free Software Foundation, Inc. +dnl Copyright (C) 1996-2003, 2005, 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/quote.m4 b/m4/quote.m4 index e0755426..23286841 100644 --- a/m4/quote.m4 +++ b/m4/quote.m4 @@ -1,5 +1,5 @@ # quote.m4 serial 5 -dnl Copyright (C) 2002, 2003, 2005, 2006, 2009, 2010 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2011 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/quotearg.m4 b/m4/quotearg.m4 index f72fd621..ff4a2fa4 100644 --- a/m4/quotearg.m4 +++ b/m4/quotearg.m4 @@ -1,5 +1,5 @@ # quotearg.m4 serial 8 -dnl Copyright (C) 2002, 2004-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2004-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/rawmemchr.m4 b/m4/rawmemchr.m4 index 2a25a490..542cba18 100644 --- a/m4/rawmemchr.m4 +++ b/m4/rawmemchr.m4 @@ -1,5 +1,5 @@ # rawmemchr.m4 serial 1 -dnl Copyright (C) 2003, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2007-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/readlink.m4 b/m4/readlink.m4 index 36cd41f9..a502ca56 100644 --- a/m4/readlink.m4 +++ b/m4/readlink.m4 @@ -1,5 +1,5 @@ # readlink.m4 serial 9 -dnl Copyright (C) 2003, 2007, 2009, 2010 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2007, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/readlinkat.m4 b/m4/readlinkat.m4 index a3897498..8dc7d19a 100644 --- a/m4/readlinkat.m4 +++ b/m4/readlinkat.m4 @@ -1,7 +1,7 @@ # serial 1 # See if we need to provide readlinkat replacement. -dnl Copyright (C) 2009-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/realloc.m4 b/m4/realloc.m4 index 01c1234f..a403d9fb 100644 --- a/m4/realloc.m4 +++ b/m4/realloc.m4 @@ -1,5 +1,5 @@ # realloc.m4 serial 11 -dnl Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/regex.m4 b/m4/regex.m4 index 38f1dd76..24198b55 100644 --- a/m4/regex.m4 +++ b/m4/regex.m4 @@ -1,7 +1,6 @@ -# serial 56 +# serial 58 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,8 +13,6 @@ AC_PREREQ([2.50]) AC_DEFUN([gl_REGEX], [ - AC_CHECK_HEADERS_ONCE([locale.h]) - AC_ARG_WITH([included-regex], [AS_HELP_STRING([--without-included-regex], [don't compile regex; this is the default on systems @@ -35,54 +32,50 @@ AC_DEFUN([gl_REGEX], [AC_RUN_IFELSE( [AC_LANG_PROGRAM( [AC_INCLUDES_DEFAULT[ - #if HAVE_LOCALE_H - #include - #endif + #include #include #include ]], - [[static struct re_pattern_buffer regex; + [[int result = 0; + static struct re_pattern_buffer regex; unsigned char folded_chars[UCHAR_MAX + 1]; int i; const char *s; struct re_registers regs; - #if HAVE_LOCALE_H - /* http://sourceware.org/ml/libc-hacker/2006-09/msg00008.html - This test needs valgrind to catch the bug on Debian - GNU/Linux 3.1 x86, but it might catch the bug better - on other platforms and it shouldn't hurt to try the - test here. */ - if (setlocale (LC_ALL, "en_US.UTF-8")) - { - static char const pat[] = "insert into"; - static char const data[] = - "\xFF\0\x12\xA2\xAA\xC4\xB1,K\x12\xC4\xB1*\xACK"; - re_set_syntax (RE_SYNTAX_GREP | RE_HAT_LISTS_NOT_NEWLINE - | RE_ICASE); - memset (®ex, 0, sizeof regex); - s = re_compile_pattern (pat, sizeof pat - 1, ®ex); - if (s) - return 1; - if (re_search (®ex, data, sizeof data - 1, - 0, sizeof data - 1, ®s) - != -1) - return 1; - if (! setlocale (LC_ALL, "C")) - return 1; - } - #endif + /* http://sourceware.org/ml/libc-hacker/2006-09/msg00008.html + This test needs valgrind to catch the bug on Debian + GNU/Linux 3.1 x86, but it might catch the bug better + on other platforms and it shouldn't hurt to try the + test here. */ + if (setlocale (LC_ALL, "en_US.UTF-8")) + { + static char const pat[] = "insert into"; + static char const data[] = + "\xFF\0\x12\xA2\xAA\xC4\xB1,K\x12\xC4\xB1*\xACK"; + re_set_syntax (RE_SYNTAX_GREP | RE_HAT_LISTS_NOT_NEWLINE + | RE_ICASE); + memset (®ex, 0, sizeof regex); + s = re_compile_pattern (pat, sizeof pat - 1, ®ex); + if (s) + result |= 1; + else if (re_search (®ex, data, sizeof data - 1, + 0, sizeof data - 1, ®s) + != -1) + result |= 1; + if (! setlocale (LC_ALL, "C")) + return 1; + } /* This test is from glibc bug 3957, reported by Andrew Mackey. */ re_set_syntax (RE_SYNTAX_EGREP | RE_HAT_LISTS_NOT_NEWLINE); memset (®ex, 0, sizeof regex); s = re_compile_pattern ("a[^x]b", 6, ®ex); if (s) - return 1; - + result |= 2; /* This should fail, but succeeds for glibc-2.5. */ - if (re_search (®ex, "a\nb", 3, 0, 3, ®s) != -1) - return 1; + else if (re_search (®ex, "a\nb", 3, 0, 3, ®s) != -1) + result |= 2; /* This regular expression is from Spencer ere test number 75 in grep-2.3. */ @@ -94,7 +87,7 @@ AC_DEFUN([gl_REGEX], s = re_compile_pattern ("a[[:@:>@:]]b\n", 11, ®ex); /* This should fail with _Invalid character class name_ error. */ if (!s) - return 1; + result |= 4; /* Ensure that [b-a] is diagnosed as invalid, when using RE_NO_EMPTY_RANGES. */ @@ -102,34 +95,31 @@ AC_DEFUN([gl_REGEX], memset (®ex, 0, sizeof regex); s = re_compile_pattern ("a[b-a]", 6, ®ex); if (s == 0) - return 1; + result |= 8; /* This should succeed, but does not for glibc-2.1.3. */ memset (®ex, 0, sizeof regex); s = re_compile_pattern ("{1", 2, ®ex); - if (s) - return 1; + result |= 8; /* The following example is derived from a problem report against gawk from Jorge Stolfi . */ memset (®ex, 0, sizeof regex); s = re_compile_pattern ("[an\371]*n", 7, ®ex); if (s) - return 1; - + result |= 8; /* This should match, but does not for glibc-2.2.1. */ - if (re_match (®ex, "an", 2, 0, ®s) != 2) - return 1; + else if (re_match (®ex, "an", 2, 0, ®s) != 2) + result |= 8; memset (®ex, 0, sizeof regex); s = re_compile_pattern ("x", 1, ®ex); if (s) - return 1; - + result |= 8; /* glibc-2.2.93 does not work with a negative RANGE argument. */ - if (re_search (®ex, "wxy", 3, 2, -2, ®s) != 1) - return 1; + else if (re_search (®ex, "wxy", 3, 2, -2, ®s) != 1) + result |= 8; /* The version of regex.c in older versions of gnulib ignored RE_ICASE. Detect that problem too. */ @@ -137,10 +127,9 @@ AC_DEFUN([gl_REGEX], memset (®ex, 0, sizeof regex); s = re_compile_pattern ("x", 1, ®ex); if (s) - return 1; - - if (re_search (®ex, "WXY", 3, 0, 3, ®s) < 0) - return 1; + result |= 16; + else if (re_search (®ex, "WXY", 3, 0, 3, ®s) < 0) + result |= 16; /* Catch a bug reported by Vin Shelton in http://lists.gnu.org/archive/html/bug-coreutils/2007-06/msg00089.html @@ -151,12 +140,12 @@ AC_DEFUN([gl_REGEX], memset (®ex, 0, sizeof regex); s = re_compile_pattern ("[[:alnum:]_-]\\\\+$", 16, ®ex); if (s) - return 1; + result |= 32; /* REG_STARTEND was added to glibc on 2004-01-15. Reject older versions. */ if (! REG_STARTEND) - return 1; + result |= 64; #if 0 /* It would be nice to reject hosts whose regoff_t values are too @@ -167,10 +156,11 @@ AC_DEFUN([gl_REGEX], when compiling --without-included-regex. */ if (sizeof (regoff_t) < sizeof (ptrdiff_t) || sizeof (regoff_t) < sizeof (ssize_t)) - return 1; + result |= 64; #endif - return 0;]])], + return result; + ]])], [gl_cv_func_re_compile_pattern_working=yes], [gl_cv_func_re_compile_pattern_working=no], dnl When crosscompiling, assume it is not working. diff --git a/m4/rename.m4 b/m4/rename.m4 index 30daf0e4..6648542c 100644 --- a/m4/rename.m4 +++ b/m4/rename.m4 @@ -1,6 +1,6 @@ -# serial 22 +# serial 23 -# Copyright (C) 2001, 2003, 2005-2006, 2009-2010 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005-2006, 2009-2011 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -28,27 +28,34 @@ AC_DEFUN([gl_FUNC_RENAME], dnl links are also broken. AC_CACHE_CHECK([whether rename honors trailing slash on destination], [gl_cv_func_rename_slash_dst_works], - [rm -rf conftest.f conftest.f1 conftest.d1 conftest.d2 conftest.lnk - touch conftest.f && mkdir conftest.d1 || + [rm -rf conftest.f conftest.f1 conftest.f2 conftest.d1 conftest.d2 conftest.lnk + touch conftest.f && touch conftest.f1 && mkdir conftest.d1 || AC_MSG_ERROR([cannot create temporary files]) # Assume that if we have lstat, we can also check symlinks. if test $ac_cv_func_lstat = yes; then ln -s conftest.f conftest.lnk fi - AC_RUN_IFELSE([AC_LANG_PROGRAM([[ -# include -# include -]], [if (rename ("conftest.f", "conftest.f1/") == 0) return 1; - if (rename ("conftest.d1", "conftest.d2/") != 0) return 2; + AC_RUN_IFELSE( + [AC_LANG_PROGRAM([[ +# include +# include + ]], + [[int result = 0; + if (rename ("conftest.f1", "conftest.f2/") == 0) + result |= 1; + if (rename ("conftest.d1", "conftest.d2/") != 0) + result |= 2; #if HAVE_LSTAT - if (rename ("conftest.f", "conftest.lnk/") == 0) return 3; + if (rename ("conftest.f", "conftest.lnk/") == 0) + result |= 4; #endif - ])], + return result; + ]])], [gl_cv_func_rename_slash_dst_works=yes], [gl_cv_func_rename_slash_dst_works=no], dnl When crosscompiling, assume rename is broken. [gl_cv_func_rename_slash_dst_works="guessing no"]) - rm -rf conftest.f conftest.f1 conftest.d1 conftest.d2 conftest.lnk + rm -rf conftest.f conftest.f1 conftest.f2 conftest.d1 conftest.d2 conftest.lnk ]) if test "x$gl_cv_func_rename_slash_dst_works" != xyes; then AC_LIBOBJ([rename]) @@ -65,27 +72,34 @@ AC_DEFUN([gl_FUNC_RENAME], dnl symlinks with a trailing slash. AC_CACHE_CHECK([whether rename honors trailing slash on source], [gl_cv_func_rename_slash_src_works], - [rm -rf conftest.f conftest.d1 conftest.d2 conftest.lnk - touch conftest.f && mkdir conftest.d1 || + [rm -rf conftest.f conftest.f1 conftest.d1 conftest.d2 conftest.d3 conftest.lnk + touch conftest.f && touch conftest.f1 && mkdir conftest.d1 || AC_MSG_ERROR([cannot create temporary files]) # Assume that if we have lstat, we can also check symlinks. if test $ac_cv_func_lstat = yes; then ln -s conftest.f conftest.lnk fi - AC_RUN_IFELSE([AC_LANG_PROGRAM([[ -# include -# include -]], [if (rename ("conftest.f/", "conftest.d2") == 0) return 1; - if (rename ("conftest.d1/", "conftest.d2") != 0) return 2; + AC_RUN_IFELSE( + [AC_LANG_PROGRAM([[ +# include +# include + ]], + [[int result = 0; + if (rename ("conftest.f1/", "conftest.d3") == 0) + result |= 1; + if (rename ("conftest.d1/", "conftest.d2") != 0) + result |= 2; #if HAVE_LSTAT - if (rename ("conftest.lnk/", "conftest.f") == 0) return 3; + if (rename ("conftest.lnk/", "conftest.f") == 0) + result |= 4; #endif - ])], + return result; + ]])], [gl_cv_func_rename_slash_src_works=yes], [gl_cv_func_rename_slash_src_works=no], dnl When crosscompiling, assume rename is broken. [gl_cv_func_rename_slash_src_works="guessing no"]) - rm -rf conftest.f conftest.d1 conftest.d2 conftest.lnk + rm -rf conftest.f conftest.f1 conftest.d1 conftest.d2 conftest.d3 conftest.lnk ]) if test "x$gl_cv_func_rename_slash_src_works" != xyes; then AC_LIBOBJ([rename]) @@ -103,14 +117,23 @@ AC_DEFUN([gl_FUNC_RENAME], [rm -rf conftest.f conftest.f1 if touch conftest.f && ln conftest.f conftest.f1 && set x `ls -i conftest.f conftest.f1` && test "$2" = "$4"; then - AC_RUN_IFELSE([AC_LANG_PROGRAM([[ -# include -# include -# include -]], [if (rename ("conftest.f", "conftest.f1")) return 1; - if (unlink ("conftest.f1")) return 2; - if (rename ("conftest.f", "conftest.f")) return 3; - if (rename ("conftest.f1", "conftest.f1") == 0) return 4;])], + AC_RUN_IFELSE( + [AC_LANG_PROGRAM([[ +# include +# include +# include + ]], + [[int result = 0; + if (rename ("conftest.f", "conftest.f1")) + result |= 1; + if (unlink ("conftest.f1")) + result |= 2; + if (rename ("conftest.f", "conftest.f")) + result |= 4; + if (rename ("conftest.f1", "conftest.f1") == 0) + result |= 8; + return result; + ]])], [gl_cv_func_rename_link_works=yes], [gl_cv_func_rename_link_works=no], dnl When crosscompiling, assume rename is broken. @@ -137,11 +160,18 @@ AC_DEFUN([gl_FUNC_RENAME], [rm -rf conftest.f conftest.d1 conftest.d2 touch conftest.f && mkdir conftest.d1 conftest.d2 || AC_MSG_ERROR([cannot create temporary files]) - AC_RUN_IFELSE([AC_LANG_PROGRAM([[ -# include -# include -]], [if (rename ("conftest.d1", "conftest.d2") != 0) return 1; - if (rename ("conftest.d2", "conftest.f") == 0) return 2;])], + AC_RUN_IFELSE( + [AC_LANG_PROGRAM([[ +# include +# include + ]], + [[int result = 0; + if (rename ("conftest.d1", "conftest.d2") != 0) + result |= 1; + if (rename ("conftest.d2", "conftest.f") == 0) + result |= 2; + return result; + ]])], [gl_cv_func_rename_dest_works=yes], [gl_cv_func_rename_dest_works=no], dnl When crosscompiling, assume rename is broken. diff --git a/m4/renameat.m4 b/m4/renameat.m4 index 4d514a1f..2fa2b8cf 100644 --- a/m4/renameat.m4 +++ b/m4/renameat.m4 @@ -1,7 +1,7 @@ # serial 2 # See if we need to provide renameat replacement. -dnl Copyright (C) 2009-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/rmdir.m4 b/m4/rmdir.m4 index a8a113ee..41705a1e 100644 --- a/m4/rmdir.m4 +++ b/m4/rmdir.m4 @@ -1,12 +1,11 @@ -# rmdir.m4 serial 8 -dnl Copyright (C) 2002, 2005, 2009-2010 Free Software Foundation, Inc. +# rmdir.m4 serial 10 +dnl Copyright (C) 2002, 2005, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_RMDIR], [ - AC_REQUIRE([gl_AC_DOS]) AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) dnl Detect cygwin 1.5.x bug. AC_CACHE_CHECK([whether rmdir works], [gl_cv_func_rmdir_works], @@ -17,8 +16,15 @@ AC_DEFUN([gl_FUNC_RMDIR], [[#include #include #include -]], [[return !rmdir ("conftest.file/") || errno != ENOTDIR - || !rmdir ("conftest.dir/./");]])], +]], [[int result = 0; + if (!rmdir ("conftest.file/")) + result |= 1; + else if (errno != ENOTDIR) + result |= 2; + if (!rmdir ("conftest.dir/./")) + result |= 4; + return result; + ]])], [gl_cv_func_rmdir_works=yes], [gl_cv_func_rmdir_works=no], [gl_cv_func_rmdir_works="guessing no"]) rm -rf conftest.dir conftest.file]) diff --git a/m4/rpmatch.m4 b/m4/rpmatch.m4 index c6222ae5..a8d0f10f 100644 --- a/m4/rpmatch.m4 +++ b/m4/rpmatch.m4 @@ -1,5 +1,5 @@ # rpmatch.m4 serial 9 -dnl Copyright (C) 2002-2003, 2007-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2007-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/safe-read.m4 b/m4/safe-read.m4 index d087bd30..ea8eedbf 100644 --- a/m4/safe-read.m4 +++ b/m4/safe-read.m4 @@ -1,5 +1,5 @@ # safe-read.m4 serial 5 -dnl Copyright (C) 2002-2003, 2005-2006, 2009-2010 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2011 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/safe-write.m4 b/m4/safe-write.m4 index 2ff11d27..7f6b9f81 100644 --- a/m4/safe-write.m4 +++ b/m4/safe-write.m4 @@ -1,5 +1,5 @@ # safe-write.m4 serial 3 -dnl Copyright (C) 2002, 2005-2006, 2009-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2005-2006, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/save-cwd.m4 b/m4/save-cwd.m4 index 06dd16be..7437e053 100644 --- a/m4/save-cwd.m4 +++ b/m4/save-cwd.m4 @@ -1,5 +1,5 @@ # serial 9 -dnl Copyright (C) 2002-2006, 2009-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/savedir.m4 b/m4/savedir.m4 index 06a4c80f..94f3e896 100644 --- a/m4/savedir.m4 +++ b/m4/savedir.m4 @@ -1,5 +1,5 @@ # savedir.m4 serial 9 -dnl Copyright (C) 2002-2003, 2005-2006, 2009-2010 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2011 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/setenv.m4 b/m4/setenv.m4 index de7171ee..ba619b08 100644 --- a/m4/setenv.m4 +++ b/m4/setenv.m4 @@ -1,5 +1,5 @@ -# setenv.m4 serial 18 -dnl Copyright (C) 2001-2004, 2006-2010 Free Software Foundation, Inc. +# setenv.m4 serial 21 +dnl Copyright (C) 2001-2004, 2006-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -16,6 +16,10 @@ AC_DEFUN([gl_FUNC_SETENV], AC_DEFUN([gl_FUNC_SETENV_SEPARATE], [ AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) + AC_CHECK_DECLS_ONCE([setenv]) + if test $ac_cv_have_decl_setenv = no; then + HAVE_DECL_SETENV=0 + fi AC_CHECK_FUNCS_ONCE([setenv]) if test $ac_cv_func_setenv = no; then HAVE_SETENV=0 @@ -27,10 +31,20 @@ AC_DEFUN([gl_FUNC_SETENV_SEPARATE], #include #include ]], [[ - if (setenv ("", "", 0) != -1) return 1; - if (errno != EINVAL) return 2; - if (setenv ("a", "=", 1) != 0) return 3; - if (strcmp (getenv ("a"), "=") != 0) return 4; + int result = 0; + { + if (setenv ("", "", 0) != -1) + result |= 1; + else if (errno != EINVAL) + result |= 2; + } + { + if (setenv ("a", "=", 1) != 0) + result |= 4; + else if (strcmp (getenv ("a"), "=") != 0) + result |= 8; + } + return result; ]])], [gl_cv_func_setenv_works=yes], [gl_cv_func_setenv_works=no], [gl_cv_func_setenv_works="guessing no"])]) @@ -45,9 +59,12 @@ AC_DEFUN([gl_FUNC_SETENV_SEPARATE], AC_DEFUN([gl_FUNC_UNSETENV], [ AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) + AC_CHECK_DECLS_ONCE([unsetenv]) + if test $ac_cv_have_decl_unsetenv = no; then + HAVE_DECL_UNSETENV=0 + fi AC_CHECK_FUNCS([unsetenv]) if test $ac_cv_func_unsetenv = no; then - HAVE_UNSETENV=0 AC_LIBOBJ([unsetenv]) gl_PREREQ_UNSETENV else @@ -56,6 +73,8 @@ AC_DEFUN([gl_FUNC_UNSETENV], [AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( [[ +#undef _BSD +#define _BSD 1 /* unhide unsetenv declaration in OSF/1 5.1 */ #include extern #ifdef __cplusplus @@ -78,20 +97,30 @@ int unsetenv(); fi dnl Solaris 10 unsetenv does not remove all copies of a name. + dnl Haiku alpha 2 unsetenv gets confused by assignment to environ. dnl OpenBSD 4.7 unsetenv("") does not fail. AC_CACHE_CHECK([whether unsetenv obeys POSIX], [gl_cv_func_unsetenv_works], [AC_RUN_IFELSE([AC_LANG_PROGRAM([[ #include #include + extern char **environ; ]], [[ - char entry[] = "b=2"; + char entry1[] = "a=1"; + char entry2[] = "b=2"; + char *env[] = { entry1, entry2, NULL }; if (putenv ((char *) "a=1")) return 1; - if (putenv (entry)) return 2; - entry[0] = 'a'; + if (putenv (entry2)) return 2; + entry2[0] = 'a'; unsetenv ("a"); if (getenv ("a")) return 3; if (!unsetenv ("") || errno != EINVAL) return 4; + entry2[0] = 'b'; + environ = env; + if (!getenv ("a")) return 5; + entry2[0] = 'a'; + unsetenv ("a"); + if (getenv ("a")) return 6; ]])], [gl_cv_func_unsetenv_works=yes], [gl_cv_func_unsetenv_works=no], [gl_cv_func_unsetenv_works="guessing no"])]) diff --git a/m4/size_max.m4 b/m4/size_max.m4 index f3b1a9df..e8070981 100644 --- a/m4/size_max.m4 +++ b/m4/size_max.m4 @@ -1,5 +1,5 @@ # size_max.m4 serial 10 -dnl Copyright (C) 2003, 2005-2006, 2008-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2005-2006, 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sleep.m4 b/m4/sleep.m4 index a5ec6552..4a251dae 100644 --- a/m4/sleep.m4 +++ b/m4/sleep.m4 @@ -1,5 +1,5 @@ -# sleep.m4 serial 3 -dnl Copyright (C) 2007-2010 Free Software Foundation, Inc. +# sleep.m4 serial 4 +dnl Copyright (C) 2007-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -38,7 +38,12 @@ handle_alarm (int sig) signal (SIGALRM, handle_alarm); alarm (1); remaining = sleep (pentecost); - return !(pentecost - 10 < remaining && remaining <= pentecost);]])], + if (remaining > pentecost) + return 3; + if (remaining <= pentecost - 10) + return 4; + return 0; + ]])], [gl_cv_func_sleep_works=yes], [gl_cv_func_sleep_works=no], [gl_cv_func_sleep_works="guessing no"])]) if test "$gl_cv_func_sleep_works" != yes; then diff --git a/m4/snprintf.m4 b/m4/snprintf.m4 index 522b107b..8aa5dbe5 100644 --- a/m4/snprintf.m4 +++ b/m4/snprintf.m4 @@ -1,5 +1,5 @@ # snprintf.m4 serial 5 -dnl Copyright (C) 2002-2004, 2007-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2004, 2007-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -13,7 +13,12 @@ AC_DEFUN([gl_FUNC_SNPRINTF], gl_SNPRINTF_SIZE1 case "$gl_cv_func_snprintf_size1" in *yes) - gl_cv_func_snprintf_usable=yes + gl_SNPRINTF_RETVAL_C99 + case "$gl_cv_func_snprintf_retval_c99" in + *yes) + gl_cv_func_snprintf_usable=yes + ;; + esac ;; esac fi diff --git a/m4/ssize_t.m4 b/m4/ssize_t.m4 index e4c160b5..d7127521 100644 --- a/m4/ssize_t.m4 +++ b/m4/ssize_t.m4 @@ -1,5 +1,5 @@ # ssize_t.m4 serial 5 (gettext-0.18.2) -dnl Copyright (C) 2001-2003, 2006, 2010 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2003, 2006, 2010-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/stat-time.m4 b/m4/stat-time.m4 index e653c434..75ddbee4 100644 --- a/m4/stat-time.m4 +++ b/m4/stat-time.m4 @@ -1,6 +1,6 @@ # Checks for stat-related time functions. -# Copyright (C) 1998-1999, 2001, 2003, 2005-2007, 2009-2010 Free Software +# Copyright (C) 1998-1999, 2001, 2003, 2005-2007, 2009-2011 Free Software # Foundation, Inc. # This file is free software; the Free Software Foundation diff --git a/m4/stat.m4 b/m4/stat.m4 index 75e1d947..27f82d5a 100644 --- a/m4/stat.m4 +++ b/m4/stat.m4 @@ -1,6 +1,6 @@ -# serial 5 +# serial 7 -# Copyright (C) 2009, 2010 Free Software Foundation, Inc. +# Copyright (C) 2009-2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9,7 +9,6 @@ AC_DEFUN([gl_FUNC_STAT], [ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles - AC_REQUIRE([gl_AC_DOS]) AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) AC_CHECK_FUNCS_ONCE([lstat]) dnl mingw is the only known platform where stat(".") and stat("./") differ @@ -36,11 +35,15 @@ AC_DEFUN([gl_FUNC_STAT], AC_RUN_IFELSE( [AC_LANG_PROGRAM( [[#include -]], [[struct stat st; - if (!stat ("conftest.tmp/", &st)) return 1; +]], [[int result = 0; + struct stat st; + if (!stat ("conftest.tmp/", &st)) + result |= 1; #if HAVE_LSTAT - if (!stat ("conftest.lnk/", &st)) return 2; + if (!stat ("conftest.lnk/", &st)) + result |= 2; #endif + return result; ]])], [gl_cv_func_stat_file_slash=yes], [gl_cv_func_stat_file_slash=no], [gl_cv_func_stat_file_slash="guessing no"]) diff --git a/m4/stdarg.m4 b/m4/stdarg.m4 index 8a62f2e8..a1ef178c 100644 --- a/m4/stdarg.m4 +++ b/m4/stdarg.m4 @@ -1,5 +1,5 @@ -# stdarg.m4 serial 4 -dnl Copyright (C) 2006, 2008-2010 Free Software Foundation, Inc. +# stdarg.m4 serial 5 +dnl Copyright (C) 2006, 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -41,7 +41,7 @@ void (*func) (va_list, va_list) = va_copy; if test $gl_aixcc = yes; then dnl Provide a substitute file. STDARG_H=stdarg.h - gl_CHECK_NEXT_HEADERS([stdarg.h]) + gl_NEXT_HEADERS([stdarg.h]) dnl Fallback for the case when contains only macro definitions. if test "$gl_cv_next_stdarg_h" = '""'; then gl_cv_next_stdarg_h='"///usr/include/stdarg.h"' diff --git a/m4/stdbool.m4 b/m4/stdbool.m4 index 1efe59ea..838cf0f4 100644 --- a/m4/stdbool.m4 +++ b/m4/stdbool.m4 @@ -1,17 +1,17 @@ # Check for stdbool.h that conforms to C99. -dnl Copyright (C) 2002-2006, 2009-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. -#serial 3 +#serial 4 # Prepare for substituting if it is not supported. AC_DEFUN([AM_STDBOOL_H], [ - AC_REQUIRE([AC_HEADER_STDBOOL]) + AC_REQUIRE([AC_CHECK_HEADER_STDBOOL]) # Define two additional variables used in the Makefile substitution. @@ -33,11 +33,9 @@ AC_DEFUN([AM_STDBOOL_H], # AM_STDBOOL_H will be renamed to gl_STDBOOL_H in the future. AC_DEFUN([gl_STDBOOL_H], [AM_STDBOOL_H]) -# This version of the macro is needed in autoconf <= 2.67. Autoconf has -# it built in since 2.60, but we want the tweaks from the 2.68 version -# to avoid rejecting xlc and clang due to relying on extensions. +# This version of the macro is needed in autoconf <= 2.68. -AC_DEFUN([AC_HEADER_STDBOOL], +AC_DEFUN([AC_CHECK_HEADER_STDBOOL], [AC_CACHE_CHECK([for stdbool.h that conforms to C99], [ac_cv_header_stdbool_h], [AC_COMPILE_IFELSE( @@ -98,6 +96,4 @@ AC_DEFUN([AC_HEADER_STDBOOL], [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/m4/stddef_h.m4 b/m4/stddef_h.m4 index c3ae5694..1942b6aa 100644 --- a/m4/stddef_h.m4 +++ b/m4/stddef_h.m4 @@ -1,6 +1,6 @@ dnl A placeholder for POSIX 2008 , for platforms that have issues. -# stddef_h.m4 serial 2 -dnl Copyright (C) 2009, 2010 Free Software Foundation, Inc. +# stddef_h.m4 serial 3 +dnl Copyright (C) 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -25,7 +25,7 @@ AC_DEFUN([gl_STDDEF_H], STDDEF_H=stddef.h fi if test -n "$STDDEF_H"; then - gl_CHECK_NEXT_HEADERS([stddef.h]) + gl_NEXT_HEADERS([stddef.h]) fi ]) diff --git a/m4/stdint.m4 b/m4/stdint.m4 index c5e813a9..e7d0d076 100644 --- a/m4/stdint.m4 +++ b/m4/stdint.m4 @@ -1,5 +1,5 @@ -# stdint.m4 serial 35 -dnl Copyright (C) 2001-2010 Free Software Foundation, Inc. +# stdint.m4 serial 39 +dnl Copyright (C) 2001-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -27,6 +27,15 @@ AC_DEFUN([gl_STDINT_H], fi AC_SUBST([HAVE_UNSIGNED_LONG_LONG_INT]) + dnl Check for , in the same way as gl_WCHAR_H does. + AC_CHECK_HEADERS_ONCE([wchar.h]) + if test $ac_cv_header_wchar_h = yes; then + HAVE_WCHAR_H=1 + else + HAVE_WCHAR_H=0 + fi + AC_SUBST([HAVE_WCHAR_H]) + dnl Check for . dnl AC_INCLUDES_DEFAULT defines $ac_cv_header_inttypes_h. if test $ac_cv_header_inttypes_h = yes; then @@ -145,9 +154,11 @@ uintmax_t j = UINTMAX_MAX; #include /* for CHAR_BIT */ #define TYPE_MINIMUM(t) \ - ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1))) + ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ TYPE_MAXIMUM (t))) #define TYPE_MAXIMUM(t) \ - ((t) ((t) 0 < (t) -1 ? (t) -1 : ~ (~ (t) 0 << (sizeof (t) * CHAR_BIT - 1)))) + ((t) ((t) 0 < (t) -1 \ + ? (t) -1 \ + : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1))) struct s { int check_PTRDIFF: PTRDIFF_MIN == TYPE_MINIMUM (ptrdiff_t) @@ -259,7 +270,7 @@ static const char *macro_values[] = || strncmp (value, "((int)"/*)*/, 6) == 0 || strncmp (value, "((signed short)"/*)*/, 15) == 0 || strncmp (value, "((signed char)"/*)*/, 14) == 0) - return 1; + return mv - macro_values + 1; } return 0; ]])], @@ -290,10 +301,6 @@ static const char *macro_values[] = fi AC_SUBST([HAVE_SYS_BITYPES_H]) - dnl Check for (missing in Linux uClibc when built without wide - dnl character support). - AC_CHECK_HEADERS_ONCE([wchar.h]) - gl_STDINT_TYPE_PROPERTIES STDINT_H=stdint.h fi diff --git a/m4/stdint_h.m4 b/m4/stdint_h.m4 index 670c0cc2..356b14e1 100644 --- a/m4/stdint_h.m4 +++ b/m4/stdint_h.m4 @@ -1,5 +1,5 @@ # stdint_h.m4 serial 9 -dnl Copyright (C) 1997-2004, 2006, 2008-2010 Free Software Foundation, Inc. +dnl Copyright (C) 1997-2004, 2006, 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4 index f5650cde..7f3ae562 100644 --- a/m4/stdio_h.m4 +++ b/m4/stdio_h.m4 @@ -1,5 +1,5 @@ -# stdio_h.m4 serial 31 -dnl Copyright (C) 2007-2010 Free Software Foundation, Inc. +# stdio_h.m4 serial 33 +dnl Copyright (C) 2007-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -8,8 +8,7 @@ AC_DEFUN([gl_STDIO_H], [ AC_REQUIRE([gl_STDIO_H_DEFAULTS]) AC_REQUIRE([AC_C_INLINE]) - AC_REQUIRE([gl_ASM_SYMBOL_PREFIX]) - gl_CHECK_NEXT_HEADERS([stdio.h]) + gl_NEXT_HEADERS([stdio.h]) dnl No need to create extra modules for these functions. Everyone who uses dnl likely needs them. GNULIB_FPRINTF=1 @@ -95,6 +94,8 @@ AC_DEFUN([gl_STDIO_H_DEFAULTS], GNULIB_VSPRINTF_POSIX=0; AC_SUBST([GNULIB_VSPRINTF_POSIX]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE_DECL_FPURGE=1; AC_SUBST([HAVE_DECL_FPURGE]) + HAVE_DECL_FSEEKO=1; AC_SUBST([HAVE_DECL_FSEEKO]) + HAVE_DECL_FTELLO=1; AC_SUBST([HAVE_DECL_FTELLO]) HAVE_DECL_GETDELIM=1; AC_SUBST([HAVE_DECL_GETDELIM]) HAVE_DECL_GETLINE=1; AC_SUBST([HAVE_DECL_GETLINE]) HAVE_DECL_OBSTACK_PRINTF=1; AC_SUBST([HAVE_DECL_OBSTACK_PRINTF]) @@ -137,23 +138,3 @@ AC_DEFUN([gl_STDIO_H_DEFAULTS], REPLACE_VSNPRINTF=0; AC_SUBST([REPLACE_VSNPRINTF]) REPLACE_VSPRINTF=0; AC_SUBST([REPLACE_VSPRINTF]) ]) - -dnl Code shared by fseeko and ftello. Determine if large files are supported, -dnl but stdin does not start as a large file by default. -AC_DEFUN([gl_STDIN_LARGE_OFFSET], - [ - AC_CACHE_CHECK([whether stdin defaults to large file offsets], - [gl_cv_var_stdin_large_offset], - [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], -[[#if defined __SL64 && defined __SCLE /* cygwin */ - /* Cygwin 1.5.24 and earlier fail to put stdin in 64-bit mode, making - fseeko/ftello needlessly fail. This bug was fixed in 1.5.25, and - it is easier to do a version check than building a runtime test. */ -# include -# if CYGWIN_VERSION_DLL_COMBINED < CYGWIN_VERSION_DLL_MAKE_COMBINED (1005, 25) - choke me -# endif -#endif]])], - [gl_cv_var_stdin_large_offset=yes], - [gl_cv_var_stdin_large_offset=no])]) -]) diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4 index e4697ce2..25fdada0 100644 --- a/m4/stdlib_h.m4 +++ b/m4/stdlib_h.m4 @@ -1,5 +1,5 @@ -# stdlib_h.m4 serial 31 -dnl Copyright (C) 2007-2010 Free Software Foundation, Inc. +# stdlib_h.m4 serial 37 +dnl Copyright (C) 2007-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -7,21 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_STDLIB_H], [ AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) - gl_CHECK_NEXT_HEADERS([stdlib.h]) - AC_CHECK_HEADERS([random.h], [], [], [AC_INCLUDES_DEFAULT]) - if test $ac_cv_header_random_h = yes; then - HAVE_RANDOM_H=1 - else - HAVE_RANDOM_H=0 - fi - AC_SUBST([HAVE_RANDOM_H]) - AC_CHECK_TYPES([struct random_data], - [], [HAVE_STRUCT_RANDOM_DATA=0], - [[#include - #if HAVE_RANDOM_H - # include - #endif - ]]) + gl_NEXT_HEADERS([stdlib.h]) dnl Check for declarations of anything we want to poison if the dnl corresponding gnulib module is not in use, and which is not @@ -58,6 +44,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS], GNULIB_GETSUBOPT=0; AC_SUBST([GNULIB_GETSUBOPT]) GNULIB_GRANTPT=0; AC_SUBST([GNULIB_GRANTPT]) GNULIB_MALLOC_POSIX=0; AC_SUBST([GNULIB_MALLOC_POSIX]) + GNULIB_MBTOWC=0; AC_SUBST([GNULIB_MBTOWC]) GNULIB_MKDTEMP=0; AC_SUBST([GNULIB_MKDTEMP]) GNULIB_MKOSTEMP=0; AC_SUBST([GNULIB_MKOSTEMP]) GNULIB_MKOSTEMPS=0; AC_SUBST([GNULIB_MKOSTEMPS]) @@ -76,6 +63,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS], GNULIB_SYSTEM_POSIX=0; AC_SUBST([GNULIB_SYSTEM_POSIX]) GNULIB_UNLOCKPT=0; AC_SUBST([GNULIB_UNLOCKPT]) GNULIB_UNSETENV=0; AC_SUBST([GNULIB_UNSETENV]) + GNULIB_WCTOMB=0; AC_SUBST([GNULIB_WCTOMB]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE__EXIT=1; AC_SUBST([HAVE__EXIT]) HAVE_ATOLL=1; AC_SUBST([HAVE_ATOLL]) @@ -89,20 +77,23 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS], HAVE_MKSTEMP=1; AC_SUBST([HAVE_MKSTEMP]) HAVE_MKSTEMPS=1; AC_SUBST([HAVE_MKSTEMPS]) HAVE_PTSNAME=1; AC_SUBST([HAVE_PTSNAME]) + HAVE_RANDOM_H=1; AC_SUBST([HAVE_RANDOM_H]) HAVE_RANDOM_R=1; AC_SUBST([HAVE_RANDOM_R]) HAVE_REALPATH=1; AC_SUBST([HAVE_REALPATH]) HAVE_RPMATCH=1; AC_SUBST([HAVE_RPMATCH]) HAVE_SETENV=1; AC_SUBST([HAVE_SETENV]) + HAVE_DECL_SETENV=1; AC_SUBST([HAVE_DECL_SETENV]) HAVE_STRTOD=1; AC_SUBST([HAVE_STRTOD]) HAVE_STRTOLL=1; AC_SUBST([HAVE_STRTOLL]) HAVE_STRTOULL=1; AC_SUBST([HAVE_STRTOULL]) HAVE_STRUCT_RANDOM_DATA=1; AC_SUBST([HAVE_STRUCT_RANDOM_DATA]) HAVE_SYS_LOADAVG_H=0; AC_SUBST([HAVE_SYS_LOADAVG_H]) HAVE_UNLOCKPT=1; AC_SUBST([HAVE_UNLOCKPT]) - HAVE_UNSETENV=1; AC_SUBST([HAVE_UNSETENV]) + HAVE_DECL_UNSETENV=1; AC_SUBST([HAVE_DECL_UNSETENV]) REPLACE_CALLOC=0; AC_SUBST([REPLACE_CALLOC]) REPLACE_CANONICALIZE_FILE_NAME=0; AC_SUBST([REPLACE_CANONICALIZE_FILE_NAME]) REPLACE_MALLOC=0; AC_SUBST([REPLACE_MALLOC]) + REPLACE_MBTOWC=0; AC_SUBST([REPLACE_MBTOWC]) REPLACE_MKSTEMP=0; AC_SUBST([REPLACE_MKSTEMP]) REPLACE_PUTENV=0; AC_SUBST([REPLACE_PUTENV]) REPLACE_REALLOC=0; AC_SUBST([REPLACE_REALLOC]) @@ -110,4 +101,5 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS], REPLACE_SETENV=0; AC_SUBST([REPLACE_SETENV]) REPLACE_STRTOD=0; AC_SUBST([REPLACE_STRTOD]) REPLACE_UNSETENV=0; AC_SUBST([REPLACE_UNSETENV]) + REPLACE_WCTOMB=0; AC_SUBST([REPLACE_WCTOMB]) ]) diff --git a/m4/stpcpy.m4 b/m4/stpcpy.m4 index d32d93a8..c321d496 100644 --- a/m4/stpcpy.m4 +++ b/m4/stpcpy.m4 @@ -1,5 +1,5 @@ # stpcpy.m4 serial 7 -dnl Copyright (C) 2002, 2007, 2009, 2010 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2007, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/strcase.m4 b/m4/strcase.m4 index 33de423a..1c553ff2 100644 --- a/m4/strcase.m4 +++ b/m4/strcase.m4 @@ -1,5 +1,5 @@ # strcase.m4 serial 10 -dnl Copyright (C) 2002, 2005-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2005-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/strchrnul.m4 b/m4/strchrnul.m4 index 0072e60e..a64e805b 100644 --- a/m4/strchrnul.m4 +++ b/m4/strchrnul.m4 @@ -1,5 +1,5 @@ # strchrnul.m4 serial 7 -dnl Copyright (C) 2003, 2007, 2009, 2010 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2007, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/strdup.m4 b/m4/strdup.m4 index ce40c215..3fb36dd9 100644 --- a/m4/strdup.m4 +++ b/m4/strdup.m4 @@ -1,6 +1,6 @@ # strdup.m4 serial 12 -dnl Copyright (C) 2002-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/strerror.m4 b/m4/strerror.m4 index 1649b245..73d1d54d 100644 --- a/m4/strerror.m4 +++ b/m4/strerror.m4 @@ -1,5 +1,5 @@ # strerror.m4 serial 9 -dnl Copyright (C) 2002, 2007-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2007-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/string_h.m4 b/m4/string_h.m4 index 1977aecf..30ddfbc3 100644 --- a/m4/string_h.m4 +++ b/m4/string_h.m4 @@ -1,11 +1,11 @@ # Configure a GNU-like replacement for . -# Copyright (C) 2007-2010 Free Software Foundation, Inc. +# Copyright (C) 2007-2011 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 17 +# serial 19 # Written by Paul Eggert. @@ -20,7 +20,7 @@ AC_DEFUN([gl_HEADER_STRING_H_BODY], [ AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) - gl_CHECK_NEXT_HEADERS([string.h]) + gl_NEXT_HEADERS([string.h]) dnl Check for declarations of anything we want to poison if the dnl corresponding gnulib module is not in use, and which is not @@ -28,8 +28,8 @@ AC_DEFUN([gl_HEADER_STRING_H_BODY], gl_WARN_ON_USE_PREPARE([[#include ]], [memmem mempcpy memrchr rawmemchr stpcpy stpncpy strchrnul strdup - strncat strndup strnlen strpbrk strsep strcasestr strtok_r strsignal - strverscmp]) + strncat strndup strnlen strpbrk strsep strcasestr strtok_r strerror_r + strsignal strverscmp]) ]) AC_DEFUN([gl_STRING_MODULE_INDICATOR], @@ -75,6 +75,7 @@ AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS], GNULIB_MBSSEP=0; AC_SUBST([GNULIB_MBSSEP]) GNULIB_MBSTOK_R=0; AC_SUBST([GNULIB_MBSTOK_R]) GNULIB_STRERROR=0; AC_SUBST([GNULIB_STRERROR]) + GNULIB_STRERROR_R=0; AC_SUBST([GNULIB_STRERROR_R]) GNULIB_STRSIGNAL=0; AC_SUBST([GNULIB_STRSIGNAL]) GNULIB_STRVERSCMP=0; AC_SUBST([GNULIB_STRVERSCMP]) HAVE_MBSLEN=0; AC_SUBST([HAVE_MBSLEN]) @@ -94,6 +95,7 @@ AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS], HAVE_STRSEP=1; AC_SUBST([HAVE_STRSEP]) HAVE_STRCASESTR=1; AC_SUBST([HAVE_STRCASESTR]) HAVE_DECL_STRTOK_R=1; AC_SUBST([HAVE_DECL_STRTOK_R]) + HAVE_DECL_STRERROR_R=1; AC_SUBST([HAVE_DECL_STRERROR_R]) HAVE_DECL_STRSIGNAL=1; AC_SUBST([HAVE_DECL_STRSIGNAL]) HAVE_STRVERSCMP=1; AC_SUBST([HAVE_STRVERSCMP]) REPLACE_MEMCHR=0; AC_SUBST([REPLACE_MEMCHR]) @@ -103,6 +105,7 @@ AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS], REPLACE_STRSTR=0; AC_SUBST([REPLACE_STRSTR]) REPLACE_STRCASESTR=0; AC_SUBST([REPLACE_STRCASESTR]) REPLACE_STRERROR=0; AC_SUBST([REPLACE_STRERROR]) + REPLACE_STRERROR_R=0; AC_SUBST([REPLACE_STRERROR_R]) REPLACE_STRNCAT=0; AC_SUBST([REPLACE_STRNCAT]) REPLACE_STRNDUP=0; AC_SUBST([REPLACE_STRNDUP]) REPLACE_STRNLEN=0; AC_SUBST([REPLACE_STRNLEN]) diff --git a/m4/strings_h.m4 b/m4/strings_h.m4 index 4374c7cb..71d284b6 100644 --- a/m4/strings_h.m4 +++ b/m4/strings_h.m4 @@ -1,7 +1,7 @@ # Configure a replacement for . # serial 3 -# Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc. +# Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/strndup.m4 b/m4/strndup.m4 index b3567d89..d8f00cab 100644 --- a/m4/strndup.m4 +++ b/m4/strndup.m4 @@ -1,5 +1,5 @@ # strndup.m4 serial 18 -dnl Copyright (C) 2002-2003, 2005-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2005-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/strnlen.m4 b/m4/strnlen.m4 index 52bb838f..a1c59ac6 100644 --- a/m4/strnlen.m4 +++ b/m4/strnlen.m4 @@ -1,5 +1,5 @@ # strnlen.m4 serial 12 -dnl Copyright (C) 2002-2003, 2005-2007, 2009-2010 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2007, 2009-2011 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/strtoimax.m4 b/m4/strtoimax.m4 index 8d8298b9..e82e7cd0 100644 --- a/m4/strtoimax.m4 +++ b/m4/strtoimax.m4 @@ -1,16 +1,11 @@ -# strtoimax.m4 serial 7 -dnl Copyright (C) 2002, 2003, 2004, 2006, 2009, 2010 Free Software Foundation, -dnl Inc. +# strtoimax.m4 serial 8 +dnl Copyright (C) 2002-2004, 2006, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_STRTOIMAX], [ - dnl Work around a bug of AC_EGREP_CPP in autoconf-2.57. - AC_REQUIRE([AC_PROG_CPP]) - AC_REQUIRE([AC_PROG_EGREP]) - AC_CACHE_CHECK([whether defines strtoimax as a macro], gl_cv_func_strtoimax_macro, [AC_EGREP_CPP([inttypes_h_defines_strtoimax], [#include diff --git a/m4/strtol.m4 b/m4/strtol.m4 index 2f27ce88..10f0284b 100644 --- a/m4/strtol.m4 +++ b/m4/strtol.m4 @@ -1,5 +1,5 @@ # strtol.m4 serial 5 -dnl Copyright (C) 2002, 2003, 2006, 2009, 2010 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2006, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/strtoll.m4 b/m4/strtoll.m4 index 065047a6..fd0a13db 100644 --- a/m4/strtoll.m4 +++ b/m4/strtoll.m4 @@ -1,6 +1,5 @@ # strtoll.m4 serial 6 -dnl Copyright (C) 2002, 2004, 2006, 2008, 2009, 2010 Free Software Foundation, -dnl Inc. +dnl Copyright (C) 2002, 2004, 2006, 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/strtoul.m4 b/m4/strtoul.m4 index 5da011c5..06979d16 100644 --- a/m4/strtoul.m4 +++ b/m4/strtoul.m4 @@ -1,5 +1,5 @@ # strtoul.m4 serial 4 -dnl Copyright (C) 2002, 2006, 2009, 2010 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2006, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/strtoull.m4 b/m4/strtoull.m4 index e58e1366..abf607fd 100644 --- a/m4/strtoull.m4 +++ b/m4/strtoull.m4 @@ -1,6 +1,5 @@ # strtoull.m4 serial 6 -dnl Copyright (C) 2002, 2004, 2006, 2008, 2009, 2010 Free Software Foundation, -dnl Inc. +dnl Copyright (C) 2002, 2004, 2006, 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/strtoumax.m4 b/m4/strtoumax.m4 index 684634f5..448c4d9b 100644 --- a/m4/strtoumax.m4 +++ b/m4/strtoumax.m4 @@ -1,16 +1,11 @@ -# strtoumax.m4 serial 7 -dnl Copyright (C) 2002, 2003, 2004, 2006, 2009, 2010 Free Software Foundation, -dnl Inc. +# strtoumax.m4 serial 8 +dnl Copyright (C) 2002-2004, 2006, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_STRTOUMAX], [ - dnl Work around a bug of AC_EGREP_CPP in autoconf-2.57. - AC_REQUIRE([AC_PROG_CPP]) - AC_REQUIRE([AC_PROG_EGREP]) - AC_CACHE_CHECK([whether defines strtoumax as a macro], gl_cv_func_strtoumax_macro, [AC_EGREP_CPP([inttypes_h_defines_strtoumax], [#include diff --git a/m4/symlink.m4 b/m4/symlink.m4 index fb619846..917d5f0e 100644 --- a/m4/symlink.m4 +++ b/m4/symlink.m4 @@ -1,7 +1,7 @@ -# serial 3 +# serial 4 # See if we need to provide symlink replacement. -dnl Copyright (C) 2009, 2010 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -24,9 +24,16 @@ AC_DEFUN([gl_FUNC_SYMLINK], [AC_RUN_IFELSE( [AC_LANG_PROGRAM( [[#include -]], [[if (!symlink ("a", "conftest.link/")) return 1; - if (symlink ("conftest.f", "conftest.lnk2")) return 2; - if (!symlink ("a", "conftest.lnk2/")) return 3;]])], + ]], + [[int result = 0; + if (!symlink ("a", "conftest.link/")) + result |= 1; + if (symlink ("conftest.f", "conftest.lnk2")) + result |= 2; + else if (!symlink ("a", "conftest.lnk2/")) + result |= 4; + return result; + ]])], [gl_cv_func_symlink_works=yes], [gl_cv_func_symlink_works=no], [gl_cv_func_symlink_works="guessing no"]) rm -f conftest.f conftest.link conftest.lnk2]) diff --git a/m4/symlinkat.m4 b/m4/symlinkat.m4 index ed8bb87c..48395686 100644 --- a/m4/symlinkat.m4 +++ b/m4/symlinkat.m4 @@ -1,7 +1,7 @@ # serial 4 # See if we need to provide symlinkat replacement. -dnl Copyright (C) 2009-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sys_stat_h.m4 b/m4/sys_stat_h.m4 index 7181c253..fc419129 100644 --- a/m4/sys_stat_h.m4 +++ b/m4/sys_stat_h.m4 @@ -1,5 +1,5 @@ # sys_stat_h.m4 serial 24 -*- Autoconf -*- -dnl Copyright (C) 2006-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sys_time_h.m4 b/m4/sys_time_h.m4 index da575271..3a3adc8c 100644 --- a/m4/sys_time_h.m4 +++ b/m4/sys_time_h.m4 @@ -1,7 +1,7 @@ # Configure a replacement for . # serial 6 -# Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc. +# Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/sysexits.m4 b/m4/sysexits.m4 index b3baa51c..4d145722 100644 --- a/m4/sysexits.m4 +++ b/m4/sysexits.m4 @@ -1,5 +1,5 @@ # sysexits.m4 serial 5 -dnl Copyright (C) 2003, 2005, 2007, 2009, 2010 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2005, 2007, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/tempname.m4 b/m4/tempname.m4 index bf83f195..6bd74ab7 100644 --- a/m4/tempname.m4 +++ b/m4/tempname.m4 @@ -1,6 +1,6 @@ #serial 3 -# Copyright (C) 2006-2007, 2009-2010 Free Software Foundation, Inc. +# Copyright (C) 2006-2007, 2009-2011 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/time_h.m4 b/m4/time_h.m4 index a45a10a9..615da1cf 100644 --- a/m4/time_h.m4 +++ b/m4/time_h.m4 @@ -1,8 +1,8 @@ # Configure a more-standard replacement for . -# Copyright (C) 2000-2001, 2003-2007, 2009-2010 Free Software Foundation, Inc. +# Copyright (C) 2000-2001, 2003-2007, 2009-2011 Free Software Foundation, Inc. -# serial 2 +# serial 4 # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -21,7 +21,7 @@ AC_DEFUN([gl_HEADER_TIME_H_BODY], [ AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) - gl_CHECK_NEXT_HEADERS([time.h]) + gl_NEXT_HEADERS([time.h]) AC_REQUIRE([gl_CHECK_TYPE_STRUCT_TIMESPEC]) ]) @@ -95,7 +95,7 @@ AC_DEFUN([gl_HEADER_TIME_H_DEFAULTS], GNULIB_TIMEGM=0; AC_SUBST([GNULIB_TIMEGM]) GNULIB_TIME_R=0; AC_SUBST([GNULIB_TIME_R]) dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_LOCALTIME_R=1; AC_SUBST([HAVE_LOCALTIME_R]) + HAVE_DECL_LOCALTIME_R=1; AC_SUBST([HAVE_DECL_LOCALTIME_R]) HAVE_NANOSLEEP=1; AC_SUBST([HAVE_NANOSLEEP]) HAVE_STRPTIME=1; AC_SUBST([HAVE_STRPTIME]) HAVE_TIMEGM=1; AC_SUBST([HAVE_TIMEGM]) diff --git a/m4/time_r.m4 b/m4/time_r.m4 index 9e82d39f..9bb28005 100644 --- a/m4/time_r.m4 +++ b/m4/time_r.m4 @@ -1,6 +1,6 @@ dnl Reentrant time functions: localtime_r, gmtime_r. -dnl Copyright (C) 2003, 2006-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2006-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -15,8 +15,16 @@ AC_DEFUN([gl_TIME_R], AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) AC_REQUIRE([AC_C_RESTRICT]) + dnl Some systems don't declare localtime_r() and gmtime_r() if _REENTRANT is + dnl not defined. + AC_CHECK_DECLS_ONCE([localtime_r]) + if test $ac_cv_have_decl_localtime_r = no; then + HAVE_DECL_LOCALTIME_R=0 + fi + AC_CHECK_FUNCS_ONCE([localtime_r]) if test $ac_cv_func_localtime_r = yes; then + HAVE_LOCALTIME_R=1 AC_CACHE_CHECK([whether localtime_r is compatible with its POSIX signature], [gl_cv_time_r_posix], [AC_COMPILE_IFELSE( diff --git a/m4/timespec.m4 b/m4/timespec.m4 index 5dbaed74..4a1c7adb 100644 --- a/m4/timespec.m4 +++ b/m4/timespec.m4 @@ -1,6 +1,6 @@ #serial 14 -# Copyright (C) 2000-2001, 2003-2007, 2009-2010 Free Software Foundation, Inc. +# Copyright (C) 2000-2001, 2003-2007, 2009-2011 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/tm_gmtoff.m4 b/m4/tm_gmtoff.m4 index 43bda96f..d65ddc01 100644 --- a/m4/tm_gmtoff.m4 +++ b/m4/tm_gmtoff.m4 @@ -1,5 +1,5 @@ # tm_gmtoff.m4 serial 3 -dnl Copyright (C) 2002, 2009-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/unistd-safer.m4 b/m4/unistd-safer.m4 index 74c3ce60..00ff1bd4 100644 --- a/m4/unistd-safer.m4 +++ b/m4/unistd-safer.m4 @@ -1,5 +1,5 @@ #serial 8 -dnl Copyright (C) 2002, 2005-2006, 2009-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2005-2006, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/unistd_h.m4 b/m4/unistd_h.m4 index 48d06c74..c81a1138 100644 --- a/m4/unistd_h.m4 +++ b/m4/unistd_h.m4 @@ -1,5 +1,5 @@ -# unistd_h.m4 serial 46 -dnl Copyright (C) 2006-2010 Free Software Foundation, Inc. +# unistd_h.m4 serial 53 +dnl Copyright (C) 2006-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -14,8 +14,6 @@ AC_DEFUN([gl_UNISTD_H], AC_REQUIRE([AC_C_INLINE]) gl_CHECK_NEXT_HEADERS([unistd.h]) - - AC_CHECK_HEADERS_ONCE([unistd.h]) if test $ac_cv_header_unistd_h = yes; then HAVE_UNISTD_H=1 else @@ -27,7 +25,7 @@ AC_DEFUN([gl_UNISTD_H], dnl corresponding gnulib module is not in use. gl_WARN_ON_USE_PREPARE([[#include /* Some systems declare various items in the wrong headers. */ -#ifndef __GLIBC__ +#if !(defined __GLIBC__ && !defined __UCLIBC__) # include # include # include @@ -38,7 +36,7 @@ AC_DEFUN([gl_UNISTD_H], ]], [chown dup2 dup3 environ euidaccess faccessat fchdir fchownat fsync ftruncate getcwd getdomainname getdtablesize getgroups gethostname getlogin getlogin_r getpagesize getusershell setusershell - endusershell lchown link linkat lseek pipe2 pread pwrite readlink + endusershell lchown link linkat lseek pipe pipe2 pread pwrite readlink readlinkat rmdir sleep symlink symlinkat ttyname_r unlink unlinkat usleep]) ]) @@ -78,6 +76,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS], GNULIB_LINK=0; AC_SUBST([GNULIB_LINK]) GNULIB_LINKAT=0; AC_SUBST([GNULIB_LINKAT]) GNULIB_LSEEK=0; AC_SUBST([GNULIB_LSEEK]) + GNULIB_PIPE=0; AC_SUBST([GNULIB_PIPE]) GNULIB_PIPE2=0; AC_SUBST([GNULIB_PIPE2]) GNULIB_PREAD=0; AC_SUBST([GNULIB_PREAD]) GNULIB_PWRITE=0; AC_SUBST([GNULIB_PWRITE]) @@ -104,7 +103,6 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS], HAVE_FCHOWNAT=1; AC_SUBST([HAVE_FCHOWNAT]) HAVE_FSYNC=1; AC_SUBST([HAVE_FSYNC]) HAVE_FTRUNCATE=1; AC_SUBST([HAVE_FTRUNCATE]) - HAVE_GETDOMAINNAME=1; AC_SUBST([HAVE_GETDOMAINNAME]) HAVE_GETDTABLESIZE=1; AC_SUBST([HAVE_GETDTABLESIZE]) HAVE_GETGROUPS=1; AC_SUBST([HAVE_GETGROUPS]) HAVE_GETHOSTNAME=1; AC_SUBST([HAVE_GETHOSTNAME]) @@ -113,6 +111,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS], HAVE_LCHOWN=1; AC_SUBST([HAVE_LCHOWN]) HAVE_LINK=1; AC_SUBST([HAVE_LINK]) HAVE_LINKAT=1; AC_SUBST([HAVE_LINKAT]) + HAVE_PIPE=1; AC_SUBST([HAVE_PIPE]) HAVE_PIPE2=1; AC_SUBST([HAVE_PIPE2]) HAVE_PREAD=1; AC_SUBST([HAVE_PREAD]) HAVE_PWRITE=1; AC_SUBST([HAVE_PWRITE]) @@ -121,13 +120,15 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS], HAVE_SLEEP=1; AC_SUBST([HAVE_SLEEP]) HAVE_SYMLINK=1; AC_SUBST([HAVE_SYMLINK]) HAVE_SYMLINKAT=1; AC_SUBST([HAVE_SYMLINKAT]) - HAVE_TTYNAME_R=1; AC_SUBST([HAVE_TTYNAME_R]) HAVE_UNLINKAT=1; AC_SUBST([HAVE_UNLINKAT]) HAVE_USLEEP=1; AC_SUBST([HAVE_USLEEP]) HAVE_DECL_ENVIRON=1; AC_SUBST([HAVE_DECL_ENVIRON]) + HAVE_DECL_FCHDIR=1; AC_SUBST([HAVE_DECL_FCHDIR]) + HAVE_DECL_GETDOMAINNAME=1; AC_SUBST([HAVE_DECL_GETDOMAINNAME]) HAVE_DECL_GETLOGIN_R=1; AC_SUBST([HAVE_DECL_GETLOGIN_R]) HAVE_DECL_GETPAGESIZE=1; AC_SUBST([HAVE_DECL_GETPAGESIZE]) HAVE_DECL_GETUSERSHELL=1; AC_SUBST([HAVE_DECL_GETUSERSHELL]) + HAVE_DECL_TTYNAME_R=1; AC_SUBST([HAVE_DECL_TTYNAME_R]) HAVE_OS_H=0; AC_SUBST([HAVE_OS_H]) HAVE_SYS_PARAM_H=0; AC_SUBST([HAVE_SYS_PARAM_H]) REPLACE_CHOWN=0; AC_SUBST([REPLACE_CHOWN]) @@ -136,6 +137,8 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS], REPLACE_DUP2=0; AC_SUBST([REPLACE_DUP2]) REPLACE_FCHOWNAT=0; AC_SUBST([REPLACE_FCHOWNAT]) REPLACE_GETCWD=0; AC_SUBST([REPLACE_GETCWD]) + REPLACE_GETDOMAINNAME=0; AC_SUBST([REPLACE_GETDOMAINNAME]) + REPLACE_GETLOGIN_R=0; AC_SUBST([REPLACE_GETLOGIN_R]) REPLACE_GETGROUPS=0; AC_SUBST([REPLACE_GETGROUPS]) REPLACE_GETPAGESIZE=0; AC_SUBST([REPLACE_GETPAGESIZE]) REPLACE_LCHOWN=0; AC_SUBST([REPLACE_LCHOWN]) diff --git a/m4/unlink.m4 b/m4/unlink.m4 index b20af63e..a49a6928 100644 --- a/m4/unlink.m4 +++ b/m4/unlink.m4 @@ -1,12 +1,11 @@ -# unlink.m4 serial 5 -dnl Copyright (C) 2009, 2010 Free Software Foundation, Inc. +# unlink.m4 serial 7 +dnl Copyright (C) 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_UNLINK], [ - AC_REQUIRE([gl_AC_DOS]) AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) AC_REQUIRE([AC_CANONICAL_HOST]) dnl Detect FreeBSD 7.2, AIX 7.1, Solaris 9 bug. @@ -21,18 +20,27 @@ AC_DEFUN([gl_FUNC_UNLINK], [AC_LANG_PROGRAM( [[#include #include -]], [[if (!unlink ("conftest.file/") || errno != ENOTDIR) return 1; + ]], + [[int result = 0; + if (!unlink ("conftest.file/")) + result |= 1; + else if (errno != ENOTDIR) + result |= 2; #if HAVE_LSTAT - if (!unlink ("conftest.lnk/") || errno != ENOTDIR) return 2; + if (!unlink ("conftest.lnk/")) + result |= 4; + else if (errno != ENOTDIR) + result |= 8; #endif - ]])], + return result; + ]])], [gl_cv_func_unlink_honors_slashes=yes], [gl_cv_func_unlink_honors_slashes=no], [gl_cv_func_unlink_honors_slashes="guessing no"]) rm -f conftest.file conftest.lnk]) dnl Detect MacOS X 10.5.6 bug: On read-write HFS mounts, unlink("..") or dnl unlink("../..") succeeds without doing anything. - AC_CACHE_CHECK([whether unlink of a parent directory fails is it should], + AC_CACHE_CHECK([whether unlink of a parent directory fails as it should], [gl_cv_func_unlink_parent_fails], [case "$host_os" in darwin*) @@ -65,9 +73,12 @@ AC_DEFUN([gl_FUNC_UNLINK], #include int main () { + int result = 0; if (chdir (getenv ("GL_SUBDIR_FOR_UNLINK")) != 0) - return 1; - return unlink ("..") == 0; + result |= 1; + else if (unlink ("..") == 0) + result |= 2; + return result; } ]])], [gl_cv_func_unlink_parent_fails=yes], diff --git a/m4/unlinkdir.m4 b/m4/unlinkdir.m4 index 3b3c75e7..dabe5f40 100644 --- a/m4/unlinkdir.m4 +++ b/m4/unlinkdir.m4 @@ -1,6 +1,6 @@ # serial 6 -# Copyright (C) 2005-2007, 2009-2010 Free Software Foundation, Inc. +# Copyright (C) 2005-2007, 2009-2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/unlocked-io.m4 b/m4/unlocked-io.m4 index bddec0de..be4323c0 100644 --- a/m4/unlocked-io.m4 +++ b/m4/unlocked-io.m4 @@ -1,6 +1,6 @@ # unlocked-io.m4 serial 15 -# Copyright (C) 1998-2006, 2009-2010 Free Software Foundation, Inc. +# Copyright (C) 1998-2006, 2009-2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/utimbuf.m4 b/m4/utimbuf.m4 index 88a9f45f..58ead2fd 100644 --- a/m4/utimbuf.m4 +++ b/m4/utimbuf.m4 @@ -1,6 +1,6 @@ # serial 9 -# Copyright (C) 1998-2001, 2003-2004, 2007, 2009-2010 Free Software Foundation, +# Copyright (C) 1998-2001, 2003-2004, 2007, 2009-2011 Free Software Foundation, # Inc. # # This file is free software; the Free Software Foundation diff --git a/m4/utimens.m4 b/m4/utimens.m4 index 2baa2561..f2c755e8 100644 --- a/m4/utimens.m4 +++ b/m4/utimens.m4 @@ -1,9 +1,9 @@ -dnl Copyright (C) 2003-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2003-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. -dnl serial 4 +dnl serial 5 AC_DEFUN([gl_UTIMENS], [ @@ -25,6 +25,7 @@ AC_DEFUN([gl_UTIMENS], AC_RUN_IFELSE([AC_LANG_PROGRAM([[ #include #include +#include ]], [[ int fd = open ("conftest.file", O_RDWR); if (fd < 0) return 1; if (futimesat (fd, NULL, NULL)) return 2; diff --git a/m4/utimensat.m4 b/m4/utimensat.m4 index 1110e07c..78472a5f 100644 --- a/m4/utimensat.m4 +++ b/m4/utimensat.m4 @@ -1,7 +1,7 @@ -# serial 3 +# serial 4 # See if we need to provide utimensat replacement. -dnl Copyright (C) 2009, 2010 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -19,22 +19,39 @@ AC_DEFUN([gl_FUNC_UTIMENSAT], else AC_CACHE_CHECK([whether utimensat works], [gl_cv_func_utimensat_works], - [AC_RUN_IFELSE([AC_LANG_PROGRAM([[ + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM([[ #include #include #include -]], [[struct timespec ts[2] = { { 1, UTIME_OMIT }, { 1, UTIME_NOW } }; - struct stat st; - const char *f = "conftest.file"; - if (close (creat (f, 0600))) return 1; - if (utimensat (AT_FDCWD, f, NULL, AT_SYMLINK_NOFOLLOW)) return 2; - if (utimensat (AT_FDCWD, f, ts, 0)) return 3; - sleep (1); - ts[0].tv_nsec = UTIME_NOW; - ts[1].tv_nsec = UTIME_OMIT; - if (utimensat (AT_FDCWD, f, ts, 0)) return 4; - if (stat (f, &st)) return 5; - if (st.st_ctime < st.st_atime) return 6;]])], +]], [[int result = 0; + const char *f = "conftest.file"; + if (close (creat (f, 0600))) + return 1; + /* Test whether the AT_SYMLINK_NOFOLLOW flag is supported. */ + { + if (utimensat (AT_FDCWD, f, NULL, AT_SYMLINK_NOFOLLOW)) + result |= 2; + } + /* Test whether UTIME_NOW and UTIME_OMIT work. */ + { + struct timespec ts[2] = { { 1, UTIME_OMIT }, { 1, UTIME_NOW } }; + if (utimensat (AT_FDCWD, f, ts, 0)) + result |= 4; + } + sleep (1); + { + struct timespec ts[2] = { { 1, UTIME_NOW }, { 1, UTIME_OMIT } }; + struct stat st; + if (utimensat (AT_FDCWD, f, ts, 0)) + result |= 8; + if (stat (f, &st)) + result |= 16; + else if (st.st_ctime < st.st_atime) + result |= 32; + } + return result; + ]])], dnl FIXME: simplify this in 2012, when file system bugs are no longer common [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #ifdef __linux__ diff --git a/m4/utimes.m4 b/m4/utimes.m4 index e6d6f776..593e43d8 100644 --- a/m4/utimes.m4 +++ b/m4/utimes.m4 @@ -1,7 +1,7 @@ # Detect some bugs in glibc's implementation of utimes. -# serial 2 +# serial 3 -dnl Copyright (C) 2003-2005, 2009-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2003-2005, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -34,44 +34,96 @@ AC_DEFUN([gl_FUNC_UTIMES], #include #include +static int +inorder (time_t a, time_t b, time_t c) +{ + return a <= b && b <= c; +} + int main () { - static struct timeval timeval[2] = {{9, 10}, {999999, 999999}}; - struct stat sbuf; + int result = 0; char const *file = "conftest.utimes"; - FILE *f; - time_t now; - int fd; + static struct timeval timeval[2] = {{9, 10}, {999999, 999999}}; - int ok = ((f = fopen (file, "w")) - && fclose (f) == 0 - && utimes (file, timeval) == 0 - && lstat (file, &sbuf) == 0 - && sbuf.st_atime == timeval[0].tv_sec - && sbuf.st_mtime == timeval[1].tv_sec); - unlink (file); - if (!ok) - exit (1); + /* Test whether utimes() essentially works. */ + { + struct stat sbuf; + FILE *f = fopen (file, "w"); + if (f == NULL) + result |= 1; + else if (fclose (f) != 0) + result |= 1; + else if (utimes (file, timeval) != 0) + result |= 2; + else if (lstat (file, &sbuf) != 0) + result |= 1; + else if (!(sbuf.st_atime == timeval[0].tv_sec + && sbuf.st_mtime == timeval[1].tv_sec)) + result |= 4; + if (unlink (file) != 0) + result |= 1; + } - ok = - ((f = fopen (file, "w")) - && fclose (f) == 0 - && time (&now) != (time_t)-1 - && utimes (file, NULL) == 0 - && lstat (file, &sbuf) == 0 - && now - sbuf.st_atime <= 2 - && now - sbuf.st_mtime <= 2); - unlink (file); - if (!ok) - exit (1); + /* Test whether utimes() with a NULL argument sets the file's timestamp + to the current time. Use 'fstat' as well as 'time' to + determine the "current" time, to accommodate NFS file systems + if there is a time skew between the host and the NFS server. */ + { + int fd = open (file, O_WRONLY|O_CREAT, 0644); + if (fd < 0) + result |= 1; + else + { + time_t t0, t2; + struct stat st0, st1, st2; + if (time (&t0) == (time_t) -1) + result |= 1; + else if (fstat (fd, &st0) != 0) + result |= 1; + else if (utimes (file, timeval) != 0) + result |= 2; + else if (utimes (file, NULL) != 0) + result |= 8; + else if (fstat (fd, &st1) != 0) + result |= 1; + else if (write (fd, "\n", 1) != 1) + result |= 1; + else if (fstat (fd, &st2) != 0) + result |= 1; + else if (time (&t2) == (time_t) -1) + result |= 1; + else + { + int m_ok_POSIX = inorder (t0, st1.st_mtime, t2); + int m_ok_NFS = inorder (st0.st_mtime, st1.st_mtime, st2.st_mtime); + if (! (st1.st_atime == st1.st_mtime)) + result |= 16; + if (! (m_ok_POSIX || m_ok_NFS)) + result |= 32; + } + if (close (fd) != 0) + result |= 1; + } + if (unlink (file) != 0) + result |= 1; + } - ok = (0 <= (fd = open (file, O_WRONLY|O_CREAT, 0444)) - && close (fd) == 0 - && utimes (file, NULL) == 0); - unlink (file); + /* Test whether utimes() with a NULL argument works on read-only files. */ + { + int fd = open (file, O_WRONLY|O_CREAT, 0444); + if (fd < 0) + result |= 1; + else if (close (fd) != 0) + result |= 1; + else if (utimes (file, NULL) != 0) + result |= 64; + if (unlink (file) != 0) + result |= 1; + } - exit (!ok); + return result; } ]])], [gl_cv_func_working_utimes=yes], diff --git a/m4/vasnprintf.m4 b/m4/vasnprintf.m4 index ebe3c52c..32ea985b 100644 --- a/m4/vasnprintf.m4 +++ b/m4/vasnprintf.m4 @@ -1,5 +1,5 @@ -# vasnprintf.m4 serial 31 -dnl Copyright (C) 2002-2004, 2006-2010 Free Software Foundation, Inc. +# vasnprintf.m4 serial 32 +dnl Copyright (C) 2002-2004, 2006-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -40,6 +40,7 @@ AC_DEFUN([gl_PREREQ_PRINTF_ARGS], # Prequisites of lib/printf-parse.h, lib/printf-parse.c. AC_DEFUN([gl_PREREQ_PRINTF_PARSE], [ + AC_REQUIRE([gl_FEATURES_H]) AC_REQUIRE([AC_TYPE_LONG_LONG_INT]) AC_REQUIRE([gt_TYPE_WCHAR_T]) AC_REQUIRE([gt_TYPE_WINT_T]) diff --git a/m4/vasprintf.m4 b/m4/vasprintf.m4 index b142bc0f..6db52b18 100644 --- a/m4/vasprintf.m4 +++ b/m4/vasprintf.m4 @@ -1,5 +1,5 @@ # vasprintf.m4 serial 6 -dnl Copyright (C) 2002-2003, 2006-2007, 2009-2010 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2006-2007, 2009-2011 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/version-etc.m4 b/m4/version-etc.m4 index 2c572b4b..5032bf85 100644 --- a/m4/version-etc.m4 +++ b/m4/version-etc.m4 @@ -1,5 +1,5 @@ # version-etc.m4 serial 1 -# Copyright (C) 2009-2010 Free Software Foundation, Inc. +# Copyright (C) 2009-2011 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/vsnprintf.m4 b/m4/vsnprintf.m4 index ed189c23..e4725e45 100644 --- a/m4/vsnprintf.m4 +++ b/m4/vsnprintf.m4 @@ -1,5 +1,5 @@ # vsnprintf.m4 serial 5 -dnl Copyright (C) 2002-2004, 2007-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2004, 2007-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -13,7 +13,12 @@ AC_DEFUN([gl_FUNC_VSNPRINTF], gl_SNPRINTF_SIZE1 case "$gl_cv_func_snprintf_size1" in *yes) - gl_cv_func_vsnprintf_usable=yes + gl_SNPRINTF_RETVAL_C99 + case "$gl_cv_func_snprintf_retval_c99" in + *yes) + gl_cv_func_vsnprintf_usable=yes + ;; + esac ;; esac fi diff --git a/m4/warn-on-use.m4 b/m4/warn-on-use.m4 index 42daae87..e0d0f276 100644 --- a/m4/warn-on-use.m4 +++ b/m4/warn-on-use.m4 @@ -1,5 +1,5 @@ # warn-on-use.m4 serial 2 -dnl Copyright (C) 2010 Free Software Foundation, Inc. +dnl Copyright (C) 2010-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/wchar_h.m4 b/m4/wchar_h.m4 index 8cae82dd..6255ff35 100644 --- a/m4/wchar_h.m4 +++ b/m4/wchar_h.m4 @@ -1,13 +1,13 @@ dnl A placeholder for ISO C99 , for platforms that have issues. -dnl Copyright (C) 2007-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl Written by Eric Blake. -# wchar_h.m4 serial 33 +# wchar_h.m4 serial 38 AC_DEFUN([gl_WCHAR_H], [ @@ -17,7 +17,6 @@ AC_DEFUN([gl_WCHAR_H], dnl Check for (missing in Linux uClibc when built without wide dnl character support). dnl is always overridden, because of GNULIB_POSIXCHECK. - AC_CHECK_HEADERS_ONCE([wchar.h]) gl_CHECK_NEXT_HEADERS([wchar.h]) if test $ac_cv_header_wchar_h = yes; then HAVE_WCHAR_H=1 @@ -26,6 +25,8 @@ AC_DEFUN([gl_WCHAR_H], fi AC_SUBST([HAVE_WCHAR_H]) + AC_REQUIRE([gl_FEATURES_H]) + AC_REQUIRE([gt_TYPE_WINT_T]) if test $gt_cv_c_wint_t = yes; then HAVE_WINT_T=1 @@ -37,15 +38,23 @@ AC_DEFUN([gl_WCHAR_H], dnl Check for declarations of anything we want to poison if the dnl corresponding gnulib module is not in use. gl_WARN_ON_USE_PREPARE([[ -/* Some systems require additional headers. */ -#ifndef __GLIBC__ +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#if !(defined __GLIBC__ && !defined __UCLIBC__) # include # include # include #endif #include - ]], [btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb - wcsrtombs wcsnrtombs wcwidth]) + ]], + [btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb + wcsrtombs wcsnrtombs wcwidth wmemchr wmemcmp wmemcpy wmemmove wmemset + wcslen wcsnlen wcscpy wcpcpy wcsncpy wcpncpy wcscat wcsncat wcscmp + wcsncmp wcscasecmp wcsncasecmp wcscoll wcsxfrm wcsdup wcschr wcsrchr + wcscspn wcsspn wcspbrk wcsstr wcstok wcswidth + ]) ]) dnl Check whether is usable at all. @@ -61,6 +70,13 @@ AC_DEFUN([gl_WCHAR_H_INLINE_OK], [gl_cv_header_wchar_h_correct_inline=yes AC_LANG_CONFTEST([ AC_LANG_SOURCE([[#define wcstod renamed_wcstod +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include #include extern int zero (void); int main () { return zero(); } @@ -69,6 +85,13 @@ int main () { return zero(); } mv conftest.$ac_objext conftest1.$ac_objext AC_LANG_CONFTEST([ AC_LANG_SOURCE([[#define wcstod renamed_wcstod +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include #include int zero (void) { return 0; } ]])]) @@ -114,17 +137,45 @@ AC_DEFUN([gl_WCHAR_MODULE_INDICATOR], AC_DEFUN([gl_WCHAR_H_DEFAULTS], [ - GNULIB_BTOWC=0; AC_SUBST([GNULIB_BTOWC]) - GNULIB_WCTOB=0; AC_SUBST([GNULIB_WCTOB]) - GNULIB_MBSINIT=0; AC_SUBST([GNULIB_MBSINIT]) - GNULIB_MBRTOWC=0; AC_SUBST([GNULIB_MBRTOWC]) - GNULIB_MBRLEN=0; AC_SUBST([GNULIB_MBRLEN]) - GNULIB_MBSRTOWCS=0; AC_SUBST([GNULIB_MBSRTOWCS]) - GNULIB_MBSNRTOWCS=0; AC_SUBST([GNULIB_MBSNRTOWCS]) - GNULIB_WCRTOMB=0; AC_SUBST([GNULIB_WCRTOMB]) - GNULIB_WCSRTOMBS=0; AC_SUBST([GNULIB_WCSRTOMBS]) - GNULIB_WCSNRTOMBS=0; AC_SUBST([GNULIB_WCSNRTOMBS]) - GNULIB_WCWIDTH=0; AC_SUBST([GNULIB_WCWIDTH]) + GNULIB_BTOWC=0; AC_SUBST([GNULIB_BTOWC]) + GNULIB_WCTOB=0; AC_SUBST([GNULIB_WCTOB]) + GNULIB_MBSINIT=0; AC_SUBST([GNULIB_MBSINIT]) + GNULIB_MBRTOWC=0; AC_SUBST([GNULIB_MBRTOWC]) + GNULIB_MBRLEN=0; AC_SUBST([GNULIB_MBRLEN]) + GNULIB_MBSRTOWCS=0; AC_SUBST([GNULIB_MBSRTOWCS]) + GNULIB_MBSNRTOWCS=0; AC_SUBST([GNULIB_MBSNRTOWCS]) + GNULIB_WCRTOMB=0; AC_SUBST([GNULIB_WCRTOMB]) + GNULIB_WCSRTOMBS=0; AC_SUBST([GNULIB_WCSRTOMBS]) + GNULIB_WCSNRTOMBS=0; AC_SUBST([GNULIB_WCSNRTOMBS]) + GNULIB_WCWIDTH=0; AC_SUBST([GNULIB_WCWIDTH]) + GNULIB_WMEMCHR=0; AC_SUBST([GNULIB_WMEMCHR]) + GNULIB_WMEMCMP=0; AC_SUBST([GNULIB_WMEMCMP]) + GNULIB_WMEMCPY=0; AC_SUBST([GNULIB_WMEMCPY]) + GNULIB_WMEMMOVE=0; AC_SUBST([GNULIB_WMEMMOVE]) + GNULIB_WMEMSET=0; AC_SUBST([GNULIB_WMEMSET]) + GNULIB_WCSLEN=0; AC_SUBST([GNULIB_WCSLEN]) + GNULIB_WCSNLEN=0; AC_SUBST([GNULIB_WCSNLEN]) + GNULIB_WCSCPY=0; AC_SUBST([GNULIB_WCSCPY]) + GNULIB_WCPCPY=0; AC_SUBST([GNULIB_WCPCPY]) + GNULIB_WCSNCPY=0; AC_SUBST([GNULIB_WCSNCPY]) + GNULIB_WCPNCPY=0; AC_SUBST([GNULIB_WCPNCPY]) + GNULIB_WCSCAT=0; AC_SUBST([GNULIB_WCSCAT]) + GNULIB_WCSNCAT=0; AC_SUBST([GNULIB_WCSNCAT]) + GNULIB_WCSCMP=0; AC_SUBST([GNULIB_WCSCMP]) + GNULIB_WCSNCMP=0; AC_SUBST([GNULIB_WCSNCMP]) + GNULIB_WCSCASECMP=0; AC_SUBST([GNULIB_WCSCASECMP]) + GNULIB_WCSNCASECMP=0; AC_SUBST([GNULIB_WCSNCASECMP]) + GNULIB_WCSCOLL=0; AC_SUBST([GNULIB_WCSCOLL]) + GNULIB_WCSXFRM=0; AC_SUBST([GNULIB_WCSXFRM]) + GNULIB_WCSDUP=0; AC_SUBST([GNULIB_WCSDUP]) + GNULIB_WCSCHR=0; AC_SUBST([GNULIB_WCSCHR]) + GNULIB_WCSRCHR=0; AC_SUBST([GNULIB_WCSRCHR]) + GNULIB_WCSCSPN=0; AC_SUBST([GNULIB_WCSCSPN]) + GNULIB_WCSSPN=0; AC_SUBST([GNULIB_WCSSPN]) + GNULIB_WCSPBRK=0; AC_SUBST([GNULIB_WCSPBRK]) + GNULIB_WCSSTR=0; AC_SUBST([GNULIB_WCSSTR]) + GNULIB_WCSTOK=0; AC_SUBST([GNULIB_WCSTOK]) + GNULIB_WCSWIDTH=0; AC_SUBST([GNULIB_WCSWIDTH]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE_BTOWC=1; AC_SUBST([HAVE_BTOWC]) HAVE_MBSINIT=1; AC_SUBST([HAVE_MBSINIT]) @@ -135,6 +186,34 @@ AC_DEFUN([gl_WCHAR_H_DEFAULTS], HAVE_WCRTOMB=1; AC_SUBST([HAVE_WCRTOMB]) HAVE_WCSRTOMBS=1; AC_SUBST([HAVE_WCSRTOMBS]) HAVE_WCSNRTOMBS=1; AC_SUBST([HAVE_WCSNRTOMBS]) + HAVE_WMEMCHR=1; AC_SUBST([HAVE_WMEMCHR]) + HAVE_WMEMCMP=1; AC_SUBST([HAVE_WMEMCMP]) + HAVE_WMEMCPY=1; AC_SUBST([HAVE_WMEMCPY]) + HAVE_WMEMMOVE=1; AC_SUBST([HAVE_WMEMMOVE]) + HAVE_WMEMSET=1; AC_SUBST([HAVE_WMEMSET]) + HAVE_WCSLEN=1; AC_SUBST([HAVE_WCSLEN]) + HAVE_WCSNLEN=1; AC_SUBST([HAVE_WCSNLEN]) + HAVE_WCSCPY=1; AC_SUBST([HAVE_WCSCPY]) + HAVE_WCPCPY=1; AC_SUBST([HAVE_WCPCPY]) + HAVE_WCSNCPY=1; AC_SUBST([HAVE_WCSNCPY]) + HAVE_WCPNCPY=1; AC_SUBST([HAVE_WCPNCPY]) + HAVE_WCSCAT=1; AC_SUBST([HAVE_WCSCAT]) + HAVE_WCSNCAT=1; AC_SUBST([HAVE_WCSNCAT]) + HAVE_WCSCMP=1; AC_SUBST([HAVE_WCSCMP]) + HAVE_WCSNCMP=1; AC_SUBST([HAVE_WCSNCMP]) + HAVE_WCSCASECMP=1; AC_SUBST([HAVE_WCSCASECMP]) + HAVE_WCSNCASECMP=1; AC_SUBST([HAVE_WCSNCASECMP]) + HAVE_WCSCOLL=1; AC_SUBST([HAVE_WCSCOLL]) + HAVE_WCSXFRM=1; AC_SUBST([HAVE_WCSXFRM]) + HAVE_WCSDUP=1; AC_SUBST([HAVE_WCSDUP]) + HAVE_WCSCHR=1; AC_SUBST([HAVE_WCSCHR]) + HAVE_WCSRCHR=1; AC_SUBST([HAVE_WCSRCHR]) + HAVE_WCSCSPN=1; AC_SUBST([HAVE_WCSCSPN]) + HAVE_WCSSPN=1; AC_SUBST([HAVE_WCSSPN]) + HAVE_WCSPBRK=1; AC_SUBST([HAVE_WCSPBRK]) + HAVE_WCSSTR=1; AC_SUBST([HAVE_WCSSTR]) + HAVE_WCSTOK=1; AC_SUBST([HAVE_WCSTOK]) + HAVE_WCSWIDTH=1; AC_SUBST([HAVE_WCSWIDTH]) HAVE_DECL_WCTOB=1; AC_SUBST([HAVE_DECL_WCTOB]) HAVE_DECL_WCWIDTH=1; AC_SUBST([HAVE_DECL_WCWIDTH]) REPLACE_MBSTATE_T=0; AC_SUBST([REPLACE_MBSTATE_T]) @@ -149,4 +228,5 @@ AC_DEFUN([gl_WCHAR_H_DEFAULTS], REPLACE_WCSRTOMBS=0; AC_SUBST([REPLACE_WCSRTOMBS]) REPLACE_WCSNRTOMBS=0; AC_SUBST([REPLACE_WCSNRTOMBS]) REPLACE_WCWIDTH=0; AC_SUBST([REPLACE_WCWIDTH]) + REPLACE_WCSWIDTH=0; AC_SUBST([REPLACE_WCSWIDTH]) ]) diff --git a/m4/wchar_t.m4 b/m4/wchar_t.m4 index a133e6ad..d2c03c42 100644 --- a/m4/wchar_t.m4 +++ b/m4/wchar_t.m4 @@ -1,5 +1,5 @@ # wchar_t.m4 serial 4 (gettext-0.18.2) -dnl Copyright (C) 2002-2003, 2008-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/wcrtomb.m4 b/m4/wcrtomb.m4 index 0de262e6..2905d9ba 100644 --- a/m4/wcrtomb.m4 +++ b/m4/wcrtomb.m4 @@ -1,5 +1,5 @@ -# wcrtomb.m4 serial 6 -dnl Copyright (C) 2008-2010 Free Software Foundation, Inc. +# wcrtomb.m4 serial 8 +dnl Copyright (C) 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -43,32 +43,39 @@ changequote([,])dnl AC_RUN_IFELSE( [AC_LANG_SOURCE([[ #include -#include #include +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include #include int main () { + int result = 0; if (setlocale (LC_ALL, "$LOCALE_FR") != NULL) { if (wcrtomb (NULL, 0, NULL) != 1) - return 1; + result |= 1; } if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) { if (wcrtomb (NULL, 0, NULL) != 1) - return 1; + result |= 2; } if (setlocale (LC_ALL, "$LOCALE_JA") != NULL) { if (wcrtomb (NULL, 0, NULL) != 1) - return 1; + result |= 4; } if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL) { if (wcrtomb (NULL, 0, NULL) != 1) - return 1; + result |= 8; } - return 0; + return result; }]])], [gl_cv_func_wcrtomb_retval=yes], [gl_cv_func_wcrtomb_retval=no], diff --git a/m4/wctype_h.m4 b/m4/wctype_h.m4 index bc6b6e79..ef9fb049 100644 --- a/m4/wctype_h.m4 +++ b/m4/wctype_h.m4 @@ -1,8 +1,8 @@ -# wctype_h.m4 serial 8 +# wctype_h.m4 serial 14 dnl A placeholder for ISO C99 , for platforms that lack it. -dnl Copyright (C) 2006-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -11,6 +11,7 @@ dnl Written by Paul Eggert. AC_DEFUN([gl_WCTYPE_H], [ + AC_REQUIRE([gl_WCTYPE_H_DEFAULTS]) AC_REQUIRE([AC_PROG_CC]) AC_REQUIRE([AC_CANONICAL_HOST]) AC_CHECK_FUNCS_ONCE([iswcntrl]) @@ -20,23 +21,7 @@ AC_DEFUN([gl_WCTYPE_H], HAVE_ISWCNTRL=0 fi AC_SUBST([HAVE_ISWCNTRL]) - AC_CHECK_FUNCS_ONCE([iswblank]) - AC_CHECK_DECLS_ONCE([iswblank]) - if test $ac_cv_func_iswblank = yes; then - HAVE_ISWBLANK=1 - REPLACE_ISWBLANK=0 - else - HAVE_ISWBLANK=0 - if test $ac_cv_have_decl_iswblank = yes; then - REPLACE_ISWBLANK=1 - else - REPLACE_ISWBLANK=0 - fi - fi - AC_SUBST([HAVE_ISWBLANK]) - AC_SUBST([REPLACE_ISWBLANK]) - AC_CHECK_HEADERS_ONCE([wctype.h]) AC_REQUIRE([AC_C_INLINE]) AC_REQUIRE([gt_TYPE_WINT_T]) @@ -47,19 +32,26 @@ AC_DEFUN([gl_WCTYPE_H], fi AC_SUBST([HAVE_WINT_T]) + gl_CHECK_NEXT_HEADERS([wctype.h]) if test $ac_cv_header_wctype_h = yes; then if test $ac_cv_func_iswcntrl = yes; then dnl Linux libc5 has an iswprint function that returns 0 for all arguments. dnl The other functions are likely broken in the same way. AC_CACHE_CHECK([whether iswcntrl works], [gl_cv_func_iswcntrl_works], [ - AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include - #include - #include - #include - #include - int main () { return iswprint ('x') == 0; }]])], + AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ + /* Tru64 with Desktop Toolkit C has a bug: must be + included before . + BSD/OS 4.0.1 has a bug: , and + must be included before . */ + #include + #include + #include + #include + #include + int main () { return iswprint ('x') == 0; } + ]])], [gl_cv_func_iswcntrl_works=yes], [gl_cv_func_iswcntrl_works=no], [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include #if __GNU_LIBRARY__ == 1 @@ -69,7 +61,6 @@ AC_DEFUN([gl_WCTYPE_H], ]) ]) fi - gl_CHECK_NEXT_HEADERS([wctype.h]) HAVE_WCTYPE_H=1 else HAVE_WCTYPE_H=0 @@ -82,4 +73,102 @@ AC_DEFUN([gl_WCTYPE_H], REPLACE_ISWCNTRL=0 fi AC_SUBST([REPLACE_ISWCNTRL]) + + if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then + dnl Redefine all of iswcntrl, ..., towupper in . + : + fi + + dnl We assume that the wctype() and iswctype() functions exist if and only + dnl if the type wctype_t is defined in or in if that + dnl exists. + dnl HP-UX 11.00 declares all these in and lacks . + AC_CACHE_CHECK([for wctype_t], [gl_cv_type_wctype_t], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[/* Tru64 with Desktop Toolkit C has a bug: must be + included before . + BSD/OS 4.0.1 has a bug: , and + must be included before . */ + #include + #include + #include + #include + #if HAVE_WCTYPE_H + # include + #endif + wctype_t a; + ]], + [[]])], + [gl_cv_type_wctype_t=yes], + [gl_cv_type_wctype_t=no]) + ]) + if test $gl_cv_type_wctype_t = no; then + HAVE_WCTYPE_T=0 + fi + + dnl We assume that the wctrans() and towctrans() functions exist if and only + dnl if the type wctrans_t is defined in . + AC_CACHE_CHECK([for wctrans_t], [gl_cv_type_wctrans_t], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[/* Tru64 with Desktop Toolkit C has a bug: must be + included before . + BSD/OS 4.0.1 has a bug: , and + must be included before . */ + #include + #include + #include + #include + #include + wctrans_t a; + ]], + [[]])], + [gl_cv_type_wctrans_t=yes], + [gl_cv_type_wctrans_t=no]) + ]) + if test $gl_cv_type_wctrans_t = no; then + HAVE_WCTRANS_T=0 + fi + + dnl Check for declarations of anything we want to poison if the + dnl corresponding gnulib module is not in use. + gl_WARN_ON_USE_PREPARE([[ +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#if !(defined __GLIBC__ && !defined __UCLIBC__) +# include +# include +# include +# include +#endif +#include + ]], + [wctype iswctype wctrans towctrans + ]) +]) + +AC_DEFUN([gl_WCTYPE_MODULE_INDICATOR], +[ + dnl Use AC_REQUIRE here, so that the default settings are expanded once only. + AC_REQUIRE([gl_WCTYPE_H_DEFAULTS]) + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) +]) + +AC_DEFUN([gl_WCTYPE_H_DEFAULTS], +[ + GNULIB_ISWBLANK=0; AC_SUBST([GNULIB_ISWBLANK]) + GNULIB_WCTYPE=0; AC_SUBST([GNULIB_WCTYPE]) + GNULIB_ISWCTYPE=0; AC_SUBST([GNULIB_ISWCTYPE]) + GNULIB_WCTRANS=0; AC_SUBST([GNULIB_WCTRANS]) + GNULIB_TOWCTRANS=0; AC_SUBST([GNULIB_TOWCTRANS]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_ISWBLANK=1; AC_SUBST([HAVE_ISWBLANK]) + HAVE_WCTYPE_T=1; AC_SUBST([HAVE_WCTYPE_T]) + HAVE_WCTRANS_T=1; AC_SUBST([HAVE_WCTRANS_T]) + REPLACE_ISWBLANK=0; AC_SUBST([REPLACE_ISWBLANK]) ]) diff --git a/m4/wcwidth.m4 b/m4/wcwidth.m4 index ac357f37..bf39d1d2 100644 --- a/m4/wcwidth.m4 +++ b/m4/wcwidth.m4 @@ -1,5 +1,5 @@ -# wcwidth.m4 serial 17 -dnl Copyright (C) 2006-2010 Free Software Foundation, Inc. +# wcwidth.m4 serial 18 +dnl Copyright (C) 2006-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -63,10 +63,15 @@ int wcwidth (int); #endif int main () { + int result = 0; if (setlocale (LC_ALL, "fr_FR.UTF-8") != NULL) - if (wcwidth (0x0301) > 0 || wcwidth (0x200B) > 0) - return 1; - return 0; + { + if (wcwidth (0x0301) > 0) + result |= 1; + if (wcwidth (0x200B) > 0) + result |= 2; + } + return result; }]])], [gl_cv_func_wcwidth_works=yes], [gl_cv_func_wcwidth_works=no], diff --git a/m4/wint_t.m4 b/m4/wint_t.m4 index 58ef8655..da1ce3df 100644 --- a/m4/wint_t.m4 +++ b/m4/wint_t.m4 @@ -1,5 +1,5 @@ # wint_t.m4 serial 5 (gettext-0.18.2) -dnl Copyright (C) 2003, 2007-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2007-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/write.m4 b/m4/write.m4 index 56325aba..8695c896 100644 --- a/m4/write.m4 +++ b/m4/write.m4 @@ -1,5 +1,5 @@ # write.m4 serial 1 -dnl Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/xalloc.m4 b/m4/xalloc.m4 index 83247fe3..49008208 100644 --- a/m4/xalloc.m4 +++ b/m4/xalloc.m4 @@ -1,6 +1,5 @@ # xalloc.m4 serial 16 -dnl Copyright (C) 2002, 2003, 2004, 2005, 2006, 2009, 2010 Free Software -dnl Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/xgetcwd.m4 b/m4/xgetcwd.m4 index fd534f6d..4ad788bb 100644 --- a/m4/xgetcwd.m4 +++ b/m4/xgetcwd.m4 @@ -1,5 +1,5 @@ #serial 6 -dnl Copyright (C) 2002-2006, 2009-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/xsize.m4 b/m4/xsize.m4 index b653693a..8c693bc6 100644 --- a/m4/xsize.m4 +++ b/m4/xsize.m4 @@ -1,5 +1,5 @@ # xsize.m4 serial 4 -dnl Copyright (C) 2003-2004, 2008-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2003-2004, 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/xstrndup.m4 b/m4/xstrndup.m4 index 74302cc9..1400b0f1 100644 --- a/m4/xstrndup.m4 +++ b/m4/xstrndup.m4 @@ -1,5 +1,5 @@ # xstrndup.m4 serial 2 -dnl Copyright (C) 2003, 2009, 2010 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/xstrtol.m4 b/m4/xstrtol.m4 index 25ab9b3f..99b7db42 100644 --- a/m4/xstrtol.m4 +++ b/m4/xstrtol.m4 @@ -1,5 +1,5 @@ #serial 10 -dnl Copyright (C) 2002-2007, 2009-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2007, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/xvasprintf.m4 b/m4/xvasprintf.m4 index bd5200f7..7abfaefa 100644 --- a/m4/xvasprintf.m4 +++ b/m4/xvasprintf.m4 @@ -1,5 +1,5 @@ # xvasprintf.m4 serial 1 -dnl Copyright (C) 2006, 2009, 2010 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/po/POTFILES.in b/po/POTFILES.in index cd48b268..94b29b6b 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -37,7 +37,6 @@ gnu/version-etc.c gnu/xalloc-die.c lib/paxerror.c -lib/paxexit.c lib/paxnames.c lib/rtapelib.c diff --git a/po/bg.gmo b/po/bg.gmo index 894ca882f804c4ace34bb596d8a2b7e679f5dc74..69fb4c1923ad559f86ef438dcbae913cb2dd17ee 100644 GIT binary patch delta 28 jcmccmi23Rx<_+5EyoS04#=3?^3WkPOrpB8s(q+2\n" "Language-Team: Bulgarian \n" @@ -64,7 +64,7 @@ msgstr "%.*s: непознат параметър ARGP_HELP_FMT" msgid "Garbage in ARGP_HELP_FMT: %s" msgstr "Боклук в ARGP_HELP_FMT: %s" -#: gnu/argp-help.c:1246 +#: gnu/argp-help.c:1248 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." @@ -72,31 +72,31 @@ msgstr "" "Аргументите, задължителните или незадължителни за дългите опции, са " "съответно задължителни или незадължителни и за кратките опции." -#: gnu/argp-help.c:1639 +#: gnu/argp-help.c:1641 msgid "Usage:" msgstr "Използване:" -#: gnu/argp-help.c:1643 +#: gnu/argp-help.c:1645 msgid " or: " msgstr " или: " -#: gnu/argp-help.c:1655 +#: gnu/argp-help.c:1657 msgid " [OPTION...]" msgstr " [ОПЦИЯ...]" -#: gnu/argp-help.c:1682 +#: gnu/argp-help.c:1684 #, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Използвайте „%s --help“ or „%s --usage“ за повече информация.\n" -#: gnu/argp-help.c:1710 +#: gnu/argp-help.c:1712 #, c-format msgid "Report bugs to %s.\n" msgstr "" "Съобщавайте за програмни грешки на %s.\n" "За грешки в българския превод на .\n" -#: gnu/argp-help.c:1929 gnu/error.c:183 +#: gnu/argp-help.c:1931 gnu/error.c:183 msgid "Unknown system error" msgstr "Непозната системна грешка" @@ -202,16 +202,16 @@ msgstr "%s: опцията „-W %s“ не допуска аргумент\n" msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: опцията „%s“ изисква аргумент\n" -#: gnu/obstack.c:425 gnu/obstack.c:427 gnu/xalloc-die.c:36 +#: gnu/obstack.c:423 gnu/obstack.c:425 gnu/xalloc-die.c:36 msgid "memory exhausted" msgstr "паметта е изчерпана" -#: gnu/openat-die.c:36 +#: gnu/openat-die.c:40 #, fuzzy, c-format msgid "unable to record current working directory" msgstr "Не може да се смени работният каталог" -#: gnu/openat-die.c:54 +#: gnu/openat-die.c:59 #, fuzzy, c-format msgid "failed to return to initial working directory" msgstr "Не може да се запази работният каталог" @@ -235,11 +235,11 @@ msgstr "Не може да се запази работният каталог" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: gnu/quotearg.c:274 +#: gnu/quotearg.c:273 msgid "`" msgstr "„" -#: gnu/quotearg.c:275 +#: gnu/quotearg.c:274 msgid "'" msgstr "“" @@ -486,21 +486,21 @@ msgid_plural "%s: Wrote only %lu of %lu bytes" msgstr[0] "%s: Записани са само %lu от %lu байт" msgstr[1] "%s: Записани са само %lu от %lu байта" -#: lib/paxnames.c:155 +#: lib/paxnames.c:140 #, c-format msgid "Removing leading `%s' from member names" msgstr "Премахва се началното „%s“ от имената на членове" -#: lib/paxnames.c:156 +#: lib/paxnames.c:141 #, c-format msgid "Removing leading `%s' from hard link targets" msgstr "Премахва се началното „%s“ от целите на твърдите връзки" -#: lib/paxnames.c:169 +#: lib/paxnames.c:154 msgid "Substituting `.' for empty member name" msgstr "Полага се „.“ вместо празно име на член" -#: lib/paxnames.c:170 +#: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" msgstr "Полага се „.“ вместо празна цел на твърда връзка" @@ -803,20 +803,20 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "Само %lu от %lu байт можаха да се прочетат" msgstr[1] "Само %lu от %lu байта можаха да се прочетат" -#: src/compare.c:105 src/compare.c:382 +#: src/compare.c:105 src/compare.c:383 msgid "Contents differ" msgstr "Съдържанието се различава" -#: src/compare.c:131 src/extract.c:972 src/incremen.c:1462 src/list.c:458 -#: src/list.c:1392 src/xheader.c:711 +#: src/compare.c:131 src/extract.c:984 src/incremen.c:1456 src/list.c:456 +#: src/list.c:1388 src/xheader.c:711 msgid "Unexpected EOF in archive" msgstr "Неочакван знак за край (EOF) в архива" -#: src/compare.c:179 src/compare.c:195 src/compare.c:308 src/compare.c:406 +#: src/compare.c:179 src/compare.c:195 src/compare.c:309 src/compare.c:407 msgid "File type differs" msgstr "Файловите типове се различават" -#: src/compare.c:182 src/compare.c:202 src/compare.c:322 +#: src/compare.c:182 src/compare.c:202 src/compare.c:323 msgid "Mode differs" msgstr "Режимите за достъп се различават" @@ -832,49 +832,54 @@ msgstr "Групите се различават" msgid "Mod time differs" msgstr "Времената на промяна се различават" -#: src/compare.c:215 src/compare.c:414 +#: src/compare.c:215 src/compare.c:415 msgid "Size differs" msgstr "Размерите се различават" -#: src/compare.c:263 +#: src/compare.c:264 #, c-format msgid "Not linked to %s" msgstr "Не е свързан с %s" -#: src/compare.c:287 +#: src/compare.c:288 msgid "Symlink differs" msgstr "Символните връзки се различават" -#: src/compare.c:316 +#: src/compare.c:317 msgid "Device number differs" msgstr "Номерата на устройство се различават" -#: src/compare.c:456 +#: src/compare.c:457 #, c-format msgid "Verify " msgstr "Проверка" -#: src/compare.c:463 +#: src/compare.c:464 #, c-format msgid "%s: Unknown file type `%c', diffed as normal file" msgstr "%s: Непознат файлов тип „%c“, сравнява се като обикновен файл" -#: src/compare.c:518 +#: src/compare.c:520 msgid "Archive contains file names with leading prefixes removed." msgstr "Архивът съдържа файлови имена, с отстранени префикси." -#: src/compare.c:520 +#: src/compare.c:526 +#, fuzzy +msgid "Archive contains transformed file names." +msgstr "Архивът съдържа архаични заглавни записи по модул 64 (6 битови)" + +#: src/compare.c:531 msgid "Verification may fail to locate original files." msgstr "Проверката може и да не открие оригиналните файлове." -#: src/compare.c:593 +#: src/compare.c:603 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "НЕУСПЕШНА ПРОВЕРКА: открита е %d неправилен заглавен запис" msgstr[1] "НЕУСПЕШНА ПРОВЕРКА: открити са %d неправилни заглавни записа" -#: src/compare.c:611 src/list.c:222 +#: src/compare.c:621 src/list.c:222 #, c-format msgid "A lone zero block at %s" msgstr "Изолиран блок от нули при %s" @@ -927,7 +932,7 @@ msgstr[1] "%s: Файлът намаля с %s байта; допълва се msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: файлът е в друга файлова система; не се архивира" -#: src/create.c:1203 src/create.c:1214 src/incremen.c:582 src/incremen.c:588 +#: src/create.c:1203 src/create.c:1214 src/incremen.c:578 src/incremen.c:584 msgid "contents not dumped" msgstr "" @@ -951,7 +956,7 @@ msgstr "%s: файлът не е променен; не се архивира" msgid "%s: file is the archive; not dumped" msgstr "%s: файлът е архив; не се архивира" -#: src/create.c:1723 src/incremen.c:575 +#: src/create.c:1723 src/incremen.c:571 #, fuzzy msgid "directory not dumped" msgstr "%s: каталогът е обозначен като кеш; не се архивира" @@ -961,12 +966,12 @@ msgstr "%s: каталогът е обозначен като кеш; не се msgid "%s: file changed as we read it" msgstr "%s: файлът бе изменен по време на четене" -#: src/create.c:1857 +#: src/create.c:1858 #, c-format msgid "%s: socket ignored" msgstr "%s: гнездото се пренебрегва" -#: src/create.c:1863 +#: src/create.c:1864 #, c-format msgid "%s: door ignored" msgstr "%s: пренебрегва се специалният файл тип door" @@ -994,165 +999,165 @@ msgstr "%s: записано е време %s, което е %s сек. в бъ msgid "%s: Unexpected inconsistency when making directory" msgstr "%s: Неочаквана несъгласуваност при създаване на каталог" -#: src/extract.c:709 +#: src/extract.c:721 #, c-format msgid "%s: Directory renamed before its status could be extracted" msgstr "" "%s: каталогът бе преименуван преди да може да се извлече състоянието му" -#: src/extract.c:863 +#: src/extract.c:875 msgid "Extracting contiguous files as regular files" msgstr "Продължаващи файлове се извличат като обикновени файлове" -#: src/extract.c:1197 +#: src/extract.c:1209 msgid "Attempting extraction of symbolic links as hard links" msgstr "Опитва се извличането на символни връзки като твърди" -#: src/extract.c:1353 +#: src/extract.c:1365 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Не може да се извлича -- файлът продължава с друг том" -#: src/extract.c:1360 src/list.c:1125 +#: src/extract.c:1372 src/list.c:1121 msgid "Unexpected long name header" msgstr "Неочаквано дълъг заглавен запис" -#: src/extract.c:1367 +#: src/extract.c:1379 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Непознат файлов тип „%c“, извлича се като обикновен файл" -#: src/extract.c:1393 +#: src/extract.c:1405 #, c-format msgid "Current %s is newer or same age" msgstr "Текущият %s е по-нов или със същата възраст" -#: src/extract.c:1445 +#: src/extract.c:1457 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Не можа да се направи резервно копие на този файл" -#: src/extract.c:1582 +#: src/extract.c:1594 #, c-format msgid "Cannot rename %s to %s" msgstr "Бе невъзможно %s да се преименува на %s" -#: src/incremen.c:474 src/incremen.c:518 +#: src/incremen.c:473 src/incremen.c:517 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Каталогът бе преименуват от %s" -#: src/incremen.c:486 +#: src/incremen.c:485 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Каталогът бе преименуван" -#: src/incremen.c:531 +#: src/incremen.c:530 #, c-format msgid "%s: Directory is new" msgstr "%s: Каталогът е нов" -#: src/incremen.c:956 src/incremen.c:973 +#: src/incremen.c:951 src/incremen.c:968 msgid "Invalid time stamp" msgstr "Записано е неправилно време" -#: src/incremen.c:1012 +#: src/incremen.c:1007 msgid "Invalid modification time (seconds)" msgstr "Неправилно време на промяна (секунди)" -#: src/incremen.c:1027 +#: src/incremen.c:1022 msgid "Invalid modification time (nanoseconds)" msgstr "Неправилно време на промяна (наносекунди)" -#: src/incremen.c:1047 +#: src/incremen.c:1042 msgid "Invalid device number" msgstr "Неправилен номер на устройство" -#: src/incremen.c:1062 +#: src/incremen.c:1057 msgid "Invalid inode number" msgstr "Неправилен номер на i-възел" -#: src/incremen.c:1113 src/incremen.c:1150 +#: src/incremen.c:1108 src/incremen.c:1145 msgid "Field too long while reading snapshot file" msgstr "Твърде дълго поле при четене на snapshot-файл" -#: src/incremen.c:1120 src/incremen.c:1158 +#: src/incremen.c:1115 src/incremen.c:1153 msgid "Read error in snapshot file" msgstr "Грешка при четене в snapshot-файл" -#: src/incremen.c:1122 src/incremen.c:1162 src/incremen.c:1214 -#: src/incremen.c:1272 +#: src/incremen.c:1117 src/incremen.c:1157 src/incremen.c:1209 +#: src/incremen.c:1267 msgid "Unexpected EOF in snapshot file" msgstr "Неочакван край на snapshot-файл" -#: src/incremen.c:1129 src/incremen.c:1169 +#: src/incremen.c:1124 src/incremen.c:1164 msgid "Unexpected field value in snapshot file" msgstr "Неочаквана стойност на поле в snapshot-файл" -#: src/incremen.c:1264 +#: src/incremen.c:1259 msgid "Missing record terminator" msgstr "Липсва завършител на записа" -#: src/incremen.c:1325 src/incremen.c:1328 +#: src/incremen.c:1320 src/incremen.c:1323 msgid "Bad incremental file format" msgstr "Грешен инкрементален файлов формат" -#: src/incremen.c:1347 +#: src/incremen.c:1342 #, c-format msgid "Unsupported incremental format version: %" msgstr "Неподдържана версия на инкрементален формат: %" -#: src/incremen.c:1502 +#: src/incremen.c:1496 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "Лошо формиран dumpdir: очаква се „%c“, а вместо това има %#3o" -#: src/incremen.c:1512 +#: src/incremen.c:1506 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Лошо формиран dumpdir: „X“ е дублиран" -#: src/incremen.c:1525 +#: src/incremen.c:1519 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Лошо формиран dumpdir: празно име в „R“" -#: src/incremen.c:1538 +#: src/incremen.c:1532 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Лошо формиран dumpdir: „T“ не се предхожда от „R“" -#: src/incremen.c:1544 +#: src/incremen.c:1538 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Лошо формиран dumpdir: празно име в „T“" -#: src/incremen.c:1564 +#: src/incremen.c:1558 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "Лошо формиран dumpdir: очаква се „%c“, вместо това данните свършват" -#: src/incremen.c:1571 +#: src/incremen.c:1565 msgid "Malformed dumpdir: 'X' never used" msgstr "Лошо формиран dumpdir: „X“ никога не се използва" -#: src/incremen.c:1615 +#: src/incremen.c:1609 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Не може да се създаде временен каталог, използвайки шаблона %s" -#: src/incremen.c:1677 +#: src/incremen.c:1670 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Каталогът не се изчиства: не може да се достъпи" -#: src/incremen.c:1690 +#: src/incremen.c:1683 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: каталогът е на друго устройство: не се изчиства" -#: src/incremen.c:1698 +#: src/incremen.c:1691 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Изтрива се %s\n" -#: src/incremen.c:1703 +#: src/incremen.c:1696 #, c-format msgid "%s: Cannot remove" msgstr "%s: Не може да се изтрие" @@ -1172,20 +1177,20 @@ msgstr "блок %s: ** Блок от знаци NUL **\n" msgid "block %s: ** End of File **\n" msgstr "блок %s: ** Край на файла **\n" -#: src/list.c:256 src/list.c:1097 src/list.c:1360 +#: src/list.c:256 src/list.c:1093 src/list.c:1356 #, c-format msgid "block %s: " msgstr "блок %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:712 +#: src/list.c:708 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Интервали в заглавен запис вместо числова стойност на %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:767 +#: src/list.c:763 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1193,143 +1198,138 @@ msgstr "" "е допълнение до две" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:778 +#: src/list.c:774 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Осмичната стойност %.*s в архива е извън диапазона за %s" -#: src/list.c:799 +#: src/list.c:795 msgid "Archive contains obsolescent base-64 headers" msgstr "Архивът съдържа архаични заглавни записи по модул 64 (6 битови)" -#: src/list.c:813 +#: src/list.c:809 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "" "Архивът е подписан с низ по модул 64 %s, който е е извън диапазона за %s" -#: src/list.c:844 +#: src/list.c:840 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Стойността по модул 256 в архива е извън диапазона %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:873 +#: src/list.c:869 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Архивът съдържа %.*s, вместо това се очаква числова стойност на %s" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:895 +#: src/list.c:891 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Стойността %s в архива е извън допустимия диапазон за %s (%s..%s)" -#: src/list.c:1261 +#: src/list.c:1257 #, c-format msgid " link to %s\n" msgstr " връзка към %s\n" -#: src/list.c:1269 +#: src/list.c:1265 #, c-format msgid " unknown file type %s\n" msgstr " непознат файлов тип %s\n" -#: src/list.c:1287 +#: src/list.c:1283 #, c-format msgid "--Long Link--\n" msgstr "--Дълга връзка--\n" -#: src/list.c:1291 +#: src/list.c:1287 #, c-format msgid "--Long Name--\n" msgstr "--Дълго име--\n" -#: src/list.c:1295 +#: src/list.c:1291 #, c-format msgid "--Volume Header--\n" msgstr "--Заглавен запис на тома--\n" -#: src/list.c:1303 +#: src/list.c:1299 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Продължава при байт %s--\n" -#: src/list.c:1365 +#: src/list.c:1361 msgid "Creating directory:" msgstr "Създава се каталог:" -#: src/misc.c:298 +#: src/misc.c:297 #, fuzzy msgid "Cannot get working directory" msgstr "Не може да се смени работният каталог" -#: src/misc.c:571 +#: src/misc.c:570 #, c-format msgid "Renaming %s to %s\n" msgstr "Преименува се %s на %s\n" -#: src/misc.c:580 src/misc.c:599 +#: src/misc.c:579 src/misc.c:598 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: Не може да се преименува на %s" -#: src/misc.c:604 +#: src/misc.c:603 #, c-format msgid "Renaming %s back to %s\n" msgstr "Преименува се %s обратно на %s\n" -#: src/misc.c:851 +#: src/misc.c:850 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Файлът бе изтрит преди да бъде прочетен" -#: src/misc.c:866 -#, fuzzy, c-format -msgid "%s: Directory removed before we read it" -msgstr "%s: Файлът бе изтрит преди да бъде прочетен" - -#: src/misc.c:887 +#: src/misc.c:871 msgid "child process" msgstr "породен процес" -#: src/misc.c:896 +#: src/misc.c:880 msgid "interprocess channel" msgstr "междупроцесен канал" -#: src/names.c:594 +#: src/names.c:590 #, fuzzy msgid "Pattern matching characters used in file names" msgstr "Във файловите имена са използвани „*“ и „?“. Моля," -#: src/names.c:596 +#: src/names.c:592 #, fuzzy msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" msgstr "използвайте --wildcards, за да позволите съпоставяне с образци," -#: src/names.c:614 src/names.c:630 +#: src/names.c:610 src/names.c:626 #, c-format msgid "%s: Not found in archive" msgstr "%s: Не е открит в архива" -#: src/names.c:615 +#: src/names.c:611 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Необходимо срещане не е открито в архива" -#: src/names.c:649 +#: src/names.c:645 #, fuzzy, c-format msgid "Archive label mismatch" msgstr "Архивът не е етикетиран да отговаря на %s" -#: src/names.c:953 +#: src/names.c:949 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" -#: src/names.c:959 +#: src/names.c:955 msgid "Only one -C option is allowed with --listed-incremental" msgstr "" @@ -2757,6 +2757,10 @@ msgstr "Командата бе прекратена\n" msgid "--stat requires file names" msgstr "--stat изисква файлови имена" +#, fuzzy +#~ msgid "%s: Directory removed before we read it" +#~ msgstr "%s: Файлът бе изтрит преди да бъде прочетен" + #, fuzzy #~ msgid "Cannot restore working directory" #~ msgstr "Не може да се запази работният каталог" diff --git a/po/ca.gmo b/po/ca.gmo index 8656dd30941129f4fa3dbfd8e049bff0d7bfd130..312646a31e06766cf2492a1e643199fcb3379da0 100644 GIT binary patch delta 9705 zcmYk?33yG{-pBEM5E@g21W8Cvaxy1JWhoWfF)-D~;)>JjL zRFrC|>n*oMxoD}OT3T&sFZFs`wA#AgpS9ojdH3_|`&s|Bhqcy!t+h|;xqqLmdg)}< z?JZrtY|FAPr(0GOHp#H8=9r5^umVHzG&aVYn1KG7mQ@=wa0KRIGH$>|cnW!?^%JIH z(=5xPXceIc=V1xHm1X&?h7@YiYB)w=1?HnV^gg!53#f)eTbTL+q%T$(*29&k=eMF7 zJc?@QFO0;Q~b_} zU8FINxEXq}54v$4#^VOZ<5-{g4(k4zz8v$Sbc~>)*l_~7h@Z!*xD1t%6{uA1!RmMe zL-04Oivg{T;i!hZ$R#Teqj450b8DP>-)RadR0Os$<|9?sL=44uP^mqPiFg&2i3ZGz zI*^1lFdg;cZ0vyJQB$@PnQrTAWYAVnuE}5#(s7?Pi-LN#0vqCo7=foS32$LX49_zS zj6`+h6;wtJq8j)S)uE>OCZo|9M%)flaR{p8&!IZJ@qs?e+U8X3MmlNjM?LU2#$rl4 z)4@Kd5za)tcpEmsqo|Hw#Ynu5>Ud;(6L&)`#&V288-s8cHlcm%D1~smicPUb0qMmU zbYm-20|QVGPQ(a&8Uyf6%)?!%#d!zyo@nMl?`em+zYkW!3e@(UiN2~77E;h$FGe?R zL~W~2F&NLGUhoTQ`vfo_8fho2iK9^in1YX>jq2D{)OX-6s$)r=%+&QmZNIsln15Z^ zL4|tu4OYi1s0M#V&2_DZO$M4H@3OjKG`@)H_#SMGUtl0!NBU~r$Kfu@olQqJb}^Yb zj~dwBE^{9q+ zV;ww(8rTKYRNnJZa8sz)&Ac!T3OH=)+TL9BxpPz_&m>i=@$pzdZ0 z<57#W73#h|sE&<6tr6c76lzddiR#%pOvaB-+sCtnZc@S!f+^7-6q2|6dCgDI- zrWQDELQU0C$D5c!99;b1x5j66pr8@YLVc;$qqgBCjK_!`W`947Ug9TFAC|4CwQ&X~ zqpK&s8#oo!vE8UI<7Ze8f56&!2bGa(z4ScuA4x%ruMjn|9;lJ@!$6#e%ESuPBHN03 z;UQGU&Y+&V?f4hQ5LaU>Xyl2gT~mbW*aFlVS%n_jw{}uU#j~h}{d=2Vu`H}hT!!_r z0yR~O(2XykQojQ=fRh-2XD|qVKxN<_HpAdPW-%9_rgT2~ltP<=w$(?dhWz@PFI;2P z3o=n1?2a0l54A=%pr-B=Ho`wp&)4r~7HJGNAa0H7U@Pz|laU_60t`~fwWHTs(=2tsur6E&bhR3@ikEUrUk<_J#2^Qg=f4j}*P+1LTh zH%`ETE`IG$BaInkQr8vr?Vf=lxEdSdZq!;hfg0&$vf)&8}I1g~T@M`Aev^ z^M{Xu<|=fENo5Ku1AS31oQxXz0#s^OBOf(uJ8Hzgqn-~OY8r|~O;tK7v!%$aT4Rup zpmo5BYYj8c`AR5caA6v1Uv5DyvJ0q=e23b0_pu>*hnv(DpgLHJT3pjm*WW~K<9(?2 z{*HRDx5P}zVAPsfgnZz9*1HrUs5p&k@Hf<41(up`cqHZ%m!Usya;!wHnSG8Qql@@3 zcEF>k??m7T(_juZAudHt?Q9I!{(qCgFe(nA7F+B{liFUW5spPY;6sgc11ck5I97So zEUHx0;#-R~@fe2VSyaP!Fbjjq%x_B$=5~C4McTtk>lIgnfN4Xz+sb2#tVED zG*?4W7bZKdLXF@Ms=@EE7S^0>I?@o8iA>bg4MR=UOecOGHS#T}_ng6ccpC$;#uPIJ zz7Ps(xT9k^77)LTnRpSkitA4`+b9jU5%+45SftI2F5N9`?fL&=*SKI|@q8->8u!&NdCCVlCo6_yluTg6hbn zIjjq;@|0=d66(48s1f?jH66>u+Qj`)8F&<*!^bfK{pXSY32jCv1w5^Z9Q8%tfv8C8*W?J}QHUQ5pOik)yNYImH$0<5)={|drlR0lu6CU_Rrk>606@Gj!3huNr1 z?e$SmPku(du*x(1d4w%cFJ6LLl&6rvTYk@)Z~rssCSHrY+xi%_stXtMhbGR)96XJ2 z7`Vj5tx!`j6%)|6kV1P3J1_=sqaJ9o)L4KWh{vH`xC2|^4J^TUCbStoi<;99P*Zvy zJy`d7vrE#^OtH)2=fZJ2@gFdkE0H7W0h`NYqnrtTQ(`k$!x#;hd&UJ9L8niovNB;qZYj9;Q2 zsJ6;<(2IJo5S8Ky7=tzj;T}xH;~0v+VG<*#52Zba?pW0;P2P%lh;%S=TfYOTz`dbkcX*E=y9|Ah_k zR}904HmTmn|4>lFov}WS#^yK+)saeUjHgf?`59|t;AXR`!!eh*8>+!2sE)sd`mXH4 z8h8lR@G;aPzJ>*~Z`IjiQq>bR*Yi*#-0ye`I}*oi<*yhVhgy7}Vkf+f1=#j&Q$H6K zzl&N6w^55c@f|a;fjE_T8TvFA4{b9&FGM$S8ET{pQFHzds^&hzm4Oj>%EdpkVMF5AKQ!;#g__bEsD_*DHSbHuAmZ*upH)hsl#1!t z8o$C=4B2P?r6UhD_lqzA*P~u=95u42%wNf4&`n%{s(%S1@jR+Sf1;)+ zIf^*%NuZi||$QK%O#MU7-TDl^Bi9$rIz5B@-9vfV-R zW97qI#EVdCX1U`^^i`o^4Tbi&9<`XRVg?2tGOM%$dWc71I4;I%xCPZw&p*xn?tz-? zF&K-pQHyaS#^IOP8Smp_?EHzo{}j%AVtQKjQv`1NUPq0* z+F_I0U{r>(F$V{srs`!>#!g~)`~~%%wnxanQq|*#SrkiAFW8KM_!&my*Ek8Q9yR;F z0+opkI0z4-_I2cE<~z~{wK&H+zJY4z6l#hBj+sw%Umu08RIEbXa22~?%yILA3D}Ex zEjGv7sD`}%GI0r}6TgC4_!*ACDkn_F%23z$Vl(^&3o!ho`6nA+DFrVTYcUB=pi=fH zYR`lB7L-1>-{w@{~dpf1!_a-%EXvlX>(8T7 zdj$2Ky5E`)S_VcDSD+hTLB00_^ut@MMJcF9s z{3~V^Pe3iw_pl>gM6IFd@6CNh*n{{UbFjq5sb#zML6yoDt({TvP?2FNj z5*{XMz`0J<9OYaY!#R#~0r3Ew!P(Jn8WZR0YIlff;WwK4$L%@9bL~wrDQUUHA8^lo zRKj1Nyb`rheViwW^||}sBg*!VE$Wd&7+l5Fm2k%?iZeM^bLJ3t;4GwEn|nqg-?INZ zO1YLtw3o95WgXM)O|eOV<0)lx-c=Px7yJ9zh&tmaoptUTVh6_MBot7ylQV!*$4$zQKH&7{oX`C_+S=U`a$UphB?)1! zr|eA$xe3FmeVX$V=Zk71>k05w2GDa&JcDO!oN~d~2_A&ZV57M>u$mb)Vzy%4^<-{3=5-E(Zjcjhy11 zRz7L$=<#Ll5u+!KES*w5>G8^2?N+pLW!Z~ow`rN?P0jG8rMuJ8va>RhQqxmYYZe!I zdycFaJ$ZEbcyGb*DI>Gp>8WYlm*!2&dT?K6Qfiv*n)6!K-j8&&*Usrud40}Kzshq9 WrZlKFWm0*GJ?=_qWxJJoyZr~O#oR&w delta 9720 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, 2010. +# Àngel Mompó , 2010, 2011. +# #: src/create.c:1552 msgid "" msgstr "" -"Project-Id-Version: tar-1.23.90\n" +"Project-Id-Version: tar-1.25\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2010-11-07 17:07+0200\n" -"PO-Revision-Date: 2010-07-18 20:14+0200\n" +"POT-Creation-Date: 2011-03-12 11:53+0200\n" +"PO-Revision-Date: 2011-01-15 11:54+0100\n" "Last-Translator: Àngel Mompó \n" "Language-Team: Catalan \n" "Language: ca\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" +"Plural-Forms: nplurals=2; plural=n != 1\n" #: gnu/argmatch.c:135 #, c-format @@ -57,7 +58,7 @@ msgstr "%.*s: Paràmetre ARGP_HELP_FMT desconegut" msgid "Garbage in ARGP_HELP_FMT: %s" msgstr "Hi ha brossa a ARGP_HELP_FMT: %s" -#: gnu/argp-help.c:1246 +#: gnu/argp-help.c:1248 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." @@ -65,29 +66,29 @@ msgstr "" "Els paràmetres obligatoris o opcionals per les opcions llargues també ho són " "per les corresponents opcions curtes." -#: gnu/argp-help.c:1639 +#: gnu/argp-help.c:1641 msgid "Usage:" msgstr "Ús:" -#: gnu/argp-help.c:1643 +#: gnu/argp-help.c:1645 msgid " or: " msgstr " o: " -#: gnu/argp-help.c:1655 +#: gnu/argp-help.c:1657 msgid " [OPTION...]" msgstr " [OPCIÓ...]" -#: gnu/argp-help.c:1682 +#: gnu/argp-help.c:1684 #, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Proveu «%s --help» o «%s --usage» per més informació.\n" -#: gnu/argp-help.c:1710 +#: gnu/argp-help.c:1712 #, c-format msgid "Report bugs to %s.\n" msgstr "Informeu dels errors de programació a %s.\n" -#: gnu/argp-help.c:1929 gnu/error.c:183 +#: gnu/argp-help.c:1931 gnu/error.c:183 msgid "Unknown system error" msgstr "Error de sistema desconegut" @@ -193,16 +194,16 @@ msgstr "%s: l'opció «-W %s» no permet cap paràmetre\n" msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: l'opció «-W %s» necessita un paràmetre\n" -#: gnu/obstack.c:425 gnu/obstack.c:427 gnu/xalloc-die.c:36 +#: gnu/obstack.c:423 gnu/obstack.c:425 gnu/xalloc-die.c:36 msgid "memory exhausted" msgstr "memòria exhaurida" -#: gnu/openat-die.c:36 +#: gnu/openat-die.c:40 #, c-format msgid "unable to record current working directory" msgstr "No es pot desar el directori de treball actual" -#: gnu/openat-die.c:54 +#: gnu/openat-die.c:59 #, c-format msgid "failed to return to initial working directory" msgstr "No es pot tornar al directori de treball inicial" @@ -226,11 +227,11 @@ msgstr "No es pot tornar al directori de treball inicial" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: gnu/quotearg.c:274 +#: gnu/quotearg.c:273 msgid "`" msgstr "«" -#: gnu/quotearg.c:275 +#: gnu/quotearg.c:274 msgid "'" msgstr "»" @@ -498,21 +499,21 @@ msgid_plural "%s: Wrote only %lu of %lu bytes" msgstr[0] "%s: S'ha escrit només %lu de %lu byte" msgstr[1] "%s: S'han escrit només %lu de %lu bytes" -#: lib/paxnames.c:155 +#: lib/paxnames.c:140 #, c-format msgid "Removing leading `%s' from member names" msgstr "Es treuen les primeres «%s» dels noms dels membres" -#: lib/paxnames.c:156 +#: lib/paxnames.c:141 #, c-format msgid "Removing leading `%s' from hard link targets" msgstr "Es treuen les primeres «%s» dels objectius dels enllaços durs" -#: lib/paxnames.c:169 +#: lib/paxnames.c:154 msgid "Substituting `.' for empty member name" msgstr "Se substitueixen «.» per noms buits de membres" -#: lib/paxnames.c:170 +#: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" msgstr "Se substitueixen «.» per objectius buits d'enllaços durs" @@ -806,20 +807,20 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "Només es pot llegir %lu de %lu byte" msgstr[1] "Només es poden llegir %lu de %lu bytes" -#: src/compare.c:105 src/compare.c:382 +#: src/compare.c:105 src/compare.c:383 msgid "Contents differ" msgstr "El contingut no coincideix" -#: src/compare.c:131 src/extract.c:972 src/incremen.c:1462 src/list.c:458 -#: src/list.c:1392 src/xheader.c:711 +#: src/compare.c:131 src/extract.c:984 src/incremen.c:1456 src/list.c:456 +#: src/list.c:1388 src/xheader.c:711 msgid "Unexpected EOF in archive" msgstr "Final de l'arxiu inesperat" -#: src/compare.c:179 src/compare.c:195 src/compare.c:308 src/compare.c:406 +#: src/compare.c:179 src/compare.c:195 src/compare.c:309 src/compare.c:407 msgid "File type differs" msgstr "El tipus de fitxer no coincideix" -#: src/compare.c:182 src/compare.c:202 src/compare.c:322 +#: src/compare.c:182 src/compare.c:202 src/compare.c:323 msgid "Mode differs" msgstr "El mode no coincideix" @@ -835,51 +836,56 @@ msgstr "L'identificador de grup d'usuaris no coincideix" msgid "Mod time differs" msgstr "La data de modificació no coincideix" -#: src/compare.c:215 src/compare.c:414 +#: src/compare.c:215 src/compare.c:415 msgid "Size differs" msgstr "La mida no coincideix" -#: src/compare.c:263 +#: src/compare.c:264 #, c-format msgid "Not linked to %s" msgstr "No s'ha enllaçat amb %s" -#: src/compare.c:287 +#: src/compare.c:288 msgid "Symlink differs" msgstr "L'enllaç tou no coincideix" -#: src/compare.c:316 +#: src/compare.c:317 msgid "Device number differs" msgstr "El número de dispositiu no coincideix" -#: src/compare.c:456 +#: src/compare.c:457 #, c-format msgid "Verify " msgstr "Verifiqueu " -#: src/compare.c:463 +#: src/compare.c:464 #, c-format msgid "%s: Unknown file type `%c', diffed as normal file" msgstr "" "%s: Tipus de fitxer desconegut `%c', s'usa diff com si es tractés d'un " "fitxer normal" -#: src/compare.c:518 +#: src/compare.c:520 msgid "Archive contains file names with leading prefixes removed." msgstr "L'arxiu conté noms de fitxers amb els prefixes inicials esborrats." -#: src/compare.c:520 +#: src/compare.c:526 +#, fuzzy +msgid "Archive contains transformed file names." +msgstr "L'arxiu conté capçaleres amb base 64 que estan esdevenint obsoletes" + +#: src/compare.c:531 msgid "Verification may fail to locate original files." msgstr "Pot ser que la verificació no pugui trobar els fitxers originals." -#: src/compare.c:593 +#: src/compare.c:603 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "HA FALLAT LA VERIFICACIÓ: %d s'ha detectat una capçalera invàlida" msgstr[1] "HA FALLAT LA VERIFICACIÓ: %d s'han detectat capçaleres invàlides" -#: src/compare.c:611 src/list.c:222 +#: src/compare.c:621 src/list.c:222 #, c-format msgid "A lone zero block at %s" msgstr "Un sol bloc zero a %s" @@ -930,7 +936,7 @@ msgstr[1] "%s: El fitxer s'encongeix %s bytes; s'omple amb zeros" msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: el fitxer es troba a un sistema de fitxers diferent; no s'aboca" -#: src/create.c:1203 src/create.c:1214 src/incremen.c:582 src/incremen.c:588 +#: src/create.c:1203 src/create.c:1214 src/incremen.c:578 src/incremen.c:584 msgid "contents not dumped" msgstr "els continguts no s'aboquen" @@ -954,7 +960,7 @@ msgstr "%s: el fitxer no ha canviat; no s'aboca" msgid "%s: file is the archive; not dumped" msgstr "%s: el fitxer és l'arxiu; no s'aboca" -#: src/create.c:1723 src/incremen.c:575 +#: src/create.c:1723 src/incremen.c:571 msgid "directory not dumped" msgstr "el directori no s'aboca" @@ -963,12 +969,12 @@ msgstr "el directori no s'aboca" msgid "%s: file changed as we read it" msgstr "%s: el fitxer ha canviat mentre es llegia" -#: src/create.c:1857 +#: src/create.c:1858 #, c-format msgid "%s: socket ignored" msgstr "%s: sòcol ignorat" -#: src/create.c:1863 +#: src/create.c:1864 #, c-format msgid "%s: door ignored" msgstr "%s: porta ignorada" @@ -996,167 +1002,167 @@ msgstr "%s: la marca horària %s pertany %s s al futur" msgid "%s: Unexpected inconsistency when making directory" msgstr "%s: Inconsistència inesperada en crear el directori" -#: src/extract.c:709 +#: src/extract.c:721 #, c-format msgid "%s: Directory renamed before its status could be extracted" msgstr "" "%s: S'ha canviat el nom del directori abans de poder extreure'n l'estat" -#: src/extract.c:863 +#: src/extract.c:875 msgid "Extracting contiguous files as regular files" msgstr "Els fitxers contigus s'extreuen com fitxers normals" -#: src/extract.c:1197 +#: src/extract.c:1209 msgid "Attempting extraction of symbolic links as hard links" msgstr "Es prova d'extreure els enllaços simbòlics com enllaços durs" -#: src/extract.c:1353 +#: src/extract.c:1365 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: No espot extreure -- el fitxer continua des d'un altre volum" -#: src/extract.c:1360 src/list.c:1125 +#: src/extract.c:1372 src/list.c:1121 msgid "Unexpected long name header" msgstr "Nom de la capçalera inesperadament llarg" -#: src/extract.c:1367 +#: src/extract.c:1379 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Tipus de fitxer «%c» desconegut, s'extreu com un fitxer normal" -#: src/extract.c:1393 +#: src/extract.c:1405 #, c-format msgid "Current %s is newer or same age" msgstr "L'actual %s és igual d'antic o més nou" -#: src/extract.c:1445 +#: src/extract.c:1457 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: No es pot fer la còpia de seguretat d'aquest fitxer" -#: src/extract.c:1582 +#: src/extract.c:1594 #, c-format msgid "Cannot rename %s to %s" msgstr "No es pot canviar el nom de %s a %s" -#: src/incremen.c:474 src/incremen.c:518 +#: src/incremen.c:473 src/incremen.c:517 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: El directori ha canviat de nom a partir de %s" -#: src/incremen.c:486 +#: src/incremen.c:485 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: El directori ha canviat de nom" -#: src/incremen.c:531 +#: src/incremen.c:530 #, c-format msgid "%s: Directory is new" msgstr "%s: El directori és nou" -#: src/incremen.c:956 src/incremen.c:973 +#: src/incremen.c:951 src/incremen.c:968 msgid "Invalid time stamp" msgstr "Marca horària invàlida" -#: src/incremen.c:1012 +#: src/incremen.c:1007 msgid "Invalid modification time (seconds)" msgstr "Modificació invalida del temps (segons)" -#: src/incremen.c:1027 +#: src/incremen.c:1022 msgid "Invalid modification time (nanoseconds)" msgstr "Modificació invàlida del temps (nanosegons)" -#: src/incremen.c:1047 +#: src/incremen.c:1042 msgid "Invalid device number" msgstr "Número de dispositiu invàlid" -#: src/incremen.c:1062 +#: src/incremen.c:1057 msgid "Invalid inode number" msgstr "Número de node d'identificació invàlid" -#: src/incremen.c:1113 src/incremen.c:1150 +#: src/incremen.c:1108 src/incremen.c:1145 msgid "Field too long while reading snapshot file" msgstr "Camp massa llarg en llegir el fitxer d'instantània" -#: src/incremen.c:1120 src/incremen.c:1158 +#: src/incremen.c:1115 src/incremen.c:1153 msgid "Read error in snapshot file" msgstr "Error de lectura del fitxer d'instantània" -#: src/incremen.c:1122 src/incremen.c:1162 src/incremen.c:1214 -#: src/incremen.c:1272 +#: src/incremen.c:1117 src/incremen.c:1157 src/incremen.c:1209 +#: src/incremen.c:1267 msgid "Unexpected EOF in snapshot file" msgstr "Final de l'arxiu d'instantània inesperat" -#: src/incremen.c:1129 src/incremen.c:1169 +#: src/incremen.c:1124 src/incremen.c:1164 msgid "Unexpected field value in snapshot file" msgstr "Valor de camp inesperat del fitxer d'instantània" -#: src/incremen.c:1264 +#: src/incremen.c:1259 msgid "Missing record terminator" msgstr "Falta el terminador del registre" -#: src/incremen.c:1325 src/incremen.c:1328 +#: src/incremen.c:1320 src/incremen.c:1323 msgid "Bad incremental file format" msgstr "Format del fitxer incremental erroni" -#: src/incremen.c:1347 +#: src/incremen.c:1342 #, c-format msgid "Unsupported incremental format version: %" msgstr "No se suporta la versió del format incremental: %" -#: src/incremen.c:1502 +#: src/incremen.c:1496 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "Directori d'abocament mal format: s'esperava «%c» i s'ha trobat %#3o" -#: src/incremen.c:1512 +#: src/incremen.c:1506 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Directori d'abocament mal format: «X» duplicada" -#: src/incremen.c:1525 +#: src/incremen.c:1519 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Directori d'abocament mal format: nom buit a «R»" -#: src/incremen.c:1538 +#: src/incremen.c:1532 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Directori d'abocament mal format: «T» no està  precedit de «R»" -#: src/incremen.c:1544 +#: src/incremen.c:1538 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Directori d'abocament mal format: nom buit a «T»" -#: src/incremen.c:1564 +#: src/incremen.c:1558 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" "Directori d'abocament mal format: s'esperava «%c» però s'ha trobat el final " "de les dades" -#: src/incremen.c:1571 +#: src/incremen.c:1565 msgid "Malformed dumpdir: 'X' never used" msgstr "Directori d'abocament mal format: no s'ha fet servir «X»" -#: src/incremen.c:1615 +#: src/incremen.c:1609 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "No es pot crear el directori temporal fent servir la plantilla %s" -#: src/incremen.c:1677 +#: src/incremen.c:1670 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: No es purga el directori: no se'n pot saber l'estat" -#: src/incremen.c:1690 +#: src/incremen.c:1683 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: el directori és en un dispositiu diferent: no es purga" -#: src/incremen.c:1698 +#: src/incremen.c:1691 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: S'elimina %s\n" -#: src/incremen.c:1703 +#: src/incremen.c:1696 #, c-format msgid "%s: Cannot remove" msgstr "%s: No es pot esborrar" @@ -1176,20 +1182,20 @@ msgstr "bloc %s: ** Bloc de NULs **\n" msgid "block %s: ** End of File **\n" msgstr "bloc %s: ** Final del Fitxer **\n" -#: src/list.c:256 src/list.c:1097 src/list.c:1360 +#: src/list.c:256 src/list.c:1093 src/list.c:1356 #, c-format msgid "block %s: " msgstr "bloc %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:712 +#: src/list.c:708 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Capçalera amb blancs on hi hauria d'haver un valor numèric %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:767 +#: src/list.c:763 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1197,115 +1203,109 @@ msgstr "" "complement a dos" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:778 +#: src/list.c:774 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "El valor octal de l'arxiu %.*s està fora del rang %s" -#: src/list.c:799 +#: src/list.c:795 msgid "Archive contains obsolescent base-64 headers" msgstr "L'arxiu conté capçaleres amb base 64 que estan esdevenint obsoletes" -#: src/list.c:813 +#: src/list.c:809 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "La cadena de signatura %s amb base 64 de l'arxiu està fora del rang %s" -#: src/list.c:844 +#: src/list.c:840 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "El valor amb base 256 de l'arxiu està fora del rang %s " #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:873 +#: src/list.c:869 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "L'arxiu conté %.*s on hi hauria d'haver un valor numèric de tipus %s" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:895 +#: src/list.c:891 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "El valor %s de l'arxiu està fora del rang %s %s..%s" -#: src/list.c:1261 +#: src/list.c:1257 #, c-format msgid " link to %s\n" msgstr " enllaç cap a %s\n" -#: src/list.c:1269 +#: src/list.c:1265 #, c-format msgid " unknown file type %s\n" msgstr " tipus de fitxer desconegut %s\n" -#: src/list.c:1287 +#: src/list.c:1283 #, c-format msgid "--Long Link--\n" msgstr "--Enllaç llarg--\n" -#: src/list.c:1291 +#: src/list.c:1287 #, c-format msgid "--Long Name--\n" msgstr "--Nom Llarg--\n" -#: src/list.c:1295 +#: src/list.c:1291 #, c-format msgid "--Volume Header--\n" msgstr "--Capçalera del volum--\n" -#: src/list.c:1303 +#: src/list.c:1299 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Continua al byte %s--\n" -#: src/list.c:1365 +#: src/list.c:1361 msgid "Creating directory:" msgstr "Es crea el directori:" -#: src/misc.c:298 -#, fuzzy +#: src/misc.c:297 msgid "Cannot get working directory" -msgstr "No es pot canviar el directori de treball" +msgstr "No es pot trobar el directori de treball" -#: src/misc.c:571 +#: src/misc.c:570 #, c-format msgid "Renaming %s to %s\n" msgstr "Es canvia el nom %s per %s\n" -#: src/misc.c:580 src/misc.c:599 +#: src/misc.c:579 src/misc.c:598 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: No es pot canviar el nom a %s" -#: src/misc.c:604 +#: src/misc.c:603 #, c-format msgid "Renaming %s back to %s\n" msgstr "Es torna a canviar el nom %s a %s\n" -#: src/misc.c:851 +#: src/misc.c:850 #, c-format msgid "%s: File removed before we read it" msgstr "%s: El fitxer s'ha esborrat abans de poder-lo llegir" -#: src/misc.c:866 -#, c-format -msgid "%s: Directory removed before we read it" -msgstr "%s: El directori s'ha esborrat abans de poder-lo llegir" - -#: src/misc.c:887 +#: src/misc.c:871 msgid "child process" msgstr "procés descendent" -#: src/misc.c:896 +#: src/misc.c:880 msgid "interprocess channel" msgstr "canal d'intercomunicació" -#: src/names.c:594 +#: src/names.c:590 msgid "Pattern matching characters used in file names" msgstr "" "Caràcters de patró de coincidència que es fan servir en noms de fitxers" -#: src/names.c:596 +#: src/names.c:592 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" @@ -1313,29 +1313,29 @@ msgstr "" "Feu servir --wildcards per habilitar els patrons de coincidència, o --no-" "wildcars per eliminar aquest avís." -#: src/names.c:614 src/names.c:630 +#: src/names.c:610 src/names.c:626 #, c-format msgid "%s: Not found in archive" msgstr "%s: No s'ha trobat a l'arxiu" -#: src/names.c:615 +#: src/names.c:611 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: No s'ha trobat cap coincidència a l'arxiu" -#: src/names.c:649 +#: src/names.c:645 #, c-format msgid "Archive label mismatch" msgstr "L'etiqueta de l'arxiu no coincideix" -#: src/names.c:953 +#: src/names.c:949 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" "No podeu fer servir la opció -C als llistats de fitxer amb --listed-" "incremental" -#: src/names.c:959 +#: src/names.c:955 msgid "Only one -C option is allowed with --listed-incremental" msgstr "Només podeu fer servit una opció -C amb --listed-incemental" @@ -2763,5 +2763,8 @@ msgstr "Comanda finalitzada\n" msgid "--stat requires file names" msgstr "--stat requereix noms de fitxers" +#~ msgid "%s: Directory removed before we read it" +#~ msgstr "%s: El directori s'ha esborrat abans de poder-lo llegir" + #~ msgid "Cannot save working directory" #~ msgstr "No es pot desar al directori de treball" diff --git a/po/cs.gmo b/po/cs.gmo index 620a669dd866e2b8067bfab839c5bd21158af72f..d9dc46fadc8f5476d0101182f086baa4841a7c64 100644 GIT binary patch delta 9715 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 pkIxKyG&L(JE!~-(nv\n" "Language-Team: Czech \n" "Language: cs\n" @@ -67,7 +67,7 @@ msgstr "%.*s: Neznámý parametr ARGP_HELP_FMT" msgid "Garbage in ARGP_HELP_FMT: %s" msgstr "Nepořádek v ARGP_HELP_FMT: %s" -#: gnu/argp-help.c:1246 +#: gnu/argp-help.c:1248 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." @@ -75,31 +75,31 @@ msgstr "" "Povinné nebo volitelné argumenty dlouhých přepínačů jsou rovněž povinné\n" "nebo volitelné u odpovídajících krátkých přepínačů." -#: gnu/argp-help.c:1639 +#: gnu/argp-help.c:1641 msgid "Usage:" msgstr "Použití:" -#: gnu/argp-help.c:1643 +#: gnu/argp-help.c:1645 msgid " or: " msgstr "nebo: " -#: gnu/argp-help.c:1655 +#: gnu/argp-help.c:1657 msgid " [OPTION...]" msgstr " [PŘEPÍNAČ…]" -#: gnu/argp-help.c:1682 +#: gnu/argp-help.c:1684 #, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Více informací získáte pomocí „%s --help“ nebo „%s --usage“.\n" -#: gnu/argp-help.c:1710 +#: gnu/argp-help.c:1712 #, c-format msgid "Report bugs to %s.\n" msgstr "" "Chyby v programu oznamujte na adrese %s (anglicky), připomínky k překladu na " "adrese (česky).\n" -#: gnu/argp-help.c:1929 gnu/error.c:183 +#: gnu/argp-help.c:1931 gnu/error.c:183 msgid "Unknown system error" msgstr "Neznámá systémová chyba" @@ -206,16 +206,16 @@ msgstr "%s: přepínač „-W %s“ musí být zadán bez argumentu\n" msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: přepínač „-W %s“ vyžaduje argument\n" -#: gnu/obstack.c:425 gnu/obstack.c:427 gnu/xalloc-die.c:36 +#: gnu/obstack.c:423 gnu/obstack.c:425 gnu/xalloc-die.c:36 msgid "memory exhausted" msgstr "paměť vyčerpána" -#: gnu/openat-die.c:36 +#: gnu/openat-die.c:40 #, c-format msgid "unable to record current working directory" msgstr "pracovní adresář nelze si nelze zapamatovat" -#: gnu/openat-die.c:54 +#: gnu/openat-die.c:59 #, c-format msgid "failed to return to initial working directory" msgstr "do původního pracovního adresáře se nelze vrátit" @@ -239,11 +239,11 @@ msgstr "do původního pracovního adresáře se nelze vrátit" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: gnu/quotearg.c:274 +#: gnu/quotearg.c:273 msgid "`" msgstr "„" -#: gnu/quotearg.c:275 +#: gnu/quotearg.c:274 msgid "'" msgstr "“" @@ -520,22 +520,22 @@ msgstr[1] "%s: Zapsáno pouze %lu z %lu bajtů" msgstr[2] "%s: Zapsáno pouze %lu z %lu bajtů" # member name je část cesty názvy souboru -#: lib/paxnames.c:155 +#: lib/paxnames.c:140 #, c-format msgid "Removing leading `%s' from member names" msgstr "Odstraňuje se úvodní „%s„ z názvů prvků" -#: lib/paxnames.c:156 +#: lib/paxnames.c:141 #, c-format msgid "Removing leading `%s' from hard link targets" msgstr "Odstraňuje se úvodní „%s„ z cílů pevného odkazu" # member name je část cesty názvy souboru -#: lib/paxnames.c:169 +#: lib/paxnames.c:154 msgid "Substituting `.' for empty member name" msgstr "Prázdný prvek názvu se nahradí „.“" -#: lib/paxnames.c:170 +#: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" msgstr "Prázdný cíl pevného odkazu se nahradí „.“" @@ -829,20 +829,20 @@ msgstr[0] "Bylo možné načíst pouze %'lu z %'lu bajtu" msgstr[1] "Bylo možné načíst pouze %'lu z %'lu bajtů" msgstr[2] "Bylo možné načíst pouze %'lu z %'lu bajtů" -#: src/compare.c:105 src/compare.c:382 +#: src/compare.c:105 src/compare.c:383 msgid "Contents differ" msgstr "Obsahy se liší" -#: src/compare.c:131 src/extract.c:972 src/incremen.c:1462 src/list.c:458 -#: src/list.c:1392 src/xheader.c:711 +#: src/compare.c:131 src/extract.c:984 src/incremen.c:1456 src/list.c:456 +#: src/list.c:1388 src/xheader.c:711 msgid "Unexpected EOF in archive" msgstr "Neočekávaný konec archivu" -#: src/compare.c:179 src/compare.c:195 src/compare.c:308 src/compare.c:406 +#: src/compare.c:179 src/compare.c:195 src/compare.c:309 src/compare.c:407 msgid "File type differs" msgstr "Typ souboru se liší" -#: src/compare.c:182 src/compare.c:202 src/compare.c:322 +#: src/compare.c:182 src/compare.c:202 src/compare.c:323 msgid "Mode differs" msgstr "Práva se liší" @@ -858,42 +858,47 @@ msgstr "GID se liší" msgid "Mod time differs" msgstr "Čas poslední modifikace se liší" -#: src/compare.c:215 src/compare.c:414 +#: src/compare.c:215 src/compare.c:415 msgid "Size differs" msgstr "Velikost se liší" -#: src/compare.c:263 +#: src/compare.c:264 #, c-format msgid "Not linked to %s" msgstr "Není odkazem na %s" -#: src/compare.c:287 +#: src/compare.c:288 msgid "Symlink differs" msgstr "Symbolický odkaz se liší" -#: src/compare.c:316 +#: src/compare.c:317 msgid "Device number differs" msgstr "Číslo zařízení se liší" -#: src/compare.c:456 +#: src/compare.c:457 #, c-format msgid "Verify " msgstr "Ověřuji " -#: src/compare.c:463 +#: src/compare.c:464 #, c-format msgid "%s: Unknown file type `%c', diffed as normal file" msgstr "%s: Neznámý typ souboru „%c“, porovnáván jako normální soubor" -#: src/compare.c:518 +#: src/compare.c:520 msgid "Archive contains file names with leading prefixes removed." msgstr "Archiv obsahuje názvy souborů, kterým byly odstraněny předpony." -#: src/compare.c:520 +#: src/compare.c:526 +#, fuzzy +msgid "Archive contains transformed file names." +msgstr "Archiv obsahuje zastaralé base-64 hlavičky" + +#: src/compare.c:531 msgid "Verification may fail to locate original files." msgstr "Při kontrole může selhat nalezení původních souborů." -#: src/compare.c:593 +#: src/compare.c:603 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" @@ -901,7 +906,7 @@ msgstr[0] "SELHÁNÍ KONTROLY: zjiÅ¡těna %d chybná hlavička" msgstr[1] "SELHÁNÍ KONTROLY: zjiÅ¡těny %d chybné hlavičky" msgstr[2] "SELHÁNÍ KONTROLY: zjiÅ¡těno %d chybných hlaviček" -#: src/compare.c:611 src/list.c:222 +#: src/compare.c:621 src/list.c:222 #, c-format msgid "A lone zero block at %s" msgstr "Osiřelý nulový blok na pozici %s" @@ -953,7 +958,7 @@ msgstr[2] "%s: Soubor je kratší o %s bajtů; Doplňuji nulami." msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: soubor je na jiném souborovém systému; nearchivován" -#: src/create.c:1203 src/create.c:1214 src/incremen.c:582 src/incremen.c:588 +#: src/create.c:1203 src/create.c:1214 src/incremen.c:578 src/incremen.c:584 msgid "contents not dumped" msgstr "obsah nezpracován" @@ -977,7 +982,7 @@ msgstr "%s: soubor není změněn; neaktualizován" msgid "%s: file is the archive; not dumped" msgstr "%s: soubor je archiv; nearchivován" -#: src/create.c:1723 src/incremen.c:575 +#: src/create.c:1723 src/incremen.c:571 msgid "directory not dumped" msgstr "adresář nezpracován" @@ -986,12 +991,12 @@ msgstr "adresář nezpracován" msgid "%s: file changed as we read it" msgstr "%s: soubor byl během čtení změněn" -#: src/create.c:1857 +#: src/create.c:1858 #, c-format msgid "%s: socket ignored" msgstr "%s: soket ignorován" -#: src/create.c:1863 +#: src/create.c:1864 #, c-format msgid "%s: door ignored" msgstr "%s: dveře ignorovány" @@ -1019,164 +1024,164 @@ msgstr "%s: časová značka %s je %s s v budoucnosti" msgid "%s: Unexpected inconsistency when making directory" msgstr "%s: Neočekávaná inkonzistence, při vytváření adresáře" -#: src/extract.c:709 +#: src/extract.c:721 #, c-format msgid "%s: Directory renamed before its status could be extracted" msgstr "%s: Adresář byl přejmenován dříve, než bylo možné získat jeho stav" -#: src/extract.c:863 +#: src/extract.c:875 msgid "Extracting contiguous files as regular files" msgstr "Souvisle uložené soubory rozbaluji jako obyčejné soubory" -#: src/extract.c:1197 +#: src/extract.c:1209 msgid "Attempting extraction of symbolic links as hard links" msgstr "Zkouším rozbalit symbolické odkazy jako pevné odkazy" -#: src/extract.c:1353 +#: src/extract.c:1365 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Nelze rozbalit – soubor je pokračováním jiného svazku" -#: src/extract.c:1360 src/list.c:1125 +#: src/extract.c:1372 src/list.c:1121 msgid "Unexpected long name header" msgstr "Neočekávaná hlavička dlouhého názvu" -#: src/extract.c:1367 +#: src/extract.c:1379 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Neznámý typ souboru „%c“, rozbalen jako normální soubor" -#: src/extract.c:1393 +#: src/extract.c:1405 #, c-format msgid "Current %s is newer or same age" msgstr "Současný soubor %s je novější nebo stejně starý" -#: src/extract.c:1445 +#: src/extract.c:1457 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Tento soubor nebylo možné zálohovat" -#: src/extract.c:1582 +#: src/extract.c:1594 #, c-format msgid "Cannot rename %s to %s" msgstr "%s nelze přejmenovat na %s" -#: src/incremen.c:474 src/incremen.c:518 +#: src/incremen.c:473 src/incremen.c:517 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Adresář byl přejmenován z %s" -#: src/incremen.c:486 +#: src/incremen.c:485 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Adresář byl přejmenován" -#: src/incremen.c:531 +#: src/incremen.c:530 #, c-format msgid "%s: Directory is new" msgstr "%s: Adresář je nový" -#: src/incremen.c:956 src/incremen.c:973 +#: src/incremen.c:951 src/incremen.c:968 msgid "Invalid time stamp" msgstr "Neplatný čas souboru" -#: src/incremen.c:1012 +#: src/incremen.c:1007 msgid "Invalid modification time (seconds)" msgstr "Neplatný čas změny obsahu souboru (sekundy)" -#: src/incremen.c:1027 +#: src/incremen.c:1022 msgid "Invalid modification time (nanoseconds)" msgstr "Neplatný čas změny obsahu souboru (nanosekundy)" -#: src/incremen.c:1047 +#: src/incremen.c:1042 msgid "Invalid device number" msgstr "Neplatné číslo zařízení" -#: src/incremen.c:1062 +#: src/incremen.c:1057 msgid "Invalid inode number" msgstr "Neplatné číslo i-uzlu" -#: src/incremen.c:1113 src/incremen.c:1150 +#: src/incremen.c:1108 src/incremen.c:1145 msgid "Field too long while reading snapshot file" msgstr "Při čtení souboru snímku: položka je příliÅ¡ dlouhá" -#: src/incremen.c:1120 src/incremen.c:1158 +#: src/incremen.c:1115 src/incremen.c:1153 msgid "Read error in snapshot file" msgstr "Chyba čtení uvnitř souboru snímku" -#: src/incremen.c:1122 src/incremen.c:1162 src/incremen.c:1214 -#: src/incremen.c:1272 +#: src/incremen.c:1117 src/incremen.c:1157 src/incremen.c:1209 +#: src/incremen.c:1267 msgid "Unexpected EOF in snapshot file" msgstr "Neočekávaný konec souboru snímku" -#: src/incremen.c:1129 src/incremen.c:1169 +#: src/incremen.c:1124 src/incremen.c:1164 msgid "Unexpected field value in snapshot file" msgstr "Neočekávaná hodnota položky v souboru snímku" -#: src/incremen.c:1264 +#: src/incremen.c:1259 msgid "Missing record terminator" msgstr "Chybí uzávěr záznamu" -#: src/incremen.c:1325 src/incremen.c:1328 +#: src/incremen.c:1320 src/incremen.c:1323 msgid "Bad incremental file format" msgstr "Chybný formát přírůstkového souboru" -#: src/incremen.c:1347 +#: src/incremen.c:1342 #, c-format msgid "Unsupported incremental format version: %" msgstr "Nepodporovaná verze přírůstkového formátu: %" -#: src/incremen.c:1502 +#: src/incremen.c:1496 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "PoÅ¡kozený dumpdir: očekáváno „%c“, ale nalezeno %#3o" -#: src/incremen.c:1512 +#: src/incremen.c:1506 msgid "Malformed dumpdir: 'X' duplicated" msgstr "PoÅ¡kozený dumpdir: „X“ duplikováno" -#: src/incremen.c:1525 +#: src/incremen.c:1519 msgid "Malformed dumpdir: empty name in 'R'" msgstr "PoÅ¡kozený dumpdir: prázdný název v „R“" -#: src/incremen.c:1538 +#: src/incremen.c:1532 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "PoÅ¡kozený dumpdir: „R“ není před „T“" -#: src/incremen.c:1544 +#: src/incremen.c:1538 msgid "Malformed dumpdir: empty name in 'T'" msgstr "PoÅ¡kozený dumpdir: prázdný název v „T“" -#: src/incremen.c:1564 +#: src/incremen.c:1558 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "PoÅ¡kozený dumpdir: očekáváno „%c“, ale zjiÅ¡těn konec dat" -#: src/incremen.c:1571 +#: src/incremen.c:1565 msgid "Malformed dumpdir: 'X' never used" msgstr "PoÅ¡kozený dumpdir: „X“ nebylo nikdy použito" -#: src/incremen.c:1615 +#: src/incremen.c:1609 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Podle Å¡ablony %s nelze vytvořit dočasný adresář" -#: src/incremen.c:1677 +#: src/incremen.c:1670 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Adresář nebude vyčiÅ¡těn: nelze provést stat()" -#: src/incremen.c:1690 +#: src/incremen.c:1683 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: adresář je na jiném zařízení: nebude vyčiÅ¡těn" -#: src/incremen.c:1698 +#: src/incremen.c:1691 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Mažu %s\n" -#: src/incremen.c:1703 +#: src/incremen.c:1696 #, c-format msgid "%s: Cannot remove" msgstr "%s: Nelze smazat" @@ -1196,134 +1201,128 @@ msgstr "blok %s: ** Blok NUL **\n" msgid "block %s: ** End of File **\n" msgstr "blok %s: ** Konec souboru **\n" -#: src/list.c:256 src/list.c:1097 src/list.c:1360 +#: src/list.c:256 src/list.c:1093 src/list.c:1356 #, c-format msgid "block %s: " msgstr "blok %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:712 +#: src/list.c:708 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Mezery v hlavičce na místě, kde je očekávána číselná hodnota typu %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:767 +#: src/list.c:763 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" "Osmičková hodnota %.*s typu %s je mimo rozsah; přiřazuji dvojkový complement" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:778 +#: src/list.c:774 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Osmičková hodnota %.*s typu %s je mimo rozsah" -#: src/list.c:799 +#: src/list.c:795 msgid "Archive contains obsolescent base-64 headers" msgstr "Archiv obsahuje zastaralé base-64 hlavičky" -#: src/list.c:813 +#: src/list.c:809 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "Base-64 řetězec %s je mimo rozsah typu %s" -#: src/list.c:844 +#: src/list.c:840 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Hodnota base-256 je mimo rozsah typu %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:873 +#: src/list.c:869 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Archiv obsahuje %.*s tam, kde je očekávána číselná hodnota typu %s" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:895 +#: src/list.c:891 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Hodnota %s typu %s je mimo rozsah %s..%s" -#: src/list.c:1261 +#: src/list.c:1257 #, c-format msgid " link to %s\n" msgstr " odkaz na %s\n" -#: src/list.c:1269 +#: src/list.c:1265 #, c-format msgid " unknown file type %s\n" msgstr " neznámý souborový typ %s\n" -#: src/list.c:1287 +#: src/list.c:1283 #, c-format msgid "--Long Link--\n" msgstr "--Dlouhý odkaz--\n" -#: src/list.c:1291 +#: src/list.c:1287 #, c-format msgid "--Long Name--\n" msgstr "--Dlouhý název--\n" -#: src/list.c:1295 +#: src/list.c:1291 #, c-format msgid "--Volume Header--\n" msgstr "--Hlavička svazku--\n" -#: src/list.c:1303 +#: src/list.c:1299 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Pokračováno od %s bajtu--\n" -#: src/list.c:1365 +#: src/list.c:1361 msgid "Creating directory:" msgstr "Vytvářím adresář:" -#: src/misc.c:298 -#, fuzzy +#: src/misc.c:297 msgid "Cannot get working directory" -msgstr "Pracovní adresář nelze změnit" +msgstr "Nelze zjistit pracovní adresář" -#: src/misc.c:571 +#: src/misc.c:570 #, c-format msgid "Renaming %s to %s\n" msgstr "Přejmenovávám %s na %s\n" -#: src/misc.c:580 src/misc.c:599 +#: src/misc.c:579 src/misc.c:598 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: nelze přejmenovat na %s" -#: src/misc.c:604 +#: src/misc.c:603 #, c-format msgid "Renaming %s back to %s\n" msgstr "Přejmenovávám %s zpět na %s\n" -#: src/misc.c:851 +#: src/misc.c:850 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Soubor smazán dříve než mohl být přečten" -#: src/misc.c:866 -#, c-format -msgid "%s: Directory removed before we read it" -msgstr "%s: Adresář smazán dříve než mohl být přečten" - -#: src/misc.c:887 +#: src/misc.c:871 msgid "child process" msgstr "potomek" -#: src/misc.c:896 +#: src/misc.c:880 msgid "interprocess channel" msgstr "meziprocesový kanál" -#: src/names.c:594 +#: src/names.c:590 msgid "Pattern matching characters used in file names" msgstr "V názvech souborů se nachází žolíkové znaky" -#: src/names.c:596 +#: src/names.c:592 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" @@ -1331,29 +1330,29 @@ msgstr "" "Porovnávání proti žolíkových znaků zapněte pomocí --wildcards, nebo varování " "potlačte prostřednictvím --no-wildcards" -#: src/names.c:614 src/names.c:630 +#: src/names.c:610 src/names.c:626 #, c-format msgid "%s: Not found in archive" msgstr "%s: V archivu nenalezen" -#: src/names.c:615 +#: src/names.c:611 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Požadovaný výskyt nebyl v archivu nalezen" -#: src/names.c:649 +#: src/names.c:645 #, c-format msgid "Archive label mismatch" msgstr "Název archivu se neodpovídá" -#: src/names.c:953 +#: src/names.c:949 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" "Použití přepínače -C uvnitř seznamu souborů není spolu s --listed-" "incremental dovoleno" -#: src/names.c:959 +#: src/names.c:955 msgid "Only one -C option is allowed with --listed-incremental" msgstr "S --listed-incremental je dovolen pouze jediný přepínač -C" @@ -2756,6 +2755,9 @@ msgstr "Příkaz ukončen\n" msgid "--stat requires file names" msgstr "--stat potřebuje název souboru" +#~ msgid "%s: Directory removed before we read it" +#~ msgstr "%s: Adresář smazán dříve než mohl být přečten" + #~ msgid "Cannot save working directory" #~ msgstr "Pracovní adresář nelze uchovat" diff --git a/po/da.gmo b/po/da.gmo index d2ed2967495246acfa61458f31c89a38576e7d57..2c05765bf0f9cc41a159e7b24544d16aa98e3de9 100644 GIT binary patch delta 9669 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 b=kEP&?m{nn_hVsu$3OO~|K6H4VeS48`YEDl diff --git a/po/da.po b/po/da.po index 9fef7bca..df1d2fdf 100644 --- a/po/da.po +++ b/po/da.po @@ -4,14 +4,14 @@ # # Claus Hindsgaul , 2001. # Keld Jørn Simonsen , 2000-2001,2009,2010. -# Keld Simonsen , 2010. +# Keld Simonsen , 2010-2011. #: src/create.c:1552 msgid "" msgstr "" -"Project-Id-Version: GNU tar 1.23.90\n" +"Project-Id-Version: GNU tar 1.25\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2010-11-07 17:07+0200\n" -"PO-Revision-Date: 2010-09-26 09:18+0200\n" +"POT-Creation-Date: 2011-03-12 11:53+0200\n" +"PO-Revision-Date: 2011-01-07 09:18+0100\n" "Last-Translator: Keld Simonsen \n" "Language-Team: Danish \n" "Language: da\n" @@ -61,7 +61,7 @@ msgstr "%.*s: Ukendt ARGP_HELP_FMT-parameter" msgid "Garbage in ARGP_HELP_FMT: %s" msgstr "Skidt i ARGP_HELP_FMT: %s" -#: gnu/argp-help.c:1246 +#: gnu/argp-help.c:1248 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." @@ -69,29 +69,29 @@ msgstr "" "Obligatoriske eller valgfri argumenter til lange flag er også obligatoriske " "eller valgfri for alle tilsvarende korte flag." -#: gnu/argp-help.c:1639 +#: gnu/argp-help.c:1641 msgid "Usage:" msgstr "Brug:" -#: gnu/argp-help.c:1643 +#: gnu/argp-help.c:1645 msgid " or: " msgstr " eller: " -#: gnu/argp-help.c:1655 +#: gnu/argp-help.c:1657 msgid " [OPTION...]" msgstr " [FLAG...]" -#: gnu/argp-help.c:1682 +#: gnu/argp-help.c:1684 #, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Prøv '%s --help' eller '%s --usage' for mere information.\n" -#: gnu/argp-help.c:1710 +#: gnu/argp-help.c:1712 #, c-format msgid "Report bugs to %s.\n" msgstr "Rapportér fejl til %s.\n" -#: gnu/argp-help.c:1929 gnu/error.c:183 +#: gnu/argp-help.c:1931 gnu/error.c:183 msgid "Unknown system error" msgstr "Ukendt systemfejl" @@ -197,16 +197,16 @@ msgstr "%s: flag '-W %s' tillader ikke et argument\n" msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: flag '-W %s' kræver et argument\n" -#: gnu/obstack.c:425 gnu/obstack.c:427 gnu/xalloc-die.c:36 +#: gnu/obstack.c:423 gnu/obstack.c:425 gnu/xalloc-die.c:36 msgid "memory exhausted" msgstr "hovedlager opbrugt" -#: gnu/openat-die.c:36 +#: gnu/openat-die.c:40 #, c-format msgid "unable to record current working directory" msgstr "Kan ikke notere nuværende arbejdskatalog" -#: gnu/openat-die.c:54 +#: gnu/openat-die.c:59 #, c-format msgid "failed to return to initial working directory" msgstr "Kan ikke gå tilbage til oprindeligt arbejdskatalog" @@ -230,11 +230,11 @@ msgstr "Kan ikke g #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: gnu/quotearg.c:274 +#: gnu/quotearg.c:273 msgid "`" msgstr "'" -#: gnu/quotearg.c:275 +#: gnu/quotearg.c:274 msgid "'" msgstr "'" @@ -500,21 +500,21 @@ msgid_plural "%s: Wrote only %lu of %lu bytes" msgstr[0] "%s: Kunne kun skrive %lu af %lu byte" msgstr[1] "%s: Kunne kun skrive %lu af %lu byte" -#: lib/paxnames.c:155 +#: lib/paxnames.c:140 #, c-format msgid "Removing leading `%s' from member names" msgstr "Fjerner indledende '%s' fra medlemsnavne" -#: lib/paxnames.c:156 +#: lib/paxnames.c:141 #, c-format msgid "Removing leading `%s' from hard link targets" msgstr "Fjerner indledende '%s' fra hårde lænkemål" -#: lib/paxnames.c:169 +#: lib/paxnames.c:154 msgid "Substituting `.' for empty member name" msgstr "Erstatter tomme navne i arkivet med \".\"" -#: lib/paxnames.c:170 +#: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" msgstr "Erstatter tomt mål for hård lænke med \".\"" @@ -807,20 +807,20 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "Kunne kun læse %lu af %lu byte" msgstr[1] "Kunne kun læse %lu af %lu byte" -#: src/compare.c:105 src/compare.c:382 +#: src/compare.c:105 src/compare.c:383 msgid "Contents differ" msgstr "Indhold er forskelligt" -#: src/compare.c:131 src/extract.c:972 src/incremen.c:1462 src/list.c:458 -#: src/list.c:1392 src/xheader.c:711 +#: src/compare.c:131 src/extract.c:984 src/incremen.c:1456 src/list.c:456 +#: src/list.c:1388 src/xheader.c:711 msgid "Unexpected EOF in archive" msgstr "Uventet filslutning i arkivet" -#: src/compare.c:179 src/compare.c:195 src/compare.c:308 src/compare.c:406 +#: src/compare.c:179 src/compare.c:195 src/compare.c:309 src/compare.c:407 msgid "File type differs" msgstr "Filtype er forskellig" -#: src/compare.c:182 src/compare.c:202 src/compare.c:322 +#: src/compare.c:182 src/compare.c:202 src/compare.c:323 msgid "Mode differs" msgstr "Modus er forskellig" @@ -836,49 +836,54 @@ msgstr "Gruppe-ID er forskellig" msgid "Mod time differs" msgstr "Modificeringstid er forskellig" -#: src/compare.c:215 src/compare.c:414 +#: src/compare.c:215 src/compare.c:415 msgid "Size differs" msgstr "Størrelse er forskellig" -#: src/compare.c:263 +#: src/compare.c:264 #, c-format msgid "Not linked to %s" msgstr "Ikke lænket til %s" -#: src/compare.c:287 +#: src/compare.c:288 msgid "Symlink differs" msgstr "Symbolsk lænke er forskellig" -#: src/compare.c:316 +#: src/compare.c:317 msgid "Device number differs" msgstr "Enhedsnummer er forskellig" -#: src/compare.c:456 +#: src/compare.c:457 #, c-format msgid "Verify " msgstr "Verificér " -#: src/compare.c:463 +#: src/compare.c:464 #, c-format msgid "%s: Unknown file type `%c', diffed as normal file" msgstr "%s: Ukendt filtype '%c', diff'et som en almindelig fil" -#: src/compare.c:518 +#: src/compare.c:520 msgid "Archive contains file names with leading prefixes removed." msgstr "Arkivet indeholder filnavne med indledende prefixer borttaget." -#: src/compare.c:520 +#: src/compare.c:526 +#, fuzzy +msgid "Archive contains transformed file names." +msgstr "Arkiv indeholder forældede base-64 hoveder" + +#: src/compare.c:531 msgid "Verification may fail to locate original files." msgstr "Verificering kan mislykkes med at finde originalfiler." -#: src/compare.c:593 +#: src/compare.c:603 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "VERIFICERINGSFEJL: %d ukendt hoved fundet" msgstr[1] "VERIFICERINGSFEJL: %d ukendte hoveder fundet" -#: src/compare.c:611 src/list.c:222 +#: src/compare.c:621 src/list.c:222 #, c-format msgid "A lone zero block at %s" msgstr "En enkeltstående nulblok ved %s" @@ -929,7 +934,7 @@ msgstr[1] "%s: Filen formindsket med %s byte, fylder ud med nuller" msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: fil er på et andet filesystem; ikke arkiveret" -#: src/create.c:1203 src/create.c:1214 src/incremen.c:582 src/incremen.c:588 +#: src/create.c:1203 src/create.c:1214 src/incremen.c:578 src/incremen.c:584 msgid "contents not dumped" msgstr "indholdet ikke arkiveret" @@ -953,7 +958,7 @@ msgstr "%s: fil er u msgid "%s: file is the archive; not dumped" msgstr "%s: fil er det samme som arkivet; ikke arkiveret" -#: src/create.c:1723 src/incremen.c:575 +#: src/create.c:1723 src/incremen.c:571 msgid "directory not dumped" msgstr "katalog ikke arkiveret" @@ -962,12 +967,12 @@ msgstr "katalog ikke arkiveret" msgid "%s: file changed as we read it" msgstr "%s: Fil ændredes mens vi læste den" -#: src/create.c:1857 +#: src/create.c:1858 #, c-format msgid "%s: socket ignored" msgstr "%s: sokkel ignoreret" -#: src/create.c:1863 +#: src/create.c:1864 #, c-format msgid "%s: door ignored" msgstr "%s: dør ignoreret" @@ -995,166 +1000,166 @@ msgstr "%s: tidsstempel %s er %s sekunder ud i fremtiden" msgid "%s: Unexpected inconsistency when making directory" msgstr "%s: Uventet uoverensstemmelse ved oprettelse af katalog" -#: src/extract.c:709 +#: src/extract.c:721 #, c-format msgid "%s: Directory renamed before its status could be extracted" msgstr "%s: Katalog omdøbt før dets status kunne blive udpakket" -#: src/extract.c:863 +#: src/extract.c:875 msgid "Extracting contiguous files as regular files" msgstr "Udpakker sammenhængende filer som almindelige filer" -#: src/extract.c:1197 +#: src/extract.c:1209 msgid "Attempting extraction of symbolic links as hard links" msgstr "Forsøger at udpakke symbolske lænker som hårde lænker" -#: src/extract.c:1353 +#: src/extract.c:1365 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Kan ikke udpakke -- filen er fortsat fra et andet delarkiv" -#: src/extract.c:1360 src/list.c:1125 +#: src/extract.c:1372 src/list.c:1121 msgid "Unexpected long name header" msgstr "Uventet langt filnavnshoved" -#: src/extract.c:1367 +#: src/extract.c:1379 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Ukendt filtype '%c', udpakket som en almindelig fil" -#: src/extract.c:1393 +#: src/extract.c:1405 #, c-format msgid "Current %s is newer or same age" msgstr "Nuværende %s er nyere eller lige så gammel" -#: src/extract.c:1445 +#: src/extract.c:1457 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Kunne ikke sikkerhedskopiere denne fil" -#: src/extract.c:1582 +#: src/extract.c:1594 #, c-format msgid "Cannot rename %s to %s" msgstr "Kan ikke omdøbe %s til %s" -#: src/incremen.c:474 src/incremen.c:518 +#: src/incremen.c:473 src/incremen.c:517 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Kataloget er blevet omdøbt fra %s" -#: src/incremen.c:486 +#: src/incremen.c:485 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Kataloget er blevet omdøbt" -#: src/incremen.c:531 +#: src/incremen.c:530 #, c-format msgid "%s: Directory is new" msgstr "%s: Kataloget er nyt" -#: src/incremen.c:956 src/incremen.c:973 +#: src/incremen.c:951 src/incremen.c:968 msgid "Invalid time stamp" msgstr "Ugyldigt tidsstempel" -#: src/incremen.c:1012 +#: src/incremen.c:1007 msgid "Invalid modification time (seconds)" msgstr "Ugyldig modifikationstid (sekunder)" -#: src/incremen.c:1027 +#: src/incremen.c:1022 msgid "Invalid modification time (nanoseconds)" msgstr "Ugyldig modifikationstid (nanosekunder)" -#: src/incremen.c:1047 +#: src/incremen.c:1042 msgid "Invalid device number" msgstr "Ugyldigt enhedsnummer" -#: src/incremen.c:1062 +#: src/incremen.c:1057 msgid "Invalid inode number" msgstr "Ugyldigt inode-nummer" -#: src/incremen.c:1113 src/incremen.c:1150 +#: src/incremen.c:1108 src/incremen.c:1145 msgid "Field too long while reading snapshot file" msgstr "Felt for langt da øjebliksfil læstes" -#: src/incremen.c:1120 src/incremen.c:1158 +#: src/incremen.c:1115 src/incremen.c:1153 msgid "Read error in snapshot file" msgstr "Læsefejl i øjebliksfil" -#: src/incremen.c:1122 src/incremen.c:1162 src/incremen.c:1214 -#: src/incremen.c:1272 +#: src/incremen.c:1117 src/incremen.c:1157 src/incremen.c:1209 +#: src/incremen.c:1267 msgid "Unexpected EOF in snapshot file" msgstr "Uventet filslutning i øjebliksfil" -#: src/incremen.c:1129 src/incremen.c:1169 +#: src/incremen.c:1124 src/incremen.c:1164 msgid "Unexpected field value in snapshot file" msgstr "Uventet feltværdi i øjebliksfil" -#: src/incremen.c:1264 +#: src/incremen.c:1259 msgid "Missing record terminator" msgstr "Postafslutning mangler" -#: src/incremen.c:1325 src/incremen.c:1328 +#: src/incremen.c:1320 src/incremen.c:1323 msgid "Bad incremental file format" msgstr "Fejlagtigt inkrementelt filformat" -#: src/incremen.c:1347 +#: src/incremen.c:1342 #, c-format msgid "Unsupported incremental format version: %" msgstr "" "Formatversion for inkrementel sikkerhedskopiering understøttes ikke: " "%" -#: src/incremen.c:1502 +#: src/incremen.c:1496 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "Fejlagtigt dumpkatalog: forventede \"%c\" men fandt %#3o" -#: src/incremen.c:1512 +#: src/incremen.c:1506 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Fejlagtigt dumpkatalog: \"X\" duplikeret" -#: src/incremen.c:1525 +#: src/incremen.c:1519 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Fejlagtigt dumpkatalog: tomt navn i \"R\"" -#: src/incremen.c:1538 +#: src/incremen.c:1532 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Fejlagtigt dumpkatalog: \"T\" foregås ikke af \"R\"" -#: src/incremen.c:1544 +#: src/incremen.c:1538 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Fejlagtigt dumpkatalog: tomt navn i \"T\"" -#: src/incremen.c:1564 +#: src/incremen.c:1558 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "Fejlagtigt dumpkatalog: forventede \"%c\" men fandt slut på data" -#: src/incremen.c:1571 +#: src/incremen.c:1565 msgid "Malformed dumpdir: 'X' never used" msgstr "Fejlagtigt dumpkatalog: \"X\" bruges aldrig" -#: src/incremen.c:1615 +#: src/incremen.c:1609 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "kan ikke oprette midlertidigt katalog ved brug af skabelonen %s" -#: src/incremen.c:1677 +#: src/incremen.c:1670 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Renser ikke katalog: kunne ikke tage status" -#: src/incremen.c:1690 +#: src/incremen.c:1683 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: fil er på et andet filesystem: sletter ikke" -#: src/incremen.c:1698 +#: src/incremen.c:1691 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Sletter %s\n" -#: src/incremen.c:1703 +#: src/incremen.c:1696 #, c-format msgid "%s: Cannot remove" msgstr "Kan ikke slette %s" @@ -1174,133 +1179,127 @@ msgstr "blok %s: ** Blok med NULler **\n" msgid "block %s: ** End of File **\n" msgstr "blok %s: ** Slut på fil **\n" -#: src/list.c:256 src/list.c:1097 src/list.c:1360 +#: src/list.c:256 src/list.c:1093 src/list.c:1356 #, c-format msgid "block %s: " msgstr "blok %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:712 +#: src/list.c:708 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Blank-tegn i hovedet hvor numerisk %s værdi var forventet" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:767 +#: src/list.c:763 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "Oktal værdi %.*s i arkiv er udenfor %s interval; antager to-komplement" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:778 +#: src/list.c:774 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Oktal værdi %.*s i arkiv er udenfor %s interval" -#: src/list.c:799 +#: src/list.c:795 msgid "Archive contains obsolescent base-64 headers" msgstr "Arkiv indeholder forældede base-64 hoveder" -#: src/list.c:813 +#: src/list.c:809 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "Base-64 streng med fortegn %s i arkiv er udenfor %s interval" -#: src/list.c:844 +#: src/list.c:840 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Base-256 værdi i arkiv er udenfor %s interval" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:873 +#: src/list.c:869 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Arkiv indeholder %.*s hvor numerisk %s-værdi var forventet" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:895 +#: src/list.c:891 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Arkiv værdi %s er udenfor %s interval %s..%s" -#: src/list.c:1261 +#: src/list.c:1257 #, c-format msgid " link to %s\n" msgstr " lænke til %s\n" -#: src/list.c:1269 +#: src/list.c:1265 #, c-format msgid " unknown file type %s\n" msgstr " ukendt filtype %s\n" -#: src/list.c:1287 +#: src/list.c:1283 #, c-format msgid "--Long Link--\n" msgstr "--Lang lænke--\n" -#: src/list.c:1291 +#: src/list.c:1287 #, c-format msgid "--Long Name--\n" msgstr "--Langt navn--\n" -#: src/list.c:1295 +#: src/list.c:1291 #, c-format msgid "--Volume Header--\n" msgstr "--Delarkivhoved--\n" -#: src/list.c:1303 +#: src/list.c:1299 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Fortsat ved byte %s--\n" -#: src/list.c:1365 +#: src/list.c:1361 msgid "Creating directory:" msgstr "Opretter katalog:" -#: src/misc.c:298 -#, fuzzy +#: src/misc.c:297 msgid "Cannot get working directory" -msgstr "Kan ikke ændre arbejdskatalog" +msgstr "Kan ikke finde arbejdskatalog" -#: src/misc.c:571 +#: src/misc.c:570 #, c-format msgid "Renaming %s to %s\n" msgstr "Omdøber %s til %s\n" -#: src/misc.c:580 src/misc.c:599 +#: src/misc.c:579 src/misc.c:598 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: Kan ikke omdøbe til %s" -#: src/misc.c:604 +#: src/misc.c:603 #, c-format msgid "Renaming %s back to %s\n" msgstr "Omdøber %s tilbage til %s\n" -#: src/misc.c:851 +#: src/misc.c:850 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Fil fjernet før vi læste den" -#: src/misc.c:866 -#, c-format -msgid "%s: Directory removed before we read it" -msgstr "%s: Katalog fjernet før vi læste det" - -#: src/misc.c:887 +#: src/misc.c:871 msgid "child process" msgstr "underproces" -#: src/misc.c:896 +#: src/misc.c:880 msgid "interprocess channel" msgstr "mellemproces-kanal" -#: src/names.c:594 +#: src/names.c:590 msgid "Pattern matching characters used in file names" msgstr "Mønstermatchningstegn bruges i filnavne" -#: src/names.c:596 +#: src/names.c:592 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" @@ -1308,28 +1307,28 @@ msgstr "" "Brug --wildcards for at aktivere mønstermatchning, eller --no-wildcards for " "at undertrykke denne advarsel" -#: src/names.c:614 src/names.c:630 +#: src/names.c:610 src/names.c:626 #, c-format msgid "%s: Not found in archive" msgstr "%s: Ikke fundet i arkivet" -#: src/names.c:615 +#: src/names.c:611 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Krævet forekomst blev ikke fundet i arkivet" -#: src/names.c:649 +#: src/names.c:645 #, c-format msgid "Archive label mismatch" msgstr "Arkivetiket stemmer ikke overrens" -#: src/names.c:953 +#: src/names.c:949 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" "At bruge -C-flaget i en filliste er ikke tilladt med --listed-incremental" -#: src/names.c:959 +#: src/names.c:955 msgid "Only one -C option is allowed with --listed-incremental" msgstr "Kun ét -C-flag er tilladt med --listed-incremental" @@ -2730,5 +2729,8 @@ msgstr "Kommandoen afsluttedes\n" msgid "--stat requires file names" msgstr "--stat kræver filnavne" +#~ msgid "%s: Directory removed before we read it" +#~ msgstr "%s: Katalog fjernet før vi læste det" + #~ msgid "Cannot save working directory" #~ msgstr "Kan ikke gemme arbejdskatalog" diff --git a/po/de.gmo b/po/de.gmo index ce7ae53e82182f9af597813dad34cafd99270a14..aac9e352fe7912744e2b8e74338fbc0f651e41f0 100644 GIT binary patch delta 9715 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 KFI#iD%l`r$)y;VT diff --git a/po/de.po b/po/de.po index eedf744a..1e482237 100644 --- a/po/de.po +++ b/po/de.po @@ -9,10 +9,10 @@ #: src/create.c:1552 msgid "" msgstr "" -"Project-Id-Version: tar 1.23.90\n" +"Project-Id-Version: tar 1.24\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2010-11-07 17:07+0200\n" -"PO-Revision-Date: 2010-08-17 21:45+0200\n" +"POT-Creation-Date: 2011-03-12 11:53+0200\n" +"PO-Revision-Date: 2010-10-26 21:35+0200\n" "Last-Translator: Michael Piefel \n" "Language-Team: German \n" "Language: de\n" @@ -61,7 +61,7 @@ msgstr "%.*s: unbekannter ARGP_HELP_FMT-Parameter" msgid "Garbage in ARGP_HELP_FMT: %s" msgstr "Müll in ARGP_HELP_FMT: %s" -#: gnu/argp-help.c:1246 +#: gnu/argp-help.c:1248 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." @@ -69,29 +69,29 @@ msgstr "" "Erforderliche oder optionale Argumente für lange Optionen sind ebenso " "erforderlich bzw. optional für die entsprechenden Kurzoptionen." -#: gnu/argp-help.c:1639 +#: gnu/argp-help.c:1641 msgid "Usage:" msgstr "Aufruf:" -#: gnu/argp-help.c:1643 +#: gnu/argp-help.c:1645 msgid " or: " msgstr " oder: " -#: gnu/argp-help.c:1655 +#: gnu/argp-help.c:1657 msgid " [OPTION...]" msgstr " [OPTION...]" -#: gnu/argp-help.c:1682 +#: gnu/argp-help.c:1684 #, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "„%s --help“ oder „%s --usage“ gibt weitere Informationen.\n" -#: gnu/argp-help.c:1710 +#: gnu/argp-help.c:1712 #, c-format msgid "Report bugs to %s.\n" msgstr "Melden Sie Fehler (auf Englisch, mit LC_ALL=C) an %s.\n" -#: gnu/argp-help.c:1929 gnu/error.c:183 +#: gnu/argp-help.c:1931 gnu/error.c:183 msgid "Unknown system error" msgstr "Unbekannter Systemfehler." @@ -197,16 +197,16 @@ msgstr "%s: Option „-W %s“ erlaubt keinen Parameter\n" msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: Option „-W %s“ benötigt einen Parameter\n" -#: gnu/obstack.c:425 gnu/obstack.c:427 gnu/xalloc-die.c:36 +#: gnu/obstack.c:423 gnu/obstack.c:425 gnu/xalloc-die.c:36 msgid "memory exhausted" msgstr "Kein Speicher mehr" -#: gnu/openat-die.c:36 +#: gnu/openat-die.c:40 #, c-format msgid "unable to record current working directory" msgstr "Kann Arbeitsverzeichnis nicht aufzeichnen." -#: gnu/openat-die.c:54 +#: gnu/openat-die.c:59 #, c-format msgid "failed to return to initial working directory" msgstr "Konnte nicht zu ursprünglichem Arbeitsverzeichnis zurückkehren." @@ -230,11 +230,11 @@ msgstr "Konnte nicht zu ursprünglichem Arbeitsverzeichnis zurückkehren." #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: gnu/quotearg.c:274 +#: gnu/quotearg.c:273 msgid "`" msgstr "„" -#: gnu/quotearg.c:275 +#: gnu/quotearg.c:274 msgid "'" msgstr "“" @@ -500,21 +500,21 @@ msgid_plural "%s: Wrote only %lu of %lu bytes" msgstr[0] "%s: Nur %lu von einem Byte geschrieben" msgstr[1] "%s: Nur %lu von %lu Bytes geschrieben" -#: lib/paxnames.c:155 +#: lib/paxnames.c:140 #, c-format msgid "Removing leading `%s' from member names" msgstr "Entferne führende „%s“ von Elementnamen" -#: lib/paxnames.c:156 +#: lib/paxnames.c:141 #, c-format msgid "Removing leading `%s' from hard link targets" msgstr "Entferne führende „%s“ von Zielen harter Verknüpfungen" -#: lib/paxnames.c:169 +#: lib/paxnames.c:154 msgid "Substituting `.' for empty member name" msgstr "Ersetze „.“ für leeren Elementnamen" -#: lib/paxnames.c:170 +#: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" msgstr "Ersetze „.“ für leeres Ziel einer harten Verknüpfung" @@ -809,20 +809,20 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "Konnte nur %lu von %lu Byte lesen" msgstr[1] "Konnte nur %lu von %lu Bytes lesen" -#: src/compare.c:105 src/compare.c:382 +#: src/compare.c:105 src/compare.c:383 msgid "Contents differ" msgstr "Unterschiedliche Inhalte" -#: src/compare.c:131 src/extract.c:972 src/incremen.c:1462 src/list.c:458 -#: src/list.c:1392 src/xheader.c:711 +#: src/compare.c:131 src/extract.c:984 src/incremen.c:1456 src/list.c:456 +#: src/list.c:1388 src/xheader.c:711 msgid "Unexpected EOF in archive" msgstr "Unerwartetes Dateiende im Archiv." -#: src/compare.c:179 src/compare.c:195 src/compare.c:308 src/compare.c:406 +#: src/compare.c:179 src/compare.c:195 src/compare.c:309 src/compare.c:407 msgid "File type differs" msgstr "Unterschiedliche Dateitypen " -#: src/compare.c:182 src/compare.c:202 src/compare.c:322 +#: src/compare.c:182 src/compare.c:202 src/compare.c:323 msgid "Mode differs" msgstr "Modus ist unterschiedlich" @@ -838,49 +838,54 @@ msgstr "Gruppenkennung ist unterschiedlich" msgid "Mod time differs" msgstr "Änderungszeit ist unterschiedlich" -#: src/compare.c:215 src/compare.c:414 +#: src/compare.c:215 src/compare.c:415 msgid "Size differs" msgstr "Größe ist unterschiedlich" -#: src/compare.c:263 +#: src/compare.c:264 #, c-format msgid "Not linked to %s" msgstr "Nicht mit „%s“ verknüpft" -#: src/compare.c:287 +#: src/compare.c:288 msgid "Symlink differs" msgstr "Symbolische Verknüpfung ist unterschiedlich" -#: src/compare.c:316 +#: src/compare.c:317 msgid "Device number differs" msgstr "Unterschiedliche Gerätenummern" -#: src/compare.c:456 +#: src/compare.c:457 #, c-format msgid "Verify " msgstr "Prüfe " -#: src/compare.c:463 +#: src/compare.c:464 #, c-format msgid "%s: Unknown file type `%c', diffed as normal file" msgstr "%s: Unbekannter Dateityp „%c“, Differenz wie für eine normale Datei." -#: src/compare.c:518 +#: src/compare.c:520 msgid "Archive contains file names with leading prefixes removed." msgstr "Archiv enthält Dateinamen, deren Präfixe entfernt wurden." -#: src/compare.c:520 +#: src/compare.c:526 +#, fuzzy +msgid "Archive contains transformed file names." +msgstr "Archiv enthält veraltete Base64-Kopfteile" + +#: src/compare.c:531 msgid "Verification may fail to locate original files." msgstr "Die Überprüfung findet möglicherweise die Originaldateien nicht." -#: src/compare.c:593 +#: src/compare.c:603 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "FEHLER BEI PRÜFUNG: %d ungültiger Kopfteil erkannt." msgstr[1] "FEHLER BEI PRÜFUNG: %d ungültige Kopfteile erkannt." -#: src/compare.c:611 src/list.c:222 +#: src/compare.c:621 src/list.c:222 #, c-format msgid "A lone zero block at %s" msgstr "Ein einzelner Nullblock bei %s" @@ -932,7 +937,7 @@ msgstr[1] "Datei %s ist um %s Bytes geschrumpft, fülle mit Nullen auf." msgid "%s: file is on a different filesystem; not dumped" msgstr "Datei %s liegt auf einem anderen Dateisystem; nicht gesichert." -#: src/create.c:1203 src/create.c:1214 src/incremen.c:582 src/incremen.c:588 +#: src/create.c:1203 src/create.c:1214 src/incremen.c:578 src/incremen.c:584 msgid "contents not dumped" msgstr "Inhalt nicht gesichert" @@ -956,7 +961,7 @@ msgstr "Datei %s ist unverändert; nicht gesichert." msgid "%s: file is the archive; not dumped" msgstr "%s ist das Archiv; nicht gesichert." -#: src/create.c:1723 src/incremen.c:575 +#: src/create.c:1723 src/incremen.c:571 msgid "directory not dumped" msgstr "Verzeichnis nicht gesichert" @@ -965,12 +970,12 @@ msgstr "Verzeichnis nicht gesichert" msgid "%s: file changed as we read it" msgstr "%s: Datei hat sich beim Lesen geändert." -#: src/create.c:1857 +#: src/create.c:1858 #, c-format msgid "%s: socket ignored" msgstr "%s: Socket ignoriert" -#: src/create.c:1863 +#: src/create.c:1864 #, c-format msgid "%s: door ignored" msgstr "%s: Klappe ignoriert" @@ -998,168 +1003,168 @@ msgstr "%s: Zeitstempel %s liegt %s Sekunden in der Zukunft." msgid "%s: Unexpected inconsistency when making directory" msgstr "%s: Unerwarteter Inkonsitenz beim Erstellen des Verzeichnisses." -#: src/extract.c:709 +#: src/extract.c:721 #, c-format msgid "%s: Directory renamed before its status could be extracted" msgstr "%s: Verzeichnis umbenannt bevor sein Status ermittelt werden konnte" -#: src/extract.c:863 +#: src/extract.c:875 msgid "Extracting contiguous files as regular files" msgstr "Extrahiere zusammenhängende Dateien („contiguous files“) als reguläre." -#: src/extract.c:1197 +#: src/extract.c:1209 msgid "Attempting extraction of symbolic links as hard links" msgstr "" "Versuche symbolische Verknüpfungen als harte Verknüpfungen herauszuholen." -#: src/extract.c:1353 +#: src/extract.c:1365 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "" "Kann „%s“ nicht herausholen – Datei ist Fortsetzung eines anderen Teils." -#: src/extract.c:1360 src/list.c:1125 +#: src/extract.c:1372 src/list.c:1121 msgid "Unexpected long name header" msgstr "Unerwarteter Kopfteil mit langem Namen" -#: src/extract.c:1367 +#: src/extract.c:1379 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Unbekannter Dateityp „%c“, wie normale Datei extrahiert." -#: src/extract.c:1393 +#: src/extract.c:1405 #, c-format msgid "Current %s is newer or same age" msgstr "Aktuelles %s ist neuer oder hat dasselbe Alter." -#: src/extract.c:1445 +#: src/extract.c:1457 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Konnte keine Sicherheitskopie von dieser Datei erstellen" -#: src/extract.c:1582 +#: src/extract.c:1594 #, c-format msgid "Cannot rename %s to %s" msgstr "Kann %s nicht in %s umbenennen." -#: src/incremen.c:474 src/incremen.c:518 +#: src/incremen.c:473 src/incremen.c:517 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Verzeichnis wurde von „%s“ umbenannt." -#: src/incremen.c:486 +#: src/incremen.c:485 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Verzeichnis wurde umbenannt." -#: src/incremen.c:531 +#: src/incremen.c:530 #, c-format msgid "%s: Directory is new" msgstr "Verzeichnis „%s“ ist neu." -#: src/incremen.c:956 src/incremen.c:973 +#: src/incremen.c:951 src/incremen.c:968 msgid "Invalid time stamp" msgstr "Ungültiger Zeitstempel" -#: src/incremen.c:1012 +#: src/incremen.c:1007 msgid "Invalid modification time (seconds)" msgstr "Ungültige Änderungszeit (Sekunden)." -#: src/incremen.c:1027 +#: src/incremen.c:1022 msgid "Invalid modification time (nanoseconds)" msgstr "Ungültige Änderungszeit (Nanosekunden)." -#: src/incremen.c:1047 +#: src/incremen.c:1042 msgid "Invalid device number" msgstr "Ungültige Gerätenummer" -#: src/incremen.c:1062 +#: src/incremen.c:1057 msgid "Invalid inode number" msgstr "Ungültige Inode-Nummer" -#: src/incremen.c:1113 src/incremen.c:1150 +#: src/incremen.c:1108 src/incremen.c:1145 msgid "Field too long while reading snapshot file" msgstr "Feld zu lang beim Lesen der Schnappschussdatei" -#: src/incremen.c:1120 src/incremen.c:1158 +#: src/incremen.c:1115 src/incremen.c:1153 msgid "Read error in snapshot file" msgstr "Lesefehler in Schnappschussdatei" -#: src/incremen.c:1122 src/incremen.c:1162 src/incremen.c:1214 -#: src/incremen.c:1272 +#: src/incremen.c:1117 src/incremen.c:1157 src/incremen.c:1209 +#: src/incremen.c:1267 msgid "Unexpected EOF in snapshot file" msgstr "Unerwartetes Dateiende im Schnappschussdatei." -#: src/incremen.c:1129 src/incremen.c:1169 +#: src/incremen.c:1124 src/incremen.c:1164 msgid "Unexpected field value in snapshot file" msgstr "Unerwarteter Feldwert in Schnappschussdatei" -#: src/incremen.c:1264 +#: src/incremen.c:1259 msgid "Missing record terminator" msgstr "Fehlender Record-Abschluss" -#: src/incremen.c:1325 src/incremen.c:1328 +#: src/incremen.c:1320 src/incremen.c:1323 msgid "Bad incremental file format" msgstr "unzulässiges inkrementelles Dateiformat" -#: src/incremen.c:1347 +#: src/incremen.c:1342 #, c-format msgid "Unsupported incremental format version: %" msgstr "Nicht unterstützte Version des inkrementellen Formats: %" -#: src/incremen.c:1502 +#: src/incremen.c:1496 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "Fehlgeformtes Verzeichnis für Dump: „%c“ erwartet, aber %#3o gefunden" -#: src/incremen.c:1512 +#: src/incremen.c:1506 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Fehlgeformtes Verzeichnis für Dump: „X“ dupliziert" -#: src/incremen.c:1525 +#: src/incremen.c:1519 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Fehlgeformtes Verzeichnis für Dump: leerer Name in „R“" -#: src/incremen.c:1538 +#: src/incremen.c:1532 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Fehlgeformtes Verzeichnis für Dump: „T“ folgt nicht „R“" -#: src/incremen.c:1544 +#: src/incremen.c:1538 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Fehlgeformtes Verzeichnis für Dump: leerer Name in „T“" -#: src/incremen.c:1564 +#: src/incremen.c:1558 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" "Fehlgeformtes Verzeichnis für Dump: „%c“ erwartet, aber Ende der Daten " "gefunden" -#: src/incremen.c:1571 +#: src/incremen.c:1565 msgid "Malformed dumpdir: 'X' never used" msgstr "Fehlgeformtes Verzeichnis für Dump: „X“ nie benutzt" -#: src/incremen.c:1615 +#: src/incremen.c:1609 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Kann kein temporäres Verzeichnis mit der Schablone %s anlegen" -#: src/incremen.c:1677 +#: src/incremen.c:1670 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Entferne Verzeichnis nicht: kann nicht zugreifen" -#: src/incremen.c:1690 +#: src/incremen.c:1683 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: Verzeichnis liegt auf einem anderen Dateisystem: entferne nicht." -#: src/incremen.c:1698 +#: src/incremen.c:1691 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Lösche %s.\n" -#: src/incremen.c:1703 +#: src/incremen.c:1696 #, c-format msgid "%s: Cannot remove" msgstr "%s: Kann nicht entfernen." @@ -1179,72 +1184,72 @@ msgstr "Block %s: ** Block aus NULlen **\n" msgid "block %s: ** End of File **\n" msgstr "Block %s: ** Ende der Datei **\n" -#: src/list.c:256 src/list.c:1097 src/list.c:1360 +#: src/list.c:256 src/list.c:1093 src/list.c:1356 #, c-format msgid "block %s: " msgstr "Block %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:712 +#: src/list.c:708 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Leerzeichen im Kopfteil, wo numerische %s-Werte stehen sollten." #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:767 +#: src/list.c:763 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "Oktalzahl %.*s außerhalb des %s-Bereichs, nehme Zweierkomplement an?" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:778 +#: src/list.c:774 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Oktalzahl %.*s außerhalb des %s-Bereichs" -#: src/list.c:799 +#: src/list.c:795 msgid "Archive contains obsolescent base-64 headers" msgstr "Archiv enthält veraltete Base64-Kopfteile" -#: src/list.c:813 +#: src/list.c:809 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "Base64-Text %s außerhalb des %s-Bereichs." -#: src/list.c:844 +#: src/list.c:840 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Base-256-Wert ist außerhalb des %s-Bereichs." #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:873 +#: src/list.c:869 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Archiv enthält „%.*s“ wo numerische %s-Werte stehen sollten." #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:895 +#: src/list.c:891 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Wert %s außerhalb des %s-Bereichs %s..%s." -#: src/list.c:1261 +#: src/list.c:1257 #, c-format msgid " link to %s\n" msgstr " Verknüpfung zu %s\n" -#: src/list.c:1269 +#: src/list.c:1265 #, c-format msgid " unknown file type %s\n" msgstr " unbekannter Dateityp %s\n" -#: src/list.c:1287 +#: src/list.c:1283 #, c-format msgid "--Long Link--\n" msgstr "––Lange Verknüpfung––\n" -#: src/list.c:1291 +#: src/list.c:1287 #, c-format msgid "--Long Name--\n" msgstr "––Langer Name––\n" @@ -1252,63 +1257,57 @@ msgstr "––Langer Name––\n" # Alte Üs: Band Kopfteil. Kann diese Meldung auch bei Disketten # ausgegeben werden? Dann kann man ja nicht "Band" sagen; am besten # einfach "Volume" lassen. ke. -#: src/list.c:1295 +#: src/list.c:1291 #, c-format msgid "--Volume Header--\n" msgstr "––Vorspann des Teils––\n" -#: src/list.c:1303 +#: src/list.c:1299 #, c-format msgid "--Continued at byte %s--\n" msgstr "––Fortgesetzt bei Byte %s––\n" -#: src/list.c:1365 +#: src/list.c:1361 msgid "Creating directory:" msgstr "Erzeuge Verzeichnis:" -#: src/misc.c:298 -#, fuzzy +#: src/misc.c:297 msgid "Cannot get working directory" -msgstr "Kann Arbeitsverzeichnis nicht wechseln." +msgstr "Kann Arbeitsverzeichnis nicht ermitteln." -#: src/misc.c:571 +#: src/misc.c:570 #, c-format msgid "Renaming %s to %s\n" msgstr "Benenne „%s“ in „%s“ um.\n" -#: src/misc.c:580 src/misc.c:599 +#: src/misc.c:579 src/misc.c:598 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: Kann nicht in %s umbenennen" -#: src/misc.c:604 +#: src/misc.c:603 #, c-format msgid "Renaming %s back to %s\n" msgstr "Benenne „%s“ zurück in „%s“.\n" -#: src/misc.c:851 +#: src/misc.c:850 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Datei gelöscht, bevor sie gelesen wurde." -#: src/misc.c:866 -#, c-format -msgid "%s: Directory removed before we read it" -msgstr "%s: Verzeichnis gelöscht, bevor es gelesen wurde." - -#: src/misc.c:887 +#: src/misc.c:871 msgid "child process" msgstr "Kindprozess" -#: src/misc.c:896 +#: src/misc.c:880 msgid "interprocess channel" msgstr "Interprocess-Kanal" -#: src/names.c:594 +#: src/names.c:590 msgid "Pattern matching characters used in file names" msgstr "Zeichen für Musterüberdeckung im Dateinamen benutzt" -#: src/names.c:596 +#: src/names.c:592 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" @@ -1316,27 +1315,27 @@ msgstr "" "Benutzen Sie --wildcards, um Musterüberdeckung zu ermöglichen oder\n" "--no-wildcards, um diese Warnung zu unterdrücken." -#: src/names.c:614 src/names.c:630 +#: src/names.c:610 src/names.c:626 #, c-format msgid "%s: Not found in archive" msgstr "%s: Nicht im Archiv gefunden." -#: src/names.c:615 +#: src/names.c:611 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Erforderliches Auftreten nicht im Archiv gefunden." -#: src/names.c:649 +#: src/names.c:645 #, c-format msgid "Archive label mismatch" msgstr "Kennzeichnung des Archivs passt nicht" -#: src/names.c:953 +#: src/names.c:949 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "Option -C in Dateiliste ist nicht erlaubt mit --listed-incremental" -#: src/names.c:959 +#: src/names.c:955 msgid "Only one -C option is allowed with --listed-incremental" msgstr "In --listed-incremental ist nur eine Option -C erlaubt" @@ -2762,6 +2761,9 @@ msgstr "Befehl beendet\n" msgid "--stat requires file names" msgstr "--stat erfordert Dateinamen" +#~ msgid "%s: Directory removed before we read it" +#~ msgstr "%s: Verzeichnis gelöscht, bevor es gelesen wurde." + #~ msgid "Cannot save working directory" #~ msgstr "Kann aktuelles Verzeichnis nicht sichern." diff --git a/po/el.gmo b/po/el.gmo index 6c2fad02de36e59d19e70cdcb72c08b4a7c36f9a..f1860aac4340895aa5edbc243a18d781e00de036 100644 GIT binary patch delta 26 hcmbPNGOuKVuLQ55u7Rfw_XAxs`$W<|v6HiU4sx2h9Kg diff --git a/po/el.po b/po/el.po index 8553e131..db286c88 100644 --- a/po/el.po +++ b/po/el.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: tar 1.13.25 \n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2010-11-07 17:07+0200\n" +"POT-Creation-Date: 2011-03-12 11:53+0200\n" "PO-Revision-Date: 2004-03-08 14:44+0200\n" "Last-Translator: Μπαλάσκας Ευάγγελος (Balaskas Euaggelos) \n" @@ -59,40 +59,40 @@ msgstr "" msgid "Garbage in ARGP_HELP_FMT: %s" msgstr "" -#: gnu/argp-help.c:1246 +#: gnu/argp-help.c:1248 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." msgstr "" -#: gnu/argp-help.c:1639 +#: gnu/argp-help.c:1641 msgid "Usage:" msgstr "" -#: gnu/argp-help.c:1643 +#: gnu/argp-help.c:1645 msgid " or: " msgstr "" -#: gnu/argp-help.c:1655 +#: gnu/argp-help.c:1657 #, fuzzy msgid " [OPTION...]" msgstr "" "\n" "Χρήση: %s [ΕΠΙΛΟΓΉ]...\n" -#: gnu/argp-help.c:1682 +#: gnu/argp-help.c:1684 #, fuzzy, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Προσπαθήστε `%s --help' για περισσότερες πληροφορίες.\n" -#: gnu/argp-help.c:1710 +#: gnu/argp-help.c:1712 #, fuzzy, c-format msgid "Report bugs to %s.\n" msgstr "" "\n" "Αναφορά σφαλμάτων στο .\n" -#: gnu/argp-help.c:1929 gnu/error.c:183 +#: gnu/argp-help.c:1931 gnu/error.c:183 msgid "Unknown system error" msgstr "Άγνωστο σφάλμα συστήματος" @@ -198,16 +198,16 @@ msgstr "%s: η επιλογή `-W %s' δεν επιτρέπει όρισμα\n" msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: η επιλογή `%s' απαιτεί όρισμα\n" -#: gnu/obstack.c:425 gnu/obstack.c:427 gnu/xalloc-die.c:36 +#: gnu/obstack.c:423 gnu/obstack.c:425 gnu/xalloc-die.c:36 msgid "memory exhausted" msgstr "η μνήμη εξαντλήθηκε" -#: gnu/openat-die.c:36 +#: gnu/openat-die.c:40 #, fuzzy, c-format msgid "unable to record current working directory" msgstr "Δεν είναι δυνατή η τροποποίηση του τρέχοντος καταλόγου" -#: gnu/openat-die.c:54 +#: gnu/openat-die.c:59 #, fuzzy, c-format msgid "failed to return to initial working directory" msgstr "Δεν είναι δυνατή η αποθήκευση του τρέχοντος καταλόγου" @@ -231,11 +231,11 @@ msgstr "Δεν είναι δυνατή η αποθήκευση του τρέχο #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: gnu/quotearg.c:274 +#: gnu/quotearg.c:273 msgid "`" msgstr "`" -#: gnu/quotearg.c:275 +#: gnu/quotearg.c:274 msgid "'" msgstr "'" @@ -488,22 +488,22 @@ msgid_plural "%s: Wrote only %lu of %lu bytes" msgstr[0] "%s: Γράφτηκαν μόνο %lu από %lu byte" msgstr[1] "%s: Γράφτηκαν μόνο %lu από %lu byte" -#: lib/paxnames.c:155 +#: lib/paxnames.c:140 #, fuzzy, c-format msgid "Removing leading `%s' from member names" msgstr "Απομακρύνονται τα αρχικά `%.*s' από τα ονόματα των μελών" -#: lib/paxnames.c:156 +#: lib/paxnames.c:141 #, fuzzy, c-format msgid "Removing leading `%s' from hard link targets" msgstr "Απομακρύνονται τα αρχικά `%.*s' από τα ονόματα των μελών" -#: lib/paxnames.c:169 +#: lib/paxnames.c:154 #, fuzzy msgid "Substituting `.' for empty member name" msgstr "Απομακρύνονται τα αρχικά `%.*s' από τα ονόματα των μελών" -#: lib/paxnames.c:170 +#: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" msgstr "" @@ -802,20 +802,20 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "Δυνατή μόνο η ανάγνωση %lu από %lu byte" msgstr[1] "Δυνατή μόνο η ανάγνωση %lu από %lu byte" -#: src/compare.c:105 src/compare.c:382 +#: src/compare.c:105 src/compare.c:383 msgid "Contents differ" msgstr "Τα περιεχόμενα διαφέρουν" -#: src/compare.c:131 src/extract.c:972 src/incremen.c:1462 src/list.c:458 -#: src/list.c:1392 src/xheader.c:711 +#: src/compare.c:131 src/extract.c:984 src/incremen.c:1456 src/list.c:456 +#: src/list.c:1388 src/xheader.c:711 msgid "Unexpected EOF in archive" msgstr "Μη αναμενόμενο EOF (Τέλος Αρχείου) στην αρχειοθήκη" -#: src/compare.c:179 src/compare.c:195 src/compare.c:308 src/compare.c:406 +#: src/compare.c:179 src/compare.c:195 src/compare.c:309 src/compare.c:407 msgid "File type differs" msgstr "Οι τύποι αρχείων διαφέρουν" -#: src/compare.c:182 src/compare.c:202 src/compare.c:322 +#: src/compare.c:182 src/compare.c:202 src/compare.c:323 msgid "Mode differs" msgstr "Οι καταστάσεις διαφέρουν" @@ -831,49 +831,54 @@ msgstr "Ταυτότητες ομάδας διαφέρουν" msgid "Mod time differs" msgstr "Ώρες τροποποίησης διαφέρουν" -#: src/compare.c:215 src/compare.c:414 +#: src/compare.c:215 src/compare.c:415 msgid "Size differs" msgstr "Τα μεγέθη διαφέρουν" -#: src/compare.c:263 +#: src/compare.c:264 #, c-format msgid "Not linked to %s" msgstr "Δεν είναι συνδεδεμένο με %s" -#: src/compare.c:287 +#: src/compare.c:288 msgid "Symlink differs" msgstr "Οι σύνδεσμοι διαφέρουν" -#: src/compare.c:316 +#: src/compare.c:317 msgid "Device number differs" msgstr "Οι αριθμοί των συσκευών διαφέρουν" -#: src/compare.c:456 +#: src/compare.c:457 #, c-format msgid "Verify " msgstr "Επαλήθευση " -#: src/compare.c:463 +#: src/compare.c:464 #, fuzzy, c-format msgid "%s: Unknown file type `%c', diffed as normal file" msgstr "%s: Άγνωστος τύπος αρχείου '%c', εκτέλεση της diff ως κανονικό αρχείο" -#: src/compare.c:518 +#: src/compare.c:520 msgid "Archive contains file names with leading prefixes removed." msgstr "" -#: src/compare.c:520 +#: src/compare.c:526 +#, fuzzy +msgid "Archive contains transformed file names." +msgstr "Η αρχειοθήκη περιέχει απαρχαιωμένες επικεφαλίδες κωδικοποίησης base64" + +#: src/compare.c:531 msgid "Verification may fail to locate original files." msgstr "" -#: src/compare.c:593 +#: src/compare.c:603 #, fuzzy, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "Η ΕΠΑΛΎΘΕΥΣΗ ΑΠΈΤΥΧΕ: ανιχνεύτηκαν %d άκυρη(ες) επικεφαλίδα(δες)" msgstr[1] "Η ΕΠΑΛΎΘΕΥΣΗ ΑΠΈΤΥΧΕ: ανιχνεύτηκαν %d άκυρη(ες) επικεφαλίδα(δες)" -#: src/compare.c:611 src/list.c:222 +#: src/compare.c:621 src/list.c:222 #, c-format msgid "A lone zero block at %s" msgstr "" @@ -924,7 +929,7 @@ msgstr[1] "%s: Το αρχείο συρρικνώθηκε σε %s bytes; συμ msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: το αρχείο είναι σε διαφορετικό σύστημα αρχείων; δεν αποθηκεύτηκε" -#: src/create.c:1203 src/create.c:1214 src/incremen.c:582 src/incremen.c:588 +#: src/create.c:1203 src/create.c:1214 src/incremen.c:578 src/incremen.c:584 msgid "contents not dumped" msgstr "" @@ -948,7 +953,7 @@ msgstr "%s: δεν μπορεί να τροποποιηθεί το αρχείο; msgid "%s: file is the archive; not dumped" msgstr "%s: το αρχείο είναι η αρχειοθήκη; δεν αποθηκεύτηκε" -#: src/create.c:1723 src/incremen.c:575 +#: src/create.c:1723 src/incremen.c:571 msgid "directory not dumped" msgstr "" @@ -957,12 +962,12 @@ msgstr "" msgid "%s: file changed as we read it" msgstr "%s: αρχείο τροποποιήθηκε κατά την ανάγνωση" -#: src/create.c:1857 +#: src/create.c:1858 #, c-format msgid "%s: socket ignored" msgstr "%s: η υποδοχή αγνοήθηκε" -#: src/create.c:1863 +#: src/create.c:1864 #, c-format msgid "%s: door ignored" msgstr "%s: η πόρτα αγνοήθηκε" @@ -990,167 +995,167 @@ msgstr "%s: η ένδειξη χρόνου %s είναι %lu s στο μέλλο msgid "%s: Unexpected inconsistency when making directory" msgstr "%s: Μη αναμενόμενη ανακολουθία κατά την δημιουργία του καταλόγου" -#: src/extract.c:709 +#: src/extract.c:721 #, c-format msgid "%s: Directory renamed before its status could be extracted" msgstr "%s: Ο κατάλογος μετονομάστηκε πριν η κατάστασή του γίνει μη εξαγώγιμη" -#: src/extract.c:863 +#: src/extract.c:875 msgid "Extracting contiguous files as regular files" msgstr "Εξαγωγή συνεχόμενων αρχείων ως κανονικών αρχείων" -#: src/extract.c:1197 +#: src/extract.c:1209 msgid "Attempting extraction of symbolic links as hard links" msgstr "Προσπάθεια εξαγωγής των συμβολικών συνδέσμων ως σθεναρών συνδέσμων" -#: src/extract.c:1353 +#: src/extract.c:1365 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Δεν είναι δυνατή η εξαγωγή -- το αρχείο συνεχίζεται σε άλλο τόμο" -#: src/extract.c:1360 src/list.c:1125 +#: src/extract.c:1372 src/list.c:1121 #, fuzzy msgid "Unexpected long name header" msgstr "Μη αναμενόμενο EOF (Τέλος Αρχείου) στα κατακερματισμένα ονόματα" -#: src/extract.c:1367 +#: src/extract.c:1379 #, fuzzy, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Άγνωστος τύπος αρχείου '%c', εξαγωγή ως κανονικό αρχείο" -#: src/extract.c:1393 +#: src/extract.c:1405 #, c-format msgid "Current %s is newer or same age" msgstr "" -#: src/extract.c:1445 +#: src/extract.c:1457 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Δεν είναι δυνατή η αποθήκευση αυτού του αρχείου" -#: src/extract.c:1582 +#: src/extract.c:1594 #, fuzzy, c-format msgid "Cannot rename %s to %s" msgstr "%s: Δεν είναι δυνατή η μετονομασία σε %s" -#: src/incremen.c:474 src/incremen.c:518 +#: src/incremen.c:473 src/incremen.c:517 #, fuzzy, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Ο κατάλογος έχει μετονομαστεί" -#: src/incremen.c:486 +#: src/incremen.c:485 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Ο κατάλογος έχει μετονομαστεί" -#: src/incremen.c:531 +#: src/incremen.c:530 #, c-format msgid "%s: Directory is new" msgstr "%s: Ο κατάλογος είναι καινούριος" -#: src/incremen.c:956 src/incremen.c:973 +#: src/incremen.c:951 src/incremen.c:968 msgid "Invalid time stamp" msgstr "Άκυρη ένδειξη χρόνου" -#: src/incremen.c:1012 +#: src/incremen.c:1007 #, fuzzy msgid "Invalid modification time (seconds)" msgstr "Άκυρη κατάσταση δόθηκε σε επιλογή" -#: src/incremen.c:1027 +#: src/incremen.c:1022 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:1047 +#: src/incremen.c:1042 msgid "Invalid device number" msgstr "Άκυρος αριθμός συσκευής" -#: src/incremen.c:1062 +#: src/incremen.c:1057 msgid "Invalid inode number" msgstr "Άκυρος αριθμός i-κόμβου" -#: src/incremen.c:1113 src/incremen.c:1150 +#: src/incremen.c:1108 src/incremen.c:1145 msgid "Field too long while reading snapshot file" msgstr "" -#: src/incremen.c:1120 src/incremen.c:1158 +#: src/incremen.c:1115 src/incremen.c:1153 msgid "Read error in snapshot file" msgstr "" -#: src/incremen.c:1122 src/incremen.c:1162 src/incremen.c:1214 -#: src/incremen.c:1272 +#: src/incremen.c:1117 src/incremen.c:1157 src/incremen.c:1209 +#: src/incremen.c:1267 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "Μη αναμενόμενο EOF (Τέλος Αρχείου) στην αρχειοθήκη" -#: src/incremen.c:1129 src/incremen.c:1169 +#: src/incremen.c:1124 src/incremen.c:1164 msgid "Unexpected field value in snapshot file" msgstr "" -#: src/incremen.c:1264 +#: src/incremen.c:1259 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1325 src/incremen.c:1328 +#: src/incremen.c:1320 src/incremen.c:1323 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1347 +#: src/incremen.c:1342 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1502 +#: src/incremen.c:1496 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1512 +#: src/incremen.c:1506 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1525 +#: src/incremen.c:1519 msgid "Malformed dumpdir: empty name in 'R'" msgstr "" -#: src/incremen.c:1538 +#: src/incremen.c:1532 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1544 +#: src/incremen.c:1538 msgid "Malformed dumpdir: empty name in 'T'" msgstr "" -#: src/incremen.c:1564 +#: src/incremen.c:1558 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1571 +#: src/incremen.c:1565 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1615 +#: src/incremen.c:1609 #, fuzzy, c-format msgid "Cannot create temporary directory using template %s" msgstr "Δεν είναι δυνατή η δέσμευση μνήμης για τον συντελεστή ομαδοποίησης %d" -#: src/incremen.c:1677 +#: src/incremen.c:1670 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1690 +#: src/incremen.c:1683 #, fuzzy, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: το αρχείο είναι σε διαφορετικό σύστημα αρχείων; δεν αποθηκεύτηκε" -#: src/incremen.c:1698 +#: src/incremen.c:1691 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Διαγραφή %s\n" -#: src/incremen.c:1703 +#: src/incremen.c:1696 #, c-format msgid "%s: Cannot remove" msgstr "%s: Δεν είναι δυνατή η απομάκρυνση" @@ -1170,20 +1175,20 @@ msgstr "μπλοκ %s: ** Μπλοκ με χαρακτήρες NUL **\n" msgid "block %s: ** End of File **\n" msgstr "μπλοκ %s: ** Τέλος Αρχείου **\n" -#: src/list.c:256 src/list.c:1097 src/list.c:1360 +#: src/list.c:256 src/list.c:1093 src/list.c:1356 #, c-format msgid "block %s: " msgstr "μπλοκ %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:712 +#: src/list.c:708 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Κενά στην επικεφαλίδα ενώ αναμενόταν αριθμητική τιμή %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:767 +#: src/list.c:763 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1191,142 +1196,137 @@ msgstr "" "συμπληρώματα" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:778 +#: src/list.c:774 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Αρχειοθήκη οκταδικής τιμής %.*s είναι εκτός του %s εύρους" -#: src/list.c:799 +#: src/list.c:795 msgid "Archive contains obsolescent base-64 headers" msgstr "Η αρχειοθήκη περιέχει απαρχαιωμένες επικεφαλίδες κωδικοποίησης base64" -#: src/list.c:813 +#: src/list.c:809 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "" "Η αρχειοθήκη είναι υπογεγραμμένη με αλφαριθμητικά base-64 %s είναι εκτός του " "%s εύρους" -#: src/list.c:844 +#: src/list.c:840 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Η αρχειοθήκη με base-256 τιμές είναι εκτός του %s εύρους" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:873 +#: src/list.c:869 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Η αρχειοθήκη περιέχει %.*s όπου αριθμητικές %s τιμές αναμένονται" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:895 +#: src/list.c:891 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Η τιμή της αρχειοθήκης %s είναι εκτός του %s εύρους %s..%s" -#: src/list.c:1261 +#: src/list.c:1257 #, c-format msgid " link to %s\n" msgstr " σύνδεσμος σε %s\n" -#: src/list.c:1269 +#: src/list.c:1265 #, c-format msgid " unknown file type %s\n" msgstr " άγνωστος τύπος αρχείου %s\n" -#: src/list.c:1287 +#: src/list.c:1283 #, c-format msgid "--Long Link--\n" msgstr "" -#: src/list.c:1291 +#: src/list.c:1287 #, c-format msgid "--Long Name--\n" msgstr "" -#: src/list.c:1295 +#: src/list.c:1291 #, c-format msgid "--Volume Header--\n" msgstr "--Επικεφαλίδα Τόμου--\n" -#: src/list.c:1303 +#: src/list.c:1299 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Συνέχιση στο byte %s--\n" -#: src/list.c:1365 +#: src/list.c:1361 msgid "Creating directory:" msgstr "Δημιουργία καταλόγου:" -#: src/misc.c:298 +#: src/misc.c:297 #, fuzzy msgid "Cannot get working directory" msgstr "Δεν είναι δυνατή η τροποποίηση του τρέχοντος καταλόγου" -#: src/misc.c:571 +#: src/misc.c:570 #, c-format msgid "Renaming %s to %s\n" msgstr "Μετονομασία %s σε %s\n" -#: src/misc.c:580 src/misc.c:599 +#: src/misc.c:579 src/misc.c:598 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: Δεν είναι δυνατή η μετονομασία σε %s" -#: src/misc.c:604 +#: src/misc.c:603 #, c-format msgid "Renaming %s back to %s\n" msgstr "Μετονομασία %s πίσω στο %s\n" -#: src/misc.c:851 +#: src/misc.c:850 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Το αρχείο απομακρύνθηκε πριν το διαβάσουμε" -#: src/misc.c:866 -#, fuzzy, c-format -msgid "%s: Directory removed before we read it" -msgstr "%s: Το αρχείο απομακρύνθηκε πριν το διαβάσουμε" - -#: src/misc.c:887 +#: src/misc.c:871 msgid "child process" msgstr "θυγατρική διεργασία" -#: src/misc.c:896 +#: src/misc.c:880 msgid "interprocess channel" msgstr "κανάλι μεταξύ διεργασιών" -#: src/names.c:594 +#: src/names.c:590 msgid "Pattern matching characters used in file names" msgstr "" -#: src/names.c:596 +#: src/names.c:592 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" msgstr "" -#: src/names.c:614 src/names.c:630 +#: src/names.c:610 src/names.c:626 #, c-format msgid "%s: Not found in archive" msgstr "%s: Δεν βρέθηκε στην αρχειοθήκη" -#: src/names.c:615 +#: src/names.c:611 #, fuzzy, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Δεν βρέθηκε στην αρχειοθήκη" -#: src/names.c:649 +#: src/names.c:645 #, fuzzy, c-format msgid "Archive label mismatch" msgstr "Η αρχειοθήκη δεν έχει ετικέτα για ταίριασμα %s" -#: src/names.c:953 +#: src/names.c:949 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" -#: src/names.c:959 +#: src/names.c:955 msgid "Only one -C option is allowed with --listed-incremental" msgstr "" @@ -2700,6 +2700,10 @@ msgstr "" msgid "--stat requires file names" msgstr "--Κατακερματισμένα ονόματα αρχείων--\n" +#, fuzzy +#~ msgid "%s: Directory removed before we read it" +#~ msgstr "%s: Το αρχείο απομακρύνθηκε πριν το διαβάσουμε" + #, fuzzy #~ msgid "Cannot restore working directory" #~ msgstr "Δεν είναι δυνατή η αποθήκευση του τρέχοντος καταλόγου" diff --git a/po/es.gmo b/po/es.gmo index 0bd75ccb51697755fb2537c4e867e79784fc52a5..4c8274e1959d872fae7decc35e4f7fdf610e98bb 100644 GIT binary patch delta 28 jcmX?egz?M~#tr=DyoS04#=3?^3WkPOrpB9P%nh^wiGc_F delta 28 jcmX?egz?M~#tr=Dyau|4hPnpk3WnxZ2IiY(%nh^wiMt2` diff --git a/po/es.po b/po/es.po index e5dd7790..77c7fd6b 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU tar 1.15.1\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2010-11-07 17:07+0200\n" +"POT-Creation-Date: 2011-03-12 11:53+0200\n" "PO-Revision-Date: 2004-12-27 20:45+0100\n" "Last-Translator: Santiago Vila Doncel \n" "Language-Team: Spanish \n" @@ -59,7 +59,7 @@ msgstr "%.*s: Par msgid "Garbage in ARGP_HELP_FMT: %s" msgstr "Incongruencia en ARGP_HELP_FMT: %s" -#: gnu/argp-help.c:1246 +#: gnu/argp-help.c:1248 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." @@ -68,19 +68,19 @@ msgstr "" "también\n" "obligatorios u opcionales para las opciones cortas correspondientes." -#: gnu/argp-help.c:1639 +#: gnu/argp-help.c:1641 msgid "Usage:" msgstr "Modo de empleo:" -#: gnu/argp-help.c:1643 +#: gnu/argp-help.c:1645 msgid " or: " msgstr " o bien: " -#: gnu/argp-help.c:1655 +#: gnu/argp-help.c:1657 msgid " [OPTION...]" msgstr " [OPCIÓN...]" -#: gnu/argp-help.c:1682 +#: gnu/argp-help.c:1684 #, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Pruebe `%s --help' o `%s --usage' para más información.\n" @@ -101,12 +101,12 @@ msgstr "Pruebe `%s --help' o `%s --usage' para m # ¿No tendría sentido catalogarlos entonces? # # Véase "A Bug's life". -#: gnu/argp-help.c:1710 +#: gnu/argp-help.c:1712 #, c-format msgid "Report bugs to %s.\n" msgstr "Comunicar bichos a %s.\n" -#: gnu/argp-help.c:1929 gnu/error.c:183 +#: gnu/argp-help.c:1931 gnu/error.c:183 msgid "Unknown system error" msgstr "Error del sistema desconocido" @@ -215,16 +215,16 @@ msgstr "%s: la opci msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: la opción `%s' requiere un argumento\n" -#: gnu/obstack.c:425 gnu/obstack.c:427 gnu/xalloc-die.c:36 +#: gnu/obstack.c:423 gnu/obstack.c:425 gnu/xalloc-die.c:36 msgid "memory exhausted" msgstr "memoria agotada" -#: gnu/openat-die.c:36 +#: gnu/openat-die.c:40 #, fuzzy, c-format msgid "unable to record current working directory" msgstr "No se pudo obtener el directorio actual" -#: gnu/openat-die.c:54 +#: gnu/openat-die.c:59 #, fuzzy, c-format msgid "failed to return to initial working directory" msgstr "No se puede determinar el directorio de trabajo inicial" @@ -248,11 +248,11 @@ msgstr "No se puede determinar el directorio de trabajo inicial" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: gnu/quotearg.c:274 +#: gnu/quotearg.c:273 msgid "`" msgstr "`" -#: gnu/quotearg.c:275 +#: gnu/quotearg.c:274 msgid "'" msgstr "'" @@ -529,22 +529,22 @@ msgstr[0] "%s: S msgstr[1] "%s: Sólo se escribieron %lu de %lu bytes" # FIXME. This might not always work. Is `%.*s' male or female? sv -#: lib/paxnames.c:155 +#: lib/paxnames.c:140 #, c-format msgid "Removing leading `%s' from member names" msgstr "Eliminando la `%s' inicial de los nombres" -#: lib/paxnames.c:156 +#: lib/paxnames.c:141 #, c-format msgid "Removing leading `%s' from hard link targets" msgstr "Eliminando la `%s' inicial de los objetivos de los enlaces" # FIXME. This might not always work. Is `%.*s' male or female? sv -#: lib/paxnames.c:169 +#: lib/paxnames.c:154 msgid "Substituting `.' for empty member name" msgstr "Se sustituye `.' por el nombre vacío" -#: lib/paxnames.c:170 +#: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" msgstr "Se sustituye `.' por un objetivo vacío de enlace duro" @@ -951,16 +951,16 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "Sólo se pudieron leer %lu de %lu byte" msgstr[1] "Sólo se pudieron leer %lu de %lu bytes" -#: src/compare.c:105 src/compare.c:382 +#: src/compare.c:105 src/compare.c:383 msgid "Contents differ" msgstr "El contenido es distinto" -#: src/compare.c:131 src/extract.c:972 src/incremen.c:1462 src/list.c:458 -#: src/list.c:1392 src/xheader.c:711 +#: src/compare.c:131 src/extract.c:984 src/incremen.c:1456 src/list.c:456 +#: src/list.c:1388 src/xheader.c:711 msgid "Unexpected EOF in archive" msgstr "Fin de fichero inesperado en el archivo" -#: src/compare.c:179 src/compare.c:195 src/compare.c:308 src/compare.c:406 +#: src/compare.c:179 src/compare.c:195 src/compare.c:309 src/compare.c:407 msgid "File type differs" msgstr "El tipo de fichero es distinto" @@ -970,7 +970,7 @@ msgstr "El tipo de fichero es distinto" # corresponder siempre una frase corta española, el resultado sonará a indio # completamente (me refiero a los indios esos de las películas del oeste, # que solamente hablan con sustantivos, verbos y adjetivos). sv -#: src/compare.c:182 src/compare.c:202 src/compare.c:322 +#: src/compare.c:182 src/compare.c:202 src/compare.c:323 msgid "Mode differs" msgstr "El modo es distinto" @@ -986,30 +986,30 @@ msgstr "El gid es distinto" msgid "Mod time differs" msgstr "La fecha de modificación es distinta" -#: src/compare.c:215 src/compare.c:414 +#: src/compare.c:215 src/compare.c:415 msgid "Size differs" msgstr "El tamaño es distinto" # Creo que este enlace se efectúa al descomprimir un archivo tar. # No es que nos diga si está enlazado o no lo está, sino si él hace # el enlace o no lo hace. sv -#: src/compare.c:263 +#: src/compare.c:264 #, c-format msgid "Not linked to %s" msgstr "No se enlaza a %s" -#: src/compare.c:287 +#: src/compare.c:288 msgid "Symlink differs" msgstr "El enlace simbólico es distinto" -#: src/compare.c:316 +#: src/compare.c:317 msgid "Device number differs" msgstr "El número de dispositivo es distinto" # "Verifica ". Supongo que depende de si se concatena en algún # mensaje. jmg # FUZZY. Es verdad, habrá que verlo. -#: src/compare.c:456 +#: src/compare.c:457 #, c-format msgid "Verify " msgstr "Verificar " @@ -1022,30 +1022,35 @@ msgstr "Verificar " # Realmente, dice lo que hace y no lo que ha hecho. sv # FIXME. Decirle al autor que estandarice las comillas: ¿'%c' o `%c'? # De momento lo estandarizo en la traducción. -#: src/compare.c:463 +#: src/compare.c:464 #, fuzzy, c-format msgid "%s: Unknown file type `%c', diffed as normal file" msgstr "" "%s: Tipo de fichero `%c' desconocido, se toma la diferencia\n" "como fichero normal" -#: src/compare.c:518 +#: src/compare.c:520 msgid "Archive contains file names with leading prefixes removed." msgstr "" "El archivo contiene nombres de fichero con los prefijos iniciales eliminados." -#: src/compare.c:520 +#: src/compare.c:526 +#, fuzzy +msgid "Archive contains transformed file names." +msgstr "El archivo contiene la marca de tiempo en el futuro %s" + +#: src/compare.c:531 msgid "Verification may fail to locate original files." msgstr "Puede que la verificación no encuentre los ficheros originales." -#: src/compare.c:593 +#: src/compare.c:603 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "FALLO DE VERIFICACIÓN: %d cabecera inválida detectada" msgstr[1] "FALLO DE VERIFICACIÓN: %d cabeceras inválidas detectadas" -#: src/compare.c:611 src/list.c:222 +#: src/compare.c:621 src/list.c:222 #, c-format msgid "A lone zero block at %s" msgstr "Un bloque de ceros aislado en %s" @@ -1109,7 +1114,7 @@ msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: el fichero está en un sistema de ficheros distinto; no se vuelca" # Se vuelca la *memoria* del proceso en un fichero llamado `core'. -#: src/create.c:1203 src/create.c:1214 src/incremen.c:582 src/incremen.c:588 +#: src/create.c:1203 src/create.c:1214 src/incremen.c:578 src/incremen.c:584 #, fuzzy msgid "contents not dumped" msgstr " (memoria volcada)" @@ -1151,7 +1156,7 @@ msgstr "%s: el fichero no ha cambiado; no se vuelca" msgid "%s: file is the archive; not dumped" msgstr "%s: el fichero es el propio archivo; no se vuelca" -#: src/create.c:1723 src/incremen.c:575 +#: src/create.c:1723 src/incremen.c:571 #, fuzzy msgid "directory not dumped" msgstr "%s: contiene una marca de directorio caché; no se vuelca" @@ -1161,12 +1166,12 @@ msgstr "%s: contiene una marca de directorio cach msgid "%s: file changed as we read it" msgstr "%s: el fichero cambió mientras se estaba leyendo" -#: src/create.c:1857 +#: src/create.c:1858 #, c-format msgid "%s: socket ignored" msgstr "%s: el `socket' no se tendrá en cuenta" -#: src/create.c:1863 +#: src/create.c:1864 #, c-format msgid "%s: door ignored" msgstr "%s: no se tendrá en cuenta la puerta" @@ -1194,7 +1199,7 @@ msgstr "%s: la marca de tiempo %s est msgid "%s: Unexpected inconsistency when making directory" msgstr "%s: Inconsistencia inesperada al crear el directorio" -#: src/extract.c:709 +#: src/extract.c:721 #, c-format msgid "%s: Directory renamed before its status could be extracted" msgstr "" @@ -1204,7 +1209,7 @@ msgstr "" # ni un dispositivo (de bloques o de caracteres) ni un fifo, etc. # Uno puede pensar que son los ficheros "normales", pero eso depende, # pues un directorio es de lo más "normal"... -#: src/extract.c:863 +#: src/extract.c:875 msgid "Extracting contiguous files as regular files" msgstr "Extrayendo ficheros contiguos como ficheros regulares" @@ -1213,165 +1218,165 @@ msgstr "Extrayendo ficheros contiguos como ficheros regulares" # Es una cuestión todavía no dirimida. # ¿Tienes algún dato más? ¿Qué dicen los libros? sv # Enlaces duros. Lo acabo de mirar en un libro. gag -#: src/extract.c:1197 +#: src/extract.c:1209 msgid "Attempting extraction of symbolic links as hard links" msgstr "Intentando la extracción de enlaces simbólicos como enlaces duros" -#: src/extract.c:1353 +#: src/extract.c:1365 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: No se puede extraer -- el fichero es continuación de otro volumen" # ¿No se referirá al autor a "mangled filenames"?... jmg # FIXME. Preguntárselo. -#: src/extract.c:1360 src/list.c:1125 +#: src/extract.c:1372 src/list.c:1121 #, fuzzy msgid "Unexpected long name header" msgstr "Fin de fichero inesperado en los nombres modificados" # FIXME. Lo de las comillas '%c'. # Como antes, lo estandarizo en la traducción a pesar de todo. -#: src/extract.c:1367 +#: src/extract.c:1379 #, fuzzy, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Tipo de fichero `%c' desconocido, se extrae como fichero normal" -#: src/extract.c:1393 +#: src/extract.c:1405 #, fuzzy, c-format msgid "Current %s is newer or same age" msgstr "El `%s' actual es más reciente" -#: src/extract.c:1445 +#: src/extract.c:1457 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: No se pudo hacer copia de seguridad de este fichero" -#: src/extract.c:1582 +#: src/extract.c:1594 #, fuzzy, c-format msgid "Cannot rename %s to %s" msgstr "%s: No se puede renombrar a %s" -#: src/incremen.c:474 src/incremen.c:518 +#: src/incremen.c:473 src/incremen.c:517 #, fuzzy, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: El directorio ha sido renombrado" -#: src/incremen.c:486 +#: src/incremen.c:485 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: El directorio ha sido renombrado" -#: src/incremen.c:531 +#: src/incremen.c:530 #, c-format msgid "%s: Directory is new" msgstr "%s: El directorio es nuevo" -#: src/incremen.c:956 src/incremen.c:973 +#: src/incremen.c:951 src/incremen.c:968 msgid "Invalid time stamp" msgstr "Marca de tiempo inválida" -#: src/incremen.c:1012 +#: src/incremen.c:1007 #, fuzzy msgid "Invalid modification time (seconds)" msgstr "Se ha especificado un modo no válido en la opción" -#: src/incremen.c:1027 +#: src/incremen.c:1022 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:1047 +#: src/incremen.c:1042 msgid "Invalid device number" msgstr "Número de dispositivo inválido" -#: src/incremen.c:1062 +#: src/incremen.c:1057 msgid "Invalid inode number" msgstr "Número de nodo-i inválido" -#: src/incremen.c:1113 src/incremen.c:1150 +#: src/incremen.c:1108 src/incremen.c:1145 msgid "Field too long while reading snapshot file" msgstr "" -#: src/incremen.c:1120 src/incremen.c:1158 +#: src/incremen.c:1115 src/incremen.c:1153 #, fuzzy msgid "Read error in snapshot file" msgstr "Error de lectura en %s" -#: src/incremen.c:1122 src/incremen.c:1162 src/incremen.c:1214 -#: src/incremen.c:1272 +#: src/incremen.c:1117 src/incremen.c:1157 src/incremen.c:1209 +#: src/incremen.c:1267 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "Fin de fichero inesperado en el archivo" -#: src/incremen.c:1129 src/incremen.c:1169 +#: src/incremen.c:1124 src/incremen.c:1164 msgid "Unexpected field value in snapshot file" msgstr "" -#: src/incremen.c:1264 +#: src/incremen.c:1259 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1325 src/incremen.c:1328 +#: src/incremen.c:1320 src/incremen.c:1323 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1347 +#: src/incremen.c:1342 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1502 +#: src/incremen.c:1496 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1512 +#: src/incremen.c:1506 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1525 +#: src/incremen.c:1519 #, fuzzy msgid "Malformed dumpdir: empty name in 'R'" msgstr "Argumento de densidad mal formado: '%s'" -#: src/incremen.c:1538 +#: src/incremen.c:1532 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1544 +#: src/incremen.c:1538 #, fuzzy msgid "Malformed dumpdir: empty name in 'T'" msgstr "Argumento de densidad mal formado: '%s'" -#: src/incremen.c:1564 +#: src/incremen.c:1558 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1571 +#: src/incremen.c:1565 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1615 +#: src/incremen.c:1609 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "" -#: src/incremen.c:1677 +#: src/incremen.c:1670 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: No se purga el directorio: no se puede efectuar `stat'" -#: src/incremen.c:1690 +#: src/incremen.c:1683 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: el directorio está en un dispositivo distinto: no se purga" -#: src/incremen.c:1698 +#: src/incremen.c:1691 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Borrando %s\n" -#: src/incremen.c:1703 +#: src/incremen.c:1696 #, c-format msgid "%s: Cannot remove" msgstr "%s: No se puede borrar" @@ -1391,20 +1396,20 @@ msgstr "bloque %s: ** Bloque de NULos **\n" msgid "block %s: ** End of File **\n" msgstr "bloque %s: ** Fin de Fichero **\n" -#: src/list.c:256 src/list.c:1097 src/list.c:1360 +#: src/list.c:256 src/list.c:1093 src/list.c:1356 #, c-format msgid "block %s: " msgstr "bloque %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:712 +#: src/list.c:708 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Hay blancos en la cabecera cuando se esperaba el valor numérico %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:767 +#: src/list.c:763 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1412,127 +1417,122 @@ msgstr "" "se supone complemento a dos" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:778 +#: src/list.c:774 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "El valor octal %.*s del archivo está fuera del rango %s" -#: src/list.c:799 +#: src/list.c:795 msgid "Archive contains obsolescent base-64 headers" msgstr "El archivo contiene cabeceras base 64 obsoletas" -#: src/list.c:813 +#: src/list.c:809 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "La cadena firmada en base 64 %s del archivo está fuera del rango %s" -#: src/list.c:844 +#: src/list.c:840 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "El valor en base 256 del archivo está fuera del rango %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:873 +#: src/list.c:869 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "El archivo contiene %.*s donde se esperaba el valor numérico %s" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:895 +#: src/list.c:891 #, fuzzy, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "El valor del archivo %s está fuera del rango %s %s.%s" -#: src/list.c:1261 +#: src/list.c:1257 #, c-format msgid " link to %s\n" msgstr " enlace a %s\n" -#: src/list.c:1269 +#: src/list.c:1265 #, c-format msgid " unknown file type %s\n" msgstr " tipo de fichero desconocido %s\n" -#: src/list.c:1287 +#: src/list.c:1283 #, c-format msgid "--Long Link--\n" msgstr "--Enlace largo--\n" -#: src/list.c:1291 +#: src/list.c:1287 #, c-format msgid "--Long Name--\n" msgstr "--Nombre largo--\n" -#: src/list.c:1295 +#: src/list.c:1291 #, c-format msgid "--Volume Header--\n" msgstr "--Cabecera de Volumen--\n" -#: src/list.c:1303 +#: src/list.c:1299 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Continúa en el byte %s--\n" -#: src/list.c:1365 +#: src/list.c:1361 msgid "Creating directory:" msgstr "Creando el directorio:" -#: src/misc.c:298 +#: src/misc.c:297 #, fuzzy msgid "Cannot get working directory" msgstr "No se puede cambiar el directorio de trabajo" -#: src/misc.c:571 +#: src/misc.c:570 #, c-format msgid "Renaming %s to %s\n" msgstr "Se renombra %s como %s\n" -#: src/misc.c:580 src/misc.c:599 +#: src/misc.c:579 src/misc.c:598 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: No se puede renombrar a %s" -#: src/misc.c:604 +#: src/misc.c:603 #, c-format msgid "Renaming %s back to %s\n" msgstr "Se vuelve a renombrar %s como %s\n" -#: src/misc.c:851 +#: src/misc.c:850 #, c-format msgid "%s: File removed before we read it" msgstr "%s: El fichero fue borrado antes de leerlo" -#: src/misc.c:866 -#, fuzzy, c-format -msgid "%s: Directory removed before we read it" -msgstr "%s: El fichero fue borrado antes de leerlo" - -#: src/misc.c:887 +#: src/misc.c:871 msgid "child process" msgstr "proceso hijo" -#: src/misc.c:896 +#: src/misc.c:880 msgid "interprocess channel" msgstr "canal de interproceso" -#: src/names.c:594 +#: src/names.c:590 #, fuzzy msgid "Pattern matching characters used in file names" msgstr "" "los patrones de exclusión encajan con el comienzo del nombre del fichero" -#: src/names.c:596 +#: src/names.c:592 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" msgstr "" -#: src/names.c:614 src/names.c:630 +#: src/names.c:610 src/names.c:626 #, c-format msgid "%s: Not found in archive" msgstr "%s: No se encuentra en el archivo" -#: src/names.c:615 +#: src/names.c:611 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: El elemento solicitado no se encuentra en el archivo" @@ -1543,17 +1543,17 @@ msgstr "%s: El elemento solicitado no se encuentra en el archivo" # Si no se sabe eso, se podría dejar de forma más neutra como # "Archivo no etiquetado para concordancia con `%s'" - gerardo (gag) # FIXME: Preguntar. -#: src/names.c:649 +#: src/names.c:645 #, fuzzy, c-format msgid "Archive label mismatch" msgstr "El archivo no está etiquetado para que coincida con %s" -#: src/names.c:953 +#: src/names.c:949 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" -#: src/names.c:959 +#: src/names.c:955 msgid "Only one -C option is allowed with --listed-incremental" msgstr "" @@ -3102,6 +3102,10 @@ msgstr "" msgid "--stat requires file names" msgstr "--Nombres de fichero modificados--\n" +#, fuzzy +#~ msgid "%s: Directory removed before we read it" +#~ msgstr "%s: El fichero fue borrado antes de leerlo" + #, fuzzy #~ msgid "Cannot restore working directory" #~ msgstr "No se puede guardar el directorio de trabajo" @@ -3747,9 +3751,6 @@ msgstr "--Nombres de fichero modificados--\n" #~ msgid "Removing `%.*s' prefix from member names" #~ msgstr "Eliminando el prefijo `%.*s' de los nombres" -#~ msgid "Archive contains future timestamp %s" -#~ msgstr "El archivo contiene la marca de tiempo en el futuro %s" - #~ msgid "%s: Cannot symlink %s %s" #~ msgstr "%s: No se puede crear el enlace simbólico %s %s" diff --git a/po/et.gmo b/po/et.gmo index bae3e9457a6db40535d94f1f2e97e6c61924bd84..5cd146ca4f0695be7714e533e7fe7d877ea08026 100644 GIT binary patch delta 9691 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 A=l}o! diff --git a/po/et.po b/po/et.po index 64b3e11f..e5554b47 100644 --- a/po/et.po +++ b/po/et.po @@ -6,10 +6,10 @@ #: src/create.c:1552 msgid "" msgstr "" -"Project-Id-Version: GNU tar 1.23.90\n" +"Project-Id-Version: GNU tar 1.25\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2010-11-07 17:07+0200\n" -"PO-Revision-Date: 2010-08-11 17:57+0300\n" +"POT-Creation-Date: 2011-03-12 11:53+0200\n" +"PO-Revision-Date: 2010-11-11 11:26+0200\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" "Language: et\n" @@ -58,7 +58,7 @@ msgstr "%.*s: Tundmatu ARGP_HELP_FMT parameeter" msgid "Garbage in ARGP_HELP_FMT: %s" msgstr "Prügi ARGP_HELP_FMT parameetrites: %s" -#: gnu/argp-help.c:1246 +#: gnu/argp-help.c:1248 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." @@ -66,29 +66,29 @@ msgstr "" "Kohustuslikud või mittekohustuslikud argumendid pikkadele võtmetele on ka " "kohustuslikud või mittekohustuslikud vastavatele lühikestele võtmetele." -#: gnu/argp-help.c:1639 +#: gnu/argp-help.c:1641 msgid "Usage:" msgstr "Kasutamine:" -#: gnu/argp-help.c:1643 +#: gnu/argp-help.c:1645 msgid " or: " msgstr " või: " -#: gnu/argp-help.c:1655 +#: gnu/argp-help.c:1657 msgid " [OPTION...]" msgstr " [VÕTI...]" -#: gnu/argp-help.c:1682 +#: gnu/argp-help.c:1684 #, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "`%s --help' või `%s --usage' annab rohkem infot.\n" -#: gnu/argp-help.c:1710 +#: gnu/argp-help.c:1712 #, c-format msgid "Report bugs to %s.\n" msgstr "Teated vigadest saatke palun aadressil %s.\n" -#: gnu/argp-help.c:1929 gnu/error.c:183 +#: gnu/argp-help.c:1931 gnu/error.c:183 msgid "Unknown system error" msgstr "Tundmatu süsteemi viga" @@ -194,16 +194,16 @@ msgstr "%s: v msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: võti '-W %s' nõuab argumenti\n" -#: gnu/obstack.c:425 gnu/obstack.c:427 gnu/xalloc-die.c:36 +#: gnu/obstack.c:423 gnu/obstack.c:425 gnu/xalloc-die.c:36 msgid "memory exhausted" msgstr "mälu on otsas" -#: gnu/openat-die.c:36 +#: gnu/openat-die.c:40 #, c-format msgid "unable to record current working directory" msgstr "ei õnnestu salvestada jooksvat töökataloogi" -#: gnu/openat-die.c:54 +#: gnu/openat-die.c:59 #, c-format msgid "failed to return to initial working directory" msgstr "algsesse töökataloogi ei õnnestu tagasi minna" @@ -227,11 +227,11 @@ msgstr "algsesse t #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: gnu/quotearg.c:274 +#: gnu/quotearg.c:273 msgid "`" msgstr "`" -#: gnu/quotearg.c:275 +#: gnu/quotearg.c:274 msgid "'" msgstr "'" @@ -498,21 +498,21 @@ msgid_plural "%s: Wrote only %lu of %lu bytes" msgstr[0] "%s: Sain kirjutada ainult %lu baiti (soovisin %lu)" msgstr[1] "%s: Sain kirjutada ainult %lu baiti (soovisin %lu)" -#: lib/paxnames.c:155 +#: lib/paxnames.c:140 #, c-format msgid "Removing leading `%s' from member names" msgstr "Eemaldan liikmete nimedelt prefiksi `%s'" -#: lib/paxnames.c:156 +#: lib/paxnames.c:141 #, c-format msgid "Removing leading `%s' from hard link targets" msgstr "Eemaldan viidatavate nimedelt prefiksi `%s'" -#: lib/paxnames.c:169 +#: lib/paxnames.c:154 msgid "Substituting `.' for empty member name" msgstr "Kasutan tühjade nimede asemel `.'" -#: lib/paxnames.c:170 +#: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" msgstr "Kasutan tühja viidatava nime asemel `.'" @@ -805,20 +805,20 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "Sain lugeda ainult %lu baiti (sooviti %lu)" msgstr[1] "Sain lugeda ainult %lu baiti (sooviti %lu)" -#: src/compare.c:105 src/compare.c:382 +#: src/compare.c:105 src/compare.c:383 msgid "Contents differ" msgstr "Sisu on erinev" -#: src/compare.c:131 src/extract.c:972 src/incremen.c:1462 src/list.c:458 -#: src/list.c:1392 src/xheader.c:711 +#: src/compare.c:131 src/extract.c:984 src/incremen.c:1456 src/list.c:456 +#: src/list.c:1388 src/xheader.c:711 msgid "Unexpected EOF in archive" msgstr "Ootamatu arhiivi lõpp" -#: src/compare.c:179 src/compare.c:195 src/compare.c:308 src/compare.c:406 +#: src/compare.c:179 src/compare.c:195 src/compare.c:309 src/compare.c:407 msgid "File type differs" msgstr "Failitüübid on erinevad" -#: src/compare.c:182 src/compare.c:202 src/compare.c:322 +#: src/compare.c:182 src/compare.c:202 src/compare.c:323 msgid "Mode differs" msgstr "Moodid erinevad" @@ -834,49 +834,54 @@ msgstr "GID on erinevad" msgid "Mod time differs" msgstr "Muutmise ajad erinevad" -#: src/compare.c:215 src/compare.c:414 +#: src/compare.c:215 src/compare.c:415 msgid "Size differs" msgstr "Suurused erinevad" -#: src/compare.c:263 +#: src/compare.c:264 #, c-format msgid "Not linked to %s" msgstr "ei viita %s-le" -#: src/compare.c:287 +#: src/compare.c:288 msgid "Symlink differs" msgstr "Nimeviited erinevad" -#: src/compare.c:316 +#: src/compare.c:317 msgid "Device number differs" msgstr "Seadme numbrid on erinevad" -#: src/compare.c:456 +#: src/compare.c:457 #, c-format msgid "Verify " msgstr "Kontroll " -#: src/compare.c:463 +#: src/compare.c:464 #, c-format msgid "%s: Unknown file type `%c', diffed as normal file" msgstr "%s: Tundmatu failitüüp '%c', võrdlen tavalise failina" -#: src/compare.c:518 +#: src/compare.c:520 msgid "Archive contains file names with leading prefixes removed." msgstr "Arhiiv sisaldab eemaldatud prefiksitega failinimesid." -#: src/compare.c:520 +#: src/compare.c:526 +#, fuzzy +msgid "Archive contains transformed file names." +msgstr "Arhiiv sisaldab aegunuid base-64 päiseid" + +#: src/compare.c:531 msgid "Verification may fail to locate original files." msgstr "Kontrollimine ei pruugi leida algseid faile." -#: src/compare.c:593 +#: src/compare.c:603 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "VIGA KONTROLLIMISEL: leiti %d vigast päist" msgstr[1] "VIGA KONTROLLIMISEL: leiti %d vigast päist" -#: src/compare.c:611 src/list.c:222 +#: src/compare.c:621 src/list.c:222 #, c-format msgid "A lone zero block at %s" msgstr "Üksik null blokk kohal %s" @@ -927,7 +932,7 @@ msgstr[1] "%s: Fail l msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: fail on teises failisüsteemis; ei salvesta" -#: src/create.c:1203 src/create.c:1214 src/incremen.c:582 src/incremen.c:588 +#: src/create.c:1203 src/create.c:1214 src/incremen.c:578 src/incremen.c:584 msgid "contents not dumped" msgstr "sisu ei salestata" @@ -951,7 +956,7 @@ msgstr "%s: pole muutunud; ei salvesta" msgid "%s: file is the archive; not dumped" msgstr "%s on arhiiv; ei salvesta" -#: src/create.c:1723 src/incremen.c:575 +#: src/create.c:1723 src/incremen.c:571 msgid "directory not dumped" msgstr "kataloogi ei salvestatud" @@ -960,12 +965,12 @@ msgstr "kataloogi ei salvestatud" msgid "%s: file changed as we read it" msgstr "%s: fail muutus lugemisel" -#: src/create.c:1857 +#: src/create.c:1858 #, c-format msgid "%s: socket ignored" msgstr "%s: ignoreerin pesa" -#: src/create.c:1863 +#: src/create.c:1864 #, c-format msgid "%s: door ignored" msgstr "%s: ignoreerin ust" @@ -993,164 +998,164 @@ msgstr "%s: ajatempel %s on %s sekundit tulevikus" msgid "%s: Unexpected inconsistency when making directory" msgstr "%s: Ootamatu kooskõlalisuse probleem kataloogi loomisel" -#: src/extract.c:709 +#: src/extract.c:721 #, c-format msgid "%s: Directory renamed before its status could be extracted" msgstr "%s: Kataloog nimetati ümber, enne kui sai loetud tema olek" -#: src/extract.c:863 +#: src/extract.c:875 msgid "Extracting contiguous files as regular files" msgstr "Taastan jätkuvad failid kui tavalised" -#: src/extract.c:1197 +#: src/extract.c:1209 msgid "Attempting extraction of symbolic links as hard links" msgstr "Üritan taastada nimeviiteid viidetena" -#: src/extract.c:1353 +#: src/extract.c:1365 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Ei saa taastada -- fail jätkub teisel volüümil" -#: src/extract.c:1360 src/list.c:1125 +#: src/extract.c:1372 src/list.c:1121 msgid "Unexpected long name header" msgstr "Ootamatu pika nime päis" -#: src/extract.c:1367 +#: src/extract.c:1379 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Tundmatu failitüüp `%c', taastan tavalise failina" -#: src/extract.c:1393 +#: src/extract.c:1405 #, c-format msgid "Current %s is newer or same age" msgstr "Olemasolev %s on uuem või sama kuupäevaga" -#: src/extract.c:1445 +#: src/extract.c:1457 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Selle faili varundamine ebaõnnestus" -#: src/extract.c:1582 +#: src/extract.c:1594 #, c-format msgid "Cannot rename %s to %s" msgstr "%s ei õnnestu ümber nimetada %s-ks" -#: src/incremen.c:474 src/incremen.c:518 +#: src/incremen.c:473 src/incremen.c:517 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Kataloog %s on ümber nimetatud" -#: src/incremen.c:486 +#: src/incremen.c:485 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Kataloog on ümber nimetatud" -#: src/incremen.c:531 +#: src/incremen.c:530 #, c-format msgid "%s: Directory is new" msgstr "%s: Kataloog on uus" -#: src/incremen.c:956 src/incremen.c:973 +#: src/incremen.c:951 src/incremen.c:968 msgid "Invalid time stamp" msgstr "Vigane ajatempel" -#: src/incremen.c:1012 +#: src/incremen.c:1007 msgid "Invalid modification time (seconds)" msgstr "Vigane muutmise aeg (sekundid)" -#: src/incremen.c:1027 +#: src/incremen.c:1022 msgid "Invalid modification time (nanoseconds)" msgstr "Vigane muutmise aeg (nanosekundid)" -#: src/incremen.c:1047 +#: src/incremen.c:1042 msgid "Invalid device number" msgstr "Vigane seadmenumber" -#: src/incremen.c:1062 +#: src/incremen.c:1057 msgid "Invalid inode number" msgstr "Vigane i-kirje number" -#: src/incremen.c:1113 src/incremen.c:1150 +#: src/incremen.c:1108 src/incremen.c:1145 msgid "Field too long while reading snapshot file" msgstr "Snapshoti faili lugemisel leiti liiga pikk väli" -#: src/incremen.c:1120 src/incremen.c:1158 +#: src/incremen.c:1115 src/incremen.c:1153 msgid "Read error in snapshot file" msgstr "Snapshoti failist lugemise viga" -#: src/incremen.c:1122 src/incremen.c:1162 src/incremen.c:1214 -#: src/incremen.c:1272 +#: src/incremen.c:1117 src/incremen.c:1157 src/incremen.c:1209 +#: src/incremen.c:1267 msgid "Unexpected EOF in snapshot file" msgstr "Ootamatu snapshoti faili lõpp" -#: src/incremen.c:1129 src/incremen.c:1169 +#: src/incremen.c:1124 src/incremen.c:1164 msgid "Unexpected field value in snapshot file" msgstr "Snapshoti failis on väljal ootamatu väärtus" -#: src/incremen.c:1264 +#: src/incremen.c:1259 msgid "Missing record terminator" msgstr "Puudub kirje lõpetaja" -#: src/incremen.c:1325 src/incremen.c:1328 +#: src/incremen.c:1320 src/incremen.c:1323 msgid "Bad incremental file format" msgstr "Inkrementaalse faili vorming on vigane" -#: src/incremen.c:1347 +#: src/incremen.c:1342 #, c-format msgid "Unsupported incremental format version: %" msgstr "Mittetoetatud inkrementaalse vormingu versioon: %" -#: src/incremen.c:1502 +#: src/incremen.c:1496 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "Vigane taastamise kataloog: eeldasin '%c', sain %#3o" -#: src/incremen.c:1512 +#: src/incremen.c:1506 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Vigane taastamise kataloog: dubleeritud 'X'" -#: src/incremen.c:1525 +#: src/incremen.c:1519 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Vigane taastamise kataloog: tühi nimi 'R' väljal" -#: src/incremen.c:1538 +#: src/incremen.c:1532 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Vigane taastamise kataloog: 'R' ei ole 'T' ees" -#: src/incremen.c:1544 +#: src/incremen.c:1538 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Vigane taastamise kataloog: tühi nimi 'T' väljal" -#: src/incremen.c:1564 +#: src/incremen.c:1558 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "Vigane taastamise kataloog: ootasin '%c', aga andmed said otsa" -#: src/incremen.c:1571 +#: src/incremen.c:1565 msgid "Malformed dumpdir: 'X' never used" msgstr "Vigane taastamise kataloog: 'X' ei kasutata" -#: src/incremen.c:1615 +#: src/incremen.c:1609 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Vormiga %s ei saa ajutist kataloogi luua" -#: src/incremen.c:1677 +#: src/incremen.c:1670 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Ei puhasta kataloogi: stat ebaõnnestus" -#: src/incremen.c:1690 +#: src/incremen.c:1683 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: kataloog on teisel seadmel; ei puhasta" -#: src/incremen.c:1698 +#: src/incremen.c:1691 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Kustutan %s\n" -#: src/incremen.c:1703 +#: src/incremen.c:1696 #, c-format msgid "%s: Cannot remove" msgstr "%s: Ei saa eemaldada" @@ -1170,134 +1175,128 @@ msgstr "blokk %s: ** NULlide blokk **\n" msgid "block %s: ** End of File **\n" msgstr "blokk %s: ** Faili lõpp **\n" -#: src/list.c:256 src/list.c:1097 src/list.c:1360 +#: src/list.c:256 src/list.c:1093 src/list.c:1356 #, c-format msgid "block %s: " msgstr "blokk %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:712 +#: src/list.c:708 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Tühjad väljad päises kohtadel, kus eeldati numbrit %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:767 +#: src/list.c:763 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" "Arhiivi kaheksandväärtus %.*s on %s piiridest väljas; eeldan kahe täiendit" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:778 +#: src/list.c:774 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Arhiivi kaheksandväärtus %.*s on %s piiridest väljas" -#: src/list.c:799 +#: src/list.c:795 msgid "Archive contains obsolescent base-64 headers" msgstr "Arhiiv sisaldab aegunuid base-64 päiseid" -#: src/list.c:813 +#: src/list.c:809 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "Arhiivi märgiga base-64 sõne %s on %s piiridest väljas" -#: src/list.c:844 +#: src/list.c:840 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Arhiivi base-256 väärtus on %s piiridest väljas" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:873 +#: src/list.c:869 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Arhiiv sisaldab %.*s, eeldati numbrit %s" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:895 +#: src/list.c:891 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Arhiivi väärtus %s on %s piiridest %s..%s väljas" -#: src/list.c:1261 +#: src/list.c:1257 #, c-format msgid " link to %s\n" msgstr " viide %s-le\n" -#: src/list.c:1269 +#: src/list.c:1265 #, c-format msgid " unknown file type %s\n" msgstr " tundmatu failitüüp %s\n" -#: src/list.c:1287 +#: src/list.c:1283 #, c-format msgid "--Long Link--\n" msgstr "--Pikk viide--\n" -#: src/list.c:1291 +#: src/list.c:1287 #, c-format msgid "--Long Name--\n" msgstr "--Pikk nimi--\n" -#: src/list.c:1295 +#: src/list.c:1291 #, c-format msgid "--Volume Header--\n" msgstr "--Volüümi päis--\n" -#: src/list.c:1303 +#: src/list.c:1299 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Jätkub baidilt %s--\n" -#: src/list.c:1365 +#: src/list.c:1361 msgid "Creating directory:" msgstr "Loon kataloogi:" -#: src/misc.c:298 -#, fuzzy +#: src/misc.c:297 msgid "Cannot get working directory" -msgstr "Ei õnnestu vahetada töökataloogi" +msgstr "Ei õnnestu lugeda töökataloogi" -#: src/misc.c:571 +#: src/misc.c:570 #, c-format msgid "Renaming %s to %s\n" msgstr "Annan %s uueks nimeks %s\n" -#: src/misc.c:580 src/misc.c:599 +#: src/misc.c:579 src/misc.c:598 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: ei õnnestu ümber nimetada %s-ks" -#: src/misc.c:604 +#: src/misc.c:603 #, c-format msgid "Renaming %s back to %s\n" msgstr "Nimetan `%s' tagasi `%s'\n" -#: src/misc.c:851 +#: src/misc.c:850 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Fail kustutati enne lugemist" -#: src/misc.c:866 -#, c-format -msgid "%s: Directory removed before we read it" -msgstr "%s: Kataloog kustutati enne lugemist" - -#: src/misc.c:887 +#: src/misc.c:871 msgid "child process" msgstr "alamprotsess" -#: src/misc.c:896 +#: src/misc.c:880 msgid "interprocess channel" msgstr "protsessidevaheline kanal" -#: src/names.c:594 +#: src/names.c:590 msgid "Pattern matching characters used in file names" msgstr "Failide nimedes on jokkersümbolid" -#: src/names.c:596 +#: src/names.c:592 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" @@ -1305,27 +1304,27 @@ msgstr "" "Jokkerite lubamiseks kasutage --wildcars või --no-wildcards selle teate " "blokeerimiseks" -#: src/names.c:614 src/names.c:630 +#: src/names.c:610 src/names.c:626 #, c-format msgid "%s: Not found in archive" msgstr "%s: Puudub arhiivis" -#: src/names.c:615 +#: src/names.c:611 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Nõutud eksemplar puudub arhiivis" -#: src/names.c:649 +#: src/names.c:645 #, c-format msgid "Archive label mismatch" msgstr "Arhiivi märgend ei sobi" -#: src/names.c:953 +#: src/names.c:949 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "--listed-incremental ei luba faili loendis võtit -C kasutada" -#: src/names.c:959 +#: src/names.c:955 msgid "Only one -C option is allowed with --listed-incremental" msgstr "Võti --listed-incremental lubab ainult ühte -C kasutamist" @@ -2703,5 +2702,5 @@ msgstr "K msgid "--stat requires file names" msgstr "--stat nõuab failinimesid" -#~ msgid "Cannot save working directory" -#~ msgstr "Töökataloogi ei õnnestu salvestada" +#~ msgid "%s: Directory removed before we read it" +#~ msgstr "%s: Kataloog kustutati enne lugemist" diff --git a/po/eu.gmo b/po/eu.gmo index ff4504c324bd6557f61f97142899737508d50b40..b08f4dae4efb596fe2fa45655aa8945e02b707ff 100644 GIT binary patch delta 28 kcmcaQf$8c5rVSJPcnx(8jCBo-6bucmOpQ0s_1j?y0Fe6$ZU6uP delta 28 kcmcaQf$8c5rVSJPcnx$74RsC76%5U-49qvr_1j?y0FgBbbpQYW diff --git a/po/eu.po b/po/eu.po index 44857157..cea5af3c 100644 --- a/po/eu.po +++ b/po/eu.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: tar-1.15.91-eu\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2010-11-07 17:07+0200\n" +"POT-Creation-Date: 2011-03-12 11:53+0200\n" "PO-Revision-Date: 2006-12-13 19:52+0100\n" "Last-Translator: Mikel Olasagasti \n" "Language-Team: Basque \n" @@ -60,7 +60,7 @@ msgstr "%.*s: ARGP_HELP_FMT parametro ezezaguna" msgid "Garbage in ARGP_HELP_FMT: %s" msgstr "Zaborra ARGP_HELP_FMT-en: %s" -#: gnu/argp-help.c:1246 +#: gnu/argp-help.c:1248 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." @@ -68,29 +68,29 @@ msgstr "" "Aukera luzeentzat beharrezko edo aukerako argumentuak modu berdinean " "beharrezko edo aukerakoak izango dira aukera luzeentzat ere." -#: gnu/argp-help.c:1639 +#: gnu/argp-help.c:1641 msgid "Usage:" msgstr "Erabilera:" -#: gnu/argp-help.c:1643 +#: gnu/argp-help.c:1645 msgid " or: " msgstr " edo: " -#: gnu/argp-help.c:1655 +#: gnu/argp-help.c:1657 msgid " [OPTION...]" msgstr " [AUKERA...]" -#: gnu/argp-help.c:1682 +#: gnu/argp-help.c:1684 #, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "`%s --help' edo `%s --usage' saiatu argibide gehiagorako.\n" -#: gnu/argp-help.c:1710 +#: gnu/argp-help.c:1712 #, c-format msgid "Report bugs to %s.\n" msgstr "Arazoen berri %s-en eman.\n" -#: gnu/argp-help.c:1929 gnu/error.c:183 +#: gnu/argp-help.c:1931 gnu/error.c:183 msgid "Unknown system error" msgstr "Sistema errore ezezaguna" @@ -196,16 +196,16 @@ msgstr "%s: `-W %s' aukerak ez du argumenturik onartzen\n" msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: `%s' aukerak argumentu bat behar du\n" -#: gnu/obstack.c:425 gnu/obstack.c:427 gnu/xalloc-die.c:36 +#: gnu/obstack.c:423 gnu/obstack.c:425 gnu/xalloc-die.c:36 msgid "memory exhausted" msgstr "memoria askieza" -#: gnu/openat-die.c:36 +#: gnu/openat-die.c:40 #, fuzzy, c-format msgid "unable to record current working directory" msgstr "Ezin da lan direktorioa aldatu" -#: gnu/openat-die.c:54 +#: gnu/openat-die.c:59 #, fuzzy, c-format msgid "failed to return to initial working directory" msgstr "Ezin da lan direktorioa gorde" @@ -229,11 +229,11 @@ msgstr "Ezin da lan direktorioa gorde" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: gnu/quotearg.c:274 +#: gnu/quotearg.c:273 msgid "`" msgstr "`" -#: gnu/quotearg.c:275 +#: gnu/quotearg.c:274 msgid "'" msgstr "'" @@ -476,21 +476,21 @@ msgid_plural "%s: Wrote only %lu of %lu bytes" msgstr[0] "" msgstr[1] "" -#: lib/paxnames.c:155 +#: lib/paxnames.c:140 #, c-format msgid "Removing leading `%s' from member names" msgstr "" -#: lib/paxnames.c:156 +#: lib/paxnames.c:141 #, c-format msgid "Removing leading `%s' from hard link targets" msgstr "" -#: lib/paxnames.c:169 +#: lib/paxnames.c:154 msgid "Substituting `.' for empty member name" msgstr "`.' partaide izen hutsagatik aldatzen" -#: lib/paxnames.c:170 +#: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" msgstr "`.' lotura gogor helburu hutsegatik aldatzen" @@ -787,20 +787,20 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "%lu byte bakarrik irakurri daiteke %lu byte-tatik" msgstr[1] "%lu byte bakarrik irakurri daiteke %lu byte-tatik" -#: src/compare.c:105 src/compare.c:382 +#: src/compare.c:105 src/compare.c:383 msgid "Contents differ" msgstr "Eduki ezberdintasunak" -#: src/compare.c:131 src/extract.c:972 src/incremen.c:1462 src/list.c:458 -#: src/list.c:1392 src/xheader.c:711 +#: src/compare.c:131 src/extract.c:984 src/incremen.c:1456 src/list.c:456 +#: src/list.c:1388 src/xheader.c:711 msgid "Unexpected EOF in archive" msgstr "Esperogabeko Fitxategi amaiaera paketean" -#: src/compare.c:179 src/compare.c:195 src/compare.c:308 src/compare.c:406 +#: src/compare.c:179 src/compare.c:195 src/compare.c:309 src/compare.c:407 msgid "File type differs" msgstr "Fixtategi mota ezberdinak" -#: src/compare.c:182 src/compare.c:202 src/compare.c:322 +#: src/compare.c:182 src/compare.c:202 src/compare.c:323 msgid "Mode differs" msgstr "Modu ezberdinak" @@ -816,49 +816,54 @@ msgstr "Gid ezberdinak" msgid "Mod time differs" msgstr "Eraldaketa data ezberdinak" -#: src/compare.c:215 src/compare.c:414 +#: src/compare.c:215 src/compare.c:415 msgid "Size differs" msgstr "Tamaina ezberdinak" -#: src/compare.c:263 +#: src/compare.c:264 #, c-format msgid "Not linked to %s" msgstr "Ez dago %s-ra loturik" -#: src/compare.c:287 +#: src/compare.c:288 msgid "Symlink differs" msgstr "Lotura sinboliko ezberdinak" -#: src/compare.c:316 +#: src/compare.c:317 msgid "Device number differs" msgstr "Gailu zenbaki ezberdinak" -#: src/compare.c:456 +#: src/compare.c:457 #, c-format msgid "Verify " msgstr "Egiaztatu " -#: src/compare.c:463 +#: src/compare.c:464 #, c-format msgid "%s: Unknown file type `%c', diffed as normal file" msgstr "%s: `%c' fitxategi mota ezezaguna, fitxategi arrunt batez ezberdina" -#: src/compare.c:518 +#: src/compare.c:520 msgid "Archive contains file names with leading prefixes removed." msgstr "" -#: src/compare.c:520 +#: src/compare.c:526 +#, fuzzy +msgid "Archive contains transformed file names." +msgstr "Paketeak zaharkituriko base-64 buruak ditu" + +#: src/compare.c:531 msgid "Verification may fail to locate original files." msgstr "Egiaztapenak huts egin dezake jatorrizko fitxategiak kokatzerakoan." -#: src/compare.c:593 +#: src/compare.c:603 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "EGIAZTAPEN AKATSA: buru baliogabe %d aurkitu da" msgstr[1] "EGIAZTAPEN AKATSA: %d buru baliogabe aurkitu dira" -#: src/compare.c:611 src/list.c:222 +#: src/compare.c:621 src/list.c:222 #, c-format msgid "A lone zero block at %s" msgstr "" @@ -909,7 +914,7 @@ msgstr[1] "" msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: fitxategia fitxategi sistema ezberdin batetan dago, ez da irauliko" -#: src/create.c:1203 src/create.c:1214 src/incremen.c:582 src/incremen.c:588 +#: src/create.c:1203 src/create.c:1214 src/incremen.c:578 src/incremen.c:584 msgid "contents not dumped" msgstr "" @@ -933,7 +938,7 @@ msgstr "%s: fitxategia ez da aldatu, ez da irauliko" msgid "%s: file is the archive; not dumped" msgstr "%s: fitxategia paketea da, ez da irauliko" -#: src/create.c:1723 src/incremen.c:575 +#: src/create.c:1723 src/incremen.c:571 #, fuzzy msgid "directory not dumped" msgstr "%s: katxe direktorioa marka bat du; ez da irauliko" @@ -943,12 +948,12 @@ msgstr "%s: katxe direktorioa marka bat du; ez da irauliko" msgid "%s: file changed as we read it" msgstr "%s: fitxategia aldatu egin da irakurtzen ari zenean" -#: src/create.c:1857 +#: src/create.c:1858 #, c-format msgid "%s: socket ignored" msgstr "%s: socket-a alde batetara utzi da" -#: src/create.c:1863 +#: src/create.c:1864 #, c-format msgid "%s: door ignored" msgstr "%s: atea alde batetara utzia" @@ -976,170 +981,170 @@ msgstr "%s: %s denbora marka %s etorkizunean da" msgid "%s: Unexpected inconsistency when making directory" msgstr "%s: Esperogabeko inkonsistentziak direktorioa sortzerakoan" -#: src/extract.c:709 +#: src/extract.c:721 #, c-format msgid "%s: Directory renamed before its status could be extracted" msgstr "%s: Direktorioa bere egoera atera aurretik berrizendatua izan da" -#: src/extract.c:863 +#: src/extract.c:875 msgid "Extracting contiguous files as regular files" msgstr "Alboko fitxategiak fitxategi erregularrak bezala ateratzen" -#: src/extract.c:1197 +#: src/extract.c:1209 msgid "Attempting extraction of symbolic links as hard links" msgstr "Lotura sinbolikoak lotura gogor bezala ateratzen saiatzen" -#: src/extract.c:1353 +#: src/extract.c:1365 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Ezin da atera -- paketea beste bolumen baten jarraipena da" -#: src/extract.c:1360 src/list.c:1125 +#: src/extract.c:1372 src/list.c:1121 msgid "Unexpected long name header" msgstr "Buru izen luzera esperogabea" -#: src/extract.c:1367 +#: src/extract.c:1379 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "" "%s: `%c' fitxategi mota ezezaguna, fitxategi arrunt bat bezala ateratzen" -#: src/extract.c:1393 +#: src/extract.c:1405 #, c-format msgid "Current %s is newer or same age" msgstr "Unekoa %s berriagoa edo data berdinekoa da" -#: src/extract.c:1445 +#: src/extract.c:1457 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Ez da gai fitxategi honen babeskopia egiteko" -#: src/extract.c:1582 +#: src/extract.c:1594 #, c-format msgid "Cannot rename %s to %s" msgstr "Ezin da %s %s-ra berrizendatu" -#: src/incremen.c:474 src/incremen.c:518 +#: src/incremen.c:473 src/incremen.c:517 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Direktorioa %s-tik berrizendatua izan da" -#: src/incremen.c:486 +#: src/incremen.c:485 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Direktorioa berrizendatua izan da" -#: src/incremen.c:531 +#: src/incremen.c:530 #, c-format msgid "%s: Directory is new" msgstr "%s: Direktorioa berria da" -#: src/incremen.c:956 src/incremen.c:973 +#: src/incremen.c:951 src/incremen.c:968 msgid "Invalid time stamp" msgstr "denbora marka baliogabea" -#: src/incremen.c:1012 +#: src/incremen.c:1007 msgid "Invalid modification time (seconds)" msgstr "Eraldaketa denbora (segundu) baliogabea" -#: src/incremen.c:1027 +#: src/incremen.c:1022 msgid "Invalid modification time (nanoseconds)" msgstr "Eraldaketa denbora (nanosegundu) baliogabea" -#: src/incremen.c:1047 +#: src/incremen.c:1042 msgid "Invalid device number" msgstr "gailu zenbaki baliogabea" -#: src/incremen.c:1062 +#: src/incremen.c:1057 msgid "Invalid inode number" msgstr "Inodo zenbaki baliogabea" -#: src/incremen.c:1113 src/incremen.c:1150 +#: src/incremen.c:1108 src/incremen.c:1145 msgid "Field too long while reading snapshot file" msgstr "Eremu luzeegia snapshot fitxategia irakurtzerakoan" -#: src/incremen.c:1120 src/incremen.c:1158 +#: src/incremen.c:1115 src/incremen.c:1153 #, fuzzy msgid "Read error in snapshot file" msgstr "Eremu balio esperogabea snapshot fitxategian" -#: src/incremen.c:1122 src/incremen.c:1162 src/incremen.c:1214 -#: src/incremen.c:1272 +#: src/incremen.c:1117 src/incremen.c:1157 src/incremen.c:1209 +#: src/incremen.c:1267 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "Eremu balio esperogabea snapshot fitxategian" -#: src/incremen.c:1129 src/incremen.c:1169 +#: src/incremen.c:1124 src/incremen.c:1164 msgid "Unexpected field value in snapshot file" msgstr "Eremu balio esperogabea snapshot fitxategian" -#: src/incremen.c:1264 +#: src/incremen.c:1259 msgid "Missing record terminator" msgstr "Gordetze amaiera falta da" -#: src/incremen.c:1325 src/incremen.c:1328 +#: src/incremen.c:1320 src/incremen.c:1323 msgid "Bad incremental file format" msgstr "Fitxategi inkremental formatu okerra" -#: src/incremen.c:1347 +#: src/incremen.c:1342 #, fuzzy, c-format msgid "Unsupported incremental format version: %" msgstr "Onartugabeko inkremental formatu bertsioa: %d" -#: src/incremen.c:1502 +#: src/incremen.c:1496 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" "Gaizki eratutako iraulketa direktorioa: '%c'espero zen baina %#3o aurkitu da" -#: src/incremen.c:1512 +#: src/incremen.c:1506 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Gaizki eratutako iraulketa direktorioa: 'X' bikoizturik" -#: src/incremen.c:1525 +#: src/incremen.c:1519 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Gaizki eratutako iraulketa direktorioa: izen hutsa 'R'-en" -#: src/incremen.c:1538 +#: src/incremen.c:1532 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Gaizki eratutako iraulketa direktorioa: 'T' ez doa 'R' atzean" -#: src/incremen.c:1544 +#: src/incremen.c:1538 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Gaizki eratutako iraulketa direktorioa: izen hutsa 'T'-en" -#: src/incremen.c:1564 +#: src/incremen.c:1558 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" "Gaizki eratutako iraulketa direktorioa: '%c' espero zen baina data amaiera " "aurkitu da" -#: src/incremen.c:1571 +#: src/incremen.c:1565 msgid "Malformed dumpdir: 'X' never used" msgstr "Gaizki eratutako iraulketa direktorioa: 'X' ez da inoiz erabili" -#: src/incremen.c:1615 +#: src/incremen.c:1609 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Ezin da aldiroko direktorioa sortu %s txantiloia erabiliaz" -#: src/incremen.c:1677 +#: src/incremen.c:1670 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Ez da direktorioa garbituko: ezin da egoera eskuratu" -#: src/incremen.c:1690 +#: src/incremen.c:1683 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: direktorioa gailu ezberdin batetan dago: ez da garbituko" -#: src/incremen.c:1698 +#: src/incremen.c:1691 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: %s ezabatzen\n" -#: src/incremen.c:1703 +#: src/incremen.c:1696 #, c-format msgid "%s: Cannot remove" msgstr "%s: Ezin da ezabatu" @@ -1159,20 +1164,20 @@ msgstr "" msgid "block %s: ** End of File **\n" msgstr "%s blokea: ** Fitxategi Amaiera **\n" -#: src/list.c:256 src/list.c:1097 src/list.c:1360 +#: src/list.c:256 src/list.c:1093 src/list.c:1356 #, c-format msgid "block %s: " msgstr "%s blokea: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:712 +#: src/list.c:708 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Zuriunea buruan zenbakizko %s balioa espero zenean" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:767 +#: src/list.c:763 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1180,140 +1185,135 @@ msgstr "" "direla pentsatuko da" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:778 +#: src/list.c:774 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Paketearen zortzitar %.*s balioa %s eremutik kanpo dago" -#: src/list.c:799 +#: src/list.c:795 msgid "Archive contains obsolescent base-64 headers" msgstr "Paketeak zaharkituriko base-64 buruak ditu" -#: src/list.c:813 +#: src/list.c:809 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "" -#: src/list.c:844 +#: src/list.c:840 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:873 +#: src/list.c:869 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Paketeak %.*s du zenbakizko %s balioa espero zenean " #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:895 +#: src/list.c:891 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Pakete %s balioa %s eremutik kanpo dago %s.. %s" -#: src/list.c:1261 +#: src/list.c:1257 #, c-format msgid " link to %s\n" msgstr " %s-ra lotu\n" -#: src/list.c:1269 +#: src/list.c:1265 #, c-format msgid " unknown file type %s\n" msgstr " %s fitxategi mota ezezaguna\n" -#: src/list.c:1287 +#: src/list.c:1283 #, c-format msgid "--Long Link--\n" msgstr "--Lotura Luzea--\n" -#: src/list.c:1291 +#: src/list.c:1287 #, c-format msgid "--Long Name--\n" msgstr "--Izen Luzea--\n" -#: src/list.c:1295 +#: src/list.c:1291 #, c-format msgid "--Volume Header--\n" msgstr "--Bolumen Burua--\n" -#: src/list.c:1303 +#: src/list.c:1299 #, c-format msgid "--Continued at byte %s--\n" msgstr "--%s byte-an jarraitzen du--\n" -#: src/list.c:1365 +#: src/list.c:1361 msgid "Creating directory:" msgstr "Direktorioa sortzen:" -#: src/misc.c:298 +#: src/misc.c:297 #, fuzzy msgid "Cannot get working directory" msgstr "Ezin da lan direktorioa aldatu" -#: src/misc.c:571 +#: src/misc.c:570 #, c-format msgid "Renaming %s to %s\n" msgstr "%s %s-ra berrizendatzen\n" -#: src/misc.c:580 src/misc.c:599 +#: src/misc.c:579 src/misc.c:598 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: Ezin da %s-ra berrizendatu" -#: src/misc.c:604 +#: src/misc.c:603 #, c-format msgid "Renaming %s back to %s\n" msgstr "%s %s-ra atzera berrizendatzen\n" -#: src/misc.c:851 +#: src/misc.c:850 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Fitxategia irakurri baino lehen ezabaturik" -#: src/misc.c:866 -#, fuzzy, c-format -msgid "%s: Directory removed before we read it" -msgstr "%s: Fitxategia irakurri baino lehen ezabaturik" - -#: src/misc.c:887 +#: src/misc.c:871 msgid "child process" msgstr "ume prozesua" -#: src/misc.c:896 +#: src/misc.c:880 msgid "interprocess channel" msgstr "prozesu arteko kanala" -#: src/names.c:594 +#: src/names.c:590 msgid "Pattern matching characters used in file names" msgstr "" -#: src/names.c:596 +#: src/names.c:592 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" msgstr "" -#: src/names.c:614 src/names.c:630 +#: src/names.c:610 src/names.c:626 #, c-format msgid "%s: Not found in archive" msgstr "%s: Ez da paketean aurkitu" -#: src/names.c:615 +#: src/names.c:611 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "" -#: src/names.c:649 +#: src/names.c:645 #, c-format msgid "Archive label mismatch" msgstr "" -#: src/names.c:953 +#: src/names.c:949 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" -#: src/names.c:959 +#: src/names.c:955 msgid "Only one -C option is allowed with --listed-incremental" msgstr "" @@ -2730,6 +2730,10 @@ msgstr "Komandoa amaitua\n" msgid "--stat requires file names" msgstr "--stat -ek fitxategi izenak behar ditu" +#, fuzzy +#~ msgid "%s: Directory removed before we read it" +#~ msgstr "%s: Fitxategia irakurri baino lehen ezabaturik" + #, fuzzy #~ msgid "Cannot restore working directory" #~ msgstr "Ezin da lan direktorioa gorde" diff --git a/po/fi.gmo b/po/fi.gmo index b90c1b09134aaf23f26a1471722cf81e6e4b0778..16dbca2fa99402414ef86d2d22cba902787de74a 100644 GIT binary patch delta 28 jcmbQ($275zX#\n" "Language-Team: Finnish \n" @@ -57,7 +57,7 @@ msgstr "%.*s: Tuntematon ARGP_HELP_FMT-parametri" msgid "Garbage in ARGP_HELP_FMT: %s" msgstr "Roskaa ARGP_HELP_FMT:ssä: %s" -#: gnu/argp-help.c:1246 +#: gnu/argp-help.c:1248 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." @@ -65,29 +65,29 @@ msgstr "" "Pitkien valitsinten pakolliset tai valinnaiset argumentit ovat pakollisia " "tai valinnaisia myös vastaaville lyhyille." -#: gnu/argp-help.c:1639 +#: gnu/argp-help.c:1641 msgid "Usage:" msgstr "Käyttö:" -#: gnu/argp-help.c:1643 +#: gnu/argp-help.c:1645 msgid " or: " msgstr " tai: " -#: gnu/argp-help.c:1655 +#: gnu/argp-help.c:1657 msgid " [OPTION...]" msgstr " [VALITSIN...]" -#: gnu/argp-help.c:1682 +#: gnu/argp-help.c:1684 #, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Komennot ”%s --help” ja ”%s --usage” antavat lisää tietoa.\n" -#: gnu/argp-help.c:1710 +#: gnu/argp-help.c:1712 #, c-format msgid "Report bugs to %s.\n" msgstr "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen %s.\n" -#: gnu/argp-help.c:1929 gnu/error.c:183 +#: gnu/argp-help.c:1931 gnu/error.c:183 msgid "Unknown system error" msgstr "Tuntematon järjestelmävirhe" @@ -193,16 +193,16 @@ msgstr "%s: valitsin ”-W %s” ei salli argumenttia\n" msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: valitsin ”%s” vaatii argumentin\n" -#: gnu/obstack.c:425 gnu/obstack.c:427 gnu/xalloc-die.c:36 +#: gnu/obstack.c:423 gnu/obstack.c:425 gnu/xalloc-die.c:36 msgid "memory exhausted" msgstr "muisti lopussa" -#: gnu/openat-die.c:36 +#: gnu/openat-die.c:40 #, fuzzy, c-format msgid "unable to record current working directory" msgstr "Työhakemistoa ei voi vaihtaa" -#: gnu/openat-die.c:54 +#: gnu/openat-die.c:59 #, fuzzy, c-format msgid "failed to return to initial working directory" msgstr "Työhakemistoa ei voi tallentaa" @@ -226,11 +226,11 @@ msgstr "Työhakemistoa ei voi tallentaa" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: gnu/quotearg.c:274 +#: gnu/quotearg.c:273 msgid "`" msgstr "”" -#: gnu/quotearg.c:275 +#: gnu/quotearg.c:274 msgid "'" msgstr "”" @@ -477,21 +477,21 @@ msgid_plural "%s: Wrote only %lu of %lu bytes" msgstr[0] "%s: Kirjoitettiin vain %lu tavua %lu tavusta" msgstr[1] "%s: Kirjoitettiin vain %lu tavua %lu tavusta" -#: lib/paxnames.c:155 +#: lib/paxnames.c:140 #, c-format msgid "Removing leading `%s' from member names" msgstr "Poistetaan ”%s” tiedostonimien alusta" -#: lib/paxnames.c:156 +#: lib/paxnames.c:141 #, c-format msgid "Removing leading `%s' from hard link targets" msgstr "Poistetaan ”%s” kovien linkkien kohdenimien alusta" -#: lib/paxnames.c:169 +#: lib/paxnames.c:154 msgid "Substituting `.' for empty member name" msgstr "Korvataan ”.” tyhjällä tiedostonimellä" -#: lib/paxnames.c:170 +#: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" msgstr "Korvataan ”.” tyhjällä kovan linkin kohteella" @@ -795,20 +795,20 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "Voitiin lukea vain %lu tavua %lu tavusta" msgstr[1] "Voitiin lukea vain %lu tavua %lu tavusta" -#: src/compare.c:105 src/compare.c:382 +#: src/compare.c:105 src/compare.c:383 msgid "Contents differ" msgstr "Sisällöt eroavat" -#: src/compare.c:131 src/extract.c:972 src/incremen.c:1462 src/list.c:458 -#: src/list.c:1392 src/xheader.c:711 +#: src/compare.c:131 src/extract.c:984 src/incremen.c:1456 src/list.c:456 +#: src/list.c:1388 src/xheader.c:711 msgid "Unexpected EOF in archive" msgstr "Odottamaton tiedoston loppu arkistossa" -#: src/compare.c:179 src/compare.c:195 src/compare.c:308 src/compare.c:406 +#: src/compare.c:179 src/compare.c:195 src/compare.c:309 src/compare.c:407 msgid "File type differs" msgstr "Tiedoston tyyppi eroaa" -#: src/compare.c:182 src/compare.c:202 src/compare.c:322 +#: src/compare.c:182 src/compare.c:202 src/compare.c:323 msgid "Mode differs" msgstr "Tila eroaa" @@ -824,50 +824,55 @@ msgstr "GID eroaa" msgid "Mod time differs" msgstr "Muutosaika eroaa" -#: src/compare.c:215 src/compare.c:414 +#: src/compare.c:215 src/compare.c:415 msgid "Size differs" msgstr "Koko eroaa" -#: src/compare.c:263 +#: src/compare.c:264 #, c-format msgid "Not linked to %s" msgstr "Ei ole linkitetty tiedostoon %s" -#: src/compare.c:287 +#: src/compare.c:288 msgid "Symlink differs" msgstr "Symlinkki eroaa" -#: src/compare.c:316 +#: src/compare.c:317 msgid "Device number differs" msgstr "Laitenumero eroaa" -#: src/compare.c:456 +#: src/compare.c:457 #, c-format msgid "Verify " msgstr "Tarkasta " -#: src/compare.c:463 +#: src/compare.c:464 #, c-format msgid "%s: Unknown file type `%c', diffed as normal file" msgstr "%s: Tuntematon tiedostotyyppi ”%c”, vertailtu normaalina tiedostona" # Mitäh? -#: src/compare.c:518 +#: src/compare.c:520 msgid "Archive contains file names with leading prefixes removed." msgstr "Arkisto sisältää tiedostonimiä, joiden etuliitteet on poistettu." -#: src/compare.c:520 +#: src/compare.c:526 +#, fuzzy +msgid "Archive contains transformed file names." +msgstr "Arkisto sisältää käytöstä poistuvia base-64-otsakkeita" + +#: src/compare.c:531 msgid "Verification may fail to locate original files." msgstr "Tarkastus ei ehkä löydä alkuperäisiä tiedostoja." -#: src/compare.c:593 +#: src/compare.c:603 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "TARKASTUSVIRHE: havaittu %d virheellinen otsake" msgstr[1] "TARKASTUSVIRHE: havaittu %d virheellistä otsaketta" -#: src/compare.c:611 src/list.c:222 +#: src/compare.c:621 src/list.c:222 #, c-format msgid "A lone zero block at %s" msgstr "Yksinäinen nollalohko kohdassa %s" @@ -918,7 +923,7 @@ msgstr[1] "%s: Tiedosto kutistui %s tavun verran, tasataan nollilla" msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: tiedosto ei ole samalla tiedostojärjestelmällä, ei lisätä" -#: src/create.c:1203 src/create.c:1214 src/incremen.c:582 src/incremen.c:588 +#: src/create.c:1203 src/create.c:1214 src/incremen.c:578 src/incremen.c:584 msgid "contents not dumped" msgstr "" @@ -942,7 +947,7 @@ msgstr "%s: tiedosto on muuttumaton, ei lisätä" msgid "%s: file is the archive; not dumped" msgstr "%s: tiedosto on arkistossa, ei lisätä" -#: src/create.c:1723 src/incremen.c:575 +#: src/create.c:1723 src/incremen.c:571 #, fuzzy msgid "directory not dumped" msgstr "%s: näyttää välimuistihakemistolta, ei lisätä" @@ -952,12 +957,12 @@ msgstr "%s: näyttää välimuistihakemistolta, ei lisätä" msgid "%s: file changed as we read it" msgstr "%s: tiedosto muuttui lukemisen aikana" -#: src/create.c:1857 +#: src/create.c:1858 #, c-format msgid "%s: socket ignored" msgstr "%s: pistoketta ei huomioida" -#: src/create.c:1863 +#: src/create.c:1864 #, c-format msgid "%s: door ignored" msgstr "%s: ovea ei huomioida" @@ -985,168 +990,168 @@ msgstr "%s: aikaleima %s on %s sekuntia tulevaisuudessa" msgid "%s: Unexpected inconsistency when making directory" msgstr "%s: Odottamaton ristiriita luotaessa hakemistoa" -#: src/extract.c:709 +#: src/extract.c:721 #, c-format msgid "%s: Directory renamed before its status could be extracted" msgstr "%s: Hakemisto nimettiin uudelleen ennen kuin sen tilaa voitiin purkaa" -#: src/extract.c:863 +#: src/extract.c:875 msgid "Extracting contiguous files as regular files" msgstr "Puretaan jatkuvat tiedostot normaaleiksi tiedostoiksi" -#: src/extract.c:1197 +#: src/extract.c:1209 msgid "Attempting extraction of symbolic links as hard links" msgstr "Yritetään purkaa symboliset linkit koviksi linkeiksi" -#: src/extract.c:1353 +#: src/extract.c:1365 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Ei voi purkaa -- tiedosto on jatkoa toisesta arkiston osasta" -#: src/extract.c:1360 src/list.c:1125 +#: src/extract.c:1372 src/list.c:1121 #, fuzzy msgid "Unexpected long name header" msgstr "Odottamaton tiedoston loppu sovitetuissa nimissä" -#: src/extract.c:1367 +#: src/extract.c:1379 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Tuntematon tiedostotyyppi ”%c”, purettiin normaaliksi tiedostoksi" -#: src/extract.c:1393 +#: src/extract.c:1405 #, c-format msgid "Current %s is newer or same age" msgstr "Nykyinen %s on uudempi tai yhtä vanha" -#: src/extract.c:1445 +#: src/extract.c:1457 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Tätä tiedostoa ei voitu varmuuskopioida" -#: src/extract.c:1582 +#: src/extract.c:1594 #, fuzzy, c-format msgid "Cannot rename %s to %s" msgstr "%s: Uudelleennimeäminen nimelle %s ei onnistu" -#: src/incremen.c:474 src/incremen.c:518 +#: src/incremen.c:473 src/incremen.c:517 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Hakemisto %s on nimetty uudelleen" -#: src/incremen.c:486 +#: src/incremen.c:485 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Hakemisto on nimetty uudelleen" -#: src/incremen.c:531 +#: src/incremen.c:530 #, c-format msgid "%s: Directory is new" msgstr "%s: Hakemisto on uusi" -#: src/incremen.c:956 src/incremen.c:973 +#: src/incremen.c:951 src/incremen.c:968 msgid "Invalid time stamp" msgstr "Virheellinen aikaleima" -#: src/incremen.c:1012 +#: src/incremen.c:1007 msgid "Invalid modification time (seconds)" msgstr "Virheellinen muutosaika (sekunnit)" -#: src/incremen.c:1027 +#: src/incremen.c:1022 msgid "Invalid modification time (nanoseconds)" msgstr "Virheellinen muutosaika (nanosekunnit)" -#: src/incremen.c:1047 +#: src/incremen.c:1042 msgid "Invalid device number" msgstr "Virheellinen laitenumero" -#: src/incremen.c:1062 +#: src/incremen.c:1057 msgid "Invalid inode number" msgstr "Virheellinen i-solmun numero" -#: src/incremen.c:1113 src/incremen.c:1150 +#: src/incremen.c:1108 src/incremen.c:1145 msgid "Field too long while reading snapshot file" msgstr "" -#: src/incremen.c:1120 src/incremen.c:1158 +#: src/incremen.c:1115 src/incremen.c:1153 msgid "Read error in snapshot file" msgstr "" -#: src/incremen.c:1122 src/incremen.c:1162 src/incremen.c:1214 -#: src/incremen.c:1272 +#: src/incremen.c:1117 src/incremen.c:1157 src/incremen.c:1209 +#: src/incremen.c:1267 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "Odottamaton tiedoston loppu arkistossa" -#: src/incremen.c:1129 src/incremen.c:1169 +#: src/incremen.c:1124 src/incremen.c:1164 msgid "Unexpected field value in snapshot file" msgstr "" -#: src/incremen.c:1264 +#: src/incremen.c:1259 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1325 src/incremen.c:1328 +#: src/incremen.c:1320 src/incremen.c:1323 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1347 +#: src/incremen.c:1342 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1502 +#: src/incremen.c:1496 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1512 +#: src/incremen.c:1506 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1525 +#: src/incremen.c:1519 #, fuzzy msgid "Malformed dumpdir: empty name in 'R'" msgstr "Kelvoton tiheysargumentti: ”%s”" -#: src/incremen.c:1538 +#: src/incremen.c:1532 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1544 +#: src/incremen.c:1538 #, fuzzy msgid "Malformed dumpdir: empty name in 'T'" msgstr "Kelvoton tiheysargumentti: ”%s”" -#: src/incremen.c:1564 +#: src/incremen.c:1558 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1571 +#: src/incremen.c:1565 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1615 +#: src/incremen.c:1609 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Väliaikaishakemiston luominen %s-mallia käyttäen ei onnistu" -#: src/incremen.c:1677 +#: src/incremen.c:1670 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Ei poisteta hakemistoa: stat ei onnistu" -#: src/incremen.c:1690 +#: src/incremen.c:1683 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: hakemisto on eri laitteella, ei poisteta" -#: src/incremen.c:1698 +#: src/incremen.c:1691 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Poistetaan %s\n" -#: src/incremen.c:1703 +#: src/incremen.c:1696 #, c-format msgid "%s: Cannot remove" msgstr "%s: Ei voi poistaa" @@ -1166,20 +1171,20 @@ msgstr "lohko %s: ** NUL-lohko **\n" msgid "block %s: ** End of File **\n" msgstr "lohko %s: ** Tiedoston loppu **\n" -#: src/list.c:256 src/list.c:1097 src/list.c:1360 +#: src/list.c:256 src/list.c:1093 src/list.c:1356 #, c-format msgid "block %s: " msgstr "lohko %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:712 +#: src/list.c:708 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Tyhjiä merkkejä otsakkeessa, odotettiin numeerista %s-arvoa" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:767 +#: src/list.c:763 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1187,145 +1192,140 @@ msgstr "" "kahden komplementiksi" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:778 +#: src/list.c:774 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Arkiston oktaaliarvo %.*s on sallitun %s-välin ulkopuolella" -#: src/list.c:799 +#: src/list.c:795 msgid "Archive contains obsolescent base-64 headers" msgstr "Arkisto sisältää käytöstä poistuvia base-64-otsakkeita" -#: src/list.c:813 +#: src/list.c:809 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "" "Arkiston etumerkillinen base-64-merkkijono %s on sallitun %s-välin " "ulkopuolella" -#: src/list.c:844 +#: src/list.c:840 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Arkiston base-256-arvo on sallitun %s-välin ulkopuolella" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:873 +#: src/list.c:869 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Arkisto sisältää merkkijonon %.*s, odotettiin numeerista %s-arvoa" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:895 +#: src/list.c:891 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Arkiston arvo %s on sallitun %s-välin %s..%s ulkopuolella" -#: src/list.c:1261 +#: src/list.c:1257 #, c-format msgid " link to %s\n" msgstr " linkki tiedostoon %s\n" -#: src/list.c:1269 +#: src/list.c:1265 #, c-format msgid " unknown file type %s\n" msgstr " tuntematon tiedostotyyppi %s\n" -#: src/list.c:1287 +#: src/list.c:1283 #, c-format msgid "--Long Link--\n" msgstr "--Pitkä linkki--\n" -#: src/list.c:1291 +#: src/list.c:1287 #, c-format msgid "--Long Name--\n" msgstr "--Pitkä nimi--\n" -#: src/list.c:1295 +#: src/list.c:1291 #, c-format msgid "--Volume Header--\n" msgstr "--Arkiston osan otsake--\n" -#: src/list.c:1303 +#: src/list.c:1299 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Jatkuu tavusta %s--\n" -#: src/list.c:1365 +#: src/list.c:1361 msgid "Creating directory:" msgstr "Luodaan hakemisto:" -#: src/misc.c:298 +#: src/misc.c:297 #, fuzzy msgid "Cannot get working directory" msgstr "Työhakemistoa ei voi vaihtaa" -#: src/misc.c:571 +#: src/misc.c:570 #, c-format msgid "Renaming %s to %s\n" msgstr "Nimetään uudelleen %s -> %s\n" -#: src/misc.c:580 src/misc.c:599 +#: src/misc.c:579 src/misc.c:598 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: Uudelleennimeäminen nimelle %s ei onnistu" -#: src/misc.c:604 +#: src/misc.c:603 #, c-format msgid "Renaming %s back to %s\n" msgstr "Nimetään %s takaisin nimelle %s\n" -#: src/misc.c:851 +#: src/misc.c:850 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Tiedosto oli poistettu ennen sen lukemista" -#: src/misc.c:866 -#, fuzzy, c-format -msgid "%s: Directory removed before we read it" -msgstr "%s: Tiedosto oli poistettu ennen sen lukemista" - -#: src/misc.c:887 +#: src/misc.c:871 msgid "child process" msgstr "lapsiprosessi" -#: src/misc.c:896 +#: src/misc.c:880 msgid "interprocess channel" msgstr "prosessienvälinen kanava" # ... ja sen pitää päätyä kääntäjien ongelmaksi? -#: src/names.c:594 +#: src/names.c:590 #, fuzzy msgid "Pattern matching characters used in file names" msgstr "Tiedostonimissä on käytetty jokerimerkkejä. Käytä" -#: src/names.c:596 +#: src/names.c:592 #, fuzzy msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" msgstr "valitsinta --wildcards täsmäyksen käyttöön ottamiseksi, tai" -#: src/names.c:614 src/names.c:630 +#: src/names.c:610 src/names.c:626 #, c-format msgid "%s: Not found in archive" msgstr "%s: Ei löytynyt arkistosta" -#: src/names.c:615 +#: src/names.c:611 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Vaadittua esiintymää ei löytynyt arkistosta" -#: src/names.c:649 +#: src/names.c:645 #, fuzzy, c-format msgid "Archive label mismatch" msgstr "Arkistoa ei ole nimetty täsmää nimiöön %s" -#: src/names.c:953 +#: src/names.c:949 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" -#: src/names.c:959 +#: src/names.c:955 msgid "Only one -C option is allowed with --listed-incremental" msgstr "" @@ -2732,6 +2732,10 @@ msgstr "Komento keskeytyi\n" msgid "--stat requires file names" msgstr "--Sovitetut tiedostonimet--\n" +#, fuzzy +#~ msgid "%s: Directory removed before we read it" +#~ msgstr "%s: Tiedosto oli poistettu ennen sen lukemista" + #, fuzzy #~ msgid "Cannot restore working directory" #~ msgstr "Työhakemistoa ei voi tallentaa" diff --git a/po/fr.gmo b/po/fr.gmo index 24303d7004cec7b4633bf39660023f57664eb07d..e7a950c402e2577b7e6b931ceb205a9e9d0df48d 100644 GIT binary patch delta 9698 zcmYk?30ziH{>SnAWJutGAfSN2!@kR|A|i;mgSh093+|dL;$CQv6s4t^bknuTHj+P zhUZ!qMXMZRuog$-E4h}(3Z~GARwFPP=U^vPhyIEk@f@n*(6*+&1nG-40h{3})bl$~ z4W2|b^an;^R68?}&PbJ2fvs_6JCAwsF)DgeaUJzQ`#j4E!(kYQ^RNZ3MU8YHhT|nC zc9F&e;?|gk1JRAOn24JlPhkM@E!6$Ko_zD7ER3Y0kK=T75iiFE_#7%DD^aPe!-n`1 zhTt#Q6#Y6FBTx;cA(yNojK%q=%x!S$J!dGSQ{i7=?1WTVRTzppQK>zF$#@l&iRR3U zI*@|in1y;Sb^&JGpG)4t=D5&yPS&sNGGj#P!Ifx@t9t0 zIyewD!fMoucVR0$iR$=OjKaI9jz@JiaT#hcR$?^T7>N6@742ImDMa8^3`g%0(u;BE z#ynI5Lr@P^VI)3*ez*mTa35-M-a@@6mU+;7ic$9u#CvfLYWr5BrvZh<6g1aM(T!VC z+v@KagrA{aa2>UM{Fo1ov>W>3MAQIg;r(c%I(8NH9k`9^SV}iDb%Rmc@3C&ozb?E% zg?e@Y8{#*p27f@!b))Vk18tCZS!EcD&!akChb{4A^v7#RU#+`1%0;<{>B!ceCNrO- z26nrr$Mm#mFEf`BSjdHZWE!n%EW$&m5#Pl|7*%TSPebkZo~TsMLoKqUsO`52)zE%y zf*+s;b`CX_zj-LQDKslHFU-UQ;@%j8b5Q&GCDcf_q1M7tY=Y-d4S(m<|KY@ez0DLR zq84c$>b`-fj!ic{T}&PH`?KkCc)J~qQE*cfl2GIDQ!JJ5Vn? zhRWDk)N}uF`~%~N?`11!3gC@FDu)Sq#K0s0{putubhzSob?+45j1fn{SgBnmNDwA_D9yg*g^Bz{==cvq;4k7>Q+2kS2 zH%`Z)E`IG$BaItoQr8Rh?S2?Ta1FM^{iwBY8a2|3$fMRT*arIyH@jvLmJ-{j=f6U& zonJi^G*_V&CY9-^3=BfOa3*Txi%_XugM8Gi*HI(BgL>Y7glQ-qHC0)t%#J~3)tZES z1g*nP+-RhE&NG@qHW%ii_T_feB0Gob$R*UayNkh?Hp--~1l7SYsKqrGb$ttJ8y`fy z_YUg4X`{`Q3`eb*Cy@`F$J$LHl8Q5^27f`#mH!y?4UfW3#1qg5w>j=Xt(k+4N6^zP3=OA(Ei^-VI&pDP>U^ooJnne)Ceb|9`K+>x*3&`j~(wB zZx&SsYVo~{zW4z~;HRjDZ(%M5PB6bMJ+Ue6TTfHaB3g}&@HN!j)}iM7LyW?2Pz^VH z&{^%M%#@<`^D@)`R--z80<|{IJKn@-V(*Ep2TVp!B83$cLh%qXDC;xS_9^5pyRn)q$N# zzfO6`H^mx+-EbGC;4O^7m}#a1-7tr^7L}iBO?9A9a!cSUW_2P?^cIE8go zxbYws<*56rFczP|4BU%a?UykRqxib$xuK{IKI!-x_8|TcHQ=xrCgUX@ z3Yx1Cs0%Y4SEEL74AtOeY=piuO-F)JnaDv+-AL3_RXg!=)X2A^-g6e4;eXH{y=R#z z@PtrM!(AOKv4r>q%)#@hRU9zeY@#v{Jl0_fT9x0T7KQIaCWUQLi)b9Gp(Ushzlp(k5u4*}CvN<($xsaHJCcrm z*b75(DC+q+*bZODK<)o?6xvg91G6xt+AP8fRH~MtMzkJ7@Hpzl7cm`wMlXz-Z$7yR zSU}tw_1qK;KpR`*7UZjMoxx<iVOo zIo^s|l*h3p-o^;@rxA5H1AAi;_Qz+?6H4I{1*PUs)JT#Sng%kk5%EBLoVgo~nxd;U zWDA2HH63gCnEA~}#02UyP#qhLjd1}s#iwu?zKE?bv6lSjQs`1^=A;^16YoWh;1cS_ z-!TtE9ybm2$NPz^Q5`>xO7ZWg4*ES|S)H*1YOWVzSFA%#v9-vok?ci`Sg9?iA{MJq zpWc-ihdWUn`WW5VV6o{)ENY)uU?*IPWZOE0dSBU-W=bltBk?onqw83MpQ1W4#PgI{ z%}-+y6`ODvUdC=%yu@_iDday^9sfsbq{~vXJs-pk#A`4f3!gUsv@#x*u@k5PG$8M# zn1$Lk9!!)rg}xNt#zJiRjCrs(>W0Or#j+bq&}+GAxF?Px_MlRH5p{p)vnKA0%IJJd z#SKn;%8CDl89Z*epEIfGiwWFVi+zp)&F=Dszoi zns0tD)cut>5Z62Px3D2`*k8S*CsQ!#h61}g=%OEcEnH68-q8SMHPX{L>wyR1276#;}ATA+EpQ2OeTAw z2JES#5KZ9)EXTL-YZvpq)%;le^omJY!8X&uVd&3&GcXcsaR6?@O8gaj;iOm1RPDoH z;;&E*-og@$*k1oWk2QvZ=ISBG6&Odn8w2nYOu_F__XY1TyCMrU!fI4z)?g~0LOu5z zhGWy$jH#$8>WMKp7NfQQ7uOf~O9fkS;S|Q=6;uO_cA62Sq2{y%mHMfuj?Kn=+<AR?mTt_WV@4e>N zE*u*WkHCgF26J!{>b`ZTUGyd@L#Lhk-%$e#c+-48I=o5#^@6TcWMLVm<3iLfcpbH` zuc12TyU)BZ3HuQbz&v~fyW!W^43qbp=kn2ucrd!L0`(pb-ivGZlYc$1k%}PPi`otE zVNbkIQ$Xa*ssn^$xO$!SW5i~)cwH+%+&V7HpGijYvCOag#ZfY zQET7^x-s}I)5Er?40Ukqj9Pp>Q6uYz@i-Wx(1QiI0YmTtw#7RbikWYlj+SD5CgxJe z;KEAO;yRA)(D$IpL}y$^JRaTn3##GZL(D(6!oRurokxwV;BRId&O$B54XE98+VK}u z$3hR+XTW3SP?$wUKh&x{j+%;Q|7ZS5CLXn~J*dUA0|W6as-r)kMiP6(Y}3xzig<_< z&&5jOWf+EkVoMA?st+0SpG~2ViY}=A`Z!jjjnmQZ7^B057><8nCk%Vn{5>!nn-Xuw zI6Q#&<5w7kxyMb%2chB`RC^mSi1w{Z6uRIY%*4XKn_sai)QH!iUVH-eg6pV`_@6MT zOh-TB9ylBy!0xyoeb9Q({2A_xUW6?i!?FI~|6?eWb0Gmc;9M-my{JWV3$>2}PMTlE zjyRKeJnFvBQ5_6_-%LekOe7wSS_4Z^?>&Hh@D^^v?jMkU-FWi@^RpOs%8V=?BdIUJ z_Ba+N;5rOO?|+y%j=&bg`IwCT(T$H_M_h*m_@#5b)oD6S+zp%I&eP;ybMX!pT2yyY zizM(vV+O_&m*OU@!VC=l$c(rf&Ly6TT8x)bi!0)vCNpg@i}+#GHhc~H>pmQTd7h8W z+`owZsJMWd!>lvr!R1&%d<50e=(DDw(Wnuwa^lZ1ow)fY=Kp`_jB02-s{Y@YhOwWT zFJ?b%OYB)nA%((GR0?mP<}~axv;QklFQ`FvY`0VI_qlmt7LKHTBC)i9e*R9i2Yss&|Eg( z{JJYeHQ$Zd7(x6O)OOv6o@NxjprDaoLuDfD zJJX?j>_t2kH5GNJ)F*sz{;Dm(4#X=_9r`C~Ew%i?)R$l^aSiIdTd)_ti(VM;Bl&Mg zq2-U}=Qa|vi6@~twie597tY2%Fb`*5<12@+q2}8ACv#sr)EasMRlg54W#3{CEVynu zwg_7jAH6=v^!#5`xT$D&!=&^93?W{Q)A3cT#IT>u94^73#K+MGV{V$YkcL__GtlJFjsH;gP0h9O|%YHdHqpiyJ8buWp+|*es~HsDLm7Vvk&E#ct2_} z)Y>(%VXoHpn%H#zS;VKfrsEh+u+PV~Na{|c^}bQn9F<&|#5sj?5%Cawn6s-L9+%+i zWp{~d>ot-3hwK{S$Lwu!>6wMZ2e{`h=5Rhsc@-9LdN@BM*2?+c5pDa#m-p4~2)f7A zjpmMzC{}Z>;mjxQ!dXhWG53ta)13c1#&E5O;BC&fly%Irx5cOUPovbH^R}uudfJ!c zBb!X2^r>@Sh3%h^pQIJMm(!0^2UA}E-wEB~F75L}7>N(svlC{z2HM{x!~|s!hf;qK zmvS!Q>}E$LHg7VO(o39;xf*YGN(}Q#C3?gjm00LAm(o1yi|uWR+Qs=K=l?&}5(IOnj`5tUobonDZSskfC*caGuASp#`+Q1d$XKr2 zBsO1kIu9Y3h1$#!#-qq4t8*7Oo_FMQV&I)~-v9^yh-r zoKZc+RUgh__IIiIO&(S?#|h5)c4k_>PXZ-B?kl%vr$xH*>=kL*Q4i6DkJI>VdG zmo6;G%}mS4PRq=4XJ)p~%}&Y4%E<8TQ=Zmu+?KOM5?$2Ip2_%G=B+|&R7 delta 9678 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
HmDv5I`MaSI)zB7H zz3VHprqZz$@nBSkysuG6qVPE?g@2;vH2z;^|BpdEpc2)wgHCSEv#YQM5-&ha!6#1q|Cmpl^PPEb%*IB<>rvbF2zs>* zZc)(4AEGi5f6H{J3w9@-ftrd>P^oYBz4=vJggM0PP#wCAT1zoMnEE1&Cay$1cPDno zv*?3Sx5>XRg_zss>oyrPiKnAFwh4RUew>Q_cg*UYi35oDq2@Z|M{`|1Y7N<_`Xi_* z`x(1px4WieFJn{U&+itSp6j18+*IVF7T<7efU9u=?!j`5zh~xf1r8)WhklrL->ik! zs5LX$?%5>M^@2UCNnKZ#y}U_pA3e37eWyukfVO1-hd#6H1dqojfl`HC1X3hYxJPmorgKCJRbpV_u6I?nZ&oe-TJnM_R*_xN%Y zQLc|lgSN{&dscL~E7e{dof@Q+p5~lBf5(ybrRcB(B}(gkovQhib7nNhSdIn6B{+kl zvmF@|=jvhS$7K18rhbM!i+HZRF(x&=E%83C`3swKETy~(wJ&CJd`_$-``?ep_KPhj z(pn0wV(Ln{;tPt;a;)aaCeG*RNx2r+497DZ|NT74xpoBmIkG70^R&G&HYrH+rhWID zs`zxbug69OjHC3GbKPJ&C@woeTV)qVAcsCo`J+YlD_6Cmd=RyYN7+;3CcBF5TXCMy zbmE58AHc;Ni#WR2jpOSEjHk4cqZVi5>~`_tJ}E?AduV)~-&2&HqP~N@F}@&l5RpEy z25UYxwF458LZ76xk3%bL9@p!WXZK9Va}BkZB!s)>*c%h_5=yCkp5vHv#WvL1)F+wp zMO@3#-wsOj_)VguPnw;Z=y6T3hb9i}slBUDdxNzcuW)B=9LDh}Wq)$M**Sj{n{h-@ zKN)**?5A9bQ*6H^Z{H+J+c;KH`@f$x1ofP{5&v^yqf1zJ;Bu#~rQ=xpQc_fd zGS1xR=)*CXGvPYR(ajD`j&qgRxyebP)2UiQU3ZRX${*n4_H)T$u0(rzvd0x;e~=s% z)Pys28P!70`f)sA-%8F7c!pYiPH;SDr>A85#ZwC8xdYo=wTWMsP2(p#se@BC?ItLim-9oaac bY|@nSQIpE-(F@{sCM;MQy7SKJhkgD7kNMGb diff --git a/po/fr.po b/po/fr.po index 0d4ab239..1f2c54f6 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,10 +7,10 @@ #: src/create.c:1552 msgid "" msgstr "" -"Project-Id-Version: tar-1.23.90\n" +"Project-Id-Version: tar-1.25\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2010-11-07 17:07+0200\n" -"PO-Revision-Date: 2010-07-23 01:11+0100\n" +"POT-Creation-Date: 2011-03-12 11:53+0200\n" +"PO-Revision-Date: 2010-11-09 22:44+0100\n" "Last-Translator: Christophe Combelles \n" "Language-Team: French \n" "Language: fr\n" @@ -59,7 +59,7 @@ msgstr "%.*s : le paramètre ARGP_HELP_FMT est inconnu" msgid "Garbage in ARGP_HELP_FMT: %s" msgstr "Déchet dans ARGP_HELP_FMT : %s" -#: gnu/argp-help.c:1246 +#: gnu/argp-help.c:1248 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." @@ -67,29 +67,29 @@ msgstr "" "Les arguments obligatoires ou facultatifs pour les formes longues des " "options le sont également pour les formes courtes qui leur correspondent." -#: gnu/argp-help.c:1639 +#: gnu/argp-help.c:1641 msgid "Usage:" msgstr "Utilisation :" -#: gnu/argp-help.c:1643 +#: gnu/argp-help.c:1645 msgid " or: " msgstr " ou : " -#: gnu/argp-help.c:1655 +#: gnu/argp-help.c:1657 msgid " [OPTION...]" msgstr " [OPTION...]" -#: gnu/argp-help.c:1682 +#: gnu/argp-help.c:1684 #, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Pour en savoir davantage, faites : « %s --help » ou « %s --usage ».\n" -#: gnu/argp-help.c:1710 +#: gnu/argp-help.c:1712 #, c-format msgid "Report bugs to %s.\n" msgstr "Rapportez toute anomalie à %s.\n" -#: gnu/argp-help.c:1929 gnu/error.c:183 +#: gnu/argp-help.c:1931 gnu/error.c:183 msgid "Unknown system error" msgstr "Erreur système inconnue" @@ -195,16 +195,16 @@ msgstr "%s : l'option « -W %s » ne prend pas d'argument\n" msgid "%s: option '-W %s' requires an argument\n" msgstr "%s : l'option « -W %s » doit avoir un argument\n" -#: gnu/obstack.c:425 gnu/obstack.c:427 gnu/xalloc-die.c:36 +#: gnu/obstack.c:423 gnu/obstack.c:425 gnu/xalloc-die.c:36 msgid "memory exhausted" msgstr "mémoire épuisée" -#: gnu/openat-die.c:36 +#: gnu/openat-die.c:40 #, c-format msgid "unable to record current working directory" msgstr "Impossible d'enregistrer le répertoire de travail actuel" -#: gnu/openat-die.c:54 +#: gnu/openat-die.c:59 #, c-format msgid "failed to return to initial working directory" msgstr "Impossible de revenir au répertoire de travail initial" @@ -228,11 +228,11 @@ msgstr "Impossible de revenir au répertoire de travail initial" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: gnu/quotearg.c:274 +#: gnu/quotearg.c:273 msgid "`" msgstr "« " -#: gnu/quotearg.c:275 +#: gnu/quotearg.c:274 msgid "'" msgstr " »" @@ -505,21 +505,21 @@ msgid_plural "%s: Wrote only %lu of %lu bytes" msgstr[0] "%s : seulement %lu octet sur %lu a été écrit" msgstr[1] "%s: seulement %lu octets sur %lu ont été écrits" -#: lib/paxnames.c:155 +#: lib/paxnames.c:140 #, c-format msgid "Removing leading `%s' from member names" msgstr "Suppression de « %s » au début des noms des membres" -#: lib/paxnames.c:156 +#: lib/paxnames.c:141 #, c-format msgid "Removing leading `%s' from hard link targets" msgstr "Suppression de « %s » au début des liens physiques" -#: lib/paxnames.c:169 +#: lib/paxnames.c:154 msgid "Substituting `.' for empty member name" msgstr "Remplacement des noms vides par « . » pour les membres" -#: lib/paxnames.c:170 +#: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" msgstr "Remplacement des cibles vides par « . » pour les liens physiques" @@ -819,20 +819,20 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "Seulement %lu octet sur %lu a pu être lu" msgstr[1] "Seulement %lu octets sur %lu ont pu être lus" -#: src/compare.c:105 src/compare.c:382 +#: src/compare.c:105 src/compare.c:383 msgid "Contents differ" msgstr "Les contenus sont différents." -#: src/compare.c:131 src/extract.c:972 src/incremen.c:1462 src/list.c:458 -#: src/list.c:1392 src/xheader.c:711 +#: src/compare.c:131 src/extract.c:984 src/incremen.c:1456 src/list.c:456 +#: src/list.c:1388 src/xheader.c:711 msgid "Unexpected EOF in archive" msgstr "Fin prématurée rencontrée dans l'archive." -#: src/compare.c:179 src/compare.c:195 src/compare.c:308 src/compare.c:406 +#: src/compare.c:179 src/compare.c:195 src/compare.c:309 src/compare.c:407 msgid "File type differs" msgstr "Le type de fichier est différent." -#: src/compare.c:182 src/compare.c:202 src/compare.c:322 +#: src/compare.c:182 src/compare.c:202 src/compare.c:323 msgid "Mode differs" msgstr "Le mode est différent." @@ -848,52 +848,57 @@ msgstr "Le GID est différent." msgid "Mod time differs" msgstr "La date de modification est différente." -#: src/compare.c:215 src/compare.c:414 +#: src/compare.c:215 src/compare.c:415 msgid "Size differs" msgstr "La taille est différente." -#: src/compare.c:263 +#: src/compare.c:264 #, c-format msgid "Not linked to %s" msgstr "N'est pas lié à %s." -#: src/compare.c:287 +#: src/compare.c:288 msgid "Symlink differs" msgstr "Le lien symbolique est différent." -#: src/compare.c:316 +#: src/compare.c:317 msgid "Device number differs" msgstr "Le numéro de périphérique est différent." -#: src/compare.c:456 +#: src/compare.c:457 #, c-format msgid "Verify " msgstr "Vérification " -#: src/compare.c:463 +#: src/compare.c:464 #, c-format msgid "%s: Unknown file type `%c', diffed as normal file" msgstr "" "%s : type de fichier inconnu « %c », recherche de différence comme pour un " "fichier normal" -#: src/compare.c:518 +#: src/compare.c:520 msgid "Archive contains file names with leading prefixes removed." msgstr "L'archive contient des noms de fichiers dont le préfixe a été enlevé" -#: src/compare.c:520 +#: src/compare.c:526 +#, fuzzy +msgid "Archive contains transformed file names." +msgstr "L'archive contient des en-têtes obsolètes en base 64." + +#: src/compare.c:531 msgid "Verification may fail to locate original files." msgstr "" "La vérification peut échouer lors de la localisation des fichier originaux." -#: src/compare.c:593 +#: src/compare.c:603 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "ÉCHEC DE VÉRIFICATION : %d en-tête non valable détecté." msgstr[1] "ÉCHEC DE VÉRIFICATION : %d en-têtes non valables détectés." -#: src/compare.c:611 src/list.c:222 +#: src/compare.c:621 src/list.c:222 #, c-format msgid "A lone zero block at %s" msgstr "Bloc zéro solitaire repéré à %s" @@ -948,7 +953,7 @@ msgstr "" "%s : le fichier est sur un système de fichiers différent ; fichier non " "archivé" -#: src/create.c:1203 src/create.c:1214 src/incremen.c:582 src/incremen.c:588 +#: src/create.c:1203 src/create.c:1214 src/incremen.c:578 src/incremen.c:584 msgid "contents not dumped" msgstr "contenu non archivé" @@ -972,7 +977,7 @@ msgstr "%s : le fichier n'est pas modifié ; fichier non archivé" msgid "%s: file is the archive; not dumped" msgstr "%s : le fichier est l'archive elle-même ; fichier non archivé" -#: src/create.c:1723 src/incremen.c:575 +#: src/create.c:1723 src/incremen.c:571 msgid "directory not dumped" msgstr "répertoire non archivé" @@ -981,12 +986,12 @@ msgstr "répertoire non archivé" msgid "%s: file changed as we read it" msgstr "%s : fichier modifié pendant sa lecture" -#: src/create.c:1857 +#: src/create.c:1858 #, c-format msgid "%s: socket ignored" msgstr "%s : socket ignorée" -#: src/create.c:1863 +#: src/create.c:1864 #, c-format msgid "%s: door ignored" msgstr "%s : porte ignorée" @@ -1014,165 +1019,165 @@ msgstr "%s : l'horodatage %s est situé %s secondes dans le futur." msgid "%s: Unexpected inconsistency when making directory" msgstr "%s : incohérence inattendue lors de la création du répertoire" -#: src/extract.c:709 +#: src/extract.c:721 #, c-format msgid "%s: Directory renamed before its status could be extracted" msgstr "%s : répertoire renommé avant l'extraction de son état" -#: src/extract.c:863 +#: src/extract.c:875 msgid "Extracting contiguous files as regular files" msgstr "Extraction des fichiers contigus comme des fichiers réguliers" -#: src/extract.c:1197 +#: src/extract.c:1209 msgid "Attempting extraction of symbolic links as hard links" msgstr "Tentative d'extraction des liens symboliques comme des liens physiques" -#: src/extract.c:1353 +#: src/extract.c:1365 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s : extraction impossible (morceau de fichier issu d'un autre volume)" -#: src/extract.c:1360 src/list.c:1125 +#: src/extract.c:1372 src/list.c:1121 msgid "Unexpected long name header" msgstr "En-tête à nom long inattendu" -#: src/extract.c:1367 +#: src/extract.c:1379 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s : type de fichier inconnu « %c », extrait comme un fichier normal." -#: src/extract.c:1393 +#: src/extract.c:1405 #, c-format msgid "Current %s is newer or same age" msgstr "Le %s actuel est au moins aussi récent" -#: src/extract.c:1445 +#: src/extract.c:1457 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s : impossible d'archiver ce fichier." -#: src/extract.c:1582 +#: src/extract.c:1594 #, c-format msgid "Cannot rename %s to %s" msgstr "Impossible de renommer %s en %s" -#: src/incremen.c:474 src/incremen.c:518 +#: src/incremen.c:473 src/incremen.c:517 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s : le répertoire a été renommé depuis %s" -#: src/incremen.c:486 +#: src/incremen.c:485 #, c-format msgid "%s: Directory has been renamed" msgstr "%s : le répertoire a été renommé." -#: src/incremen.c:531 +#: src/incremen.c:530 #, c-format msgid "%s: Directory is new" msgstr "%s : le répertoire est nouveau." -#: src/incremen.c:956 src/incremen.c:973 +#: src/incremen.c:951 src/incremen.c:968 msgid "Invalid time stamp" msgstr "Horodatage non valable" -#: src/incremen.c:1012 +#: src/incremen.c:1007 msgid "Invalid modification time (seconds)" msgstr "Temps de modification non valable (secondes)" -#: src/incremen.c:1027 +#: src/incremen.c:1022 msgid "Invalid modification time (nanoseconds)" msgstr "Temps de modification non valable (nanosecondes)" -#: src/incremen.c:1047 +#: src/incremen.c:1042 msgid "Invalid device number" msgstr "Numéro de périphérique non valable" -#: src/incremen.c:1062 +#: src/incremen.c:1057 msgid "Invalid inode number" msgstr "Numéro d'inode non valable" -#: src/incremen.c:1113 src/incremen.c:1150 +#: src/incremen.c:1108 src/incremen.c:1145 msgid "Field too long while reading snapshot file" msgstr "Champ trop long rencontré pendant la lecture du fichier d'instantané" -#: src/incremen.c:1120 src/incremen.c:1158 +#: src/incremen.c:1115 src/incremen.c:1153 msgid "Read error in snapshot file" msgstr "Erreur de lecture du fichier d'instantané" -#: src/incremen.c:1122 src/incremen.c:1162 src/incremen.c:1214 -#: src/incremen.c:1272 +#: src/incremen.c:1117 src/incremen.c:1157 src/incremen.c:1209 +#: src/incremen.c:1267 msgid "Unexpected EOF in snapshot file" msgstr "Fin prématurée du fichier d'instantané" -#: src/incremen.c:1129 src/incremen.c:1169 +#: src/incremen.c:1124 src/incremen.c:1164 msgid "Unexpected field value in snapshot file" msgstr "Valeur de champ inattendue dans le fichier d'instantané" -#: src/incremen.c:1264 +#: src/incremen.c:1259 msgid "Missing record terminator" msgstr "Terminaison de champ manquante" -#: src/incremen.c:1325 src/incremen.c:1328 +#: src/incremen.c:1320 src/incremen.c:1323 msgid "Bad incremental file format" msgstr "Mauvais format de fichier incrémental" -#: src/incremen.c:1347 +#: src/incremen.c:1342 #, c-format msgid "Unsupported incremental format version: %" msgstr "Version non prise en charge pour le format incrémental : %" -#: src/incremen.c:1502 +#: src/incremen.c:1496 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "dumpdir incorrect : « %c » était attendu mais %#3o a été trouvé" -#: src/incremen.c:1512 +#: src/incremen.c:1506 msgid "Malformed dumpdir: 'X' duplicated" msgstr "dumpdir incorrect : « X » en double" -#: src/incremen.c:1525 +#: src/incremen.c:1519 msgid "Malformed dumpdir: empty name in 'R'" msgstr "dumpdir incorrect : nom vide dans « R »" -#: src/incremen.c:1538 +#: src/incremen.c:1532 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "dumpdir incorrect : « T » non précédé de « R »" -#: src/incremen.c:1544 +#: src/incremen.c:1538 msgid "Malformed dumpdir: empty name in 'T'" msgstr "dumpdir incorrect : nom vide dans « T »" -#: src/incremen.c:1564 +#: src/incremen.c:1558 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "dumpdir incorrect : fin des données trouvées au lieu de « %c »" -#: src/incremen.c:1571 +#: src/incremen.c:1565 msgid "Malformed dumpdir: 'X' never used" msgstr "dumpdir incorrect : « X » n'a jamais été utilisé" -#: src/incremen.c:1615 +#: src/incremen.c:1609 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Impossible de créer un répertoire temporaire utilisant le modèle %s" -#: src/incremen.c:1677 +#: src/incremen.c:1670 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s : répertoire non purgé : impossible d'évaluer par stat()" -#: src/incremen.c:1690 +#: src/incremen.c:1683 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "" "%s : le répertoire est sur un autre périphérique : répertoire non purgé" -#: src/incremen.c:1698 +#: src/incremen.c:1691 #, c-format msgid "%s: Deleting %s\n" msgstr "%s : suppression de %s\n" -#: src/incremen.c:1703 +#: src/incremen.c:1696 #, c-format msgid "%s: Cannot remove" msgstr "%s : suppression impossible" @@ -1192,21 +1197,21 @@ msgstr "bloc %s : ** Bloc de NULs **\n" msgid "block %s: ** End of File **\n" msgstr "bloc %s : ** Fin de fichier **\n" -#: src/list.c:256 src/list.c:1097 src/list.c:1360 +#: src/list.c:256 src/list.c:1093 src/list.c:1356 #, c-format msgid "block %s: " msgstr "bloc %s : " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:712 +#: src/list.c:708 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "" "Blancs dans l'en-tête alors qu'une valeur numérique de type %s était attendue" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:767 +#: src/list.c:763 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1214,27 +1219,27 @@ msgstr "" "complément à 2 supposé" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:778 +#: src/list.c:774 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "La valeur octale de l'archive %.*s est en dehors de la plage de %s" -#: src/list.c:799 +#: src/list.c:795 msgid "Archive contains obsolescent base-64 headers" msgstr "L'archive contient des en-têtes obsolètes en base 64." -#: src/list.c:813 +#: src/list.c:809 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "Une chaîne en base 64 signée %s de l'archive est hors de la plage %s" -#: src/list.c:844 +#: src/list.c:840 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Une valeur en base 256 de l'archive est en dehors de la plage %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:873 +#: src/list.c:869 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "" @@ -1242,89 +1247,83 @@ msgstr "" "attendue." #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:895 +#: src/list.c:891 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "La valeur de l'archive %s est hors des limites de %s : %s..%s" -#: src/list.c:1261 +#: src/list.c:1257 #, c-format msgid " link to %s\n" msgstr " lien vers %s\n" -#: src/list.c:1269 +#: src/list.c:1265 #, c-format msgid " unknown file type %s\n" msgstr " type de fichier inconnu %s\n" -#: src/list.c:1287 +#: src/list.c:1283 #, c-format msgid "--Long Link--\n" msgstr "--Lien long--\n" -#: src/list.c:1291 +#: src/list.c:1287 #, c-format msgid "--Long Name--\n" msgstr "--Nom long--\n" -#: src/list.c:1295 +#: src/list.c:1291 #, c-format msgid "--Volume Header--\n" msgstr "--En-tête de volume--\n" -#: src/list.c:1303 +#: src/list.c:1299 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Suite à l'octet %s--\n" -#: src/list.c:1365 +#: src/list.c:1361 msgid "Creating directory:" msgstr "Création du répertoire :" -#: src/misc.c:298 -#, fuzzy +#: src/misc.c:297 msgid "Cannot get working directory" -msgstr "Impossible de changer le répertoire de travail" +msgstr "Impossible de connaître le répertoire de travail" -#: src/misc.c:571 +#: src/misc.c:570 #, c-format msgid "Renaming %s to %s\n" msgstr "%s renommé en %s\n" -#: src/misc.c:580 src/misc.c:599 +#: src/misc.c:579 src/misc.c:598 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s : impossible de renommer en %s" -#: src/misc.c:604 +#: src/misc.c:603 #, c-format msgid "Renaming %s back to %s\n" msgstr "%s finalement renommé en %s\n" -#: src/misc.c:851 +#: src/misc.c:850 #, c-format msgid "%s: File removed before we read it" msgstr "%s : fichier supprimé avant d'avoir été lu" -#: src/misc.c:866 -#, c-format -msgid "%s: Directory removed before we read it" -msgstr "%s : Répertoire supprimé avant d'avoir été lu" - -#: src/misc.c:887 +#: src/misc.c:871 msgid "child process" msgstr "processus enfant" -#: src/misc.c:896 +#: src/misc.c:880 msgid "interprocess channel" msgstr "canal inter-processus" -#: src/names.c:594 +#: src/names.c:590 msgid "Pattern matching characters used in file names" msgstr "" "Caractères de correspondance de motif utilisé dans les noms de fichiers." -#: src/names.c:596 +#: src/names.c:592 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" @@ -1332,29 +1331,29 @@ msgstr "" "Utilisez « --wildcards » pour activer la correspondance de motif ou « --no-" "wildcards » pour supprimer cet avertissement" -#: src/names.c:614 src/names.c:630 +#: src/names.c:610 src/names.c:626 #, c-format msgid "%s: Not found in archive" msgstr "%s : non trouvé dans l'archive" -#: src/names.c:615 +#: src/names.c:611 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s : occurence requise non trouvée dans l'archive" -#: src/names.c:649 +#: src/names.c:645 #, c-format msgid "Archive label mismatch" msgstr "Mauvaise correspondance d'étiquette d'archive" -#: src/names.c:953 +#: src/names.c:949 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" "L'utilisation de l'option -C à l'intérieur de la liste de fichiers n'est pas " "permise avec --listed-incremental" -#: src/names.c:959 +#: src/names.c:955 msgid "Only one -C option is allowed with --listed-incremental" msgstr "Une seule option -C est autorisée avec --listed-incremental" @@ -2820,6 +2819,9 @@ msgstr "La commande s'est terminée\n" msgid "--stat requires file names" msgstr "--stat nécessite un nom de fichier" +#~ msgid "%s: Directory removed before we read it" +#~ msgstr "%s : Répertoire supprimé avant d'avoir été lu" + #~ msgid "Cannot save working directory" #~ msgstr "Le répertoire de travail ne peut pas être sauvegardé" diff --git a/po/ga.gmo b/po/ga.gmo index 1e9422e1a68ec2d3ba19f1936a761aa7a03846e2..5011e90ece0654ab1922f6d0648a60ef7c7a44f4 100644 GIT binary patch delta 28 kcmdnGo_Xtf<_*ooyoS04#=3?^3WkPOrpB8m6sx8H0FlfIHUIzs delta 28 kcmdnGo_Xtf<_*ooyau|4hPnpk3WnxZ2IiY56sx8H0Fnj?Jpcdz diff --git a/po/ga.po b/po/ga.po index 4f42b984..9a5d73d6 100644 --- a/po/ga.po +++ b/po/ga.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tar 1.22\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2010-11-07 17:07+0200\n" +"POT-Creation-Date: 2011-03-12 11:53+0200\n" "PO-Revision-Date: 2009-03-25 20:27-0600\n" "Last-Translator: Kevin Scannell \n" "Language-Team: Irish \n" @@ -59,7 +59,7 @@ msgstr "%.*s: Paraiméadar anaithnid ARGP_HELP_FMT" msgid "Garbage in ARGP_HELP_FMT: %s" msgstr "Bruscar i ARGP_HELP_FMT: %s" -#: gnu/argp-help.c:1246 +#: gnu/argp-help.c:1248 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." @@ -67,30 +67,30 @@ msgstr "" "Is riachtanach/roghnach le rogha ghearr aon argóint atá riachtanach/roghnach " "leis an rogha fhada." -#: gnu/argp-help.c:1639 +#: gnu/argp-help.c:1641 msgid "Usage:" msgstr "Úsáid:" -#: gnu/argp-help.c:1643 +#: gnu/argp-help.c:1645 msgid " or: " msgstr " nó: " -#: gnu/argp-help.c:1655 +#: gnu/argp-help.c:1657 msgid " [OPTION...]" msgstr " [ROGHA...]" -#: gnu/argp-help.c:1682 +#: gnu/argp-help.c:1684 #, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "" "Bain triail as `%s --help' nó `%s --usage' chun tuilleadh eolais a fháil.\n" -#: gnu/argp-help.c:1710 +#: gnu/argp-help.c:1712 #, c-format msgid "Report bugs to %s.\n" msgstr "Seol tuairiscí fabhtanna chuig %s.\n" -#: gnu/argp-help.c:1929 gnu/error.c:183 +#: gnu/argp-help.c:1931 gnu/error.c:183 msgid "Unknown system error" msgstr "Earráid anaithnid chórais" @@ -197,16 +197,16 @@ msgstr "%s: ní cheadaítear argóint i ndiaidh na rogha `-W %s'\n" msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: tá argóint de dhíth i ndiaidh na rogha `%s'\n" -#: gnu/obstack.c:425 gnu/obstack.c:427 gnu/xalloc-die.c:36 +#: gnu/obstack.c:423 gnu/obstack.c:425 gnu/xalloc-die.c:36 msgid "memory exhausted" msgstr "cuimhne ídithe" -#: gnu/openat-die.c:36 +#: gnu/openat-die.c:40 #, c-format msgid "unable to record current working directory" msgstr "ní féidir an chomhadlann reatha a thaifeadadh" -#: gnu/openat-die.c:54 +#: gnu/openat-die.c:59 #, c-format msgid "failed to return to initial working directory" msgstr "níorbh fhéidir an bhunchomhadlann oibre a aisfhilleadh" @@ -230,11 +230,11 @@ msgstr "níorbh fhéidir an bhunchomhadlann oibre a aisfhilleadh" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: gnu/quotearg.c:274 +#: gnu/quotearg.c:273 msgid "`" msgstr "`" -#: gnu/quotearg.c:275 +#: gnu/quotearg.c:274 msgid "'" msgstr "'" @@ -510,21 +510,21 @@ msgstr[2] "%s: Níor scríobhadh ach %lu as %lu bheart" msgstr[3] "%s: Níor scríobhadh ach %lu as %lu mbeart" msgstr[4] "%s: Níor scríobhadh ach %lu as %lu beart" -#: lib/paxnames.c:155 +#: lib/paxnames.c:140 #, c-format msgid "Removing leading `%s' from member names" msgstr "Gach `%s' tosaigh á bhaint amach as ainmneacha baill" -#: lib/paxnames.c:156 +#: lib/paxnames.c:141 #, c-format msgid "Removing leading `%s' from hard link targets" msgstr "Gach `%s' tosaigh á bhaint amach as spriocanna na nasc crua" -#: lib/paxnames.c:169 +#: lib/paxnames.c:154 msgid "Substituting `.' for empty member name" msgstr "Ag cur `.' in ionad ainm baill folamh" -#: lib/paxnames.c:170 +#: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" msgstr "Ag cur `.' in ionad sprioc fholamh den nasc crua" @@ -837,20 +837,20 @@ msgstr[2] "Níorbh fhéidir ach %lu de %lu bheart a léamh" msgstr[3] "Níorbh fhéidir ach %lu de %lu mbeart a léamh" msgstr[4] "Níorbh fhéidir ach %lu de %lu beart a léamh" -#: src/compare.c:105 src/compare.c:382 +#: src/compare.c:105 src/compare.c:383 msgid "Contents differ" msgstr "Tá difríocht idir na hábhair" -#: src/compare.c:131 src/extract.c:972 src/incremen.c:1462 src/list.c:458 -#: src/list.c:1392 src/xheader.c:711 +#: src/compare.c:131 src/extract.c:984 src/incremen.c:1456 src/list.c:456 +#: src/list.c:1388 src/xheader.c:711 msgid "Unexpected EOF in archive" msgstr "Comhadchríoch gan choinne i gcartlann" -#: src/compare.c:179 src/compare.c:195 src/compare.c:308 src/compare.c:406 +#: src/compare.c:179 src/compare.c:195 src/compare.c:309 src/compare.c:407 msgid "File type differs" msgstr "Tá difríocht idir na cineálacha comhaid" -#: src/compare.c:182 src/compare.c:202 src/compare.c:322 +#: src/compare.c:182 src/compare.c:202 src/compare.c:323 msgid "Mode differs" msgstr "Tá difríocht idir na móid" @@ -866,42 +866,47 @@ msgstr "Tá difríocht idir na GIDanna" msgid "Mod time differs" msgstr "Tá difríocht idir na hamanna modhnaithe" -#: src/compare.c:215 src/compare.c:414 +#: src/compare.c:215 src/compare.c:415 msgid "Size differs" msgstr "Tá difríocht idir na méideanna" -#: src/compare.c:263 +#: src/compare.c:264 #, c-format msgid "Not linked to %s" msgstr "Ní ceangailte le %s" -#: src/compare.c:287 +#: src/compare.c:288 msgid "Symlink differs" msgstr "Tá difríocht idir na naisc shiombalacha" -#: src/compare.c:316 +#: src/compare.c:317 msgid "Device number differs" msgstr "Tá difríocht idir na huimhreacha gléis" -#: src/compare.c:456 +#: src/compare.c:457 #, c-format msgid "Verify " msgstr "Fíoraigh " -#: src/compare.c:463 +#: src/compare.c:464 #, c-format msgid "%s: Unknown file type `%c', diffed as normal file" msgstr "%s: Cineál anaithnid comhaid `%c', déan diff mar ghnáthchomhad" -#: src/compare.c:518 +#: src/compare.c:520 msgid "Archive contains file names with leading prefixes removed." msgstr "Tá comhaid sa chartlann agus a réimíreanna scriosta." -#: src/compare.c:520 +#: src/compare.c:526 +#, fuzzy +msgid "Archive contains transformed file names." +msgstr "Tá ceanntásca le bunuimhir 64 i léig sa chartlann" + +#: src/compare.c:531 msgid "Verification may fail to locate original files." msgstr "Nach féidir i gcónaí na bunchomhaid a aimsiú agus le linn fíoraithe." -#: src/compare.c:593 +#: src/compare.c:603 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" @@ -911,7 +916,7 @@ msgstr[2] "THEIP AR DHEIMHNIÚ: aimsíodh %d cheanntásc neamhbhailí" msgstr[3] "THEIP AR DHEIMHNIÚ: aimsíodh %d gceanntásc neamhbhailí" msgstr[4] "THEIP AR DHEIMHNIÚ: aimsíodh %d ceanntásc neamhbhailí" -#: src/compare.c:611 src/list.c:222 +#: src/compare.c:621 src/list.c:222 #, c-format msgid "A lone zero block at %s" msgstr "Bloc nialasach scoite ag %s" @@ -965,7 +970,7 @@ msgstr[4] "%s: %s beart níos lú sa chomhad; ag stuáil le nialais" msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: is ar chóras comhad eile é an comhad; gan dumpáil" -#: src/create.c:1203 src/create.c:1214 src/incremen.c:582 src/incremen.c:588 +#: src/create.c:1203 src/create.c:1214 src/incremen.c:578 src/incremen.c:584 msgid "contents not dumped" msgstr "ábhar gan dumpáil" @@ -989,7 +994,7 @@ msgstr "%s: comhad gan athrú; gan dumpáil" msgid "%s: file is the archive; not dumped" msgstr "%s: is ionann é agus an chartlann féin; gan dumpáil" -#: src/create.c:1723 src/incremen.c:575 +#: src/create.c:1723 src/incremen.c:571 msgid "directory not dumped" msgstr "níor dumpáladh an chomhadlann" @@ -998,12 +1003,12 @@ msgstr "níor dumpáladh an chomhadlann" msgid "%s: file changed as we read it" msgstr "%s: athraíodh an comhad agus á léamh" -#: src/create.c:1857 +#: src/create.c:1858 #, c-format msgid "%s: socket ignored" msgstr "%s: rinneadh neamhshuim ar an soicéad" -#: src/create.c:1863 +#: src/create.c:1864 #, c-format msgid "%s: door ignored" msgstr "%s: rinneadh neamhshuim ar an doras" @@ -1031,168 +1036,168 @@ msgstr "%s: tá an stampa ama %s %s soicind amach anseo" msgid "%s: Unexpected inconsistency when making directory" msgstr "%s: Bunoscionntacht gan choinne agus comhadlann á cruthú" -#: src/extract.c:709 +#: src/extract.c:721 #, c-format msgid "%s: Directory renamed before its status could be extracted" msgstr "" "%s: Athainmníodh an chomhadlann sularbh fhéidir a stádas a bhaint amach" -#: src/extract.c:863 +#: src/extract.c:875 msgid "Extracting contiguous files as regular files" msgstr "Comhaid theorantacha á mbaint amach mar ghnáthchomhaid" -#: src/extract.c:1197 +#: src/extract.c:1209 msgid "Attempting extraction of symbolic links as hard links" msgstr "" "Ag déanamh iarracht ar naisc shiombalacha a bhaint amach mar naisc chrua" -#: src/extract.c:1353 +#: src/extract.c:1365 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Ní féidir an comhad a bhaint amach -- ar lean ó imleabhar eile" -#: src/extract.c:1360 src/list.c:1125 +#: src/extract.c:1372 src/list.c:1121 msgid "Unexpected long name header" msgstr "Ceanntásc ainm fada gan choinne" -#: src/extract.c:1367 +#: src/extract.c:1379 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Cineál anaithnid comhaid `%c', á bhaint amach mar ghnáthchomhad" -#: src/extract.c:1393 +#: src/extract.c:1405 #, c-format msgid "Current %s is newer or same age" msgstr "Tá an %s reatha níos nuaí nó ar comhaois" -#: src/extract.c:1445 +#: src/extract.c:1457 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Níorbh fhéidir cúltaca a dhéanamh" -#: src/extract.c:1582 +#: src/extract.c:1594 #, c-format msgid "Cannot rename %s to %s" msgstr "Ní féidir %s a athainmniú go %s" -#: src/incremen.c:474 src/incremen.c:518 +#: src/incremen.c:473 src/incremen.c:517 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Athainmníodh an chomhadlann ó %s" -#: src/incremen.c:486 +#: src/incremen.c:485 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Athainmníodh an chomhadlann" -#: src/incremen.c:531 +#: src/incremen.c:530 #, c-format msgid "%s: Directory is new" msgstr "%s: Comhadlann nua" -#: src/incremen.c:956 src/incremen.c:973 +#: src/incremen.c:951 src/incremen.c:968 msgid "Invalid time stamp" msgstr "Stampa ama neamhbhailí" -#: src/incremen.c:1012 +#: src/incremen.c:1007 msgid "Invalid modification time (seconds)" msgstr "Am neamhbhailí mionathraithe (soicindí)" -#: src/incremen.c:1027 +#: src/incremen.c:1022 msgid "Invalid modification time (nanoseconds)" msgstr "Am neamhbhailí mionathraithe (nanashoicindí)" -#: src/incremen.c:1047 +#: src/incremen.c:1042 msgid "Invalid device number" msgstr "Uimhir neamhbhailí gléis" -#: src/incremen.c:1062 +#: src/incremen.c:1057 msgid "Invalid inode number" msgstr "Uimhir inode as raon" -#: src/incremen.c:1113 src/incremen.c:1150 +#: src/incremen.c:1108 src/incremen.c:1145 msgid "Field too long while reading snapshot file" msgstr "Réimse rófhada agus an comhad roghbhlúire á léamh" -#: src/incremen.c:1120 src/incremen.c:1158 +#: src/incremen.c:1115 src/incremen.c:1153 msgid "Read error in snapshot file" msgstr "Earráid agus an comhad roghbhlúire á léamh" -#: src/incremen.c:1122 src/incremen.c:1162 src/incremen.c:1214 -#: src/incremen.c:1272 +#: src/incremen.c:1117 src/incremen.c:1157 src/incremen.c:1209 +#: src/incremen.c:1267 msgid "Unexpected EOF in snapshot file" msgstr "Comhadchríoch gan choinne sa chomhad roghbhlúire" -#: src/incremen.c:1129 src/incremen.c:1169 +#: src/incremen.c:1124 src/incremen.c:1164 msgid "Unexpected field value in snapshot file" msgstr "Luach réimse gan choinne sa chomhad roghbhlúire" -#: src/incremen.c:1264 +#: src/incremen.c:1259 msgid "Missing record terminator" msgstr "Críochnaitheoir taifid ar iarraidh" -#: src/incremen.c:1325 src/incremen.c:1328 +#: src/incremen.c:1320 src/incremen.c:1323 msgid "Bad incremental file format" msgstr "Drochfhormáid incriminteach" -#: src/incremen.c:1347 +#: src/incremen.c:1342 #, c-format msgid "Unsupported incremental format version: %" msgstr "" "Ní thacaítear leis an leagan seo den fhormáid incriminteach: %" -#: src/incremen.c:1502 +#: src/incremen.c:1496 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "dumpdir míchumtha: bhíothas ag súil le '%c' ach fuarthas %#3o" -#: src/incremen.c:1512 +#: src/incremen.c:1506 msgid "Malformed dumpdir: 'X' duplicated" msgstr "dumpdir míchumtha: 'X' faoi dhó" -#: src/incremen.c:1525 +#: src/incremen.c:1519 msgid "Malformed dumpdir: empty name in 'R'" msgstr "dumpdir míchumtha: ainm folamh i 'R'" -#: src/incremen.c:1538 +#: src/incremen.c:1532 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "dumpdir míchumtha: 'T' gan 'R' roimhe" -#: src/incremen.c:1544 +#: src/incremen.c:1538 msgid "Malformed dumpdir: empty name in 'T'" msgstr "dumpdir míchumtha: ainm folamh i 'T'" -#: src/incremen.c:1564 +#: src/incremen.c:1558 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" "dumpdir míchumtha: bhíothas ag súil le '%c' ach fuarthas deireadh na sonraí" -#: src/incremen.c:1571 +#: src/incremen.c:1565 msgid "Malformed dumpdir: 'X' never used" msgstr "dumpdir míchumtha: níor úsáideadh 'X' riamh" -#: src/incremen.c:1615 +#: src/incremen.c:1609 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Ní féidir comhadlann shealadach a chruthú le teimpléad %s" -#: src/incremen.c:1677 +#: src/incremen.c:1670 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: ní féidir an chomhadlann a stat: gan ghlanadh" -#: src/incremen.c:1690 +#: src/incremen.c:1683 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: tá an chomhadlann ar ghléas eile ar fad; gan ghlanadh" -#: src/incremen.c:1698 +#: src/incremen.c:1691 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: %s á scriosadh\n" -#: src/incremen.c:1703 +#: src/incremen.c:1696 #, c-format msgid "%s: Cannot remove" msgstr "%s: Ní féidir scriosadh a dhéanamh" @@ -1212,20 +1217,20 @@ msgstr "bloc %s: ** bloc de NULanna **\n" msgid "block %s: ** End of File **\n" msgstr "bloc %s: ** Deireadh comhaid **\n" -#: src/list.c:256 src/list.c:1097 src/list.c:1360 +#: src/list.c:256 src/list.c:1093 src/list.c:1356 #, c-format msgid "block %s: " msgstr "bloc %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:712 +#: src/list.c:708 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Bearnaí sa cheanntásc; ag súil le luach uimhriúil %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:767 +#: src/list.c:763 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1233,143 +1238,138 @@ msgstr "" "ag glacadh le comhlánú dénártha" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:778 +#: src/list.c:774 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Tá an luach ochtnártha %.*s as raon %s sa chartlann" -#: src/list.c:799 +#: src/list.c:795 msgid "Archive contains obsolescent base-64 headers" msgstr "Tá ceanntásca le bunuimhir 64 i léig sa chartlann" -#: src/list.c:813 +#: src/list.c:809 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "Teaghrán %s le sín agus bunuimhir 64 as raon %s sa chartlann" -#: src/list.c:844 +#: src/list.c:840 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Tá an luach le bunuimhir 256 as raon %s sa chartlann" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:873 +#: src/list.c:869 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Tá %.*s sa chartlann; ag súil le luach uimhriúil %s" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:895 +#: src/list.c:891 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Tá an luach cartlainne %s as raon %s: %s..%s" -#: src/list.c:1261 +#: src/list.c:1257 #, c-format msgid " link to %s\n" msgstr " nasc le %s\n" -#: src/list.c:1269 +#: src/list.c:1265 #, c-format msgid " unknown file type %s\n" msgstr " cineál anaithnid comhaid %s\n" -#: src/list.c:1287 +#: src/list.c:1283 #, c-format msgid "--Long Link--\n" msgstr "--Nasc Fada--\n" -#: src/list.c:1291 +#: src/list.c:1287 #, c-format msgid "--Long Name--\n" msgstr "--Ainm Fada--\n" -#: src/list.c:1295 +#: src/list.c:1291 #, c-format msgid "--Volume Header--\n" msgstr "--Ceanntásc Imleabhair--\n" -#: src/list.c:1303 +#: src/list.c:1299 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Ar lean ag beart %s--\n" -#: src/list.c:1365 +#: src/list.c:1361 msgid "Creating directory:" msgstr "Comhadlann á cruthú:" -#: src/misc.c:298 +#: src/misc.c:297 #, fuzzy msgid "Cannot get working directory" msgstr "Ní féidir an chomhadlann reatha a athrú" -#: src/misc.c:571 +#: src/misc.c:570 #, c-format msgid "Renaming %s to %s\n" msgstr "%s á athainmniú go %s\n" -#: src/misc.c:580 src/misc.c:599 +#: src/misc.c:579 src/misc.c:598 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: Ní féidir athainmniú go %s" -#: src/misc.c:604 +#: src/misc.c:603 #, c-format msgid "Renaming %s back to %s\n" msgstr "%s á athainmniú go %s arís\n" -#: src/misc.c:851 +#: src/misc.c:850 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Scriosadh an comhad sular léadh é" -#: src/misc.c:866 -#, fuzzy, c-format -msgid "%s: Directory removed before we read it" -msgstr "%s: Scriosadh an comhad sular léadh é" - -#: src/misc.c:887 +#: src/misc.c:871 msgid "child process" msgstr "macphróiseas" -#: src/misc.c:896 +#: src/misc.c:880 msgid "interprocess channel" msgstr "bealach idir próisis" -#: src/names.c:594 +#: src/names.c:590 #, fuzzy msgid "Pattern matching characters used in file names" msgstr "Aimsíodh saoróga in ainmneacha comhaid." -#: src/names.c:596 +#: src/names.c:592 #, fuzzy msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" msgstr "Úsáid --wildcards chun comhoiriúnú patrún a chumasú, nó --no-wildcards" -#: src/names.c:614 src/names.c:630 +#: src/names.c:610 src/names.c:626 #, c-format msgid "%s: Not found in archive" msgstr "%s: Ní sa chartlann é" -#: src/names.c:615 +#: src/names.c:611 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Níl rud riachtanach sa chartlann" -#: src/names.c:649 +#: src/names.c:645 #, fuzzy, c-format msgid "Archive label mismatch" msgstr "Lipéad ar chartlann nach comhoiriúnaithe le %s" -#: src/names.c:953 +#: src/names.c:949 #, fuzzy msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "Níl --preserve-order comhoiriúnach do --listed-incremental" -#: src/names.c:959 +#: src/names.c:955 #, fuzzy msgid "Only one -C option is allowed with --listed-incremental" msgstr "Níl --preserve-order comhoiriúnach do --listed-incremental" @@ -2807,6 +2807,10 @@ msgstr "Ordú críochnaithe\n" msgid "--stat requires file names" msgstr "Tá ainmneacha comhaid de dhíth ar --stat" +#, fuzzy +#~ msgid "%s: Directory removed before we read it" +#~ msgstr "%s: Scriosadh an comhad sular léadh é" + #, fuzzy #~ msgid "Cannot restore working directory" #~ msgstr "Ní féidir an chomhadlann reatha a shábháil" diff --git a/po/gl.gmo b/po/gl.gmo index e19d23b964c1bc1536baf7f03a495deafb6c8b05..b0346d965e5dc2b960cfc37059b19ec26fce515b 100644 GIT binary patch delta 26 hcmaDC`Yv?CYzbaNT?1oXLn8%4Ln~9`%_}6_gaCnP2sZ!# delta 26 hcmaDC`Yv?CYzbZiT|+}%19JsKb1MV$%_}6_gaCn}2tEJ+ diff --git a/po/gl.po b/po/gl.po index a7b0e3b9..00854939 100644 --- a/po/gl.po +++ b/po/gl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tar 1.13.25\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2010-11-07 17:07+0200\n" +"POT-Creation-Date: 2011-03-12 11:53+0200\n" "PO-Revision-Date: 2002-03-26 19:17+0100\n" "Last-Translator: Jacobo Tarrío Barreiro \n" "Language-Team: Galician \n" @@ -56,33 +56,33 @@ msgstr "" msgid "Garbage in ARGP_HELP_FMT: %s" msgstr "" -#: gnu/argp-help.c:1246 +#: gnu/argp-help.c:1248 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." msgstr "" -#: gnu/argp-help.c:1639 +#: gnu/argp-help.c:1641 msgid "Usage:" msgstr "" -#: gnu/argp-help.c:1643 +#: gnu/argp-help.c:1645 msgid " or: " msgstr "" -#: gnu/argp-help.c:1655 +#: gnu/argp-help.c:1657 #, fuzzy msgid " [OPTION...]" msgstr "" "\n" "Emprego: %s [OPCIÓN]...\n" -#: gnu/argp-help.c:1682 +#: gnu/argp-help.c:1684 #, fuzzy, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Escriba '%s --help' para máis información.\n" -#: gnu/argp-help.c:1710 +#: gnu/argp-help.c:1712 #, fuzzy, c-format msgid "Report bugs to %s.\n" msgstr "" @@ -90,7 +90,7 @@ msgstr "" "Informe dos erros no programa a .\n" "Informe dos erros na traducción a .\n" -#: gnu/argp-help.c:1929 gnu/error.c:183 +#: gnu/argp-help.c:1931 gnu/error.c:183 msgid "Unknown system error" msgstr "Erro do sistema descoñecido" @@ -196,16 +196,16 @@ msgstr "%s: a opci msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: a opción \"%s\" precisa dun argumento\n" -#: gnu/obstack.c:425 gnu/obstack.c:427 gnu/xalloc-die.c:36 +#: gnu/obstack.c:423 gnu/obstack.c:425 gnu/xalloc-die.c:36 msgid "memory exhausted" msgstr "memoria esgotada" -#: gnu/openat-die.c:36 +#: gnu/openat-die.c:40 #, fuzzy, c-format msgid "unable to record current working directory" msgstr "Non se puido obte-lo directorio actual" -#: gnu/openat-die.c:54 +#: gnu/openat-die.c:59 #, fuzzy, c-format msgid "failed to return to initial working directory" msgstr "Non se pode armacena-lo directorio de traballo" @@ -229,11 +229,11 @@ msgstr "Non se pode armacena-lo directorio de traballo" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: gnu/quotearg.c:274 +#: gnu/quotearg.c:273 msgid "`" msgstr "\"" -#: gnu/quotearg.c:275 +#: gnu/quotearg.c:274 msgid "'" msgstr "\"" @@ -480,22 +480,22 @@ msgid_plural "%s: Wrote only %lu of %lu bytes" msgstr[0] "%s: Graváronse só %lu de %lu bytes" msgstr[1] "%s: Graváronse só %lu de %lu bytes" -#: lib/paxnames.c:155 +#: lib/paxnames.c:140 #, fuzzy, c-format msgid "Removing leading `%s' from member names" msgstr "Eliminadndo o \"%.*s\" inicial dos nomes dos membros" -#: lib/paxnames.c:156 +#: lib/paxnames.c:141 #, fuzzy, c-format msgid "Removing leading `%s' from hard link targets" msgstr "Eliminadndo o \"%.*s\" inicial dos nomes dos membros" -#: lib/paxnames.c:169 +#: lib/paxnames.c:154 #, fuzzy msgid "Substituting `.' for empty member name" msgstr "Eliminadndo o \"%.*s\" inicial dos nomes dos membros" -#: lib/paxnames.c:170 +#: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" msgstr "" @@ -794,20 +794,20 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "So se puido ler %lu de %lu bytes" msgstr[1] "So se puido ler %lu de %lu bytes" -#: src/compare.c:105 src/compare.c:382 +#: src/compare.c:105 src/compare.c:383 msgid "Contents differ" msgstr "O contido é diferente" -#: src/compare.c:131 src/extract.c:972 src/incremen.c:1462 src/list.c:458 -#: src/list.c:1392 src/xheader.c:711 +#: src/compare.c:131 src/extract.c:984 src/incremen.c:1456 src/list.c:456 +#: src/list.c:1388 src/xheader.c:711 msgid "Unexpected EOF in archive" msgstr "Fin de ficheiro inesperado no arquivo" -#: src/compare.c:179 src/compare.c:195 src/compare.c:308 src/compare.c:406 +#: src/compare.c:179 src/compare.c:195 src/compare.c:309 src/compare.c:407 msgid "File type differs" msgstr "O tipo de ficheiro é diferente" -#: src/compare.c:182 src/compare.c:202 src/compare.c:322 +#: src/compare.c:182 src/compare.c:202 src/compare.c:323 msgid "Mode differs" msgstr "O modo é diferente" @@ -823,50 +823,55 @@ msgstr "Os gid son diferentes" msgid "Mod time differs" msgstr "A data de modificación é diferente" -#: src/compare.c:215 src/compare.c:414 +#: src/compare.c:215 src/compare.c:415 msgid "Size differs" msgstr "O tamaño é diferente" -#: src/compare.c:263 +#: src/compare.c:264 #, c-format msgid "Not linked to %s" msgstr "Non ligado a %s" -#: src/compare.c:287 +#: src/compare.c:288 msgid "Symlink differs" msgstr "A ligazón simbólica é diferente" -#: src/compare.c:316 +#: src/compare.c:317 msgid "Device number differs" msgstr "O número de dispositivo é diferente" -#: src/compare.c:456 +#: src/compare.c:457 #, c-format msgid "Verify " msgstr "Verificar " -#: src/compare.c:463 +#: src/compare.c:464 #, fuzzy, c-format msgid "%s: Unknown file type `%c', diffed as normal file" msgstr "" "%s: Tipo de ficheiro \"%c\" descoñecido; trátase coma un ficheiro normal" -#: src/compare.c:518 +#: src/compare.c:520 msgid "Archive contains file names with leading prefixes removed." msgstr "" -#: src/compare.c:520 +#: src/compare.c:526 +#, fuzzy +msgid "Archive contains transformed file names." +msgstr "O arquivo contén cabeceiras base-64 obsoletas" + +#: src/compare.c:531 msgid "Verification may fail to locate original files." msgstr "" -#: src/compare.c:593 +#: src/compare.c:603 #, fuzzy, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "FALLO NA VERIFICACION: detectáronse %d cabeceiras non válidas" msgstr[1] "FALLO NA VERIFICACION: detectáronse %d cabeceiras non válidas" -#: src/compare.c:611 src/list.c:222 +#: src/compare.c:621 src/list.c:222 #, c-format msgid "A lone zero block at %s" msgstr "" @@ -917,7 +922,7 @@ msgstr[1] "%s: O ficheiro encolleu %s bytes; enchendo con ceros" msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: o ficheiro está nun sistema de ficheiros diferente; non se envorca" -#: src/create.c:1203 src/create.c:1214 src/incremen.c:582 src/incremen.c:588 +#: src/create.c:1203 src/create.c:1214 src/incremen.c:578 src/incremen.c:584 #, fuzzy msgid "contents not dumped" msgstr " (memoria volcada)" @@ -942,7 +947,7 @@ msgstr "%s: ficheiro sen cambios; non se envorca" msgid "%s: file is the archive; not dumped" msgstr "%s: o ficheiro é o arquivo; non se envorca" -#: src/create.c:1723 src/incremen.c:575 +#: src/create.c:1723 src/incremen.c:571 msgid "directory not dumped" msgstr "" @@ -951,12 +956,12 @@ msgstr "" msgid "%s: file changed as we read it" msgstr "%s: o ficheiro cambiou mentres se lía" -#: src/create.c:1857 +#: src/create.c:1858 #, c-format msgid "%s: socket ignored" msgstr "%s: ignórase o socket" -#: src/create.c:1863 +#: src/create.c:1864 #, c-format msgid "%s: door ignored" msgstr "%s: ignórase a porta" @@ -984,170 +989,170 @@ msgstr "%s: a marca de tempo %s est msgid "%s: Unexpected inconsistency when making directory" msgstr "%s: Inconsistencia inesperada ao crea-lo directorio" -#: src/extract.c:709 +#: src/extract.c:721 #, c-format msgid "%s: Directory renamed before its status could be extracted" msgstr "%s: Renomeouse o directorio antes de poder estrae-lo seu estado" -#: src/extract.c:863 +#: src/extract.c:875 msgid "Extracting contiguous files as regular files" msgstr "Extraendo os ficheiros contiguos coma ficheiros normais" -#: src/extract.c:1197 +#: src/extract.c:1209 msgid "Attempting extraction of symbolic links as hard links" msgstr "Tentando extrae-las ligazóns simbólicas coma ligazóns duras" -#: src/extract.c:1353 +#: src/extract.c:1365 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Non se pode extraer -- o ficheiro é continuación doutro volume" -#: src/extract.c:1360 src/list.c:1125 +#: src/extract.c:1372 src/list.c:1121 #, fuzzy msgid "Unexpected long name header" msgstr "Fin de ficheiro (EOF) inesperado no arquivo" -#: src/extract.c:1367 +#: src/extract.c:1379 #, fuzzy, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "" "%s: Tipo de ficheiro \"%c\" descoñecido, extraéndoo coma ficheiro normal" -#: src/extract.c:1393 +#: src/extract.c:1405 #, c-format msgid "Current %s is newer or same age" msgstr "" -#: src/extract.c:1445 +#: src/extract.c:1457 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Non se puido copiar este ficheiro" -#: src/extract.c:1582 +#: src/extract.c:1594 #, fuzzy, c-format msgid "Cannot rename %s to %s" msgstr "%s: Non se pode renomear a %s" -#: src/incremen.c:474 src/incremen.c:518 +#: src/incremen.c:473 src/incremen.c:517 #, fuzzy, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Renomeouse o directorio" -#: src/incremen.c:486 +#: src/incremen.c:485 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Renomeouse o directorio" -#: src/incremen.c:531 +#: src/incremen.c:530 #, c-format msgid "%s: Directory is new" msgstr "%s: O directorio é novo" -#: src/incremen.c:956 src/incremen.c:973 +#: src/incremen.c:951 src/incremen.c:968 msgid "Invalid time stamp" msgstr "Marca de tempo non válida" -#: src/incremen.c:1012 +#: src/incremen.c:1007 #, fuzzy msgid "Invalid modification time (seconds)" msgstr "Proporcionouse na opción un modo non válido" -#: src/incremen.c:1027 +#: src/incremen.c:1022 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:1047 +#: src/incremen.c:1042 msgid "Invalid device number" msgstr "Número de dispositivo non válido" -#: src/incremen.c:1062 +#: src/incremen.c:1057 msgid "Invalid inode number" msgstr "Número de inode non válido" -#: src/incremen.c:1113 src/incremen.c:1150 +#: src/incremen.c:1108 src/incremen.c:1145 msgid "Field too long while reading snapshot file" msgstr "" -#: src/incremen.c:1120 src/incremen.c:1158 +#: src/incremen.c:1115 src/incremen.c:1153 #, fuzzy msgid "Read error in snapshot file" msgstr "Erro de lectura en %s" -#: src/incremen.c:1122 src/incremen.c:1162 src/incremen.c:1214 -#: src/incremen.c:1272 +#: src/incremen.c:1117 src/incremen.c:1157 src/incremen.c:1209 +#: src/incremen.c:1267 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "Fin de ficheiro (EOF) inesperado no arquivo" -#: src/incremen.c:1129 src/incremen.c:1169 +#: src/incremen.c:1124 src/incremen.c:1164 #, fuzzy msgid "Unexpected field value in snapshot file" msgstr "Fin de ficheiro (EOF) inesperado no arquivo" -#: src/incremen.c:1264 +#: src/incremen.c:1259 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1325 src/incremen.c:1328 +#: src/incremen.c:1320 src/incremen.c:1323 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1347 +#: src/incremen.c:1342 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1502 +#: src/incremen.c:1496 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1512 +#: src/incremen.c:1506 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1525 +#: src/incremen.c:1519 msgid "Malformed dumpdir: empty name in 'R'" msgstr "" -#: src/incremen.c:1538 +#: src/incremen.c:1532 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1544 +#: src/incremen.c:1538 msgid "Malformed dumpdir: empty name in 'T'" msgstr "" -#: src/incremen.c:1564 +#: src/incremen.c:1558 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1571 +#: src/incremen.c:1565 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1615 +#: src/incremen.c:1609 #, fuzzy, c-format msgid "Cannot create temporary directory using template %s" msgstr "Non se pode reservar memoria para o factor de bloqueo %d" -#: src/incremen.c:1677 +#: src/incremen.c:1670 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1690 +#: src/incremen.c:1683 #, fuzzy, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: o ficheiro está nun sistema de ficheiros diferente; non se envorca" -#: src/incremen.c:1698 +#: src/incremen.c:1691 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Borrando %s\n" -#: src/incremen.c:1703 +#: src/incremen.c:1696 #, c-format msgid "%s: Cannot remove" msgstr "%s: Non se pode eliminar" @@ -1167,21 +1172,21 @@ msgstr "bloque %s: ** Bloque de nulos **\n" msgid "block %s: ** End of File **\n" msgstr "bloque %s: ** Fin de Ficheiro **\n" -#: src/list.c:256 src/list.c:1097 src/list.c:1360 +#: src/list.c:256 src/list.c:1093 src/list.c:1356 #, c-format msgid "block %s: " msgstr "bloque %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:712 +#: src/list.c:708 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "" "Atopáronse espacios na cabeceira onde se esperaba un valor númerico de %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:767 +#: src/list.c:763 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1189,140 +1194,135 @@ msgstr "" "a 2" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:778 +#: src/list.c:774 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "O valor octal do arquivo %.*s está fóra do rango de %s" -#: src/list.c:799 +#: src/list.c:795 msgid "Archive contains obsolescent base-64 headers" msgstr "O arquivo contén cabeceiras base-64 obsoletas" -#: src/list.c:813 +#: src/list.c:809 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "A cadea base-64 asinada do arquivo %s está fóra do rango de %s" -#: src/list.c:844 +#: src/list.c:840 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "O valor base-256 do arquivo está fóra do rango de %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:873 +#: src/list.c:869 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "O arquivo contén %.*s onde se esperaba un valor numérico de %s" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:895 +#: src/list.c:891 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "O valor do arquivo %s está fóra do rango de %s %s..%s" -#: src/list.c:1261 +#: src/list.c:1257 #, c-format msgid " link to %s\n" msgstr " ligazón a %s\n" -#: src/list.c:1269 +#: src/list.c:1265 #, c-format msgid " unknown file type %s\n" msgstr " Tipo de ficheiro %s descoñecido\n" -#: src/list.c:1287 +#: src/list.c:1283 #, c-format msgid "--Long Link--\n" msgstr "" -#: src/list.c:1291 +#: src/list.c:1287 #, c-format msgid "--Long Name--\n" msgstr "" -#: src/list.c:1295 +#: src/list.c:1291 #, c-format msgid "--Volume Header--\n" msgstr "--Cabeceira de Volume--\n" -#: src/list.c:1303 +#: src/list.c:1299 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Continúa no byte %s--\n" -#: src/list.c:1365 +#: src/list.c:1361 msgid "Creating directory:" msgstr "Creando o directorio:" -#: src/misc.c:298 +#: src/misc.c:297 #, fuzzy msgid "Cannot get working directory" msgstr "Non se pode cambia-lo directorio de traballo" -#: src/misc.c:571 +#: src/misc.c:570 #, c-format msgid "Renaming %s to %s\n" msgstr "Renomeando %s a %s\n" -#: src/misc.c:580 src/misc.c:599 +#: src/misc.c:579 src/misc.c:598 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: Non se pode renomear a %s" -#: src/misc.c:604 +#: src/misc.c:603 #, c-format msgid "Renaming %s back to %s\n" msgstr "Renomeando %s a %s\n" -#: src/misc.c:851 +#: src/misc.c:850 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Ficheiro eliminado antes da súa lectura" -#: src/misc.c:866 -#, fuzzy, c-format -msgid "%s: Directory removed before we read it" -msgstr "%s: Ficheiro eliminado antes da súa lectura" - -#: src/misc.c:887 +#: src/misc.c:871 msgid "child process" msgstr "proceso fillo" -#: src/misc.c:896 +#: src/misc.c:880 msgid "interprocess channel" msgstr "canle interproceso" -#: src/names.c:594 +#: src/names.c:590 msgid "Pattern matching characters used in file names" msgstr "" -#: src/names.c:596 +#: src/names.c:592 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" msgstr "" -#: src/names.c:614 src/names.c:630 +#: src/names.c:610 src/names.c:626 #, c-format msgid "%s: Not found in archive" msgstr "%s: Non atopado no arquivo" -#: src/names.c:615 +#: src/names.c:611 #, fuzzy, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Non atopado no arquivo" -#: src/names.c:649 +#: src/names.c:645 #, fuzzy, c-format msgid "Archive label mismatch" msgstr "O arquivo non está etiquetado para coincidir con %s" -#: src/names.c:953 +#: src/names.c:949 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" -#: src/names.c:959 +#: src/names.c:955 msgid "Only one -C option is allowed with --listed-incremental" msgstr "" @@ -2697,6 +2697,10 @@ msgstr "" msgid "--stat requires file names" msgstr "--Nomes de ficheiro alterados--\n" +#, fuzzy +#~ msgid "%s: Directory removed before we read it" +#~ msgstr "%s: Ficheiro eliminado antes da súa lectura" + #, fuzzy #~ msgid "Cannot restore working directory" #~ msgstr "Non se pode armacena-lo directorio de traballo" diff --git a/po/hr.gmo b/po/hr.gmo index 09202cbcec8ee383cd3bd686b6afb19ef2f5ca3b..3dfdd4e6db2acfb955fdecef43c6e48388ed0b6b 100644 GIT binary patch delta 26 icmewt@-Jk=YzbaNT?1oXLn8%4Ln~9`%_}6X2?79xcL?MF delta 26 icmewt@-Jk=YzbZiT|+}%19JsKb1MV$%_}6X2?79xu?Xt` diff --git a/po/hr.po b/po/hr.po index 1e79e849..5c47afd7 100644 --- a/po/hr.po +++ b/po/hr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: tar 1.13.25\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2010-11-07 17:07+0200\n" +"POT-Creation-Date: 2011-03-12 11:53+0200\n" "PO-Revision-Date: 2002-04-26 10:49+MET(DST)(UTC+2)\n" "Last-Translator: Mirsad Todorovac \n" "Language-Team: Croatian \n" @@ -58,40 +58,40 @@ msgstr "" msgid "Garbage in ARGP_HELP_FMT: %s" msgstr "" -#: gnu/argp-help.c:1246 +#: gnu/argp-help.c:1248 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." msgstr "" -#: gnu/argp-help.c:1639 +#: gnu/argp-help.c:1641 msgid "Usage:" msgstr "" -#: gnu/argp-help.c:1643 +#: gnu/argp-help.c:1645 msgid " or: " msgstr "" -#: gnu/argp-help.c:1655 +#: gnu/argp-help.c:1657 #, fuzzy msgid " [OPTION...]" msgstr "" "\n" "Kori¹tenje: %s [OPCIJA]...\n" -#: gnu/argp-help.c:1682 +#: gnu/argp-help.c:1684 #, fuzzy, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Poku¹ajte `%s --help' za vi¹e informacija.\n" -#: gnu/argp-help.c:1710 +#: gnu/argp-help.c:1712 #, fuzzy, c-format msgid "Report bugs to %s.\n" msgstr "" "\n" "Prijavi gre¹ke i bugove na .\n" -#: gnu/argp-help.c:1929 gnu/error.c:183 +#: gnu/argp-help.c:1931 gnu/error.c:183 msgid "Unknown system error" msgstr "Nepoznata pogre¹ka u sistemu" @@ -197,16 +197,16 @@ msgstr "%s: opcija `-W %s' ne dozvoljava argument\n" msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: za opciju `%s' neophodan je argument\n" -#: gnu/obstack.c:425 gnu/obstack.c:427 gnu/xalloc-die.c:36 +#: gnu/obstack.c:423 gnu/obstack.c:425 gnu/xalloc-die.c:36 msgid "memory exhausted" msgstr "iscrpljena memorija" -#: gnu/openat-die.c:36 +#: gnu/openat-die.c:40 #, fuzzy, c-format msgid "unable to record current working directory" msgstr "Ne mogu promijeniti radni direktorij" -#: gnu/openat-die.c:54 +#: gnu/openat-die.c:59 #, fuzzy, c-format msgid "failed to return to initial working directory" msgstr "Ne mogu pohraniti radni direktorij" @@ -233,11 +233,11 @@ msgstr "Ne mogu pohraniti radni direktorij" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: gnu/quotearg.c:274 +#: gnu/quotearg.c:273 msgid "`" msgstr "`" -#: gnu/quotearg.c:275 +#: gnu/quotearg.c:274 msgid "'" msgstr "'" @@ -482,22 +482,22 @@ msgid_plural "%s: Wrote only %lu of %lu bytes" msgstr[0] "%s: Upsje¹no zapisao samo %lu od %lu bajtova" msgstr[1] "%s: Upsje¹no zapisao samo %lu od %lu bajtova" -#: lib/paxnames.c:155 +#: lib/paxnames.c:140 #, fuzzy, c-format msgid "Removing leading `%s' from member names" msgstr "Uklanjam vodeæe `%.*s' iz imena èlanova" -#: lib/paxnames.c:156 +#: lib/paxnames.c:141 #, fuzzy, c-format msgid "Removing leading `%s' from hard link targets" msgstr "Uklanjam vodeæe `%.*s' iz imena èlanova" -#: lib/paxnames.c:169 +#: lib/paxnames.c:154 #, fuzzy msgid "Substituting `.' for empty member name" msgstr "Uklanjam vodeæe `%.*s' iz imena èlanova" -#: lib/paxnames.c:170 +#: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" msgstr "" @@ -801,20 +801,20 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "Uspio proèitati samo %lu od %lu bajtova" msgstr[1] "Uspio proèitati samo %lu od %lu bajtova" -#: src/compare.c:105 src/compare.c:382 +#: src/compare.c:105 src/compare.c:383 msgid "Contents differ" msgstr "Sadr¾aji se razlikuju" -#: src/compare.c:131 src/extract.c:972 src/incremen.c:1462 src/list.c:458 -#: src/list.c:1392 src/xheader.c:711 +#: src/compare.c:131 src/extract.c:984 src/incremen.c:1456 src/list.c:456 +#: src/list.c:1388 src/xheader.c:711 msgid "Unexpected EOF in archive" msgstr "Neoèekivani EOF u arhivi" -#: src/compare.c:179 src/compare.c:195 src/compare.c:308 src/compare.c:406 +#: src/compare.c:179 src/compare.c:195 src/compare.c:309 src/compare.c:407 msgid "File type differs" msgstr "Tipovi datoteka se razlikuju" -#: src/compare.c:182 src/compare.c:202 src/compare.c:322 +#: src/compare.c:182 src/compare.c:202 src/compare.c:323 msgid "Mode differs" msgstr "Mod se razlikuje" @@ -830,50 +830,56 @@ msgstr "Gid se razlikuje" msgid "Mod time differs" msgstr "Mod time (vrijeme modifikacije) se razlikuje" -#: src/compare.c:215 src/compare.c:414 +#: src/compare.c:215 src/compare.c:415 msgid "Size differs" msgstr "Velièina se razlikuje" # FIXME -- language purists might lynch me for this "polinkan" -- TM -#: src/compare.c:263 +#: src/compare.c:264 #, c-format msgid "Not linked to %s" msgstr "Nije polinkan na %s" -#: src/compare.c:287 +#: src/compare.c:288 msgid "Symlink differs" msgstr "Simbolièki link se razlikuje" -#: src/compare.c:316 +#: src/compare.c:317 msgid "Device number differs" msgstr "Broj ureðaja (device number) se razlikuje" -#: src/compare.c:456 +#: src/compare.c:457 #, c-format msgid "Verify " msgstr "Verificiraj " -#: src/compare.c:463 +#: src/compare.c:464 #, fuzzy, c-format msgid "%s: Unknown file type `%c', diffed as normal file" msgstr "%s: Nepoznat tip datoteke '%c', diff-iran kao normalna datoteka" -#: src/compare.c:518 +#: src/compare.c:520 msgid "Archive contains file names with leading prefixes removed." msgstr "" -#: src/compare.c:520 +# FIXME -- obsolescent -- TM +#: src/compare.c:526 +#, fuzzy +msgid "Archive contains transformed file names." +msgstr "Arhiva sadr¾i base-64 zaglavlja zastarjelog formata" + +#: src/compare.c:531 msgid "Verification may fail to locate original files." msgstr "" -#: src/compare.c:593 +#: src/compare.c:603 #, fuzzy, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "NEUSPJELA VERIFIKACIJA: detektirano %d pogre¹nih zaglavlja" msgstr[1] "NEUSPJELA VERIFIKACIJA: detektirano %d pogre¹nih zaglavlja" -#: src/compare.c:611 src/list.c:222 +#: src/compare.c:621 src/list.c:222 #, c-format msgid "A lone zero block at %s" msgstr "" @@ -925,7 +931,7 @@ msgstr[1] "%s: Datoteka se skratila za %s bajtova; nadopunjujemo nulama" msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: datoteka je na drugom datoteènom sustavu; ne arhiviram ju" -#: src/create.c:1203 src/create.c:1214 src/incremen.c:582 src/incremen.c:588 +#: src/create.c:1203 src/create.c:1214 src/incremen.c:578 src/incremen.c:584 msgid "contents not dumped" msgstr "" @@ -949,7 +955,7 @@ msgstr "%s: datoteka nepromijenjena; ne arhiviram ju" msgid "%s: file is the archive; not dumped" msgstr "%s: datoteka je arhiva; ne arhiviram ju" -#: src/create.c:1723 src/incremen.c:575 +#: src/create.c:1723 src/incremen.c:571 msgid "directory not dumped" msgstr "" @@ -958,12 +964,12 @@ msgstr "" msgid "%s: file changed as we read it" msgstr "%s: datoteka se promijenila dok smo ju èitali" -#: src/create.c:1857 +#: src/create.c:1858 #, c-format msgid "%s: socket ignored" msgstr "%s: socket ignoriran" -#: src/create.c:1863 +#: src/create.c:1864 #, c-format msgid "%s: door ignored" msgstr "%s: door ignoriran" @@ -992,170 +998,170 @@ msgstr "%s: oznaka vremena %s je %lu sekundi u budu msgid "%s: Unexpected inconsistency when making directory" msgstr "%s: Neoèekivana nekonzistentnost kod otvaranja direktorija" -#: src/extract.c:709 +#: src/extract.c:721 #, c-format msgid "%s: Directory renamed before its status could be extracted" msgstr "%s: Direktoriju promijenjeno ime prije nego ¹to mu je dobavljen status" -#: src/extract.c:863 +#: src/extract.c:875 msgid "Extracting contiguous files as regular files" msgstr "Ekstrahiram neprekinute datoteke kao regularne datoteke" # FIXME -- 'hard links' -- TM -#: src/extract.c:1197 +#: src/extract.c:1209 msgid "Attempting extraction of symbolic links as hard links" msgstr "Poku¹avam ekstrakciju simbolièkih linkova kao hard linkova" -#: src/extract.c:1353 +#: src/extract.c:1365 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "" "%s: Ne mogu ekstrahirati -- datoteka se nastavlja iz drugog dijela arhive" -#: src/extract.c:1360 src/list.c:1125 +#: src/extract.c:1372 src/list.c:1121 #, fuzzy msgid "Unexpected long name header" msgstr "Neoèekivan EOF u mangliranim imenima" -#: src/extract.c:1367 +#: src/extract.c:1379 #, fuzzy, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Nepoznat tip datoteke '%c', ekstrahiran kao normalna datoteka" -#: src/extract.c:1393 +#: src/extract.c:1405 #, c-format msgid "Current %s is newer or same age" msgstr "" -#: src/extract.c:1445 +#: src/extract.c:1457 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Nisam uspio napraviti backup ove datoteke" -#: src/extract.c:1582 +#: src/extract.c:1594 #, fuzzy, c-format msgid "Cannot rename %s to %s" msgstr "%s: Ne mogu preimenovati u %s" -#: src/incremen.c:474 src/incremen.c:518 +#: src/incremen.c:473 src/incremen.c:517 #, fuzzy, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Direktoriju promijenjeno ime" -#: src/incremen.c:486 +#: src/incremen.c:485 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Direktoriju promijenjeno ime" -#: src/incremen.c:531 +#: src/incremen.c:530 #, c-format msgid "%s: Directory is new" msgstr "%s: Novi direktorij" -#: src/incremen.c:956 src/incremen.c:973 +#: src/incremen.c:951 src/incremen.c:968 msgid "Invalid time stamp" msgstr "Pogre¹na oznaka vremena" -#: src/incremen.c:1012 +#: src/incremen.c:1007 #, fuzzy msgid "Invalid modification time (seconds)" msgstr "Pogre¹an mod dan opcijom" -#: src/incremen.c:1027 +#: src/incremen.c:1022 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:1047 +#: src/incremen.c:1042 msgid "Invalid device number" msgstr "Pogre¹an broj ureðaja" -#: src/incremen.c:1062 +#: src/incremen.c:1057 msgid "Invalid inode number" msgstr "Pogre¹an inode broj" -#: src/incremen.c:1113 src/incremen.c:1150 +#: src/incremen.c:1108 src/incremen.c:1145 msgid "Field too long while reading snapshot file" msgstr "" -#: src/incremen.c:1120 src/incremen.c:1158 +#: src/incremen.c:1115 src/incremen.c:1153 msgid "Read error in snapshot file" msgstr "" -#: src/incremen.c:1122 src/incremen.c:1162 src/incremen.c:1214 -#: src/incremen.c:1272 +#: src/incremen.c:1117 src/incremen.c:1157 src/incremen.c:1209 +#: src/incremen.c:1267 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "Neoèekivani EOF u arhivi" -#: src/incremen.c:1129 src/incremen.c:1169 +#: src/incremen.c:1124 src/incremen.c:1164 msgid "Unexpected field value in snapshot file" msgstr "" -#: src/incremen.c:1264 +#: src/incremen.c:1259 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1325 src/incremen.c:1328 +#: src/incremen.c:1320 src/incremen.c:1323 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1347 +#: src/incremen.c:1342 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1502 +#: src/incremen.c:1496 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1512 +#: src/incremen.c:1506 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1525 +#: src/incremen.c:1519 msgid "Malformed dumpdir: empty name in 'R'" msgstr "" -#: src/incremen.c:1538 +#: src/incremen.c:1532 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1544 +#: src/incremen.c:1538 msgid "Malformed dumpdir: empty name in 'T'" msgstr "" -#: src/incremen.c:1564 +#: src/incremen.c:1558 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1571 +#: src/incremen.c:1565 msgid "Malformed dumpdir: 'X' never used" msgstr "" # FIXME -- blocking factor -- can't translate (ask others) -- TM -#: src/incremen.c:1615 +#: src/incremen.c:1609 #, fuzzy, c-format msgid "Cannot create temporary directory using template %s" msgstr "Ne mogu alocirati memoriju za faktor pakiranja u blokove %d" -#: src/incremen.c:1677 +#: src/incremen.c:1670 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1690 +#: src/incremen.c:1683 #, fuzzy, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: datoteka je na drugom datoteènom sustavu; ne arhiviram ju" -#: src/incremen.c:1698 +#: src/incremen.c:1691 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Bri¹em %s\n" -#: src/incremen.c:1703 +#: src/incremen.c:1696 #, c-format msgid "%s: Cannot remove" msgstr "%s: Ne mogu obrisati" @@ -1175,20 +1181,20 @@ msgstr "blok %s: ** Blok ispunjen NULama **\n" msgid "block %s: ** End of File **\n" msgstr "blok %s: ** Kraj datoteke **\n" -#: src/list.c:256 src/list.c:1097 src/list.c:1360 +#: src/list.c:256 src/list.c:1093 src/list.c:1356 #, c-format msgid "block %s: " msgstr "blok %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:712 +#: src/list.c:708 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Razmaci u zaglavlju gdje se oèekuje numerièka %s vrijednost" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:767 +#: src/list.c:763 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1196,144 +1202,139 @@ msgstr "" "komplement" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:778 +#: src/list.c:774 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Oktalna vrijednost iz arhive %.*s je izvan %s opsega" # FIXME -- obsolescent -- TM -#: src/list.c:799 +#: src/list.c:795 msgid "Archive contains obsolescent base-64 headers" msgstr "Arhiva sadr¾i base-64 zaglavlja zastarjelog formata" # FIXME?? -#: src/list.c:813 +#: src/list.c:809 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "Base-64 vrijednost s predznakom %s iz arhive je izvan %s opsega" -#: src/list.c:844 +#: src/list.c:840 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Base-256 vrijednost iz arhive je izvan %s opsega" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:873 +#: src/list.c:869 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Arhiva sadr¾i %.*s gdje je oèekivana numerièka %s vrijednost" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:895 +#: src/list.c:891 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Vrijednost %s iz arhive je izvan %s opsega %s..%s" -#: src/list.c:1261 +#: src/list.c:1257 #, c-format msgid " link to %s\n" msgstr " link do %s\n" -#: src/list.c:1269 +#: src/list.c:1265 #, c-format msgid " unknown file type %s\n" msgstr " nepoznat tip datoteke %s\n" -#: src/list.c:1287 +#: src/list.c:1283 #, c-format msgid "--Long Link--\n" msgstr "" -#: src/list.c:1291 +#: src/list.c:1287 #, c-format msgid "--Long Name--\n" msgstr "" -#: src/list.c:1295 +#: src/list.c:1291 #, c-format msgid "--Volume Header--\n" msgstr "--Zaglavlje dijela arhive--\n" # FIXME -- clarify against source -- TM -#: src/list.c:1303 +#: src/list.c:1299 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Nastavljeno s bajtom %s--\n" -#: src/list.c:1365 +#: src/list.c:1361 msgid "Creating directory:" msgstr "Kreiram direktorij:" -#: src/misc.c:298 +#: src/misc.c:297 #, fuzzy msgid "Cannot get working directory" msgstr "Ne mogu promijeniti radni direktorij" -#: src/misc.c:571 +#: src/misc.c:570 #, c-format msgid "Renaming %s to %s\n" msgstr "Preimenujem %s u %s\n" -#: src/misc.c:580 src/misc.c:599 +#: src/misc.c:579 src/misc.c:598 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: Ne mogu preimenovati u %s" -#: src/misc.c:604 +#: src/misc.c:603 #, c-format msgid "Renaming %s back to %s\n" msgstr "Preimenujem %s natrag u %s\n" -#: src/misc.c:851 +#: src/misc.c:850 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Datoteka uklonjena (removed) prije nego ¹to smo ju proèitali" -#: src/misc.c:866 -#, fuzzy, c-format -msgid "%s: Directory removed before we read it" -msgstr "%s: Datoteka uklonjena (removed) prije nego ¹to smo ju proèitali" - -#: src/misc.c:887 +#: src/misc.c:871 msgid "child process" msgstr "podproces" -#: src/misc.c:896 +#: src/misc.c:880 msgid "interprocess channel" msgstr "meðuprocesni kanal" -#: src/names.c:594 +#: src/names.c:590 msgid "Pattern matching characters used in file names" msgstr "" -#: src/names.c:596 +#: src/names.c:592 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" msgstr "" -#: src/names.c:614 src/names.c:630 +#: src/names.c:610 src/names.c:626 #, c-format msgid "%s: Not found in archive" msgstr "%s: Nije naðeno u arhivi" -#: src/names.c:615 +#: src/names.c:611 #, fuzzy, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Nije naðeno u arhivi" # FIXME -- clean against source! (TM) -#: src/names.c:649 +#: src/names.c:645 #, fuzzy, c-format msgid "Archive label mismatch" msgstr "Arhiva nije oznaèena labelom da odgovara %s" -#: src/names.c:953 +#: src/names.c:949 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" -#: src/names.c:959 +#: src/names.c:955 msgid "Only one -C option is allowed with --listed-incremental" msgstr "" @@ -2707,6 +2708,10 @@ msgstr "" msgid "--stat requires file names" msgstr "--Manglirana imena datoteka--\n" +#, fuzzy +#~ msgid "%s: Directory removed before we read it" +#~ msgstr "%s: Datoteka uklonjena (removed) prije nego ¹to smo ju proèitali" + #, fuzzy #~ msgid "Cannot restore working directory" #~ msgstr "Ne mogu pohraniti radni direktorij" diff --git a/po/hu.gmo b/po/hu.gmo index da190b8896c868113bc9701f98e4ae1f33b5a1c1..42bf11858b13aa0fb655466242974eb2912d663e 100644 GIT binary patch delta 12336 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\n" "Language-Team: Hungarian \n" "Language: hu\n" @@ -60,7 +60,7 @@ msgstr "%.*s: Ismeretlen ARGP_HELP_FMT paraméter" msgid "Garbage in ARGP_HELP_FMT: %s" msgstr "Szemét az ARGP_HELP_FMT-ben: %s" -#: gnu/argp-help.c:1246 +#: gnu/argp-help.c:1248 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." @@ -68,31 +68,31 @@ msgstr "" "A hosszú kapcsolók kötelező vagy elhagyható argumentumai a megfelelő rövid " "kapcsolókhoz is kötelezőek vagy elhagyhatóak." -#: gnu/argp-help.c:1639 +#: gnu/argp-help.c:1641 msgid "Usage:" msgstr "Használat:" -#: gnu/argp-help.c:1643 +#: gnu/argp-help.c:1645 msgid " or: " msgstr " vagy: " -#: gnu/argp-help.c:1655 +#: gnu/argp-help.c:1657 msgid " [OPTION...]" msgstr " [KAPCSOLÓ...]" -#: gnu/argp-help.c:1682 +#: gnu/argp-help.c:1684 #, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "" "További információkért próbálja kiadni a „%s --help” vagy „%s --usage” " "parancsokat.\n" -#: gnu/argp-help.c:1710 +#: gnu/argp-help.c:1712 #, c-format msgid "Report bugs to %s.\n" msgstr "A hibák a(z) %s címen jelenthetők.\n" -#: gnu/argp-help.c:1929 gnu/error.c:183 +#: gnu/argp-help.c:1931 gnu/error.c:183 msgid "Unknown system error" msgstr "Ismeretlen rendszerhiba" @@ -159,9 +159,9 @@ msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: a(z) „%c%s” kapcsoló nem enged meg argumentumot\n" #: gnu/getopt.c:639 gnu/getopt.c:658 -#, fuzzy, c-format +#, c-format msgid "%s: option '--%s' requires an argument\n" -msgstr "%s: a(z) „%s” kapcsolóhoz argumentum szükséges\n" +msgstr "%s: a(z) „--%s” kapcsolóhoz argumentum szükséges\n" #: gnu/getopt.c:696 gnu/getopt.c:699 #, c-format @@ -194,20 +194,20 @@ msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: a „-W %s” kapcsoló nem enged meg argumentumot\n" #: gnu/getopt.c:964 gnu/getopt.c:982 -#, fuzzy, c-format +#, c-format msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: a(z) „%s” kapcsolóhoz argumentum szükséges\n" +msgstr "%s: a „-W %s” kapcsolóhoz argumentum szükséges\n" -#: gnu/obstack.c:425 gnu/obstack.c:427 gnu/xalloc-die.c:36 +#: gnu/obstack.c:423 gnu/obstack.c:425 gnu/xalloc-die.c:36 msgid "memory exhausted" msgstr "elfogyott a memória" -#: gnu/openat-die.c:36 +#: gnu/openat-die.c:40 #, c-format msgid "unable to record current working directory" msgstr "A munkakönyvtár nem jegyezhető fel" -#: gnu/openat-die.c:54 +#: gnu/openat-die.c:59 #, c-format msgid "failed to return to initial working directory" msgstr "a visszatérés meghiúsult a kiinduló munkakönyvtárba" @@ -231,11 +231,11 @@ msgstr "a visszatérés meghiúsult a kiinduló munkakönyvtárba" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: gnu/quotearg.c:274 +#: gnu/quotearg.c:273 msgid "`" msgstr "”" -#: gnu/quotearg.c:275 +#: gnu/quotearg.c:274 msgid "'" msgstr "”" @@ -507,21 +507,21 @@ msgid_plural "%s: Wrote only %lu of %lu bytes" msgstr[0] "%s: Csak %lu bájt került kiírásra, összesen %lu bájtból" msgstr[1] "%s: Csak %lu bájt került kiírásra, összesen %lu bájtból" -#: lib/paxnames.c:155 +#: lib/paxnames.c:140 #, c-format msgid "Removing leading `%s' from member names" msgstr "A kezdő „%s” eltávolítása a nevek elejéről" -#: lib/paxnames.c:156 +#: lib/paxnames.c:141 #, c-format msgid "Removing leading `%s' from hard link targets" msgstr "A kezdő „%s” eltávolítása a közvetlen linkek céljaiból" -#: lib/paxnames.c:169 +#: lib/paxnames.c:154 msgid "Substituting `.' for empty member name" msgstr "Egy . helyettesítése az üres tagnév helyett" -#: lib/paxnames.c:170 +#: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" msgstr "Egy . helyettesítése a közvetlen link üres célja helyett" @@ -817,20 +817,20 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "Csak %lu bájt olvasható %lu bájtból" msgstr[1] "Csak %lu bájt olvasható %lu bájtból" -#: src/compare.c:105 src/compare.c:382 +#: src/compare.c:105 src/compare.c:383 msgid "Contents differ" msgstr "A tartalom eltér" -#: src/compare.c:131 src/extract.c:972 src/incremen.c:1462 src/list.c:458 -#: src/list.c:1392 src/xheader.c:711 +#: src/compare.c:131 src/extract.c:984 src/incremen.c:1456 src/list.c:456 +#: src/list.c:1388 src/xheader.c:711 msgid "Unexpected EOF in archive" msgstr "Váratlan fájlvége jel az archívumban" -#: src/compare.c:179 src/compare.c:195 src/compare.c:308 src/compare.c:406 +#: src/compare.c:179 src/compare.c:195 src/compare.c:309 src/compare.c:407 msgid "File type differs" msgstr "A fájltípus eltér" -#: src/compare.c:182 src/compare.c:202 src/compare.c:322 +#: src/compare.c:182 src/compare.c:202 src/compare.c:323 msgid "Mode differs" msgstr "A mód eltér" @@ -846,51 +846,56 @@ msgstr "A Gid eltér" msgid "Mod time differs" msgstr "A módosítási idő eltér" -#: src/compare.c:215 src/compare.c:414 +#: src/compare.c:215 src/compare.c:415 msgid "Size differs" msgstr "A méret eltér" -#: src/compare.c:263 +#: src/compare.c:264 #, c-format msgid "Not linked to %s" msgstr "Nincs a következőre linkelve: %s" -#: src/compare.c:287 +#: src/compare.c:288 msgid "Symlink differs" msgstr "A szimbolikus link eltér" -#: src/compare.c:316 +#: src/compare.c:317 msgid "Device number differs" msgstr "Az eszközszám eltér" -#: src/compare.c:456 +#: src/compare.c:457 #, c-format msgid "Verify " msgstr "Ellenőrzés " -#: src/compare.c:463 +#: src/compare.c:464 #, c-format msgid "%s: Unknown file type `%c', diffed as normal file" msgstr "" "%s: A(z) „%c” fájltípus ismeretlen, a diffelés normális fájlként történt" -#: src/compare.c:518 +#: src/compare.c:520 msgid "Archive contains file names with leading prefixes removed." msgstr "Az archívum eltávolított előtagokkal rendelkező fájlneveket tartalmaz." -#: src/compare.c:520 +#: src/compare.c:526 +#, fuzzy +msgid "Archive contains transformed file names." +msgstr "Az archívum elavulófélben levő base-64-es fejléceket tartalmaz" + +#: src/compare.c:531 msgid "Verification may fail to locate original files." msgstr "" "Lehetséges, hogy az ellenőrzés nem fogja megtalálni az eredeti fájlokat." -#: src/compare.c:593 +#: src/compare.c:603 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "AZ ELLENŐRZÉS SIKERTELEN: %d érvénytelen fejléc található" msgstr[1] "AZ ELLENŐRZÉS SIKERTELEN: %d érvénytelen fejléc található" -#: src/compare.c:611 src/list.c:222 +#: src/compare.c:621 src/list.c:222 #, c-format msgid "A lone zero block at %s" msgstr "Egy magányos nulla blokk %s helyen" @@ -943,7 +948,7 @@ msgstr[1] "%s: a fájl zsugorítva %s bájtra, nullákkal kerül kitöltésre" msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: a fájl eltérő fájlrendszeren van, nem kerül kiírásra" -#: src/create.c:1203 src/create.c:1214 src/incremen.c:582 src/incremen.c:588 +#: src/create.c:1203 src/create.c:1214 src/incremen.c:578 src/incremen.c:584 msgid "contents not dumped" msgstr "a tartalom nem került kiírásra" @@ -967,7 +972,7 @@ msgstr "%s: a fájl változatlan, nem kerül kiírásra" msgid "%s: file is the archive; not dumped" msgstr "%s: a fájl az archívumban van, nem kerül kiírásra" -#: src/create.c:1723 src/incremen.c:575 +#: src/create.c:1723 src/incremen.c:571 msgid "directory not dumped" msgstr "a könyvtár nem került kiírásra" @@ -976,12 +981,12 @@ msgstr "a könyvtár nem került kiírásra" msgid "%s: file changed as we read it" msgstr "%s: a fájl módosult olvasás közben" -#: src/create.c:1857 +#: src/create.c:1858 #, c-format msgid "%s: socket ignored" msgstr "%s: a foglalat figyelmen kívül hagyva" -#: src/create.c:1863 +#: src/create.c:1864 #, c-format msgid "%s: door ignored" msgstr "%s: ajtó figyelmen kívül hagyva" @@ -1009,169 +1014,169 @@ msgstr "%s: a(z) %s időbélyeg %s másodperccel a jövőbe mutat" msgid "%s: Unexpected inconsistency when making directory" msgstr "%s: Váratlan inkonzisztencia a könyvtár létrehozása során" -#: src/extract.c:709 +#: src/extract.c:721 #, c-format msgid "%s: Directory renamed before its status could be extracted" msgstr "%s: a könyvtár átnevezésre került az állapotának kinyerése előtt" -#: src/extract.c:863 +#: src/extract.c:875 msgid "Extracting contiguous files as regular files" msgstr "A folytonos fájlok kibontása normál fájlként" -#: src/extract.c:1197 +#: src/extract.c:1209 msgid "Attempting extraction of symbolic links as hard links" msgstr "Kísérlet a szimbolikus linkek kibontására közvetlen linkként" -#: src/extract.c:1353 +#: src/extract.c:1365 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: nem lehet kibontani -- a fájl egy másik köteten folytatódik" -#: src/extract.c:1360 src/list.c:1125 +#: src/extract.c:1372 src/list.c:1121 msgid "Unexpected long name header" msgstr "Váratlan hosszú névfejléc" -#: src/extract.c:1367 +#: src/extract.c:1379 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Ismeretlen fájltípus: „%c”, normál fájlként lesz kibontva" -#: src/extract.c:1393 +#: src/extract.c:1405 #, c-format msgid "Current %s is newer or same age" msgstr "A jelenlegi „%s” újabb vagy egyező korú" -#: src/extract.c:1445 +#: src/extract.c:1457 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Nem sikerült biztonsági mentést készíteni erről a fájlról" -#: src/extract.c:1582 +#: src/extract.c:1594 #, c-format msgid "Cannot rename %s to %s" msgstr "%s: Nem nevezhető át a következőre: %s" -#: src/incremen.c:474 src/incremen.c:518 +#: src/incremen.c:473 src/incremen.c:517 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: A könyvtár át lett nevezve a következőről: %s" -#: src/incremen.c:486 +#: src/incremen.c:485 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: a könyvtár át lett nevezve" -#: src/incremen.c:531 +#: src/incremen.c:530 #, c-format msgid "%s: Directory is new" msgstr "%s: a könyvtár új" -#: src/incremen.c:956 src/incremen.c:973 +#: src/incremen.c:951 src/incremen.c:968 msgid "Invalid time stamp" msgstr "Érvénytelen időbélyeg" -#: src/incremen.c:1012 +#: src/incremen.c:1007 msgid "Invalid modification time (seconds)" msgstr "Érvénytelen módosítási idő (másodperc)" -#: src/incremen.c:1027 +#: src/incremen.c:1022 msgid "Invalid modification time (nanoseconds)" msgstr "Érvénytelen módosítási idő (nanomásodperc)" -#: src/incremen.c:1047 +#: src/incremen.c:1042 msgid "Invalid device number" msgstr "Érvénytelen eszközszám" -#: src/incremen.c:1062 +#: src/incremen.c:1057 msgid "Invalid inode number" msgstr "Érvénytelen inode-szám" -#: src/incremen.c:1113 src/incremen.c:1150 +#: src/incremen.c:1108 src/incremen.c:1145 msgid "Field too long while reading snapshot file" msgstr "Túl hosszú mező a pillanatképfájl olvasása közben" -#: src/incremen.c:1120 src/incremen.c:1158 +#: src/incremen.c:1115 src/incremen.c:1153 msgid "Read error in snapshot file" msgstr "Olvasási hiba a pillanatképfájlban" -#: src/incremen.c:1122 src/incremen.c:1162 src/incremen.c:1214 -#: src/incremen.c:1272 +#: src/incremen.c:1117 src/incremen.c:1157 src/incremen.c:1209 +#: src/incremen.c:1267 msgid "Unexpected EOF in snapshot file" msgstr "Váratlan fájlvége a pillanatképfájlban" -#: src/incremen.c:1129 src/incremen.c:1169 +#: src/incremen.c:1124 src/incremen.c:1164 msgid "Unexpected field value in snapshot file" msgstr "Váratlan mezőérték a pillanatképfájlban" -#: src/incremen.c:1264 +#: src/incremen.c:1259 msgid "Missing record terminator" msgstr "Hiányzó rekordlezáró" -#: src/incremen.c:1325 src/incremen.c:1328 +#: src/incremen.c:1320 src/incremen.c:1323 msgid "Bad incremental file format" msgstr "Hibás növekményes fájlformátum" -#: src/incremen.c:1347 +#: src/incremen.c:1342 #, c-format msgid "Unsupported incremental format version: %" msgstr "Nem támogatott növekményes formátumverzió: %" -#: src/incremen.c:1502 +#: src/incremen.c:1496 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" "Rosszul formázott kiíratási könyvtár: a várt „%c” helyett %#3o található" -#: src/incremen.c:1512 +#: src/incremen.c:1506 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Rosszul formázott kiíratási könyvtár: az „X” többször szerepel" -#: src/incremen.c:1525 +#: src/incremen.c:1519 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Rosszul formázott kiíratási könyvtár: üres név az „R”-ben" -#: src/incremen.c:1538 +#: src/incremen.c:1532 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Rosszul formázott kiíratási könyvtár: a „T”-t nem előzi meg az „R”" -#: src/incremen.c:1544 +#: src/incremen.c:1538 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Rosszul formázott kiíratási könyvtár: üres név a „T”-ben" -#: src/incremen.c:1564 +#: src/incremen.c:1558 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" "Rosszul formázott kiíratási könyvtár: a várt „%c” helyett az adatok vége " "található" -#: src/incremen.c:1571 +#: src/incremen.c:1565 msgid "Malformed dumpdir: 'X' never used" msgstr "" "Rosszul formázott kiíratási könyvtár: az „X” soha nem került felhasználásra" -#: src/incremen.c:1615 +#: src/incremen.c:1609 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "" "Nem hozható létre ideiglenes könyvtár a következő sablon használatával: %s" -#: src/incremen.c:1677 +#: src/incremen.c:1670 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: a könyvtár nem kerül törlésre: nem érhető el" -#: src/incremen.c:1690 +#: src/incremen.c:1683 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: a fájl egy másik eszközön van: nem kerül törlésre" -#: src/incremen.c:1698 +#: src/incremen.c:1691 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: %s törlése\n" -#: src/incremen.c:1703 +#: src/incremen.c:1696 #, c-format msgid "%s: Cannot remove" msgstr "%s: nem távolítható el" @@ -1191,21 +1196,21 @@ msgstr "blokk %s: ** A blokk üres **\n" msgid "block %s: ** End of File **\n" msgstr "blokk %s: ** Fájlvége **\n" -#: src/list.c:256 src/list.c:1097 src/list.c:1360 +#: src/list.c:256 src/list.c:1093 src/list.c:1356 #, c-format msgid "block %s: " msgstr "blokk %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:712 +#: src/list.c:708 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "" "Üres értékek a fejléc azon részében, ahol a program a(z) %s számértéket várta" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:767 +#: src/list.c:763 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1213,115 +1218,109 @@ msgstr "" "feltételezi, hogy kettes komplemens" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:778 +#: src/list.c:774 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Az archívum %.*s oktális értéke túllépi a(z) %s tartományt" -#: src/list.c:799 +#: src/list.c:795 msgid "Archive contains obsolescent base-64 headers" msgstr "Az archívum elavulófélben levő base-64-es fejléceket tartalmaz" -#: src/list.c:813 +#: src/list.c:809 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "" "Az archívum előjeles base-64 karakterlánca (%s) túllépi a(z) %s tartományt" -#: src/list.c:844 +#: src/list.c:840 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Az archívum base-256-os értéke túllépi a(z) %s tartományt" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:873 +#: src/list.c:869 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Az archívum %.*s értéket tartalmaz, ahol a program %s számértéket vár" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:895 +#: src/list.c:891 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Az archívum %s értéke túllépi a(z) %s %s..%s tartományát" -#: src/list.c:1261 +#: src/list.c:1257 #, c-format msgid " link to %s\n" msgstr " link a következőre: %s\n" -#: src/list.c:1269 +#: src/list.c:1265 #, c-format msgid " unknown file type %s\n" msgstr " ismeretlen fájltípus: %s\n" -#: src/list.c:1287 +#: src/list.c:1283 #, c-format msgid "--Long Link--\n" msgstr "--Hosszú link--\n" -#: src/list.c:1291 +#: src/list.c:1287 #, c-format msgid "--Long Name--\n" msgstr "--Hosszú név--\n" -#: src/list.c:1295 +#: src/list.c:1291 #, c-format msgid "--Volume Header--\n" msgstr "--Kötetfejléc--\n" -#: src/list.c:1303 +#: src/list.c:1299 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Folytatva %s bájttól--\n" -#: src/list.c:1365 +#: src/list.c:1361 msgid "Creating directory:" msgstr "Könyvtár létrehozása:" -#: src/misc.c:298 -#, fuzzy +#: src/misc.c:297 msgid "Cannot get working directory" -msgstr "A munkakönyvtár nem módosítható" +msgstr "A munkakönyvtár nem kérdezhető le" -#: src/misc.c:571 +#: src/misc.c:570 #, c-format msgid "Renaming %s to %s\n" msgstr "%s átnevezése a következőre: %s\n" -#: src/misc.c:580 src/misc.c:599 +#: src/misc.c:579 src/misc.c:598 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: Nem nevezhető át a következőre: %s" -#: src/misc.c:604 +#: src/misc.c:603 #, c-format msgid "Renaming %s back to %s\n" msgstr "%s helyreállítása a következő névre: %s\n" -#: src/misc.c:851 +#: src/misc.c:850 #, c-format msgid "%s: File removed before we read it" msgstr "%s: a fájl el lett távolítva a beolvasás előtt" -#: src/misc.c:866 -#, c-format -msgid "%s: Directory removed before we read it" -msgstr "%s: a könyvtár el lett távolítva a beolvasás előtt" - -#: src/misc.c:887 +#: src/misc.c:871 msgid "child process" msgstr "gyermekfolyamat" -#: src/misc.c:896 +#: src/misc.c:880 msgid "interprocess channel" msgstr "folyamatközi csatorna" -#: src/names.c:594 +#: src/names.c:590 msgid "Pattern matching characters used in file names" msgstr "Mintaillesztő karaktereket használt a fájlnevekben" -#: src/names.c:596 +#: src/names.c:592 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" @@ -1329,29 +1328,29 @@ msgstr "" "Használja a --wildcards kapcsolót a mintaillesztés engedélyezéséhez, vagy a " "--no-wildcards kapcsolót ezen figyelmeztetés letiltásához" -#: src/names.c:614 src/names.c:630 +#: src/names.c:610 src/names.c:626 #, c-format msgid "%s: Not found in archive" msgstr "%s: Nem található az archívumban" -#: src/names.c:615 +#: src/names.c:611 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: A szükséges előfordulás nem található az archívumban" -#: src/names.c:649 -#, fuzzy, c-format +#: src/names.c:645 +#, c-format msgid "Archive label mismatch" -msgstr "Az archívum nincs úgy címkézve, hogy megfeleljen a következőhöz: %s" +msgstr "Hibás archívumcímke" -#: src/names.c:953 +#: src/names.c:949 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" "A -C használata fájllistán belül nem engedélyezett a --listed-incremental " "kapcsolóval" -#: src/names.c:959 +#: src/names.c:955 msgid "Only one -C option is allowed with --listed-incremental" msgstr "Csak egy -C engedélyezett a --listed-incremental kapcsolóval" @@ -2110,13 +2109,12 @@ msgstr "" "SIG előtag nélküli nevek is elfogadottak" #: src/tar.c:756 -#, fuzzy msgid "print file modification times in UTC" -msgstr "a fájlmódosítási dátumok kiírása UTC szerint" +msgstr "a fájlmódosítási idők kiírása UTC szerint" #: src/tar.c:758 msgid "print file time to its full resolution" -msgstr "" +msgstr "fájl módosítási idejének kíiírása teljes pontossággal" #: src/tar.c:760 msgid "send verbose output to FILE" @@ -2789,6 +2787,5 @@ msgstr "A parancs befejeződött\n" msgid "--stat requires file names" msgstr "a --stat fájlneveket igényel" -#, fuzzy -#~ msgid "Cannot restore working directory" -#~ msgstr "A munkakönyvtár nem menthető" +#~ msgid "%s: Directory removed before we read it" +#~ msgstr "%s: a könyvtár el lett távolítva a beolvasás előtt" diff --git a/po/id.gmo b/po/id.gmo index 9492a777a43f6ff6744c14b7a98276b6033561e6..6d9994f9f5edb48b6955db5622101d7eb97d2ee5 100644 GIT binary patch delta 11855 zcmYk?2YilK|Httwf*6U2ge1r!MiP->$BGr3+9dX>7PZyB)u!6gSXHyA9a^K*s9Lpa z)T~vts#W?lrP|W}=X;-%{&T(h^FF_GtuwEL=b3cSbII49uA7B&&i8N}CnAUA#A8)I z$GJf{xrF1WetWEOFCHLt{DQ&w7*C*AdB+LB^OzeSU^xDYVdxv@INlg%t%1|Y8^<{= zrwD~}RB)~H&>BcfN|C1^?QsU6KTbgYb3Wt`+UFd?hIk(%v3!E#_+T3>jy;e^IulS0 z$-wG(28&|8M3;F%sYJ&Kq@oHI#+FzR`(P-J#L_q))ziJ0gy&EV@vh)Fl`#&xVqeq? zj$jbp#wdJ&8i|q>9j7uqZA=jqGlW#w)0i@MK=pfMV#y`<)UL^x$Z0fL&2T zyBe8Z=M2(WCueOlgtal4d;qFp)369`#4tRFF?a`4ut2hTemhh{W}-%9JG%6O%M{ci zpE_np1F#r*BC@lb7O0lH&tYG=z8HWru{bWnP~3wdcn$sWPYg%z`sM|(sQc=pMy3<`;%H39 zne|;}NKa6q2R%nUs4(-O8=^2LHb(8+7U+p-s5$P2;W!4hoj%6GxCwRtL9BvzP#r7E zeB{F#s17uAQD{q{FREpGQ2YNRYP-Bb%~=eeIc>Z4sQRg>hJB8?@e9-o_oJ@Ai5lX( zjm#Pd$4K(mQ4ODsLFigb!H>cLq>;{f?BT)5#-<@-nwXKQz5>;=4Afkn!EpQ$ z^}w9X&G#SzOOiK6ZRdfgo{mF}#6tAJ4Ad0wb=SKb=d7)GfSSXRBe5JVKsEdj`ruVm&mW+s=yy~H{zA>YZ%d|?_dDe&XsA-H<4|+8%z6mp z$RA>540_G6PGGlpYt)X+~wbzpTn z#^0C1dMW~NH);gVV0nCq$r#w)%xOo|2=v7ioQrzV71WpQXVm>(9ZUlwP#tTHS|g*d z46eaIJnf>O2i(IV_$T_KZ%5O@lBf|XYx6jpSHxV@S4X|L4hCTt)Qd)9VO)jbxEnQ< z*HBaN0M!7OS0~e>Fw{^s!O}PqH8M+a2yR9VU0AAVSS{okPCZQX;P(eqPyb9aBNy7) ze7c)sF!h5m2xp-urdVC6X|6R<_`<)jQw3u>rGecb&nMS83@)30A+59Hz#!B7I zPqQYdZ8-t8$TCnOB#3e|BAR=`uJ2kRF-O-Vee zr=3x&e+q`-I@Ak~p{D9CHo#1*gGs&k{^L07G}M}zV_kqQ4=R>W(2dJbABwxE7Z&Jk z_I+j4+_u3`9F5&^5o)o$Kn-o_KBkAYP}jFc^>h?!MAlj_qSlmWU&deCX+&T1V{rxQ z1skzAp1?}@0PAAN>t=s(yi8Za9*=c_RSzd*hCsy*-3&x}kM`cU7aALFkc z45C7FvjjEATdha11o<_56JKIk?DvNG;W8KLjI#+fRfV`n_t!#otPN^yO+ZcQ7Oa7{ zuof0~^*0Sj!%|etK%L0IaD0pnu)qLwU0YNG-a&owHlQAS9YfH2AfI21#)dcvWAFr) z#Am1m6n)G5Htgy^K|?hgwWu;M8qe7Lg*_iU$ZXH*s22^zaGZmhn$Iv6Gf~egG1y#J zA0x?oqDEpmYO(LaYTEyq6m(;GR)kvE**Xy$ldneg_*X27fkVwyC8Fw6tbPR?g>jfL){ImSRELIPFfK-4+>W~LFy_L{v5bFi3V%^i6FtV68*5`B^1fIe zM`IUUhnk|?cBm;HGlB7sr?8lcAUuho zco)@TPtLbMe{6$2u_*3Djm$YzPhO&4;5pGOx+vVp)Kx-_*bndU`yW0-P4S~i{IY_M zYqGg9FRJBn=!0$18++mc9E8O&_Z0Kul31C%C2H=cp%&?O)R*umR>YgA5%QmEwrOQl z!$+e=*tLd2B!yk5A-sX5u<$hVW3xJH6;DCUPuB*%MZsOqBX+o4`O9?Rlx zTYm@jqI~b0Pj3{e=R;7dJ_EbpP1Fe2_<#}P{Z3B`dhujb%eSKD?mB8w`pq$UG?pjt zhL!Mr)JPo0IJ|8wIM?j+WQ?Z1t<{AZ;SJVP=>GZtD+NzZJViYy6V-so4_R>73AOmT zqaTj9et?C@S7I`5M~%=Q7>^<8_V0wK2G2z;+HbHXzDj5OHDopBnHQv?8ZZjA&DLQ~ zJcM3&47EtlVkgWq-@LFVs(uzG;6ZeE1hohw*+QkU7Ao(9TEwmejDHk`RaDf))7StD zE;QS!J!+1ppdPpx)u0=w2i?Ii{0A#y@kM4=w8FgPgD?+{Ms;8kHpN+}5xC@{pq2%E zWQMFdYS9fqZOcul{d*2|T_#q=Vv9}Q7PWT9qSnSb)V92g8reTE90NW!4XuQlvUWCi z^`j6(#SGNkuC)0!%ujv_)#59t7e_8JFYbbR&=k~=FGTh5I2Ocns5Ny5wc78a7N7T0 zb6iI%g;p$H>)Y$m?Jjd2_6W15poLi$!rCGIY)rEQU`} zL+-uC40QRF(;0}Tv+!WI~X?NR%EA|~S&)Eaq;YGCdRvl~KCAEuTVi&L-yevUrqx=%qZ$wal( zYm3<)-lzt}qUxKWu4{#wyWXgtj>Ag07~9}k^v1}o=EVt^M&1|I(SukDZ<*ZXysL|cr*u^59JF&rghmRzY5Ece~Z5O9LJ#7b~7@QPz_swJ#Y<9_2B#t zbKiSAX}tFT4hj|U7HZ%7e_?u90sY9EVj=8;LvS$G!8@2ABX=<^7>^p_NvMV`#~}O$ zHKMmM0t@aoQ=5n`y|5Jp?e8I&inCF3`vA2Da(!v%6g5H#s26v`e%K#7;&<2wWA~Wn zrDIj{46KF^Q1?abHB%A0m+?=cq6HNJI1|;vWmp^!U?SeYAS}3#`Nb%7PX#8BuR=BK zB5HSd?l+4p7WKR~7=j~EBbttC@S6RMe;W#~sK|q@zcMXMLv6d)tpm}6d>D4d5vav^ z9`)i^SQN`0FnL4NVjh8MxCCqApQ!7rd~NLGqM+57j+JpIsz;AeJr6r*7FBE1ji)g$ z{*B?7>yYVTX{<=z2wUTLEP`iIBliIP(K&4H3qaMoDp9CQp#_%1xfqE1u?}8B%~{Y9 z)4)h9NS=mz!2r~QCZiVJ5*&kvu`Jd;YKFca_8^~z(fAO#-{ts!V^(K0#&aSSlkr{D zke$LtnE#l`+oI+;9aC^0md2dN&HoS?gIXISQ61WZ)$uB7L<^rV4QqsH+W$i+X#1Q- z-4J%tJg^z+#$l)jZb3cZ9%?%Uow7rY;pF47EG|Q>_HVERdYm>!VomafSRSWhIPZ71 zQwYY3SO%Y<)v^#hQ%KWn7vu0DYS9H<TbE{wrkN(HxO-#IQdb$*&$WNiB_!(+fMcyzY;Oa#|4@$=>xC^z4pQ3IIzG)s*5A}kf z7=)X#Bp$`W_y{|rbIbe;=z_tdhfs^|2C5@@Zkvu4Kp*Y@1PV-@`(L_ps=$$HaL(Ag z5*D!KMVy;q&x=27xw17Z2T!%vHo&~ZOMC7s++fd5a_eHdQ23TO%E=VezuVlWJQTGy z+7W&{)Qfy45l*hD&_T6xl{$8;6H3Cmb$@>8nfsV%U4S{b?n``xSBMvsp_Mf40tUQvFG+Vjzra}lpm4#c+DfS5vTC)ZII?-3_W>fYntw)`&j7d+BGi`2j2 zxxW(nOWSbDr%}gYR6BkkI#UiK`Vxo9wR!!CPY4}vQU3b(Y zwFn*Ca4Auca2=pRo3{hWHH^fpVTkB%X1u zD(=HD>_=3fJds#LtROFj1$oXY+(DElUL$4^D+nEf@rW&xx}4+gYJLr+vfTflaQt~t z9C>cr(p=b{YdhL&ir`%G<#-wEU=R^cIT-iiyTmM_A+eXbtYaMIfg~SkCFLh6O>&pW zXD@1o2g&baIh;UzNPIzFgod=jC4`P=hX4LtOZ`@|)yNMZX9w}Ng1j#NNIaz6jrc|L zzmN(Y!zt^yLhK`^lGh_vQx4*#;gtU+wvg{fFYH3-C}nV_Vk~ji=H6VliO_KXPY}0= z$HXDR)sqvuiM+%VDsq=8@C`@7q7=WOnet%*6*PqOD; zm~$@ouQq?%%0H-lX->Fnit}e8Ilr4Zy|4?>gYq=uC}kZPm}-hn4CU`BFDE+KI`Jp* zCg-+eF&dh649WWb#8LAZ7eo;`xgaIG zzlXz!Pbg0yHc|c@zag?8J4s4Y=enA$_HQZ%WxH@0<@v)j>3A0E8_woN+W6K?v+K6Dsa*gU6x#{EdeT_TN$B?@zc=C<~2 ze%s+wc7s(-^cN53`UGvGR9yxW5i%h_o&e=HA3kIsZ9p%7Lagsmm*3l-6f5J0wO3O zEg=FD;$K7spU-#a%xBl@|J(cg&Q&L`4WH-3!=B@hc)G9qW}oljI8InL$BD%RAIG^y zxmB3ssQy@#@f4mVbo_&b@fCiJg`yqDAAdqGe1R@}jiDGC<2ZS-wzU~fChrvExSc=> zx2WJ+=TB>CT2hj{J<=X$Ec)RLlhYnats6!UYUvNaL)qISr&PCwKl zTZtOFleYd9YLQi~Y3z?wIg2qEFQ7*D8J5L@%!fvzI(qSbr!9q?n1p(84{U%7P(yna znP$hUwpna7P$QOtg>faSVFxe}Z(}I_h2=0f!Eq8X5%v7(sD>Oyw}#{q1-+m^9kYKM zU{UgBSOfimqlzEoYaYdWABn1*V=3eI1-h2#1fc_VYm$a@i2zq1uTZoQ4RL3Z@v?;=pwI=8j;?p`^KV1W;PbUE%n`e z@hBXoLPMI3ao2-l&<~rVZs?BLaUABwN$81lQFFWyUAPsso6chZ-a*~}7i!l8GY{%m z8_a_v-4xUV`35dSwd^@+|9dtx4XcEjv!1AJH^bI{foj+T^ui~o7yf~|KCqD)fjY<| zosJleAEO%XK1Lyk!VUDnKas{dc^cDe4}K4z8nU&C8JWANo_RJk4K0kCiU_QYiO6g^ zlQ02KqI#UCnd5k4BudC!iMBLe#d~gnH2t)HnSSs%Q65bLrLG40#dM z18ZPu?1Uw79BMnSLiKbzYAt+=`S2e4Y5)IjPvmN08WM_{!}6#H*SGcEQ4Je~S|d|1 zC$2^{Y$HbE8C1jnM!m?VrRjMnYKqFCIuMV=c)!z-LOJY%8mc+g?WnoBVEr3o$X%_> zFPT=T9#2Mnpf;hl-$N{eWm}tV-4>(BKR|s?cA?hBEp(5dkhhKF)WP>qEjxnxuw2A~ z_zd%6wzg(O3ZNbkiCTOeP(AB{>PS!Y!I`L$_yo1acA=hk7BynG+A{vS(SxNgb74s= zfa-Zg)V4`Nf1HC_BWqA|d=O*tHtNOx?aVK)1k6u99DQ*dYO3a;3qM5dx-Z%>{_4S1 zDhl8&^v7qY5%6knwwntR$XlZ3bQWp^mSG~EM7^kB2lHhsfx5pos)3zQ9ZN^8k2t{n{*B~!)2%kJVY&?9No-Rl|&6?HPi_7 zKs_%F)$=*1sacDB+njx<4rhN;_cQ+?6!fAv)Lhj>4fPOYTAfkIN6c^wDa(@a$eHXx0}IyfA2<96!-)S5YgZWYc@@WAg;H(o$}C_;Lf7bao| z`4B9LQ&BzHf^Xqj)MAV4ZHBfRs)xy_>(enBH={=6hBaRw#$Su7dLOg+Heep|OQ;vz zM!h&&U-Kmk#k%C}Q2TokvWT2Ds43iyn%iTjIlqd<@d@h1KK<-sM~zH}evE%U3X7>w z57wYs{ypkDaNqh0!^nO6^Vbko#4@-XgYhKNDd!Gqs+w?-?oYrG?>SG7;9@r4~VmZt< z#H^iYR0G^?C{&;@6E#%FP>bpws^wloO&*6j-x@372rP=9p$ku-rsfxn!pOJH^+~Af z#$q@w!B{+qEOxi^ltNYAz(UZCeXs=1v+l;m&2Ked)D(oHUfkN6iuK7? zUJ`vgFnGi%qRD&cgz|& zg<6!qp&Ar0+Kgab)Easl^`Zr+9v{L$e1v}JnacR9q7VfQQ8em9QVk1Wdkn@ts0WP0 zD!2jt@g7#gzcC&wjWLU`Kl+d_Ms?_OER5$+&wYe3_|F)|KL>@#vF4K-k2T4wqHat< zUtEUKxCQzAJ2z2NRO?+c1^rPYF$XK-4%CSLidwY3X{Lb{P$Sb9b$)spWg6rs>Ri@1vbUDxCDdoF=}LTzh^$F6;Us!jvCSK_&HNI7&T&r$MdH>Mx&-U z%sqj>dMH#u-B<_Jvc8xPr(s@Pf(vjBhG4Dt&5Ju@CGyFr-E#mn^p8+q!q=$97&y_4 zP*bc+J_OZp_ZA8o;%gX=PfJDVaRR!?+n}x= zfx3Pvs)0MO2Hr-d(CxUUnEl-p`*LDFYUp2~<}Ty|^AC$!sHsT9p*RDz_+DcXteT$j zL2=q)BKd4=fR|7`EjE?)giTP-KY|h3|Fxo|FOjt^oa`b{@INx<6V{ZJ#e z*4FRC>g2bv42I4y*Ed4F=xuC>Gf_Rih+6&rGg-{M->FZbBz}r6Jb`-gFIWx(XPG&y zi&~s1HlKyj;KS~Jm*~V*K#nHChv@~I03czwxb&SVlLya)f+X>?E7A*A^Q~d zg2Si=Tt{uU{PWEhFamRuN23;NCG3PlP%k`T>z`sAc^S4&Mn_PKF&#_c$_0$SD!!pY ztNAWQVD5#crR7nJC>f)0KWdI2pdRSA$TX-P>N$-t6nkI=9FN)^yD&HYfVuDnsss1k z6q-_aiZ!vuV$-rz)R29GT6E`7+tYW6*~gVpJxIbTIL_vKQETTGYHj3SY8p@zHL{)2 zg{i29x|dSWob9s}XE2ETF=}peerWQ-=uIAvYH%&oi_=jJIf{DD1JsbeLiI4_BlFv{ zGHOjVLM`@Y$l7x|!zt*-c~}V7pr+y=>P5G09<$60U0ZZf-vyKKT~tFap&Il6L<&*bq}tbA1q1|HPX66SJ*KV14Q<;|ve} z(!o09-Yd+n+vXTR-U|z0Di*_ZY@qkAqo4;o!FE_-rCI&ys3Bj2p|}mJ;(62q^Q|(w zq6BK>YGDyyUB$mQeHa~^s$X{6_)|u}^JJg3~I%*rA#YB9)j`3Ha!DnWUr=c3OA1mPt z)R0AgZq9eck>pcR4|LX>9@azkI0-fMBQP(%kLvksRD(BRcD#u>@UGjQc!=5sAsfux z$DpR58LECDY7wTPZrq4DaXUufe$;-yhY1+4(X5g7s3{nP+LjYgi+l%0q5A;^ZHu5y zX6T!tUYLYx>0or>a8!fl+WM`i>vo~0?rT&}f5M9BY&O3|D`8&JbkvI%VrM*sA=>|C zwwP7g0I6^WqFOoyHMe^)25+I})@Q3}P)*d3cSAKG1^sa*s^Kfq3)fjUTX)&>2hhd) zoud@AsP3R%oO7EQvZ|;dYK8eR4b_0@s9mrJ)zkB~KKFLBttw&x>bqhp4n~d4eN@A| zcJOy0dgDa52NzH%O~vz_W-g2DGE>q3weLrxdbk*Ua0~k4Q5=RBunsobZN3-j*qVF+ zYDDj&o}Xin8L=qTh$dpj@Bd^9n%hOF7w$ss?~9m(zoB~2e6P7~AZE-dYJ?V|Hy+1+ z_#Jk{YWvK;isxc5`Ae*V{`<{`toeS%UpG#s!i96O8g55_e1gR>`xmAsr7)hn9tL4D z*29^YF%_sO%zeN#tU79U^v9Ao7xlb7SQM`uVE#3vFR4(Ay$_mI+Y57%??yH7FlyVK zww^~1^2^u-ub|dOl|$ymy-+=#WAhED#e4;|`m-J8bB*2H6f}e%S-(Lo#+RrMP{S=QS*mIcXW{t#Ns#&E8s?KgSS!Nfl9~B$Tdela(5pJE()pk#8RwF zz8xd+1s1~a<7Sc7K#fQms)6ZP5D%kXa1J#!zn~Ufwl7VC%VHVwRj8pqgWa|NA5kbv zMT@V@14g4(=PZoHLzsZiP(v1f!u*3|7%Jb3n&X$4h$T*%p&o!u$Y-P0##K~@e7`n- zuGhwR?f)?p%5Y*MYHlu~womzQ%ncK<6!})Hj+apn3^-+`q$#SwX_ztO=pw(3dT#d9 zX0=CQ7|yuqHmXMt*A=Gyt`|mSYFJ zjJhxGta(mP)S{e<<#08+%ThQ;AskRn}_{i zhQ0-A(WT)dT!>*F{QA9MKDlcynl-i__56z%hc7QO{?Qc5T`~_!!iwbSSQ`&v5p*t_ z7lfelil`p8Mi=(L5S)M!xE!nE*O-9We>C5j2H1$a1M2*8Hw6vtkLZg&SIkI+qZZ4X zm>u~KannpiJ)|RUX9xxL zbR_1(g~-%70sP3J0>}Rh&bKzNgavGQG3P$8=fxkktj6nbWpkYO?6rxQhj?vHIfu0W z_1|Z7Ot7B9vjpE8ry;H7#&*Hq}B+WC>XGZ;$3I?ecR3F?@R zaRz50dUD-9-tRo5aGCgvavW-y(}>KYC3Sz3EX1nBYRcs^PhuJBsu4Abqr_T!E}ZgP zlyBSoPx3W{w%#zpn{dBR1s}Bkj>hCI$wp(=<5!YTi6zv3N>s5Ynf{DpJU>qm*EpA* zp5I2Ti#M~ZWz{u9xavWw_T94Bu~_z^1z z9Yd)fKnx^&zR*K?@<=IG6dtVaUL zUh4kEio|TnOR*O59`PM{P0Tz>P#8?zJ-mXCh-9K5@i(!@UU-AD2jP>E^ZuLm#1rh! ziOi!0g#gn^rw8@?;&8?i9}(5b8xYMY=jEC{c$UaKdUCD~$$p|TWgVjp&OH3h*0p!r zLOYyg%ernTQJwfx35UM3|I2bdf%0TxYsOi6j+gBDHz^mg^+TvTPdp=ENzAhKxopQW z#=jI76r^G}HsFHoL;-u@Q|v^%;9ONafT7r*s6crfv6%RTJOq7s&Pv=##1O5Csl+FQ zj$!zvEt9%4{-5}C;w6<)|9`^q=RvXLIc-b5umjh1vey*CIpoXn64u4SL>%Q{`~s&D zQ;9~z7u01Q?@}H@vPA1IFG*>VyM(vBs5u@b{~4oD!!(!JOpy$&2W%%PV7eL zC}nUaVKnib>{H2HnST7{4KI5|4>vgu5pv_7b^?iB#yQP5e%LtR&0vVU}`mmhuzs z3!-61?ET&CxpOx6$F{_5>L=K9f0=Xcj6Z4qv6X*N`P!Vws0ra`dGhnv3%e0LC{HH7 zve#|G&g42GDPP6qL`Nd?cu8R(=XPKS4b41;XMTTTsoBZ}Wr-YIkP}}K9}?Gz4~Vz9 zCL4Zf?;cNiBV}KFg~hqAIQ~SQd4y$o*##<}6WfRYdqH;1e;85UR@Al5$6M6r$6mzO zl=JYg_4fQRtU!cPKLXnj`zg=Bk;DqhdiDm&+wcUD_1HyHTG#xTrS=~x-p+F2$CMWk zkL)$m@sK?~1zQmWk\n" "Language-Team: Indonesian \n" @@ -59,7 +59,7 @@ msgstr "%.*s: Parameter ARGP_HELP_FMT tidak diketahui" msgid "Garbage in ARGP_HELP_FMT: %s" msgstr "Sampah dalam ARGP_HELP_FMT: %s" -#: gnu/argp-help.c:1246 +#: gnu/argp-help.c:1248 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." @@ -67,29 +67,29 @@ msgstr "" "Argumen wajib atau opsional ke pilihan panjang juga wajib atau opsional " "untuk argumen pendek yang berkorespondennya." -#: gnu/argp-help.c:1639 +#: gnu/argp-help.c:1641 msgid "Usage:" msgstr "Penggunaan:" -#: gnu/argp-help.c:1643 +#: gnu/argp-help.c:1645 msgid " or: " msgstr " atau: " -#: gnu/argp-help.c:1655 +#: gnu/argp-help.c:1657 msgid " [OPTION...]" msgstr " [PILIHAN...]" -#: gnu/argp-help.c:1682 +#: gnu/argp-help.c:1684 #, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Coba `%s --help' atau `%s --usage' untuk informasi lebih lanjut.\n" -#: gnu/argp-help.c:1710 +#: gnu/argp-help.c:1712 #, c-format msgid "Report bugs to %s.\n" msgstr "Laporkan bug ke %s.\n" -#: gnu/argp-help.c:1929 gnu/error.c:183 +#: gnu/argp-help.c:1931 gnu/error.c:183 msgid "Unknown system error" msgstr "Kesalahan sistem tidak dikenal" @@ -195,16 +195,16 @@ msgstr "%s: pilihan '-W %s' tidak mengijinkan sebuah argumen\n" msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: pilihan '-W %s' membutuhkan sebuah argumen\n" -#: gnu/obstack.c:425 gnu/obstack.c:427 gnu/xalloc-die.c:36 +#: gnu/obstack.c:423 gnu/obstack.c:425 gnu/xalloc-die.c:36 msgid "memory exhausted" msgstr "kehabisan memori" -#: gnu/openat-die.c:36 +#: gnu/openat-die.c:40 #, c-format msgid "unable to record current working directory" msgstr "tidak dapat menyimpan direktori kerja sekarang" -#: gnu/openat-die.c:54 +#: gnu/openat-die.c:59 #, c-format msgid "failed to return to initial working directory" msgstr "gagal untuk kembali ke direktori kerja inisial" @@ -228,11 +228,11 @@ msgstr "gagal untuk kembali ke direktori kerja inisial" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: gnu/quotearg.c:274 +#: gnu/quotearg.c:273 msgid "`" msgstr "`" -#: gnu/quotearg.c:275 +#: gnu/quotearg.c:274 msgid "'" msgstr "'" @@ -500,21 +500,21 @@ msgid_plural "%s: Wrote only %lu of %lu bytes" msgstr[0] "%s: Hanya dapat menulis %lu dari %lu byte" msgstr[1] "%s: Hanya dapat menulis %lu dari %lu byte" -#: lib/paxnames.c:155 +#: lib/paxnames.c:140 #, c-format msgid "Removing leading `%s' from member names" msgstr "Menghilangkan awalan `%s' dari nama anggota" -#: lib/paxnames.c:156 +#: lib/paxnames.c:141 #, c-format msgid "Removing leading `%s' from hard link targets" msgstr "Menghilangkan awalan `%s' dari target hard link" -#: lib/paxnames.c:169 +#: lib/paxnames.c:154 msgid "Substituting `.' for empty member name" msgstr "Mengganti `.' untuk nama anggota kosong" -#: lib/paxnames.c:170 +#: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" msgstr "Mengganti `.' untuk target hard link kosong" @@ -807,20 +807,20 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "Hanya dapat membaca %lu dari %lu byte" msgstr[1] "Hanya dapat membaca %lu dari %lu byte" -#: src/compare.c:105 src/compare.c:382 +#: src/compare.c:105 src/compare.c:383 msgid "Contents differ" msgstr "Isi berbeda" -#: src/compare.c:131 src/extract.c:972 src/incremen.c:1462 src/list.c:458 -#: src/list.c:1392 src/xheader.c:711 +#: src/compare.c:131 src/extract.c:984 src/incremen.c:1456 src/list.c:456 +#: src/list.c:1388 src/xheader.c:711 msgid "Unexpected EOF in archive" msgstr "Unexpected EOF dalam archive" -#: src/compare.c:179 src/compare.c:195 src/compare.c:308 src/compare.c:406 +#: src/compare.c:179 src/compare.c:195 src/compare.c:309 src/compare.c:407 msgid "File type differs" msgstr "Tipe berkas berbeda" -#: src/compare.c:182 src/compare.c:202 src/compare.c:322 +#: src/compare.c:182 src/compare.c:202 src/compare.c:323 msgid "Mode differs" msgstr "Mode berbeda" @@ -836,49 +836,54 @@ msgstr "Gid berbeda" msgid "Mod time differs" msgstr "Mod time berbeda" -#: src/compare.c:215 src/compare.c:414 +#: src/compare.c:215 src/compare.c:415 msgid "Size differs" msgstr "Ukuran berbeda" -#: src/compare.c:263 +#: src/compare.c:264 #, c-format msgid "Not linked to %s" msgstr "Tidak dilink ke %s" -#: src/compare.c:287 +#: src/compare.c:288 msgid "Symlink differs" msgstr "Symlink berbeda" -#: src/compare.c:316 +#: src/compare.c:317 msgid "Device number differs" msgstr "Nomor perangkat berbeda" -#: src/compare.c:456 +#: src/compare.c:457 #, c-format msgid "Verify " msgstr "Verifikasi " -#: src/compare.c:463 +#: src/compare.c:464 #, c-format msgid "%s: Unknown file type `%c', diffed as normal file" msgstr "%s: Tipe berkas '%c' tidak dikenal, lakukan diff sebagai berkas normal" -#: src/compare.c:518 +#: src/compare.c:520 msgid "Archive contains file names with leading prefixes removed." msgstr "Archive berisi nama berkas dengan awalan dihapus." -#: src/compare.c:520 +#: src/compare.c:526 +#, fuzzy +msgid "Archive contains transformed file names." +msgstr "Arsip berisikan header base-64 yang kadaluarsas" + +#: src/compare.c:531 msgid "Verification may fail to locate original files." msgstr "Verifikasi mungkin gagal untuk menemukan berkas orisinil." -#: src/compare.c:593 +#: src/compare.c:603 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "GAGAL VERIFIKASI: header %d tidak valid terdeteksi" msgstr[1] "GAGAL VERIFIKASI: header %d tidak valid terdeteksi" -#: src/compare.c:611 src/list.c:222 +#: src/compare.c:621 src/list.c:222 #, c-format msgid "A lone zero block at %s" msgstr "Sebuah lone blok nol di %s" @@ -930,7 +935,7 @@ msgstr[1] "%s: Berkas diperkecil %s byte; dipadding dengan nol" msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: file berada pada filesistem yang berbeda; tidak di-dump" -#: src/create.c:1203 src/create.c:1214 src/incremen.c:582 src/incremen.c:588 +#: src/create.c:1203 src/create.c:1214 src/incremen.c:578 src/incremen.c:584 msgid "contents not dumped" msgstr "isi tidak didump" @@ -954,7 +959,7 @@ msgstr "%s: berkas tidak berubah; tidak di-dump" msgid "%s: file is the archive; not dumped" msgstr "%s: berkas adalah archive; tidak di-dump" -#: src/create.c:1723 src/incremen.c:575 +#: src/create.c:1723 src/incremen.c:571 msgid "directory not dumped" msgstr "direktori tidak didump" @@ -963,12 +968,12 @@ msgstr "direktori tidak didump" msgid "%s: file changed as we read it" msgstr "%s: berkas berubah saat kita membacanya" -#: src/create.c:1857 +#: src/create.c:1858 #, c-format msgid "%s: socket ignored" msgstr "%s: soket diabaikan" -#: src/create.c:1863 +#: src/create.c:1864 #, c-format msgid "%s: door ignored" msgstr "%s: door diabaikan" @@ -996,165 +1001,165 @@ msgstr "%s: penanda %s adalah %s dalam masa datang" msgid "%s: Unexpected inconsistency when making directory" msgstr "%s: Inkonsistensi tidak diharapkan ketika membuat direktori" -#: src/extract.c:709 +#: src/extract.c:721 #, c-format msgid "%s: Directory renamed before its status could be extracted" msgstr "%s: Direktori diganti nama sebelum statusnya dapat diperoleh" -#: src/extract.c:863 +#: src/extract.c:875 msgid "Extracting contiguous files as regular files" msgstr "Sedang extract contiguous file sebagai regular file" -#: src/extract.c:1197 +#: src/extract.c:1209 msgid "Attempting extraction of symbolic links as hard links" msgstr "Mencoba extract symbolic link sebagai hard link" -#: src/extract.c:1353 +#: src/extract.c:1365 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "" "%s: Tidak dapat mengekstrak -- berkas adalah kelanjutan dari volume lain" -#: src/extract.c:1360 src/list.c:1125 +#: src/extract.c:1372 src/list.c:1121 msgid "Unexpected long name header" msgstr "Tidak terduga nama header panjang" -#: src/extract.c:1367 +#: src/extract.c:1379 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Tipe berkas tidak dikenal '%c', diekstraksi sebagai berkas normal" -#: src/extract.c:1393 +#: src/extract.c:1405 #, c-format msgid "Current %s is newer or same age" msgstr "Saat ini %s adalah lebih baru atau berumuran sama" -#: src/extract.c:1445 +#: src/extract.c:1457 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Tidak dapat melakukan backup berkas ini" -#: src/extract.c:1582 +#: src/extract.c:1594 #, c-format msgid "Cannot rename %s to %s" msgstr "Tidak dapat mengubah nama %s ke %s" -#: src/incremen.c:474 src/incremen.c:518 +#: src/incremen.c:473 src/incremen.c:517 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Direktori telah diubah nama dari %s" -#: src/incremen.c:486 +#: src/incremen.c:485 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Direktori telah diganti nama" -#: src/incremen.c:531 +#: src/incremen.c:530 #, c-format msgid "%s: Directory is new" msgstr "%s: Direktori adalah baru" -#: src/incremen.c:956 src/incremen.c:973 +#: src/incremen.c:951 src/incremen.c:968 msgid "Invalid time stamp" msgstr "Time stamp tidak valid" -#: src/incremen.c:1012 +#: src/incremen.c:1007 msgid "Invalid modification time (seconds)" msgstr "Waktu modifikasi (detik) tidak valid" -#: src/incremen.c:1027 +#: src/incremen.c:1022 msgid "Invalid modification time (nanoseconds)" msgstr "waktu modifikasi (nano detik) tidak valid" -#: src/incremen.c:1047 +#: src/incremen.c:1042 msgid "Invalid device number" msgstr "Nomor perangkat tidak valid" -#: src/incremen.c:1062 +#: src/incremen.c:1057 msgid "Invalid inode number" msgstr "Nomor inode tidak valid" -#: src/incremen.c:1113 src/incremen.c:1150 +#: src/incremen.c:1108 src/incremen.c:1145 msgid "Field too long while reading snapshot file" msgstr "Field terlalu panjang ketika membaca berkas snapshot" -#: src/incremen.c:1120 src/incremen.c:1158 +#: src/incremen.c:1115 src/incremen.c:1153 msgid "Read error in snapshot file" msgstr "Pembacaan error dalam berkas snapshot" -#: src/incremen.c:1122 src/incremen.c:1162 src/incremen.c:1214 -#: src/incremen.c:1272 +#: src/incremen.c:1117 src/incremen.c:1157 src/incremen.c:1209 +#: src/incremen.c:1267 msgid "Unexpected EOF in snapshot file" msgstr "Tidak terduga EOF dalam berkas snapshot" -#: src/incremen.c:1129 src/incremen.c:1169 +#: src/incremen.c:1124 src/incremen.c:1164 msgid "Unexpected field value in snapshot file" msgstr "Tidak terduga nilai field dalam berkas snapshot" -#: src/incremen.c:1264 +#: src/incremen.c:1259 msgid "Missing record terminator" msgstr "Hilang pengakhir rekaman" -#: src/incremen.c:1325 src/incremen.c:1328 +#: src/incremen.c:1320 src/incremen.c:1323 msgid "Bad incremental file format" msgstr "Format berkas incremental buruk" -#: src/incremen.c:1347 +#: src/incremen.c:1342 #, c-format msgid "Unsupported incremental format version: %" msgstr "Versi format incremental tidak didukung: %" -#: src/incremen.c:1502 +#: src/incremen.c:1496 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "Salah bentuk dumpdir: diduga '%c' tetapi ditemukan %#3o" -#: src/incremen.c:1512 +#: src/incremen.c:1506 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Salah bentuk dumpdir: 'X' terduplikasi" -#: src/incremen.c:1525 +#: src/incremen.c:1519 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Salah bentuk dumpdir: nama kosong dalam 'R'" -#: src/incremen.c:1538 +#: src/incremen.c:1532 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Salah bentuk dumpdir: 'T' tidak diawali oleh 'R'" -#: src/incremen.c:1544 +#: src/incremen.c:1538 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Salah bentuk dumpdir: nama kosong dalam 'T'" -#: src/incremen.c:1564 +#: src/incremen.c:1558 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "Salah bentuk dumpdir: diduga '%c' tetapi ditemukan akhir dari data" -#: src/incremen.c:1571 +#: src/incremen.c:1565 msgid "Malformed dumpdir: 'X' never used" msgstr "Salah bentuk dumpdir: 'X' tidak pernah digunakan" -#: src/incremen.c:1615 +#: src/incremen.c:1609 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Tidak dapat membuat direktori sementara menggunakan template %s" -#: src/incremen.c:1677 +#: src/incremen.c:1670 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Tidak menghapus direktori: tidak dapat memperoleh statistik" -#: src/incremen.c:1690 +#: src/incremen.c:1683 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: direktori berada di perangkat yang berbeda: tidak menghapus" -#: src/incremen.c:1698 +#: src/incremen.c:1691 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Menghapus %s\n" -#: src/incremen.c:1703 +#: src/incremen.c:1696 #, c-format msgid "%s: Cannot remove" msgstr "%s: Tidak dapat menghapus" @@ -1174,133 +1179,128 @@ msgstr "blok %s: ** Blok dari KOSONG **\n" msgid "block %s: ** End of File **\n" msgstr "blok %s: ** Akhir dari Berkas **\n" -#: src/list.c:256 src/list.c:1097 src/list.c:1360 +#: src/list.c:256 src/list.c:1093 src/list.c:1356 #, c-format msgid "block %s: " msgstr "blok %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:712 +#: src/list.c:708 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Kosong dalam header saat diharapkan nilai %s numerik" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:767 +#: src/list.c:763 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "Nilai oktal arsip %.*s di luar batasan %s; asumsikan komplemen dua" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:778 +#: src/list.c:774 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Nilai oktal arsip %.*s di luar batasan %s" -#: src/list.c:799 +#: src/list.c:795 msgid "Archive contains obsolescent base-64 headers" msgstr "Arsip berisikan header base-64 yang kadaluarsas" -#: src/list.c:813 +#: src/list.c:809 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "Arsip yang ditandatangahi dengan string base-64 %s di luar batasan %s" -#: src/list.c:844 +#: src/list.c:840 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Nilai arsip base-256 di luar batasan %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:873 +#: src/list.c:869 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Arsip berisikan %.*s ketika nilai numerik %s diharapkan" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:895 +#: src/list.c:891 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Nilai arsip %s dari %s di luar batasan %s..%s" -#: src/list.c:1261 +#: src/list.c:1257 #, c-format msgid " link to %s\n" msgstr " link ke %s\n" -#: src/list.c:1269 +#: src/list.c:1265 #, c-format msgid " unknown file type %s\n" msgstr " tipe file tidak dikenal %s\n" -#: src/list.c:1287 +#: src/list.c:1283 #, c-format msgid "--Long Link--\n" msgstr "--Link Panjang--\n" -#: src/list.c:1291 +#: src/list.c:1287 #, c-format msgid "--Long Name--\n" msgstr "--Nama Panjang--\n" -#: src/list.c:1295 +#: src/list.c:1291 #, c-format msgid "--Volume Header--\n" msgstr "--Volume Header--\n" -#: src/list.c:1303 +#: src/list.c:1299 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Diteruskan pada byte %s--\n" -#: src/list.c:1365 +#: src/list.c:1361 msgid "Creating directory:" msgstr "Membuat direktori:" -#: src/misc.c:298 +#: src/misc.c:297 #, fuzzy msgid "Cannot get working directory" msgstr "Tidak bisa pindah direktori kerja" -#: src/misc.c:571 +#: src/misc.c:570 #, c-format msgid "Renaming %s to %s\n" msgstr "Mengganti nama %s ke %s\n" -#: src/misc.c:580 src/misc.c:599 +#: src/misc.c:579 src/misc.c:598 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s:Tidak dapat mengganti nama ke %s" -#: src/misc.c:604 +#: src/misc.c:603 #, c-format msgid "Renaming %s back to %s\n" msgstr "Mengganti nama %s kembali ke %s\n" -#: src/misc.c:851 +#: src/misc.c:850 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Berkas dihapus sebelum kita membacanya" -#: src/misc.c:866 -#, c-format -msgid "%s: Directory removed before we read it" -msgstr "%s: Direktori dihapus sebelum kita membacanya" - -#: src/misc.c:887 +#: src/misc.c:871 msgid "child process" msgstr "proses anak" -#: src/misc.c:896 +#: src/misc.c:880 msgid "interprocess channel" msgstr "saluran interproses" -#: src/names.c:594 +#: src/names.c:590 msgid "Pattern matching characters used in file names" msgstr "Pola pencocokan karakter digunakan dalam nama berkas." -#: src/names.c:596 +#: src/names.c:592 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" @@ -1308,29 +1308,29 @@ msgstr "" "Gunakan --wildcards untuk mengaktifkan pencocokan pola, atau --no-wildcards " "untuk menekan peringatan ini" -#: src/names.c:614 src/names.c:630 +#: src/names.c:610 src/names.c:626 #, c-format msgid "%s: Not found in archive" msgstr "%s: Tidak ditemukan dalam archive" -#: src/names.c:615 +#: src/names.c:611 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Kejadian yang diinginkan tidak ditemukan dalam archive" -#: src/names.c:649 +#: src/names.c:645 #, c-format msgid "Archive label mismatch" msgstr "Label archive tidak cocok" -#: src/names.c:953 +#: src/names.c:949 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" "Menggunakan pilihan -C didalam daftar berkas tidak diijinkan dengan --listed-" "incremental" -#: src/names.c:959 +#: src/names.c:955 msgid "Only one -C option is allowed with --listed-incremental" msgstr "Hanya satu pilihan -C yang diijinkan dengan --listed-incremental" @@ -2739,6 +2739,9 @@ msgstr "Perintah berakhir\n" msgid "--stat requires file names" msgstr "--stat membutuhkan nama berkas" +#~ msgid "%s: Directory removed before we read it" +#~ msgstr "%s: Direktori dihapus sebelum kita membacanya" + #~ msgid "Cannot save working directory" #~ msgstr "Tidak dapat menyimpan direktori kerja" diff --git a/po/it.gmo b/po/it.gmo index ccb9f70d2c81d5080c206ad65c95f7f5c6fd4990..306f547034052d4d0d9081bc3ba2a23c8a2e3e02 100644 GIT binary patch delta 9722 zcmYk?2Xt0N`p5D6ib+f;A*7LnkT<>ega82&AoKtM1ZmPj3{650QhY%oMNxz+SO9gU zFDNJoMnP7J60v~_BH$7M#kH&`3akg&?~l2A{{MTz7HF0{jkBV z)-F$5%d+ZoEGq_EvNRGWzCORwK;Cu~>|0xCuk?B=Sn@Uzm-N z`Ibe|>Wi^hgJW=OzU8q(C^V$imKcMxup_ENZ(;{Li)uK$z|@x@eX%OBDXv95zXR3a zaa2RMFdCyV7{@p?OgbMp04bI0aqAPhkUGh04epR4QxH8-K-DKR72^=C94?Ya2_gie{7;cK^}t`4fSH|4 z2M3`>I2ZNeo!A18qdI;CqwzMX+#9tRt1t#_48pzGg7&TB6k6gHj6|Oj(u?uv z#x|%1hN2#vicz>2{c$rE<6hL_ypDQL9P^;}bVA)f2=B&OsO>u!Jq;)ev<3ci;x9W2xQD)D1>$zeU}ce_eQ; z3ia%t=#7_94gP?d>xSJ;23jHSvU+12K8@;lEjGu`F#vx;`fAl#G@1Dd zHLx2!J*KBkdYQRwiA7u}M5fW2i^cd3YQ(p(Ax4*)`_obTy(cQwvr&s|IcocDL^ZSz z8{Tfx5P#-ge zNvK8I26f*cRL3Tu)`(|51s@7)Q9av$X?Pgb^IuR6dG|FV4?<0m8#RJN)ZDkjR2+uN z)Dp*SsHr;c_zPwd2bbOXt?^i0C}_mf?uaJ+@_#CNk5H1ZVGuIY>F*b>wlS%iK4a%_5D*K;m|&4wj)ZHPDHN4<`Sr7)^y2jzfJ~ zCu4Jb4AsyE48~8L30&8!lW`2m4W+EFPx4V`4UuW*CQV_YZq$7H&M?Aj5G};pr$GZmDzG+R;>xh zN6>oLi5reG&w0jB$mK#cYF}7z~RN>CjvM=h>u)b-7%ZF~Ur z-kYfRrjIdGazAR#EJHqU9_uvx(St$&mHf2 zz$~gP)Z%*?{qQ4fiC>}`zK;1ARB3)&dSVmWx1OM&MYIkZ;wz}RtwqiG35>=|sD{1A zIjbF&nNrk#eiAi+b*PTlq1MKE$6qmq*k?TJ0aMVEL}4|BaC`?DlywHReTukCFPMla zxB#`dwxj0s9Ja$o6U`^P2dV>0F&^J=>d&H^IDC?snnKil3n!6(b>LMhvhg(P#l8=k zU#B+6H^sUSyWvhu#p@W0v6D>)x?vu14JuQ$s5NyK)$u=_IHAg1?~2-<OH5hDgJ>0=rhAi zfhUZD8t&>?g(bw#VjiAHt>R`g%{I!$oy0>h8GUD&j^v^`IuaAG27_@sUdDGZ$i?55 z)#i)4fA*a<;<4VPpjG)DYEk$-WKvjwT0|A7h8{dFGRw zi0z3pP|r=mW@uvuZbrWP))$yU`&RCJGX*11nOK4a_;*xFzd@~PpNCBclTn!&j=KH` zYL2&{7Ulcc9B*Jt44@HpI1Bq=F%G~L=n1EAk%Ch57iuIa3rqu9*pPS-E@SS-U`OH~ z7cy$hc*Ojwxfhw|9z?DB>8Or9gN<=NYN|fK75Ftq;^Z3gpHE?Vjrp-SgqrI=P^or5 zY8Fvj)YO!r8y8_e+=$w4f1pMhx7c*NGpeKGQSaZ5MOcq|PxKPAChlFrh@+{fqCziN ziTd>JLZ$GSQ(uo7fwk1^_aIb9%diK|!O?gGHS&aIW`w=41MztD!>w3>yHOnp^E_ro zSc<9`gPn0Tw#PH5sR@0Yzt^xcreK}pHDq~MQOnI2bUkY1pI|NqJYk;if`!CWQH%N& zOh(T^3hgL-?^Gl_X;NB-S{n~zDL#kl(6^}XLL3vRkqp5EJcv=cj(VT>Q)ZiX#th=2 zs0=T2;;ooU`_^d+nOtbF(o97zrV$Txd<2#HotT7&o%$b9sSaCZ?0_!fa=Z&GP#GA9 zCAbc~u^u(GS1?rj-({Qa5r!?ekc>)US4_mESd6<+Q*#xwG5=|kiAvOn*P$|S#_=X< zJ{8WXz>~tD3?P+>UyY*BY~EI-xqU5Y^yejK$wk847#Gtc9+aLp&9W za3hYxOV|T@KWplrK@I3M_QKof@uAS`Ig|PU=q8?tU2qL5#ploqUC*1p4Smp;*dHfg z80KLOYEjiX@kLaJny)qQ8I0+~^HG`FzLxxJPLETOh1XDV{5rF0`=C-d2jg)YY7u?n z#6LT6(0cQU%|$oYyJ9$2Vsm^1_1?7@fk$v8URdujDJ*`$q;?_(abX1(;6}U~&tXHX z#|HQlDl=D+RcwX4XclQFbQ2H4mROCNf;HF*FQDEN`jQz~tcSutD*9spZpHTa78c?S z?1XuLGpo27wg2~{I`$oE3V*~Fcn!4{0$w&5D8VtrBT?J*5W4YuR3i%OGgJ-cA|H44+|DrAC zQ#ksULz$aSf*7 zI@A=@VK9D&sdx+ZT=FjR??WMLmq}%7)Erh~8(e{!yE@bqT|tfHuGh>LG9NREXP_4A zMr@+{P;2En>it2lo6NRAO=$ECnI*h}ssLX}zHB(xKS;Ui2Q@9?J@J-bHo_Y!$D0uHPi>3>zhf7eabT2N# zbEwpfdebz#0F{Bo__B*171Sc0^Ol*Cb*PSgh{1Rb!_n_;vzy{EQ2W1t!dNc!LVfvm zVG#a|!?3}A^WaFl(*WxFI#fqrLrvKQjKI4OnETxrLR^RsV1IODEk@#3c<1;31_h<4 z={sgobj0DrT~QBizz5Oqpn36Z%pZn)>L>0l^o zEk!$VGJ0H85$E%+KOes28ns+>fn^&tV@7e%~ynu^37`2lZW8g$cL=WAQUA z#OqjqxyMYVCSoaZ4K~9Q$H>37%O&TAmUU(h3s8$^h!ao2MZ~Kx8ACoWQ&5am#P_2z z_7Q4IZehOeJ8u36Ek(7n0JUr0!cN%G^P%ZsA5_I+)JW@4FKqsinal2|7e0mQ_#U>! zYZ#B2ADcBY5C;>_!5;V-reWkK=6X-;LR^Jfyq-5GXf^(ZF&O`;`H|_4iXTOdcq?|t zlc;?hal)j!74|0{ic0k>n1q*6Q`zLCStA*kMLYxt;$zrP`~L!kTq<%tGdDhfx^X3z z;vpyY|J-z_7z3#<$2_b?b#Mo24V=OpyoITl^@SPva8w2tqB6D*LulVRPoX6h*H9@9 zJY}|7A8blog<50_P;>Y^s)L_nHhP^l|C}yBrS@^m!xN~Ecz?-Xy4VIab(gUS1J7`s z_N@UF^uopH#(j7bzr-~5=gF_k{=I$HbkO&ld2tD5a9=g*`OT;ipGI}8!FlsXXFe)p zlTZU%fI+wtJ@-)9OhI$C6SaRo!A$%C_2P)H&HoQjijlDAr>z-ozsGzhHht`d%Ra-c$^vqB{;prEU|dr(Zeo4>*_jCdrD!Ck29 zftSs%WgGM%o{O4_MW|H2ZugGKbuG0Q#ss=r*{fp)c;!<&(EceVvvGe)jX8BJu#;nB zy^<)+xBJCLxpM5Ov58?LiRs9l;|2?03#TS@iv3z_gsYGJQEY5LfpeWHxN|JDU2%!7 z-ga_aVWftZ$}`@a>V0#(7rSuQ*bCz#Tp9NIxXgeV#2<4_$5E`b&&P!(Ya%p;4XWm- z;>rZhNt{cFhvFR0u6AU6qN|tPCBDFGJoOLR3yBxm+u}2`HOp^t&u!F%uB5yc+jDw2 zPY}1m{~a;5Z$jUGT1&xqnYuCDagyR(&h?yy#9cTw?Txsn0zc*a-%-xBVuJmg1(bEn zwznmu227@;eSJe!96jyJ2~mwFQTo!kZ-gC?SeRTw%^psFP948+4(7bhU0OWvU=)tC zXC_W}4YI#aj1A5r4yXPAF6Vrlvzr~A6xjGdO3!mP;%b83F)6|;jp$)}bW)LTHKp0q zce1x7^$otCNJqTk&VS}fw;Ly?25ZH=#p%oWDEI5=VE0Zga*eW|NRDtlVsA?>N*+z^ zV$S!SJ9gqw-O8cQ2VVp0CC>ZofRtEYZ6h6-cKeiASCu_FWtjd4g*!(_$JJQRlTEOk z^8?C$TS37mB9Vgo7Q=`Jha^+Xf0h}Yb5}~V{J?!ALMAs0zeOhYpEUKQMt`}!4; z_t^2%D#~Y6O?znfubtMkcjep57qoAkot~AOo}J^)&TgBZo0^rAmE~8~H@$zwtnt&w zS4~bY89k$-tve?xJ1ae#TU%3Xo6|ZqD|@$VVYZKbdx`Jv2}|z}bXSzmoKi7u^t1~1 Wq|yJ^5GCSSRnw|=*RFlI=YIi|bJtP; delta 9701 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\n" "Language-Team: Italian \n" "Language: it\n" @@ -61,7 +61,7 @@ msgstr "%.*s: parametro ARGP_HELP_FMT sconosciuto" msgid "Garbage in ARGP_HELP_FMT: %s" msgstr "Spazzatura in ARGP_HELP_FMT: %s" -#: gnu/argp-help.c:1246 +#: gnu/argp-help.c:1248 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." @@ -69,29 +69,29 @@ msgstr "" "Gli argomenti obbligatori o facoltativi per le opzioni estese lo sono anche " "per le corrispondenti opzioni brevi." -#: gnu/argp-help.c:1639 +#: gnu/argp-help.c:1641 msgid "Usage:" msgstr "Uso:" -#: gnu/argp-help.c:1643 +#: gnu/argp-help.c:1645 msgid " or: " msgstr " o: " -#: gnu/argp-help.c:1655 +#: gnu/argp-help.c:1657 msgid " [OPTION...]" msgstr " [OPZIONE...]" -#: gnu/argp-help.c:1682 +#: gnu/argp-help.c:1684 #, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Usare \"%s --help\" o \"%s --usage\" per ulteriori informazioni.\n" -#: gnu/argp-help.c:1710 +#: gnu/argp-help.c:1712 #, c-format msgid "Report bugs to %s.\n" msgstr "Segnalare i bug a %s.\n" -#: gnu/argp-help.c:1929 gnu/error.c:183 +#: gnu/argp-help.c:1931 gnu/error.c:183 msgid "Unknown system error" msgstr "Errore di sistema sconosciuto" @@ -197,16 +197,16 @@ msgstr "%s: l'opzione \"-W %s\" non accetta un argomento\n" msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: l'opzione \"-W %s\" richiede un argomento\n" -#: gnu/obstack.c:425 gnu/obstack.c:427 gnu/xalloc-die.c:36 +#: gnu/obstack.c:423 gnu/obstack.c:425 gnu/xalloc-die.c:36 msgid "memory exhausted" msgstr "memoria esaurita" -#: gnu/openat-die.c:36 +#: gnu/openat-die.c:40 #, c-format msgid "unable to record current working directory" msgstr "Impossibile registrare la directory di lavoro corrente" -#: gnu/openat-die.c:54 +#: gnu/openat-die.c:59 #, c-format msgid "failed to return to initial working directory" msgstr "Impossibile ritornare alla directory di lavoro iniziale" @@ -230,11 +230,11 @@ msgstr "Impossibile ritornare alla directory di lavoro iniziale" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: gnu/quotearg.c:274 +#: gnu/quotearg.c:273 msgid "`" msgstr "\"" -#: gnu/quotearg.c:275 +#: gnu/quotearg.c:274 msgid "'" msgstr "\"" @@ -504,21 +504,21 @@ msgid_plural "%s: Wrote only %lu of %lu bytes" msgstr[0] "%s: scritto solo %lu byte su %lu" msgstr[1] "%s: scritti solo %lu byte su %lu" -#: lib/paxnames.c:155 +#: lib/paxnames.c:140 #, c-format msgid "Removing leading `%s' from member names" msgstr "Rimozione di \"%s\" iniziale dai nomi dei membri" -#: lib/paxnames.c:156 +#: lib/paxnames.c:141 #, c-format msgid "Removing leading `%s' from hard link targets" msgstr "Rimozione di \"%s\" iniziale dagli obiettivi dei collegamenti fisici" -#: lib/paxnames.c:169 +#: lib/paxnames.c:154 msgid "Substituting `.' for empty member name" msgstr "Sostituzione di \".\" al nome vuoto di un membro" -#: lib/paxnames.c:170 +#: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" msgstr "Sostituzione di \".\" all'obiettivo vuoto di un collegamento fisico" @@ -816,20 +816,20 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "È stato possibile leggere solo %lu byte di %lu" msgstr[1] "È stato possibile leggere solo %lu byte di %lu" -#: src/compare.c:105 src/compare.c:382 +#: src/compare.c:105 src/compare.c:383 msgid "Contents differ" msgstr "I contenuti sono differenti" -#: src/compare.c:131 src/extract.c:972 src/incremen.c:1462 src/list.c:458 -#: src/list.c:1392 src/xheader.c:711 +#: src/compare.c:131 src/extract.c:984 src/incremen.c:1456 src/list.c:456 +#: src/list.c:1388 src/xheader.c:711 msgid "Unexpected EOF in archive" msgstr "EOF inatteso nell'archivio" -#: src/compare.c:179 src/compare.c:195 src/compare.c:308 src/compare.c:406 +#: src/compare.c:179 src/compare.c:195 src/compare.c:309 src/compare.c:407 msgid "File type differs" msgstr "I tipi dei file sono diversi" -#: src/compare.c:182 src/compare.c:202 src/compare.c:322 +#: src/compare.c:182 src/compare.c:202 src/compare.c:323 msgid "Mode differs" msgstr "I modi sono diversi" @@ -845,49 +845,54 @@ msgstr "I GID sono diversi" msgid "Mod time differs" msgstr "Gli orari di modifica sono diversi" -#: src/compare.c:215 src/compare.c:414 +#: src/compare.c:215 src/compare.c:415 msgid "Size differs" msgstr "Le dimensioni sono diverse" -#: src/compare.c:263 +#: src/compare.c:264 #, c-format msgid "Not linked to %s" msgstr "Non è collegato a %s" -#: src/compare.c:287 +#: src/compare.c:288 msgid "Symlink differs" msgstr "I collegamenti simbolici sono diversi" -#: src/compare.c:316 +#: src/compare.c:317 msgid "Device number differs" msgstr "I numeri dei device sono diversi" -#: src/compare.c:456 +#: src/compare.c:457 #, c-format msgid "Verify " msgstr "Verifica " -#: src/compare.c:463 +#: src/compare.c:464 #, c-format msgid "%s: Unknown file type `%c', diffed as normal file" msgstr "%s: tipo di file \"%c\" sconosciuto, confrontato come un file normale" -#: src/compare.c:518 +#: src/compare.c:520 msgid "Archive contains file names with leading prefixes removed." msgstr "L'archivio contiene nomi di file con i prefissi iniziali rimossi." -#: src/compare.c:520 +#: src/compare.c:526 +#, fuzzy +msgid "Archive contains transformed file names." +msgstr "L'archivio contiene intestazioni base-64 obsolete" + +#: src/compare.c:531 msgid "Verification may fail to locate original files." msgstr "La verifica potrebbe non riuscire a trovare i file originali." -#: src/compare.c:593 +#: src/compare.c:603 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "Errore di verifica: trovata %d intestazione non valida" msgstr[1] "Errore di verifica: trovate %d intestazioni non valide" -#: src/compare.c:611 src/list.c:222 +#: src/compare.c:621 src/list.c:222 #, c-format msgid "A lone zero block at %s" msgstr "Un singolo blocco di zeri a %s" @@ -939,7 +944,7 @@ msgstr[1] "%s: file ristretto di %s byte; riempito con zeri" msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: il file si trova su un altro file system; non archiviato" -#: src/create.c:1203 src/create.c:1214 src/incremen.c:582 src/incremen.c:588 +#: src/create.c:1203 src/create.c:1214 src/incremen.c:578 src/incremen.c:584 msgid "contents not dumped" msgstr "contenuti non archiviati" @@ -963,7 +968,7 @@ msgstr "%s: il file non è modificato; non archiviato" msgid "%s: file is the archive; not dumped" msgstr "%s: il file è l'archivio; non archiviato" -#: src/create.c:1723 src/incremen.c:575 +#: src/create.c:1723 src/incremen.c:571 msgid "directory not dumped" msgstr "directory non archiviata" @@ -972,12 +977,12 @@ msgstr "directory non archiviata" msgid "%s: file changed as we read it" msgstr "%s: file modificato mentre era in lettura" -#: src/create.c:1857 +#: src/create.c:1858 #, c-format msgid "%s: socket ignored" msgstr "%s: socket ignorato" -#: src/create.c:1863 +#: src/create.c:1864 #, c-format msgid "%s: door ignored" msgstr "%s: door ignorata" @@ -1006,30 +1011,30 @@ msgstr "%s: l'orario %s è %s secondi nel futuro" msgid "%s: Unexpected inconsistency when making directory" msgstr "%s: incoerenza inaspettata nel creare la directory" -#: src/extract.c:709 +#: src/extract.c:721 #, c-format msgid "%s: Directory renamed before its status could be extracted" msgstr "%s: directory rinominata prima di poterne estrarre lo stato" -#: src/extract.c:863 +#: src/extract.c:875 msgid "Extracting contiguous files as regular files" msgstr "Estrazione file contigui come file normali" -#: src/extract.c:1197 +#: src/extract.c:1209 msgid "Attempting extraction of symbolic links as hard links" msgstr "" "Tentativo di estrazione dei collegamenti simbolici come collegamenti fisici" -#: src/extract.c:1353 +#: src/extract.c:1365 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: impossibile estrarre -- il file continua da un altro volume" -#: src/extract.c:1360 src/list.c:1125 +#: src/extract.c:1372 src/list.c:1121 msgid "Unexpected long name header" msgstr "Intestazione di nome lungo inattesa" -#: src/extract.c:1367 +#: src/extract.c:1379 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: tipo di file \"%c\" sconosciuto, estratto come file normale" @@ -1041,138 +1046,138 @@ msgstr "%s: tipo di file \"%c\" sconosciuto, estratto come file normale" # quote (file_name))); # return 0; # } -#: src/extract.c:1393 +#: src/extract.c:1405 #, c-format msgid "Current %s is newer or same age" msgstr "Il file %s corrente è più recente o ha la stessa data" -#: src/extract.c:1445 +#: src/extract.c:1457 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: impossibile eseguire il backup di questo file" -#: src/extract.c:1582 +#: src/extract.c:1594 #, c-format msgid "Cannot rename %s to %s" msgstr "Impossibile rinominare %s in %s" -#: src/incremen.c:474 src/incremen.c:518 +#: src/incremen.c:473 src/incremen.c:517 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: directory rinominata da %s" -#: src/incremen.c:486 +#: src/incremen.c:485 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: directory rinominata" -#: src/incremen.c:531 +#: src/incremen.c:530 #, c-format msgid "%s: Directory is new" msgstr "%s: directory nuova" -#: src/incremen.c:956 src/incremen.c:973 +#: src/incremen.c:951 src/incremen.c:968 msgid "Invalid time stamp" msgstr "Orario non valido" -#: src/incremen.c:1012 +#: src/incremen.c:1007 msgid "Invalid modification time (seconds)" msgstr "Orario di modifica non valido (secondi)" -#: src/incremen.c:1027 +#: src/incremen.c:1022 msgid "Invalid modification time (nanoseconds)" msgstr "Orario di modifica non valido (nanosecondi)" -#: src/incremen.c:1047 +#: src/incremen.c:1042 msgid "Invalid device number" msgstr "Numero di device non valido" -#: src/incremen.c:1062 +#: src/incremen.c:1057 msgid "Invalid inode number" msgstr "Numero dell'inode non valido" # (ndt) oppure rendere snapshot come istantanea? -#: src/incremen.c:1113 src/incremen.c:1150 +#: src/incremen.c:1108 src/incremen.c:1145 msgid "Field too long while reading snapshot file" msgstr "Campo troppo lungo nel leggere il file di snapshot" -#: src/incremen.c:1120 src/incremen.c:1158 +#: src/incremen.c:1115 src/incremen.c:1153 msgid "Read error in snapshot file" msgstr "Errore di lettura nel file di snapshot" -#: src/incremen.c:1122 src/incremen.c:1162 src/incremen.c:1214 -#: src/incremen.c:1272 +#: src/incremen.c:1117 src/incremen.c:1157 src/incremen.c:1209 +#: src/incremen.c:1267 msgid "Unexpected EOF in snapshot file" msgstr "EOF inatteso nel file di snapshot" -#: src/incremen.c:1129 src/incremen.c:1169 +#: src/incremen.c:1124 src/incremen.c:1164 msgid "Unexpected field value in snapshot file" msgstr "Valore del campo inatteso nel file di snapshot" -#: src/incremen.c:1264 +#: src/incremen.c:1259 msgid "Missing record terminator" msgstr "Record finale mancante" -#: src/incremen.c:1325 src/incremen.c:1328 +#: src/incremen.c:1320 src/incremen.c:1323 msgid "Bad incremental file format" msgstr "Formato file incrementale errato" -#: src/incremen.c:1347 +#: src/incremen.c:1342 #, c-format msgid "Unsupported incremental format version: %" msgstr "Versione formato incrementale non supportata: %" -#: src/incremen.c:1502 +#: src/incremen.c:1496 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "dumpdir malformata: atteso \"%c\", ma trovato %#3o" -#: src/incremen.c:1512 +#: src/incremen.c:1506 msgid "Malformed dumpdir: 'X' duplicated" msgstr "dumpdir malformata: \"X\" duplicata" -#: src/incremen.c:1525 +#: src/incremen.c:1519 msgid "Malformed dumpdir: empty name in 'R'" msgstr "dumpdir malformata: nessun nome in \"R\"" -#: src/incremen.c:1538 +#: src/incremen.c:1532 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "dumpdir malformata: \"T\" non preceduta da \"R\"" -#: src/incremen.c:1544 +#: src/incremen.c:1538 msgid "Malformed dumpdir: empty name in 'T'" msgstr "dumpdir malformata: nessun nome in \"T\"" -#: src/incremen.c:1564 +#: src/incremen.c:1558 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "dumpdir malformata: atteso \"%c\", ma trovata la fine dei dati" -#: src/incremen.c:1571 +#: src/incremen.c:1565 msgid "Malformed dumpdir: 'X' never used" msgstr "dumpdir malformata: \"X\" mai usata" -#: src/incremen.c:1615 +#: src/incremen.c:1609 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Impossibile creare la directory temporanea usando il modello %s" -#: src/incremen.c:1677 +#: src/incremen.c:1670 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: eliminazione directory non eseguita: impossibile fare stat" -#: src/incremen.c:1690 +#: src/incremen.c:1683 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: la directory si trova su un altro device: non eliminata" -#: src/incremen.c:1698 +#: src/incremen.c:1691 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: eliminazione di %s\n" -#: src/incremen.c:1703 +#: src/incremen.c:1696 #, c-format msgid "%s: Cannot remove" msgstr "%s: impossibile rimuoverlo" @@ -1192,20 +1197,20 @@ msgstr "blocco %s: ** Blocco di NUL **\n" msgid "block %s: ** End of File **\n" msgstr "blocco %s: ** Fine del file **\n" -#: src/list.c:256 src/list.c:1097 src/list.c:1360 +#: src/list.c:256 src/list.c:1093 src/list.c:1356 #, c-format msgid "block %s: " msgstr "blocco %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:712 +#: src/list.c:708 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Trovati spazi nell'intestazione dove era atteso il valore numerico %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:767 +#: src/list.c:763 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1213,115 +1218,109 @@ msgstr "" "che sia in complemento a due" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:778 +#: src/list.c:774 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Il valore ottale %.*s dell'archivio è fuori dall'intervallo %s" -#: src/list.c:799 +#: src/list.c:795 msgid "Archive contains obsolescent base-64 headers" msgstr "L'archivio contiene intestazioni base-64 obsolete" -#: src/list.c:813 +#: src/list.c:809 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "" "La stringa base-64 con segno %s dell'archivio è fuori dall'intervallo %s" -#: src/list.c:844 +#: src/list.c:840 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Il valore base-256 dell'archivio è fuori dall'intervallo %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:873 +#: src/list.c:869 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "L'archivio contiene %.*s dove era atteso il valore numerico %s" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:895 +#: src/list.c:891 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Il valore %s dell'archivio è fuori dall'intervallo (%s) %s..%s" -#: src/list.c:1261 +#: src/list.c:1257 #, c-format msgid " link to %s\n" msgstr " collegamento a %s\n" -#: src/list.c:1269 +#: src/list.c:1265 #, c-format msgid " unknown file type %s\n" msgstr " tipo di file sconosciuto %s\n" -#: src/list.c:1287 +#: src/list.c:1283 #, c-format msgid "--Long Link--\n" msgstr "--Collegamento lungo--\n" -#: src/list.c:1291 +#: src/list.c:1287 #, c-format msgid "--Long Name--\n" msgstr "--Nome lungo--\n" -#: src/list.c:1295 +#: src/list.c:1291 #, c-format msgid "--Volume Header--\n" msgstr "--Intestazione del volume--\n" -#: src/list.c:1303 +#: src/list.c:1299 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Continua al byte %s--\n" -#: src/list.c:1365 +#: src/list.c:1361 msgid "Creating directory:" msgstr "Creazione directory:" -#: src/misc.c:298 -#, fuzzy +#: src/misc.c:297 msgid "Cannot get working directory" -msgstr "Impossibile cambiare la directory di lavoro" +msgstr "Impossibile recuperare la directory di lavoro" -#: src/misc.c:571 +#: src/misc.c:570 #, c-format msgid "Renaming %s to %s\n" msgstr "Rinomina di %s in %s\n" -#: src/misc.c:580 src/misc.c:599 +#: src/misc.c:579 src/misc.c:598 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: impossibile rinominarlo in %s" -#: src/misc.c:604 +#: src/misc.c:603 #, c-format msgid "Renaming %s back to %s\n" msgstr "Rinomina di %s nuovamente in %s\n" -#: src/misc.c:851 +#: src/misc.c:850 #, c-format msgid "%s: File removed before we read it" msgstr "%s: file rimosso prima di poterlo leggere" -#: src/misc.c:866 -#, c-format -msgid "%s: Directory removed before we read it" -msgstr "%s: directory rimossa prima di poterla leggere" - -#: src/misc.c:887 +#: src/misc.c:871 msgid "child process" msgstr "il processo figlio" -#: src/misc.c:896 +#: src/misc.c:880 msgid "interprocess channel" msgstr "il canale tra processi" -#: src/names.c:594 +#: src/names.c:590 msgid "Pattern matching characters used in file names" msgstr "Usati caratteri di corrispondenza nei nomi dei file." -#: src/names.c:596 +#: src/names.c:592 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" @@ -1329,29 +1328,29 @@ msgstr "" "Usare --wildcards per abilitare la corrispondenza o --no-wildcards per " "disabilitare l'avviso" -#: src/names.c:614 src/names.c:630 +#: src/names.c:610 src/names.c:626 #, c-format msgid "%s: Not found in archive" msgstr "%s: non trovato nell'archivio" -#: src/names.c:615 +#: src/names.c:611 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: occorrenza richiesta non trovata nell'archivio" -#: src/names.c:649 +#: src/names.c:645 #, c-format msgid "Archive label mismatch" msgstr "Etichetta dell'archivio non corrispondente" -#: src/names.c:953 +#: src/names.c:949 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" "L'utilizzo dell'opzione -C all'interno dell'elenco dei file non è consentita " "con --listed-incremental" -#: src/names.c:959 +#: src/names.c:955 msgid "Only one -C option is allowed with --listed-incremental" msgstr "Solo un'opzione -C è consentita con --listed-incremental" @@ -2786,5 +2785,5 @@ msgstr "Comando terminato\n" msgid "--stat requires file names" msgstr "--stat richiede i nomi dei file" -#~ msgid "Cannot save working directory" -#~ msgstr "Impossibile salvare la directory di lavoro" +#~ msgid "%s: Directory removed before we read it" +#~ msgstr "%s: directory rimossa prima di poterla leggere" diff --git a/po/ja.gmo b/po/ja.gmo index bbeac0ce8eaa58a68992b40f625a8ff4678fca70..18c7de52bce709576f1a23cb00f7ef8558e49be5 100644 GIT binary patch delta 9686 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 delta 9697 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 wyW+~p-4!1mxqa-LHl;B|F-Ra0BMV}FaQ7m diff --git a/po/ja.po b/po/ja.po index 52d67383..900737ef 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1,4 +1,4 @@ -# Japanese messages for GNU tar 1.23.90 +# Japanese messages for GNU tar 1.25 # Copyright (C) 1999, 2000, 2001, 2004, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. # This file is distributed under the same license as the tar package. # Masahito Yamaga , 2010. @@ -9,10 +9,10 @@ #: src/create.c:1552 msgid "" msgstr "" -"Project-Id-Version: GNU tar 1.23.90\n" +"Project-Id-Version: GNU tar 1.25\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2010-11-07 17:07+0200\n" -"PO-Revision-Date: 2010-07-12 18:03+0900\n" +"POT-Creation-Date: 2011-03-12 11:53+0200\n" +"PO-Revision-Date: 2010-11-08 17:57+0900\n" "Last-Translator: Masahito Yamaga \n" "Language-Team: Japanese \n" "Language: ja\n" @@ -61,7 +61,7 @@ msgstr "%.*s: ̤ msgid "Garbage in ARGP_HELP_FMT: %s" msgstr "ARGP_HELP_FMT ¤Ë¥´¥ß: %s" -#: gnu/argp-help.c:1246 +#: gnu/argp-help.c:1248 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." @@ -69,29 +69,29 @@ msgstr "" "Ť¤¥ª¥×¥·¥ç¥ó¤ËÂФ¹¤ëɬ¿Ü¤Þ¤¿¤ÏǤ°Õ¤Î°ú¿ô¤ÏÂбþ¤¹¤ëû¤¤¥ª¥×¥·¥ç¥ó¤ËÂФ·¤Æ¤â" "ɬ¿Ü¤Þ¤¿¤ÏǤ°Õ¤Ç¤¹." -#: gnu/argp-help.c:1639 +#: gnu/argp-help.c:1641 msgid "Usage:" msgstr "»ÈÍÑË¡:" -#: gnu/argp-help.c:1643 +#: gnu/argp-help.c:1645 msgid " or: " msgstr " ¤Þ¤¿¤Ï: " -#: gnu/argp-help.c:1655 +#: gnu/argp-help.c:1657 msgid " [OPTION...]" msgstr " [¥ª¥×¥·¥ç¥ó...]" -#: gnu/argp-help.c:1682 +#: gnu/argp-help.c:1684 #, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "¤è¤ê¾Ü¤·¤¤¾ðÊó¤Ï `%s --help' ¤Þ¤¿¤Ï `%s --usage' ¤Ç.\n" -#: gnu/argp-help.c:1710 +#: gnu/argp-help.c:1712 #, c-format msgid "Report bugs to %s.\n" msgstr "¥Ð¥°¥ì¥Ý¡¼¥È¤Ï %s ¤Þ¤Ç.\n" -#: gnu/argp-help.c:1929 gnu/error.c:183 +#: gnu/argp-help.c:1931 gnu/error.c:183 msgid "Unknown system error" msgstr "ÉÔÌÀ¤Ê¥·¥¹¥Æ¥à¥¨¥é¡¼" @@ -197,16 +197,16 @@ msgstr "%s: msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: ¥ª¥×¥·¥ç¥ó '-W %s' ¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹\n" -#: gnu/obstack.c:425 gnu/obstack.c:427 gnu/xalloc-die.c:36 +#: gnu/obstack.c:423 gnu/obstack.c:425 gnu/xalloc-die.c:36 msgid "memory exhausted" msgstr "¥á¥â¥ê¤ò»È¤¤ÀÚ¤ê¤Þ¤·¤¿" -#: gnu/openat-die.c:36 +#: gnu/openat-die.c:40 #, c-format msgid "unable to record current working directory" msgstr "¸½ºß¤Î¥ï¡¼¥¯¥Ç¥£¥ì¥¯¥È¥ê¤òµ­Ï¿¤Ç¤­¤Þ¤»¤ó" -#: gnu/openat-die.c:54 +#: gnu/openat-die.c:59 #, c-format msgid "failed to return to initial working directory" msgstr "½é´ü¥ï¡¼¥¯¥Ç¥£¥ì¥¯¥È¥ê¤ËÌá¤ë¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" @@ -230,11 +230,11 @@ msgstr " #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: gnu/quotearg.c:274 +#: gnu/quotearg.c:273 msgid "`" msgstr "`" -#: gnu/quotearg.c:275 +#: gnu/quotearg.c:274 msgid "'" msgstr "'" @@ -504,21 +504,21 @@ msgid_plural "%s: Wrote only %lu of %lu bytes" msgstr[0] "%1$s: %3$lu ¥Ð¥¤¥È¤Î¤¦¤Á¡¢%2$lu ¥Ð¥¤¥È¤Î¤ß½ñ¤­¹þ¤ß¤Þ¤·¤¿" msgstr[1] "%1$s: %3$lu ¥Ð¥¤¥È¤Î¤¦¤Á¡¢%2$lu ¥Ð¥¤¥È¤Î¤ß½ñ¤­¹þ¤ß¤Þ¤·¤¿" -#: lib/paxnames.c:155 +#: lib/paxnames.c:140 #, c-format msgid "Removing leading `%s' from member names" msgstr "¥á¥ó¥Ð̾¤«¤éÀèƬ¤Î `%s' ¤ò¼è¤ê½ü¤­¤Þ¤¹" -#: lib/paxnames.c:156 +#: lib/paxnames.c:141 #, c-format msgid "Removing leading `%s' from hard link targets" msgstr "¥Ï¡¼¥É¥ê¥ó¥¯À褫¤éÀèƬ¤Î `%s' ¤ò¼è¤ê½ü¤­¤Þ¤¹" -#: lib/paxnames.c:169 +#: lib/paxnames.c:154 msgid "Substituting `.' for empty member name" msgstr "¶õ¤Î¥á¥ó¥Ð̾¤Ë `.' ¤òÂåÆþ¤·¤Þ¤¹" -#: lib/paxnames.c:170 +#: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" msgstr "¶õ¤Î¥Ï¡¼¥É¥ê¥ó¥¯Àè¤Ë `.' ¤òÂåÆþ¤·¤Þ¤¹" @@ -813,20 +813,20 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "%lu ¥Ð¥¤¥È¤À¤±¤ò %lu ¥Ð¥¤¥È¤«¤éÆɤ߹þ¤à¤³¤È¤¬¤Ç¤­¤Þ¤·¤¿" msgstr[1] "%lu ¥Ð¥¤¥È¤À¤±¤ò %lu ¥Ð¥¤¥È¤«¤éÆɤ߹þ¤à¤³¤È¤¬¤Ç¤­¤Þ¤·¤¿" -#: src/compare.c:105 src/compare.c:382 +#: src/compare.c:105 src/compare.c:383 msgid "Contents differ" msgstr "ÆâÍƤ¬°Û¤Ê¤ê¤Þ¤¹" -#: src/compare.c:131 src/extract.c:972 src/incremen.c:1462 src/list.c:458 -#: src/list.c:1392 src/xheader.c:711 +#: src/compare.c:131 src/extract.c:984 src/incremen.c:1456 src/list.c:456 +#: src/list.c:1388 src/xheader.c:711 msgid "Unexpected EOF in archive" msgstr "¥¢¡¼¥«¥¤¥ÖÃæ¤Ëͽ´ü¤»¤Ì EOF ¤¬¤¢¤ê¤Þ¤¹" -#: src/compare.c:179 src/compare.c:195 src/compare.c:308 src/compare.c:406 +#: src/compare.c:179 src/compare.c:195 src/compare.c:309 src/compare.c:407 msgid "File type differs" msgstr "¥Õ¥¡¥¤¥ë¥¿¥¤¥×¤¬°Û¤Ê¤ê¤Þ¤¹" -#: src/compare.c:182 src/compare.c:202 src/compare.c:322 +#: src/compare.c:182 src/compare.c:202 src/compare.c:323 msgid "Mode differs" msgstr "¥â¡¼¥É¤¬°Û¤Ê¤ê¤Þ¤¹" @@ -842,49 +842,54 @@ msgstr " msgid "Mod time differs" msgstr "ºÇ½ª½¤Àµ»þ¹ï¤¬°Û¤Ê¤ê¤Þ¤¹" -#: src/compare.c:215 src/compare.c:414 +#: src/compare.c:215 src/compare.c:415 msgid "Size differs" msgstr "¥µ¥¤¥º¤¬°Û¤Ê¤ê¤Þ¤¹" -#: src/compare.c:263 +#: src/compare.c:264 #, c-format msgid "Not linked to %s" msgstr "%s ¤Ë¥ê¥ó¥¯¤·¤Æ¤¤¤Þ¤»¤ó" -#: src/compare.c:287 +#: src/compare.c:288 msgid "Symlink differs" msgstr "¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤¬°Û¤Ê¤ê¤Þ¤¹" -#: src/compare.c:316 +#: src/compare.c:317 msgid "Device number differs" msgstr "¥Ç¥Ð¥¤¥¹Èֹ椬°ã¤¤¤Þ¤¹" -#: src/compare.c:456 +#: src/compare.c:457 #, c-format msgid "Verify " msgstr "¸¡¾Ú" -#: src/compare.c:463 +#: src/compare.c:464 #, c-format msgid "%s: Unknown file type `%c', diffed as normal file" msgstr "%s: ̤ÃΤΥե¡¥¤¥ë¥¿¥¤¥× `%c', Ä̾ï¥Õ¥¡¥¤¥ë¤Èº¹Ê¬¤ò¼è¤ê¤Þ¤¹" -#: src/compare.c:518 +#: src/compare.c:520 msgid "Archive contains file names with leading prefixes removed." msgstr "¥¢¡¼¥«¥¤¥ÖÃæ¤ËÀÜƬ¼­¤¬ºï½ü¤µ¤ì¤¿¥Õ¥¡¥¤¥ë̾¤¬¤¢¤ê¤Þ¤¹." -#: src/compare.c:520 +#: src/compare.c:526 +#, fuzzy +msgid "Archive contains transformed file names." +msgstr "¥¢¡¼¥«¥¤¥Ö¤ËÇѤ줿 base-64 ¥Ø¥Ã¥À¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹" + +#: src/compare.c:531 msgid "Verification may fail to locate original files." msgstr "¸µ¤Î¥Õ¥¡¥¤¥ë¤Î½êºß³Îǧ¤Ë¼ºÇÔ¤·¤¿²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹." -#: src/compare.c:593 +#: src/compare.c:603 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "³Îǧ¼ºÇÔ: %d ¸Ä¤Î̵¸ú¤Ê¥Ø¥Ã¥À¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿" msgstr[1] "³Îǧ¼ºÇÔ: %d ¸Ä¤Î̵¸ú¤Ê¥Ø¥Ã¥À¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿" -#: src/compare.c:611 src/list.c:222 +#: src/compare.c:621 src/list.c:222 #, c-format msgid "A lone zero block at %s" msgstr "%s ¤Ë¸ÉΩ¤·¤¿¥¼¥í¥Ö¥í¥Ã¥¯" @@ -935,7 +940,7 @@ msgstr[1] "%s: %s msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: ¥Õ¥¡¥¤¥ë¤Ï°Û¤Ê¤ë¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å¤Ë¤¢¤ë¤Î¤Ç¥À¥ó¥×¤·¤Þ¤»¤ó" -#: src/create.c:1203 src/create.c:1214 src/incremen.c:582 src/incremen.c:588 +#: src/create.c:1203 src/create.c:1214 src/incremen.c:578 src/incremen.c:584 msgid "contents not dumped" msgstr "ÆâÍƤò¥À¥ó¥×¤·¤Þ¤»¤ó" @@ -959,7 +964,7 @@ msgstr "%s: msgid "%s: file is the archive; not dumped" msgstr "%s: ¤Ï¥¢¡¼¥«¥¤¥Ö¤Ê¤Î¤Ç¥À¥ó¥×¤·¤Þ¤»¤ó" -#: src/create.c:1723 src/incremen.c:575 +#: src/create.c:1723 src/incremen.c:571 msgid "directory not dumped" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ò¥À¥ó¥×¤·¤Þ¤»¤ó" @@ -968,12 +973,12 @@ msgstr " msgid "%s: file changed as we read it" msgstr "%s: Æɤ߹þ¤ó¤À¥Õ¥¡¥¤¥ë¤¬Êѹ¹¤µ¤ì¤Æ¤¤¤Þ¤¹" -#: src/create.c:1857 +#: src/create.c:1858 #, c-format msgid "%s: socket ignored" msgstr "%s: ¥½¥±¥Ã¥È¤Ï̵»ë¤·¤Þ¤¹" -#: src/create.c:1863 +#: src/create.c:1864 #, c-format msgid "%s: door ignored" msgstr "%s: door ¤Ï̵»ë¤·¤Þ¤¹" @@ -1001,164 +1006,164 @@ msgstr "%s: msgid "%s: Unexpected inconsistency when making directory" msgstr "%s: ¥Ç¥£¥ì¥¯¥È¥êºîÀ®»þ¤ËÉÔ¬¤ÎÌ·½â¤¬µ¯¤³¤ê¤Þ¤·¤¿" -#: src/extract.c:709 +#: src/extract.c:721 #, c-format msgid "%s: Directory renamed before its status could be extracted" msgstr "%s: ¥Ç¥£¥ì¥¯¥È¥ê¤Ï¾õÂÖ¤òŸ³«¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ëÁ°¤Ë̾Á°¤òÊѹ¹¤µ¤ì¤Þ¤·¤¿" -#: src/extract.c:863 +#: src/extract.c:875 msgid "Extracting contiguous files as regular files" msgstr "Ϣ³¤·¤¿¥Õ¥¡¥¤¥ë¤òÀµ¾ï¤Ê¥Õ¥¡¥¤¥ë¤È¤·¤Æ¼è¤ê½Ð¤·¤Þ¤¹" -#: src/extract.c:1197 +#: src/extract.c:1209 msgid "Attempting extraction of symbolic links as hard links" msgstr "¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤ò¥Ï¡¼¥É¥ê¥ó¥¯¤È¤·¤Æ¼è¤ê½Ð¤·¤Æ¤ß¤Þ¤¹" -#: src/extract.c:1353 +#: src/extract.c:1365 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: ¼è¤ê½Ð¤»¤Þ¤»¤ó -- ¥Õ¥¡¥¤¥ë¤ÏÊ̤Υܥê¥å¡¼¥à¤«¤é³¤¤¤Æ¤¤¤Þ¤¹" -#: src/extract.c:1360 src/list.c:1125 +#: src/extract.c:1372 src/list.c:1121 msgid "Unexpected long name header" msgstr "ͽ´ü¤»¤ÌŤ¤Ì¾Á°¥Ø¥Ã¥À" -#: src/extract.c:1367 +#: src/extract.c:1379 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: ̤ÃΤΥե¡¥¤¥ë¥¿¥¤¥× '%c', Ä̾ï¥Õ¥¡¥¤¥ë¤È¤·¤ÆÃê½Ð" -#: src/extract.c:1393 +#: src/extract.c:1405 #, c-format msgid "Current %s is newer or same age" msgstr "¸½ºß¤Î %s ¤ÎÊý¤¬¿·¤·¤¤¤«Æ±¤¸" -#: src/extract.c:1445 +#: src/extract.c:1457 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: ¤³¤Î¥Õ¥¡¥¤¥ë¤Î¥Ð¥Ã¥¯¥¢¥Ã¥×¤ò¼è¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿" -#: src/extract.c:1582 +#: src/extract.c:1594 #, c-format msgid "Cannot rename %s to %s" msgstr "%s ¤Î̾Á°¤ò %s ¤ËÊѹ¹¤Ç¤­¤Þ¤»¤ó" -#: src/incremen.c:474 src/incremen.c:518 +#: src/incremen.c:473 src/incremen.c:517 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: ¥Ç¥£¥ì¥¯¥È¥ê̾¤¬ %s ¤«¤éÊѹ¹¤µ¤ì¤Þ¤·¤¿" -#: src/incremen.c:486 +#: src/incremen.c:485 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: ¥Ç¥£¥ì¥¯¥È¥ê̾¤¬Êѹ¹¤µ¤ì¤Þ¤·¤¿" -#: src/incremen.c:531 +#: src/incremen.c:530 #, c-format msgid "%s: Directory is new" msgstr "%s: ¥Ç¥£¥ì¥¯¥È¥ê¤Ï¿·¤·¤¯ºî¤é¤ì¤Þ¤·¤¿" -#: src/incremen.c:956 src/incremen.c:973 +#: src/incremen.c:951 src/incremen.c:968 msgid "Invalid time stamp" msgstr "̵¸ú¤Ê¥¿¥¤¥à¥¹¥¿¥ó¥×" -#: src/incremen.c:1012 +#: src/incremen.c:1007 msgid "Invalid modification time (seconds)" msgstr "ÉÔÀµ¤ÊºÇ½ª¹¹¿·»þ¹ï (ÉÃ)" -#: src/incremen.c:1027 +#: src/incremen.c:1022 msgid "Invalid modification time (nanoseconds)" msgstr "ÉÔÀµ¤ÊºÇ½ª¹¹¿·»þ¹ï (¥Ê¥ÎÉÃ)" -#: src/incremen.c:1047 +#: src/incremen.c:1042 msgid "Invalid device number" msgstr "̵¸ú¤Ê¥Ç¥Ð¥¤¥¹ÈÖ¹æ¤Ç¤¹" -#: src/incremen.c:1062 +#: src/incremen.c:1057 msgid "Invalid inode number" msgstr "̵¸ú¤Ê inode ÈÖ¹æ" -#: src/incremen.c:1113 src/incremen.c:1150 +#: src/incremen.c:1108 src/incremen.c:1145 msgid "Field too long while reading snapshot file" msgstr "¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¥Õ¥¡¥¤¥ë¤ÎÆɤ߹þ¤ßÃæ¤Ë¥Õ¥£¡¼¥ë¥É¤¬Ä¹²á¤®¤Þ¤¹" -#: src/incremen.c:1120 src/incremen.c:1158 +#: src/incremen.c:1115 src/incremen.c:1153 msgid "Read error in snapshot file" msgstr "¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¥Õ¥¡¥¤¥ë¤ËÆɤ߹þ¤ß¥¨¥é¡¼" -#: src/incremen.c:1122 src/incremen.c:1162 src/incremen.c:1214 -#: src/incremen.c:1272 +#: src/incremen.c:1117 src/incremen.c:1157 src/incremen.c:1209 +#: src/incremen.c:1267 msgid "Unexpected EOF in snapshot file" msgstr "¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¥Õ¥¡¥¤¥ë¤Ëͽ´ü¤»¤Ì EOF" -#: src/incremen.c:1129 src/incremen.c:1169 +#: src/incremen.c:1124 src/incremen.c:1164 msgid "Unexpected field value in snapshot file" msgstr "¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¥Õ¥¡¥¤¥ë¤Ëͽ´ü¤»¤Ì¥Õ¥£¡¼¥ë¥ÉÃÍ" -#: src/incremen.c:1264 +#: src/incremen.c:1259 msgid "Missing record terminator" msgstr "½ªÃ¼µ­Ï¿¤Ê¤·" -#: src/incremen.c:1325 src/incremen.c:1328 +#: src/incremen.c:1320 src/incremen.c:1323 msgid "Bad incremental file format" msgstr "ÉÔÀµ¤ÊÁýʬ¥Õ¥¡¥¤¥ë·Á¼°" -#: src/incremen.c:1347 +#: src/incremen.c:1342 #, c-format msgid "Unsupported incremental format version: %" msgstr "̤¼ÂÁõ¤ÎÁýʬ·Á¼°¥Ð¡¼¥¸¥ç¥ó: %" -#: src/incremen.c:1502 +#: src/incremen.c:1496 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "ÉÔÀµ·Á¼°¤Î dumpdir: '%c' ¤¬¤¢¤ë¤Ù¤­¤È¤³¤í¤Ë %#3o" -#: src/incremen.c:1512 +#: src/incremen.c:1506 msgid "Malformed dumpdir: 'X' duplicated" msgstr "ÉÔÀµ·Á¼°¤Î dumpdir: 'X' ¤¬½ÅÊ£" -#: src/incremen.c:1525 +#: src/incremen.c:1519 msgid "Malformed dumpdir: empty name in 'R'" msgstr "ÉÔÀµ·Á¼°¤Î dumpdir: 'R' ¤Ë¶õ¤Î̾Á°" -#: src/incremen.c:1538 +#: src/incremen.c:1532 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "ÉÔÀµ·Á¼°¤Î dumpdir: 'T' ¤¬ 'R' ¤ÎÁ°¤Ë¤Ê¤¤" -#: src/incremen.c:1544 +#: src/incremen.c:1538 msgid "Malformed dumpdir: empty name in 'T'" msgstr "ÉÔÀµ·Á¼°¤Î dumpdir: 'T' ¤Ë¶õ¤Î̾Á°" -#: src/incremen.c:1564 +#: src/incremen.c:1558 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "ÉÔÀµ·Á¼°¤Î dumpdir: '%c' ¤¬¤¢¤ë¤Ù¤­¤È¤³¤í¤Ë¥Ç¡¼¥¿¤Î½ªÃ¼" -#: src/incremen.c:1571 +#: src/incremen.c:1565 msgid "Malformed dumpdir: 'X' never used" msgstr "ÉÔÀµ·Á¼°¤Î dumpdir: 'X' ¤¬Ì¤»ÈÍÑ" -#: src/incremen.c:1615 +#: src/incremen.c:1609 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "¥Æ¥ó¥×¥ì¡¼¥È %s ¤ò»È¤Ã¤Æ°ì¼¡¥Ç¥£¥ì¥¯¥È¥ê¤òºî¤ì¤Þ¤»¤ó" -#: src/incremen.c:1677 +#: src/incremen.c:1670 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: ¥Ç¥£¥ì¥¯¥È¥ê¤òºï½ü¤·¤Þ¤»¤ó: ¾õÂÖ¤¬Ê¬¤«¤ê¤Þ¤»¤ó" -#: src/incremen.c:1690 +#: src/incremen.c:1683 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: ¥Ç¥£¥ì¥¯¥È¥ê¤Ï°Û¤Ê¤ë¥Ç¥Ð¥¤¥¹¾å¤Ë¤¢¤ë¤Î¤Ç¾Ãµî¤·¤Þ¤»¤ó" -#: src/incremen.c:1698 +#: src/incremen.c:1691 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: %s ¤òºï½ü\n" -#: src/incremen.c:1703 +#: src/incremen.c:1696 #, c-format msgid "%s: Cannot remove" msgstr "%s: ºï½ü¤Ç¤­¤Þ¤»¤ó" @@ -1178,133 +1183,127 @@ msgstr " msgid "block %s: ** End of File **\n" msgstr "¥Ö¥í¥Ã¥¯ %s: ** ¥Õ¥¡¥¤¥ë¤Î½ªÃ¼ **\n" -#: src/list.c:256 src/list.c:1097 src/list.c:1360 +#: src/list.c:256 src/list.c:1093 src/list.c:1356 #, c-format msgid "block %s: " msgstr "¥Ö¥í¥Ã¥¯ %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:712 +#: src/list.c:708 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "¿ôÃÍ %s ¤È¤Ê¤ë¤Ù¤­¥Ø¥Ã¥À°ÌÃÖ¤¬¶õ¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:767 +#: src/list.c:763 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "8 ¿Ê¿ôÃÍ %.*s ¤Ï %s ¤ÎÈϰϳ°¤Ç¤¹ -- 2 ¤ÎÊä¿ô¤È¸«¤Ê¤·¤Þ¤¹" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:778 +#: src/list.c:774 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "8 ¿Ê¿ôÃÍ %.*s ¤Ï %s ¤ÎÈϰϳ°¤Ç¤¹" -#: src/list.c:799 +#: src/list.c:795 msgid "Archive contains obsolescent base-64 headers" msgstr "¥¢¡¼¥«¥¤¥Ö¤ËÇѤ줿 base-64 ¥Ø¥Ã¥À¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹" -#: src/list.c:813 +#: src/list.c:809 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "Éä¹æÉÕ¤­ base-64 ʸ»úÎó %s ¤Ï %s ¤ÎÈϰϳ°¤Ç¤¹" -#: src/list.c:844 +#: src/list.c:840 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "base-256 ÃÍ¤Ï %s ¤ÎÈϰϳ°¤Ç¤¹" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:873 +#: src/list.c:869 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "¥¢¡¼¥«¥¤¥Ö¤Ë %.*s ¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢¤³¤³¤Ï¿ôÃÍ %s ¤È¤Ê¤ë¤Ï¤º¤Ç¤¹" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:895 +#: src/list.c:891 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "¥¢¡¼¥«¥¤¥Ö¤ÎÃÍ %s ¤Ï %s ¤ÎÈÏ°Ï %s..%s Æâ¤Ë¤¢¤ê¤Þ¤»¤ó" -#: src/list.c:1261 +#: src/list.c:1257 #, c-format msgid " link to %s\n" msgstr " %s ¤Ø¤Î¥ê¥ó¥¯\n" -#: src/list.c:1269 +#: src/list.c:1265 #, c-format msgid " unknown file type %s\n" msgstr " ÉÔÌÀ¤Ê¥Õ¥¡¥¤¥ë¥¿¥¤¥× %s\n" -#: src/list.c:1287 +#: src/list.c:1283 #, c-format msgid "--Long Link--\n" msgstr "--Ť¤¥ê¥ó¥¯--\n" -#: src/list.c:1291 +#: src/list.c:1287 #, c-format msgid "--Long Name--\n" msgstr "--Ť¤Ì¾Á°--\n" -#: src/list.c:1295 +#: src/list.c:1291 #, c-format msgid "--Volume Header--\n" msgstr "--¥Ü¥ê¥å¡¼¥à¥Ø¥Ã¥À--\n" -#: src/list.c:1303 +#: src/list.c:1299 #, c-format msgid "--Continued at byte %s--\n" msgstr "--¥Ð¥¤¥È %s ¤ÇϢ³--\n" -#: src/list.c:1365 +#: src/list.c:1361 msgid "Creating directory:" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤òºîÀ®:" -#: src/misc.c:298 -#, fuzzy +#: src/misc.c:297 msgid "Cannot get working directory" -msgstr "¥ï¡¼¥¯¥Ç¥£¥ì¥¯¥È¥ê¤òÊѹ¹¤Ç¤­¤Þ¤»¤ó" +msgstr "¥ï¡¼¥¯¥Ç¥£¥ì¥¯¥È¥ê¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó" -#: src/misc.c:571 +#: src/misc.c:570 #, c-format msgid "Renaming %s to %s\n" msgstr "̾Á°¤ò %s ¤«¤é %s ¤ËÊѹ¹¤·¤Þ¤¹\n" -#: src/misc.c:580 src/misc.c:599 +#: src/misc.c:579 src/misc.c:598 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: ̾Á°¤ò %s ¤ËÊѹ¹¤Ç¤­¤Þ¤»¤ó" -#: src/misc.c:604 +#: src/misc.c:603 #, c-format msgid "Renaming %s back to %s\n" msgstr "̾Á°¤ò %s ¤«¤é %s ¤ËÌᤷ¤Þ¤¹\n" -#: src/misc.c:851 +#: src/misc.c:850 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Æɤ߹þ¤ß°ÊÁ°¤Ëºï½ü¤µ¤ì¤Þ¤·¤¿" -#: src/misc.c:866 -#, c-format -msgid "%s: Directory removed before we read it" -msgstr "%s: Æɤ߹þ¤ßÁ°¤Ëºï½ü¤µ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê" - -#: src/misc.c:887 +#: src/misc.c:871 msgid "child process" msgstr "»Ò¥×¥í¥»¥¹" -#: src/misc.c:896 +#: src/misc.c:880 msgid "interprocess channel" msgstr "¥×¥í¥»¥¹´Ö¥Á¥ã¥Í¥ë" -#: src/names.c:594 +#: src/names.c:590 msgid "Pattern matching characters used in file names" msgstr "¥Ñ¥¿¡¼¥ó¥Þ¥Ã¥Á¤Îʸ»ú¤¬¥Õ¥¡¥¤¥ë̾¤Ë»È¤ï¤ì¤Æ¤¤¤Þ¤¹" -#: src/names.c:596 +#: src/names.c:592 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" @@ -1312,28 +1311,28 @@ msgstr "" "¥Ñ¥¿¡¼¥ó¥Þ¥Ã¥Á¤òÍ­¸ú¤Ë¤¹¤ë¤Ê¤é --wildcards, ¤³¤Î·Ù¹ð¤òÍ޻ߤ¹¤ë¤Ê¤é --no-" "wildcards ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤" -#: src/names.c:614 src/names.c:630 +#: src/names.c:610 src/names.c:626 #, c-format msgid "%s: Not found in archive" msgstr "%s: ¥¢¡¼¥«¥¤¥ÖÆâ¤Ë¸«¤Ä¤«¤ê¤Þ¤»¤ó" -#: src/names.c:615 +#: src/names.c:611 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: ¥¢¡¼¥«¥¤¥ÖÆâ¤Ë¸«¤Ä¤«¤ê¤Þ¤»¤ó" -#: src/names.c:649 +#: src/names.c:645 #, c-format msgid "Archive label mismatch" msgstr "¥¢¡¼¥«¥¤¥Ö¥é¥Ù¥ë¤¬°ìÃפ·¤Þ¤»¤ó" -#: src/names.c:953 +#: src/names.c:949 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" "¥Õ¥¡¥¤¥ë¥ê¥¹¥ÈÆâ¤Ç -C ¥ª¥×¥·¥ç¥ó¤Ï --listed-incremental ¤È°ì½ï¤Ë»È¤¨¤Þ¤»¤ó" -#: src/names.c:959 +#: src/names.c:955 msgid "Only one -C option is allowed with --listed-incremental" msgstr "-C ¥ª¥×¥·¥ç¥ó¤Ï 1¤Ä¤À¤±¤Ê¤é --listed-incremental ¤È°ì½ï¤Ë»È¤¨¤Þ¤¹" @@ -2713,5 +2712,5 @@ msgstr " msgid "--stat requires file names" msgstr "--stat ¤Ë¤Ï¥Õ¥¡¥¤¥ë̾¤¬É¬Í×" -#~ msgid "Cannot save working directory" -#~ msgstr "¥ï¡¼¥¯¥Ç¥£¥ì¥¯¥È¥ê¤òÊݸ¤Ç¤­¤Þ¤»¤ó" +#~ msgid "%s: Directory removed before we read it" +#~ msgstr "%s: Æɤ߹þ¤ßÁ°¤Ëºï½ü¤µ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê" diff --git a/po/ko.gmo b/po/ko.gmo index e23cebcd71735ad23a00f25e31abe982b9113ab2..ede5865167df00677b23efe8bdd1d20f769f7877 100644 GIT binary patch delta 26 hcmbQKFjHZ}QBGb%T?1oXLn8%4Ln~9`&6hac*#K#k2TlM0 delta 26 hcmbQKFjHZ}QBGb1T|+}%19JsKb1MV$&6hac*#K$J2UP$7 diff --git a/po/ko.po b/po/ko.po index 0bc6422f..7d0a6325 100644 --- a/po/ko.po +++ b/po/ko.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU tar 1.12\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2010-11-07 17:07+0200\n" +"POT-Creation-Date: 2011-03-12 11:53+0200\n" "PO-Revision-Date: 1997-05-30 22:55+0900\n" "Last-Translator: Bang Jun-Young \n" "Language-Team: Korean \n" @@ -56,21 +56,21 @@ msgstr "" msgid "Garbage in ARGP_HELP_FMT: %s" msgstr "" -#: gnu/argp-help.c:1246 +#: gnu/argp-help.c:1248 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." msgstr "" -#: gnu/argp-help.c:1639 +#: gnu/argp-help.c:1641 msgid "Usage:" msgstr "" -#: gnu/argp-help.c:1643 +#: gnu/argp-help.c:1645 msgid " or: " msgstr "" -#: gnu/argp-help.c:1655 +#: gnu/argp-help.c:1657 #, fuzzy msgid " [OPTION...]" msgstr "" @@ -79,17 +79,17 @@ msgstr "" "\n" # -#: gnu/argp-help.c:1682 +#: gnu/argp-help.c:1684 #, fuzzy, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "´õ ¸¹Àº Á¤º¸¸¦ º¸·Á¸é `%s --help' ÇϽʽÿÀ.\n" -#: gnu/argp-help.c:1710 +#: gnu/argp-help.c:1712 #, c-format msgid "Report bugs to %s.\n" msgstr "" -#: gnu/argp-help.c:1929 gnu/error.c:183 +#: gnu/argp-help.c:1931 gnu/error.c:183 msgid "Unknown system error" msgstr "¾Ë ¼ö ¾ø´Â ½Ã½ºÅÛ ¿À·ù" @@ -195,18 +195,18 @@ msgstr " msgid "%s: option '-W %s' requires an argument\n" msgstr "¿À·¡µÈ ¿É¼Ç `%c'´Â Àμö°¡ ÇÊ¿äÇÕ´Ï´Ù." -#: gnu/obstack.c:425 gnu/obstack.c:427 gnu/xalloc-die.c:36 +#: gnu/obstack.c:423 gnu/obstack.c:425 gnu/xalloc-die.c:36 #, fuzzy msgid "memory exhausted" msgstr "¸Þ¸ð¸®°¡ ¹Ù´Ú³²" # -#: gnu/openat-die.c:36 +#: gnu/openat-die.c:40 #, fuzzy, c-format msgid "unable to record current working directory" msgstr "ÇöÀç µð·ºÅ丮¸¦ ¾Ë ¼ö ¾ø½À´Ï´Ù" -#: gnu/openat-die.c:54 +#: gnu/openat-die.c:59 #, c-format msgid "failed to return to initial working directory" msgstr "" @@ -230,11 +230,11 @@ msgstr "" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: gnu/quotearg.c:274 +#: gnu/quotearg.c:273 msgid "`" msgstr "" -#: gnu/quotearg.c:275 +#: gnu/quotearg.c:274 msgid "'" msgstr "" @@ -485,22 +485,22 @@ msgstr[0] "%s: %d msgstr[1] "%s: %d ¹ÙÀÌÆ®(%d ¹ÙÀÌÆ® Áß)¸¸ ½è½À´Ï´Ù" # -#: lib/paxnames.c:155 +#: lib/paxnames.c:140 #, fuzzy, c-format msgid "Removing leading `%s' from member names" msgstr "Àý´ë ¸µÅ©µé¿¡¼­ ¾Õ¿¡ ºÙÀº `/'¸¦ Á¦°ÅÇÔ" # -#: lib/paxnames.c:156 +#: lib/paxnames.c:141 #, fuzzy, c-format msgid "Removing leading `%s' from hard link targets" msgstr "Àý´ë ¸µÅ©µé¿¡¼­ ¾Õ¿¡ ºÙÀº `/'¸¦ Á¦°ÅÇÔ" -#: lib/paxnames.c:169 +#: lib/paxnames.c:154 msgid "Substituting `.' for empty member name" msgstr "" -#: lib/paxnames.c:170 +#: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" msgstr "" @@ -823,24 +823,24 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "%d ¹ÙÀÌÆ®(%ld ¹ÙÀÌÆ® Áß)¸¸ ÀÐÀ» ¼ö ÀÖ½À´Ï´Ù" msgstr[1] "%d ¹ÙÀÌÆ®(%ld ¹ÙÀÌÆ® Áß)¸¸ ÀÐÀ» ¼ö ÀÖ½À´Ï´Ù" -#: src/compare.c:105 src/compare.c:382 +#: src/compare.c:105 src/compare.c:383 #, fuzzy msgid "Contents differ" msgstr "¸ðµå°¡ ´Ù¸¨´Ï´Ù" # -#: src/compare.c:131 src/extract.c:972 src/incremen.c:1462 src/list.c:458 -#: src/list.c:1392 src/xheader.c:711 +#: src/compare.c:131 src/extract.c:984 src/incremen.c:1456 src/list.c:456 +#: src/list.c:1388 src/xheader.c:711 msgid "Unexpected EOF in archive" msgstr "¾ÆÄ«À̺꿡 ¿¹±âÄ¡ ¾ÊÀº EOF" # -#: src/compare.c:179 src/compare.c:195 src/compare.c:308 src/compare.c:406 +#: src/compare.c:179 src/compare.c:195 src/compare.c:309 src/compare.c:407 #, fuzzy msgid "File type differs" msgstr "Å©±â°¡ ´Ù¸¨´Ï´Ù" -#: src/compare.c:182 src/compare.c:202 src/compare.c:322 +#: src/compare.c:182 src/compare.c:202 src/compare.c:323 msgid "Mode differs" msgstr "¸ðµå°¡ ´Ù¸¨´Ï´Ù" @@ -860,56 +860,60 @@ msgid "Mod time differs" msgstr "º¯°æ ½Ã°¢ÀÌ ´Ù¸¨´Ï´Ù" # -#: src/compare.c:215 src/compare.c:414 +#: src/compare.c:215 src/compare.c:415 msgid "Size differs" msgstr "Å©±â°¡ ´Ù¸¨´Ï´Ù" # -#: src/compare.c:263 +#: src/compare.c:264 #, c-format msgid "Not linked to %s" msgstr "%s¿¡ ¿¬°áµÇÁö ¾ÊÀ½" # -#: src/compare.c:287 +#: src/compare.c:288 msgid "Symlink differs" msgstr "±âÈ£¸µÅ©°¡ ´Ù¸¨´Ï´Ù" # -#: src/compare.c:316 +#: src/compare.c:317 #, fuzzy msgid "Device number differs" msgstr "ÀåÄ¡ ¹øÈ£°¡ ¹Ù²î¾úÀ½" # -#: src/compare.c:456 +#: src/compare.c:457 #, c-format msgid "Verify " msgstr "°ËÁõ " # -#: src/compare.c:463 +#: src/compare.c:464 #, fuzzy, c-format msgid "%s: Unknown file type `%c', diffed as normal file" msgstr "%s: ¾Ë ¼ö ¾ø´Â ÆÄÀÏ Å¸ÀÔ; ÆÄÀÏÀÌ ¹«½ÃµÊ" -#: src/compare.c:518 +#: src/compare.c:520 msgid "Archive contains file names with leading prefixes removed." msgstr "" -#: src/compare.c:520 +#: src/compare.c:526 +msgid "Archive contains transformed file names." +msgstr "" + +#: src/compare.c:531 msgid "Verification may fail to locate original files." msgstr "" # -#: src/compare.c:593 +#: src/compare.c:603 #, fuzzy, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "°ËÁõ ½ÇÆÐ: %d°³ÀÇ ºÎÀûÀýÇÑ Çì´õ°¡ °ËÃâµÊ" msgstr[1] "°ËÁõ ½ÇÆÐ: %d°³ÀÇ ºÎÀûÀýÇÑ Çì´õ°¡ °ËÃâµÊ" -#: src/compare.c:611 src/list.c:222 +#: src/compare.c:621 src/list.c:222 #, c-format msgid "A lone zero block at %s" msgstr "" @@ -965,7 +969,7 @@ msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: ´Ù¸¥ ÆÄÀϽýºÅÛ »ó¿¡ ÀÖÀ½; ´ýÇÁµÇÁö ¾ÊÀ½" # -#: src/create.c:1203 src/create.c:1214 src/incremen.c:582 src/incremen.c:588 +#: src/create.c:1203 src/create.c:1214 src/incremen.c:578 src/incremen.c:584 #, fuzzy msgid "contents not dumped" msgstr " (ÄÚ¾î Ãâ·ÂµÊ)" @@ -994,7 +998,7 @@ msgstr "%s: msgid "%s: file is the archive; not dumped" msgstr "%s´Â ¾ÆÄ«À̺êÀÔ´Ï´Ù; ´ýÇÁµÇÁö ¾ÊÀ½" -#: src/create.c:1723 src/incremen.c:575 +#: src/create.c:1723 src/incremen.c:571 msgid "directory not dumped" msgstr "" @@ -1003,12 +1007,12 @@ msgstr "" msgid "%s: file changed as we read it" msgstr "" -#: src/create.c:1857 +#: src/create.c:1858 #, c-format msgid "%s: socket ignored" msgstr "" -#: src/create.c:1863 +#: src/create.c:1864 #, c-format msgid "%s: door ignored" msgstr "" @@ -1038,181 +1042,181 @@ msgstr "" msgid "%s: Unexpected inconsistency when making directory" msgstr "" -#: src/extract.c:709 +#: src/extract.c:721 #, c-format msgid "%s: Directory renamed before its status could be extracted" msgstr "" -#: src/extract.c:863 +#: src/extract.c:875 msgid "Extracting contiguous files as regular files" msgstr "¿¬¼ÓµÇ¾î ÀÖ´Â ÆÄÀÏÀ» ÀÏ¹Ý ÆÄÀÏ·Î ÃßÃâÇÔ" -#: src/extract.c:1197 +#: src/extract.c:1209 msgid "Attempting extraction of symbolic links as hard links" msgstr "±âÈ£ ¸µÅ©¸¦ ÇÏµå ¸µÅ©·Î ÃßÃâÇÏ°í ÀÖ½À´Ï´Ù" -#: src/extract.c:1353 +#: src/extract.c:1365 #, fuzzy, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "`%s'¸¦ ÃßÃâÇÒ ¼ö ¾ø½À´Ï´Ù -- ÀÌ ÆÄÀÏÀº ´Ù¸¥ º¼·ý¿¡ ¿¬¼ÓµÇ¾î ÀÖ½À´Ï´Ù" # -#: src/extract.c:1360 src/list.c:1125 +#: src/extract.c:1372 src/list.c:1121 #, fuzzy msgid "Unexpected long name header" msgstr "¾ÆÄ«À̺ê ÆÄÀÏ¿¡ ¿¹±âÄ¡ ¾ÊÀº EOF" # -#: src/extract.c:1367 +#: src/extract.c:1379 #, fuzzy, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: ¾Ë ¼ö ¾ø´Â ÆÄÀÏ Å¸ÀÔ; ÆÄÀÏÀÌ ¹«½ÃµÊ" -#: src/extract.c:1393 +#: src/extract.c:1405 #, c-format msgid "Current %s is newer or same age" msgstr "" -#: src/extract.c:1445 +#: src/extract.c:1457 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: ÀÌ ÆÄÀÏÀ» ¹é¾÷ÇÒ ¼ö ¾ø¾ú½À´Ï´Ù" # -#: src/extract.c:1582 +#: src/extract.c:1594 #, c-format msgid "Cannot rename %s to %s" msgstr "%s¸¦ %s·Î À̸§À» ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù" # -#: src/incremen.c:474 src/incremen.c:518 +#: src/incremen.c:473 src/incremen.c:517 #, fuzzy, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s µð·ºÅ丮´Â À̸§ÀÌ ¹Ù²î¾ú½À´Ï´Ù" # -#: src/incremen.c:486 +#: src/incremen.c:485 #, fuzzy, c-format msgid "%s: Directory has been renamed" msgstr "%s µð·ºÅ丮´Â À̸§ÀÌ ¹Ù²î¾ú½À´Ï´Ù" # -#: src/incremen.c:531 +#: src/incremen.c:530 #, fuzzy, c-format msgid "%s: Directory is new" msgstr "%s´Â »õ µð·ºÅ丮ÀÔ´Ï´Ù" -#: src/incremen.c:956 src/incremen.c:973 +#: src/incremen.c:951 src/incremen.c:968 msgid "Invalid time stamp" msgstr "" -#: src/incremen.c:1012 +#: src/incremen.c:1007 #, fuzzy msgid "Invalid modification time (seconds)" msgstr "¿É¼Ç¿¡ ºÎÀûÀýÇÑ ¸ðµå°¡ ÁÖ¾îÁü" -#: src/incremen.c:1027 +#: src/incremen.c:1022 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:1047 +#: src/incremen.c:1042 msgid "Invalid device number" msgstr "" -#: src/incremen.c:1062 +#: src/incremen.c:1057 msgid "Invalid inode number" msgstr "" -#: src/incremen.c:1113 src/incremen.c:1150 +#: src/incremen.c:1108 src/incremen.c:1145 msgid "Field too long while reading snapshot file" msgstr "" # -#: src/incremen.c:1120 src/incremen.c:1158 +#: src/incremen.c:1115 src/incremen.c:1153 #, fuzzy msgid "Read error in snapshot file" msgstr "%s¿¡¼­ Àб⠿À·ù" # -#: src/incremen.c:1122 src/incremen.c:1162 src/incremen.c:1214 -#: src/incremen.c:1272 +#: src/incremen.c:1117 src/incremen.c:1157 src/incremen.c:1209 +#: src/incremen.c:1267 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "¾ÆÄ«À̺ê ÆÄÀÏ¿¡ ¿¹±âÄ¡ ¾ÊÀº EOF" # -#: src/incremen.c:1129 src/incremen.c:1169 +#: src/incremen.c:1124 src/incremen.c:1164 #, fuzzy msgid "Unexpected field value in snapshot file" msgstr "¾ÆÄ«À̺ê ÆÄÀÏ¿¡ ¿¹±âÄ¡ ¾ÊÀº EOF" -#: src/incremen.c:1264 +#: src/incremen.c:1259 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1325 src/incremen.c:1328 +#: src/incremen.c:1320 src/incremen.c:1323 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1347 +#: src/incremen.c:1342 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1502 +#: src/incremen.c:1496 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1512 +#: src/incremen.c:1506 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1525 +#: src/incremen.c:1519 msgid "Malformed dumpdir: empty name in 'R'" msgstr "" -#: src/incremen.c:1538 +#: src/incremen.c:1532 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1544 +#: src/incremen.c:1538 msgid "Malformed dumpdir: empty name in 'T'" msgstr "" -#: src/incremen.c:1564 +#: src/incremen.c:1558 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1571 +#: src/incremen.c:1565 msgid "Malformed dumpdir: 'X' never used" msgstr "" # -#: src/incremen.c:1615 +#: src/incremen.c:1609 #, fuzzy, c-format msgid "Cannot create temporary directory using template %s" msgstr "%s·Î µð·ºÅ丮¸¦ ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù" -#: src/incremen.c:1677 +#: src/incremen.c:1670 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1690 +#: src/incremen.c:1683 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "" # -#: src/incremen.c:1698 +#: src/incremen.c:1691 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: %s¸¦ Áö¿ò\n" # -#: src/incremen.c:1703 +#: src/incremen.c:1696 #, fuzzy, c-format msgid "%s: Cannot remove" msgstr "%s¸¦ Áö¿ï ¼ö ¾ø½À´Ï´Ù" @@ -1233,172 +1237,166 @@ msgstr " msgid "block %s: ** End of File **\n" msgstr "ºí·° %10ld: ** ÆÄÀÏÀÇ ³¡ **\n" -#: src/list.c:256 src/list.c:1097 src/list.c:1360 +#: src/list.c:256 src/list.c:1093 src/list.c:1356 #, fuzzy, c-format msgid "block %s: " msgstr "ºí·° %10ld: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:712 +#: src/list.c:708 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:767 +#: src/list.c:763 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:778 +#: src/list.c:774 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "" -#: src/list.c:799 +#: src/list.c:795 msgid "Archive contains obsolescent base-64 headers" msgstr "" -#: src/list.c:813 +#: src/list.c:809 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "" # -#: src/list.c:844 +#: src/list.c:840 #, fuzzy, c-format msgid "Archive base-256 value is out of %s range" msgstr "ÀÌ º¼·ýÀº ¼ø¼­¸¦ ¹þ¾î³µ½À´Ï´Ù" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:873 +#: src/list.c:869 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:895 +#: src/list.c:891 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "" # -#: src/list.c:1261 +#: src/list.c:1257 #, c-format msgid " link to %s\n" msgstr " %s·Î ¸µÅ©\n" # -#: src/list.c:1269 +#: src/list.c:1265 #, fuzzy, c-format msgid " unknown file type %s\n" msgstr " ¾Ë ¼ö ¾ø´Â ÆÄÀÏ Å¸ÀÔ `%c'\n" -#: src/list.c:1287 +#: src/list.c:1283 #, c-format msgid "--Long Link--\n" msgstr "" -#: src/list.c:1291 +#: src/list.c:1287 #, c-format msgid "--Long Name--\n" msgstr "" # -#: src/list.c:1295 +#: src/list.c:1291 #, c-format msgid "--Volume Header--\n" msgstr "--º¼·ý Çì´õ--\n" # -#: src/list.c:1303 +#: src/list.c:1299 #, fuzzy, c-format msgid "--Continued at byte %s--\n" msgstr "--%ld ¹ÙÀÌÆ® °¿¡ °è¼ÓµÊ--\n" # -#: src/list.c:1365 +#: src/list.c:1361 msgid "Creating directory:" msgstr "µð·ºÅ丮¸¦ ¸¸µå´Â Áß:" # -#: src/misc.c:298 +#: src/misc.c:297 #, fuzzy msgid "Cannot get working directory" msgstr "%s·Î µð·ºÅ丮¸¦ ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù" # -#: src/misc.c:571 +#: src/misc.c:570 #, fuzzy, c-format msgid "Renaming %s to %s\n" msgstr "%s¸¦ %s·Î À̸§ ¹Ù²Þ" # -#: src/misc.c:580 src/misc.c:599 +#: src/misc.c:579 src/misc.c:598 #, fuzzy, c-format msgid "%s: Cannot rename to %s" msgstr "%s¸¦ %s·Î À̸§À» ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù" # -#: src/misc.c:604 +#: src/misc.c:603 #, fuzzy, c-format msgid "Renaming %s back to %s\n" msgstr "%s¸¦ %s·Î À̸§ ¹Ù²Þ" -#: src/misc.c:851 +#: src/misc.c:850 #, c-format msgid "%s: File removed before we read it" msgstr "" -# -#: src/misc.c:866 -#, fuzzy, c-format -msgid "%s: Directory removed before we read it" -msgstr "%s µð·ºÅ丮´Â À̸§ÀÌ ¹Ù²î¾ú½À´Ï´Ù" - -#: src/misc.c:887 +#: src/misc.c:871 msgid "child process" msgstr "" -#: src/misc.c:896 +#: src/misc.c:880 msgid "interprocess channel" msgstr "" -#: src/names.c:594 +#: src/names.c:590 msgid "Pattern matching characters used in file names" msgstr "" -#: src/names.c:596 +#: src/names.c:592 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" msgstr "" # -#: src/names.c:614 src/names.c:630 +#: src/names.c:610 src/names.c:626 #, c-format msgid "%s: Not found in archive" msgstr "%s: ¾ÆÄ«À̺꿡 ¾øÀ½" # -#: src/names.c:615 +#: src/names.c:611 #, fuzzy, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: ¾ÆÄ«À̺꿡 ¾øÀ½" -#: src/names.c:649 +#: src/names.c:645 #, fuzzy, c-format msgid "Archive label mismatch" msgstr "`%s'¿Í ÀÏÄ¡Çϵµ·Ï ¶óº§ÀÌ ºÙÁö ¾ÊÀº ¾ÆÄ«À̺ê" -#: src/names.c:953 +#: src/names.c:949 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" -#: src/names.c:959 +#: src/names.c:955 msgid "Only one -C option is allowed with --listed-incremental" msgstr "" @@ -2768,6 +2766,11 @@ msgstr "" msgid "--stat requires file names" msgstr "" +# +#, fuzzy +#~ msgid "%s: Directory removed before we read it" +#~ msgstr "%s µð·ºÅ丮´Â À̸§ÀÌ ¹Ù²î¾ú½À´Ï´Ù" + # #, fuzzy #~ msgid "Cannot restore working directory" diff --git a/po/ky.gmo b/po/ky.gmo index 6340dfe8bb6efe1b81062c19ee966a7d4e04bb5d..cdfb7c0de06dacfa75172651c86ecc35a6630a1e 100644 GIT binary patch delta 28 jcmZ4Xf_d2s<_(NlyoS04#=3?^3WkPOrpBB3vLw0yjF$+F delta 28 jcmZ4Xf_d2s<_(Nlyau|4hPnpk3WnxZ2IiajvLw0yjL`^` diff --git a/po/ky.po b/po/ky.po index 57c8af1d..c507d9f8 100644 --- a/po/ky.po +++ b/po/ky.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: tar 1.18\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2010-11-07 17:07+0200\n" +"POT-Creation-Date: 2011-03-12 11:53+0200\n" "PO-Revision-Date: 2007-09-01 01:06+0100\n" "Last-Translator: Azilet Beishenaliev \n" "Language-Team: Kirghiz \n" @@ -62,7 +62,7 @@ msgstr "%.*s: ARGP_HELP_FMT параметри белгисиз" msgid "Garbage in ARGP_HELP_FMT: %s" msgstr "ARGP_HELP_FMT параметри бузук: %s" -#: gnu/argp-help.c:1246 +#: gnu/argp-help.c:1248 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." @@ -71,29 +71,29 @@ msgstr "" "жараша жазылса, кыска жазылган опциялар менен да сөзсүз түрдө же тилекке " "жараша жазылат." -#: gnu/argp-help.c:1639 +#: gnu/argp-help.c:1641 msgid "Usage:" msgstr "Колдонулушу:" -#: gnu/argp-help.c:1643 +#: gnu/argp-help.c:1645 msgid " or: " msgstr " же: " -#: gnu/argp-help.c:1655 +#: gnu/argp-help.c:1657 msgid " [OPTION...]" msgstr " [ОПЦИЯ...]" -#: gnu/argp-help.c:1682 +#: gnu/argp-help.c:1684 #, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Толук маалымат үчүн `%s --help' же `%s --usage' деп жазгыла.\n" -#: gnu/argp-help.c:1710 +#: gnu/argp-help.c:1712 #, c-format msgid "Report bugs to %s.\n" msgstr "Каталарды бул жерге билдиргиле %s.\n" -#: gnu/argp-help.c:1929 gnu/error.c:183 +#: gnu/argp-help.c:1931 gnu/error.c:183 msgid "Unknown system error" msgstr "Белгисиз система катасы" @@ -200,16 +200,16 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: `%s' опциясы менен аргумент болуш керек\n" # Памятты эмне дейбиз яя? ;) -#: gnu/obstack.c:425 gnu/obstack.c:427 gnu/xalloc-die.c:36 +#: gnu/obstack.c:423 gnu/obstack.c:425 gnu/xalloc-die.c:36 msgid "memory exhausted" msgstr "Память жетпей калды" -#: gnu/openat-die.c:36 +#: gnu/openat-die.c:40 #, fuzzy, c-format msgid "unable to record current working directory" msgstr "Учурдагы папка алмаштырылбайтат" -#: gnu/openat-die.c:54 +#: gnu/openat-die.c:59 #, fuzzy, c-format msgid "failed to return to initial working directory" msgstr "Учурдагы папка сакталбайтат" @@ -233,11 +233,11 @@ msgstr "Учурдагы папка сакталбайтат" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: gnu/quotearg.c:274 +#: gnu/quotearg.c:273 msgid "`" msgstr "„" -#: gnu/quotearg.c:275 +#: gnu/quotearg.c:274 msgid "'" msgstr "“" @@ -485,21 +485,21 @@ msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" msgstr[0] "%1$s: жалпы %3$lu байттан %2$lu байт гана жазылды" -#: lib/paxnames.c:155 +#: lib/paxnames.c:140 #, c-format msgid "Removing leading `%s' from member names" msgstr "Мүчө аттарынын башындагы `%s' алынып салды" -#: lib/paxnames.c:156 +#: lib/paxnames.c:141 #, c-format msgid "Removing leading `%s' from hard link targets" msgstr "Түз шилтемелер көрсөтүп турган файлдардын башындагы `%s' алынып салды" -#: lib/paxnames.c:169 +#: lib/paxnames.c:154 msgid "Substituting `.' for empty member name" msgstr "Бош болгон мүчө аттын ордуна `.' коюлду" -#: lib/paxnames.c:170 +#: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" msgstr "Түз шилтеме көрсөтүп турган бош файлдын ордуна `.' коюлду" @@ -794,20 +794,20 @@ msgid "Could only read %lu of %lu byte" msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "%2$lu байттан %1$lu гана окулду" -#: src/compare.c:105 src/compare.c:382 +#: src/compare.c:105 src/compare.c:383 msgid "Contents differ" msgstr "Мазмундары окшобойт" -#: src/compare.c:131 src/extract.c:972 src/incremen.c:1462 src/list.c:458 -#: src/list.c:1392 src/xheader.c:711 +#: src/compare.c:131 src/extract.c:984 src/incremen.c:1456 src/list.c:456 +#: src/list.c:1388 src/xheader.c:711 msgid "Unexpected EOF in archive" msgstr "Архивде күтүлбөгөн жерде файлдын соңу бар" -#: src/compare.c:179 src/compare.c:195 src/compare.c:308 src/compare.c:406 +#: src/compare.c:179 src/compare.c:195 src/compare.c:309 src/compare.c:407 msgid "File type differs" msgstr "Файл түрү окшошпойт" -#: src/compare.c:182 src/compare.c:202 src/compare.c:322 +#: src/compare.c:182 src/compare.c:202 src/compare.c:323 msgid "Mode differs" msgstr "Укук абалдары окшошпойт" @@ -823,48 +823,53 @@ msgstr "Gid окшошпойт" msgid "Mod time differs" msgstr "Алмаштыруу убактылары окшошпойт" -#: src/compare.c:215 src/compare.c:414 +#: src/compare.c:215 src/compare.c:415 msgid "Size differs" msgstr "Көлөмү окшошпойт" -#: src/compare.c:263 +#: src/compare.c:264 #, c-format msgid "Not linked to %s" msgstr "%s жака шилтенген эмес" -#: src/compare.c:287 +#: src/compare.c:288 msgid "Symlink differs" msgstr "Символикалык шилтеме окшошпойт" -#: src/compare.c:316 +#: src/compare.c:317 msgid "Device number differs" msgstr "Аспап номери окшошпойт" -#: src/compare.c:456 +#: src/compare.c:457 #, c-format msgid "Verify " msgstr "Текшерүү " -#: src/compare.c:463 +#: src/compare.c:464 #, c-format msgid "%s: Unknown file type `%c', diffed as normal file" msgstr "%s: `%c' файл түрү бүлгисиз, жөнөкөй файл катары салыштырды" -#: src/compare.c:518 +#: src/compare.c:520 msgid "Archive contains file names with leading prefixes removed." msgstr "Архивдин ичинде префикстери алынган файл аттары бар." -#: src/compare.c:520 +#: src/compare.c:526 +#, fuzzy +msgid "Archive contains transformed file names." +msgstr "Архивде эски түрдөгү base-64 башкы-маалымат бар" + +#: src/compare.c:531 msgid "Verification may fail to locate original files." msgstr "Текшерүү учурунда алгачкы файлдар табылбай калышы мүмкүн." -#: src/compare.c:593 +#: src/compare.c:603 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "ТЕКШЕРҮҮ КАТАСЫ: %d жараксыз башкы маалымат табылды" -#: src/compare.c:611 src/list.c:222 +#: src/compare.c:621 src/list.c:222 #, c-format msgid "A lone zero block at %s" msgstr "%s болгон жерде нөлдүк блок бар" @@ -914,7 +919,7 @@ msgstr[0] "%s: Файл %s байтка азайды; нөлдөр менен т msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: файл башка файл-системасында; кошулбайт" -#: src/create.c:1203 src/create.c:1214 src/incremen.c:582 src/incremen.c:588 +#: src/create.c:1203 src/create.c:1214 src/incremen.c:578 src/incremen.c:584 msgid "contents not dumped" msgstr "астындагылар кошулган жок" @@ -938,7 +943,7 @@ msgstr "%s: файл алмашкан жок; кошулбайт" msgid "%s: file is the archive; not dumped" msgstr "%s: файл архив экен; кошулбайт" -#: src/create.c:1723 src/incremen.c:575 +#: src/create.c:1723 src/incremen.c:571 msgid "directory not dumped" msgstr "папка кошулган жок" @@ -947,12 +952,12 @@ msgstr "папка кошулган жок" msgid "%s: file changed as we read it" msgstr "%s: файлды окуу учурунда файл алмашты" -#: src/create.c:1857 +#: src/create.c:1858 #, c-format msgid "%s: socket ignored" msgstr "%s: сокет каралбайт" -#: src/create.c:1863 +#: src/create.c:1864 #, c-format msgid "%s: door ignored" msgstr "%s: door каралбайт" @@ -980,168 +985,168 @@ msgstr "%s: %s убакыт тамгасы %s сек. келечекте" msgid "%s: Unexpected inconsistency when making directory" msgstr "%s: Папка ачыбатканда күтүлбөгөн нерселер болду" -#: src/extract.c:709 +#: src/extract.c:721 #, c-format msgid "%s: Directory renamed before its status could be extracted" msgstr "%s: Папканын статусу билинелектен мурун аты алмашып кетти" -#: src/extract.c:863 +#: src/extract.c:875 msgid "Extracting contiguous files as regular files" msgstr "Удаа болгон файлдар жөнөкөй файл катары чыгарылып жатат" -#: src/extract.c:1197 +#: src/extract.c:1209 msgid "Attempting extraction of symbolic links as hard links" msgstr "Символикалык шилтемелерди түз шилтеме катары чыгарууга аракет кылынат" -#: src/extract.c:1353 +#: src/extract.c:1365 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Чыгарылган жок -- файл башка томдон уланып келиптир" -#: src/extract.c:1360 src/list.c:1125 +#: src/extract.c:1372 src/list.c:1121 msgid "Unexpected long name header" msgstr "Башкы-маалымат узун" -#: src/extract.c:1367 +#: src/extract.c:1379 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: `%c' файл түрү бүлгисиз, жөнөкөй файл катары чыгарылды" -#: src/extract.c:1393 +#: src/extract.c:1405 #, c-format msgid "Current %s is newer or same age" msgstr "Азыркы %s жаңыраак же бирдей" -#: src/extract.c:1445 +#: src/extract.c:1457 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Бул файлдын резерв копиясы алыналбай калды" -#: src/extract.c:1582 +#: src/extract.c:1594 #, c-format msgid "Cannot rename %s to %s" msgstr "%s файлы %s деп алмаштыралбай калды" -#: src/incremen.c:474 src/incremen.c:518 +#: src/incremen.c:473 src/incremen.c:517 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Папканын эски аты %s эле" -#: src/incremen.c:486 +#: src/incremen.c:485 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Папка алмаштырылды" -#: src/incremen.c:531 +#: src/incremen.c:530 #, c-format msgid "%s: Directory is new" msgstr "%s: Папка жаңы" -#: src/incremen.c:956 src/incremen.c:973 +#: src/incremen.c:951 src/incremen.c:968 msgid "Invalid time stamp" msgstr "Жараксыз убакыт тамгасы" -#: src/incremen.c:1012 +#: src/incremen.c:1007 msgid "Invalid modification time (seconds)" msgstr "Алмашуу убагы туура эмес (секундалары)" -#: src/incremen.c:1027 +#: src/incremen.c:1022 msgid "Invalid modification time (nanoseconds)" msgstr "Алмашуу убагы туура эмес (нано-секундалары)" -#: src/incremen.c:1047 +#: src/incremen.c:1042 msgid "Invalid device number" msgstr "Аспаптын номери жараксыз " -#: src/incremen.c:1062 +#: src/incremen.c:1057 msgid "Invalid inode number" msgstr "Inode номери жараксыз" # фиелд, снэпшот дегендер кандай болот? -#: src/incremen.c:1113 src/incremen.c:1150 +#: src/incremen.c:1108 src/incremen.c:1145 msgid "Field too long while reading snapshot file" msgstr "Снэпшот файлды окубатканда ото узун поле чыкты" # snapshot? -#: src/incremen.c:1120 src/incremen.c:1158 +#: src/incremen.c:1115 src/incremen.c:1153 msgid "Read error in snapshot file" msgstr "Снэпшот файлды окубатканда ката болду" # snapshot? -#: src/incremen.c:1122 src/incremen.c:1162 src/incremen.c:1214 -#: src/incremen.c:1272 +#: src/incremen.c:1117 src/incremen.c:1157 src/incremen.c:1209 +#: src/incremen.c:1267 msgid "Unexpected EOF in snapshot file" msgstr "Снэпшот файлда күтүлбөгөн жерде файлдын соңу (EOF) бар" # фиелд кандай болот? snapshot? -#: src/incremen.c:1129 src/incremen.c:1169 +#: src/incremen.c:1124 src/incremen.c:1164 msgid "Unexpected field value in snapshot file" msgstr "Снэпшот файлда күтүлбөгөн поле(фиелд) бар" -#: src/incremen.c:1264 +#: src/incremen.c:1259 msgid "Missing record terminator" msgstr "Записьтерди бөлүүчү символ жок" -#: src/incremen.c:1325 src/incremen.c:1328 +#: src/incremen.c:1320 src/incremen.c:1323 msgid "Bad incremental file format" msgstr "Файлдын форматы туура эмес" -#: src/incremen.c:1347 +#: src/incremen.c:1342 #, c-format msgid "Unsupported incremental format version: %" msgstr "Форматтын бул версиясы иштетиле албайт: %" -#: src/incremen.c:1502 +#: src/incremen.c:1496 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "Кошулуучу папка бузук: '%c' күтүлгөн бирок %#3o келди" -#: src/incremen.c:1512 +#: src/incremen.c:1506 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Кошулуучу папка бузук: 'X' копиялары бар" -#: src/incremen.c:1525 +#: src/incremen.c:1519 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Кошулуучу папка бузук: 'R' менен берилген ат бош" -#: src/incremen.c:1538 +#: src/incremen.c:1532 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Кошулуучу папка бузук: 'T'дан мурун 'R' жок" -#: src/incremen.c:1544 +#: src/incremen.c:1538 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Кошулуучу папка бузук: 'T' менен берилген ат бош" -#: src/incremen.c:1564 +#: src/incremen.c:1558 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "Кошулуучу папка бузук: '%c' күтүлгөн бирок датанын соңу келди" -#: src/incremen.c:1571 +#: src/incremen.c:1565 msgid "Malformed dumpdir: 'X' never used" msgstr "Кошулуучу папка бузук: 'X' эч колдонулган жок" -#: src/incremen.c:1615 +#: src/incremen.c:1609 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "%s шаблонун колдонуп убактылуу жаңы папка ачылган жок" -#: src/incremen.c:1677 +#: src/incremen.c:1670 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Папка өчүрүлгөн жок: stat иштебей койду" -#: src/incremen.c:1690 +#: src/incremen.c:1683 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: бул папка башка аспапта жайгашкан: өчүрүлбөйт" -#: src/incremen.c:1698 +#: src/incremen.c:1691 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: %s өчүрүлүп жатат\n" -#: src/incremen.c:1703 +#: src/incremen.c:1696 #, c-format msgid "%s: Cannot remove" msgstr "%s: Өчүрүлбөй жатат" @@ -1161,20 +1166,20 @@ msgstr "блок %s: ** нөлдөр болгон блок **\n" msgid "block %s: ** End of File **\n" msgstr "блок %s: ** Файлдын соңу **\n" -#: src/list.c:256 src/list.c:1097 src/list.c:1360 +#: src/list.c:256 src/list.c:1093 src/list.c:1356 #, c-format msgid "block %s: " msgstr "блок %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:712 +#: src/list.c:708 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Башкы-маалыматта сан түрүндө %s болотурган жерде бош жерлер бар" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:767 +#: src/list.c:763 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1182,120 +1187,115 @@ msgstr "" "экилик системадагы терси алынды" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:778 +#: src/list.c:774 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "" "Архивдин сегиздик системадагы мааниси болгон %.*s %s диапазонунун тышында" -#: src/list.c:799 +#: src/list.c:795 msgid "Archive contains obsolescent base-64 headers" msgstr "Архивде эски түрдөгү base-64 башкы-маалымат бар" -#: src/list.c:813 +#: src/list.c:809 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "Архивдеги base-64 түрүндөгү %s сөзү %s диапазонунун тышында" -#: src/list.c:844 +#: src/list.c:840 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Архивдин base-256 мааниси %s диапазонунун тышында" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:873 +#: src/list.c:869 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "" "Архивдин ичинде %.*s бар, алардын ордунда сан түрүндө %s болушу керек эле" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:895 +#: src/list.c:891 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Архивдин %s мааниси %s түрүнүн %s..%s диапазонунда эмес" -#: src/list.c:1261 +#: src/list.c:1257 #, c-format msgid " link to %s\n" msgstr " %s жака шилтеме\n" -#: src/list.c:1269 +#: src/list.c:1265 #, c-format msgid " unknown file type %s\n" msgstr " белгисиз файл түрү %s\n" -#: src/list.c:1287 +#: src/list.c:1283 #, c-format msgid "--Long Link--\n" msgstr "--Узун шилтеме--\n" -#: src/list.c:1291 +#: src/list.c:1287 #, c-format msgid "--Long Name--\n" msgstr "--Узун ат--\n" -#: src/list.c:1295 +#: src/list.c:1291 #, c-format msgid "--Volume Header--\n" msgstr "--Томдун башкы-маалыматы--\n" -#: src/list.c:1303 +#: src/list.c:1299 #, c-format msgid "--Continued at byte %s--\n" msgstr "--%s-байттан баштап уланды--\n" -#: src/list.c:1365 +#: src/list.c:1361 msgid "Creating directory:" msgstr "Жаңы папка ачылыбатат:" -#: src/misc.c:298 +#: src/misc.c:297 #, fuzzy msgid "Cannot get working directory" msgstr "Учурдагы папка алмаштырылбайтат" -#: src/misc.c:571 +#: src/misc.c:570 #, c-format msgid "Renaming %s to %s\n" msgstr "%s'тин атын %s деп алмаштырды\n" -#: src/misc.c:580 src/misc.c:599 +#: src/misc.c:579 src/misc.c:598 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: Аты %s деп алмаштыралбай калды" -#: src/misc.c:604 +#: src/misc.c:603 #, c-format msgid "Renaming %s back to %s\n" msgstr "%s'тин атын кайра %s деп алмаштырды\n" -#: src/misc.c:851 +#: src/misc.c:850 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Файл окулганча өчүрүлүп кетти" -#: src/misc.c:866 -#, fuzzy, c-format -msgid "%s: Directory removed before we read it" -msgstr "%s: Файл окулганча өчүрүлүп кетти" - # орусчада дочерный процесс, бир процесс өз ичинен жаңы бир # процесс жаратканда ошол чайлд процесс болот. Биз эмне дейбиз? # Мен туулган процесс дейм. -#: src/misc.c:887 +#: src/misc.c:871 msgid "child process" msgstr "туулган процесс" -#: src/misc.c:896 +#: src/misc.c:880 msgid "interprocess channel" msgstr "процесс-аралык канал" -#: src/names.c:594 +#: src/names.c:590 #, fuzzy msgid "Pattern matching characters used in file names" msgstr "Файлдын аттарында уйкаштарды издөө үчүн колдонулган тамгалар бар." -#: src/names.c:596 +#: src/names.c:592 #, fuzzy msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " @@ -1303,27 +1303,27 @@ msgid "" msgstr "" "Уйкаштарды издөө үчүн --wildcards опциясын колдонуңуз, же --no-wildcards" -#: src/names.c:614 src/names.c:630 +#: src/names.c:610 src/names.c:626 #, c-format msgid "%s: Not found in archive" msgstr "%s: Архивде табылган жок" -#: src/names.c:615 +#: src/names.c:611 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Керектүү нерселер архивде табылган жок" -#: src/names.c:649 +#: src/names.c:645 #, fuzzy, c-format msgid "Archive label mismatch" msgstr "Архивдин тамгасы %s менен келишпей жатат" -#: src/names.c:953 +#: src/names.c:949 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" -#: src/names.c:959 +#: src/names.c:955 msgid "Only one -C option is allowed with --listed-incremental" msgstr "" @@ -2756,6 +2756,10 @@ msgstr "Команда жабылды\n" msgid "--stat requires file names" msgstr "--stat опциясы менен файл аттары жазылыш керек" +#, fuzzy +#~ msgid "%s: Directory removed before we read it" +#~ msgstr "%s: Файл окулганча өчүрүлүп кетти" + #, fuzzy #~ msgid "Cannot restore working directory" #~ msgstr "Учурдагы папка сакталбайтат" diff --git a/po/ms.gmo b/po/ms.gmo index 7f3a6edc82d5ea54b4ed5834b7651fa09d98ec96..b7c4b394ea7f0f74c3b6f99f2269debcfd39f9e0 100644 GIT binary patch delta 26 hcmaFp`_Om8BynCtT?1oXLn8%4Ln~9`&GW^b_yK%d2l4;_ delta 26 hcmaFp`_Om8BynB?T|+}%19JsKb1MV$&GW^b_yK&C2l)U1 diff --git a/po/ms.po b/po/ms.po index 008c41e3..f786b8f2 100644 --- a/po/ms.po +++ b/po/ms.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tar 1.13.25\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2010-11-07 17:07+0200\n" +"POT-Creation-Date: 2011-03-12 11:53+0200\n" "PO-Revision-Date: 2002-11-23 02:38+0800\n" "Last-Translator: Hasbullah Bin Pit \n" "Language-Team: Malay \n" @@ -56,40 +56,40 @@ msgstr "" msgid "Garbage in ARGP_HELP_FMT: %s" msgstr "" -#: gnu/argp-help.c:1246 +#: gnu/argp-help.c:1248 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." msgstr "" -#: gnu/argp-help.c:1639 +#: gnu/argp-help.c:1641 msgid "Usage:" msgstr "" -#: gnu/argp-help.c:1643 +#: gnu/argp-help.c:1645 msgid " or: " msgstr "" -#: gnu/argp-help.c:1655 +#: gnu/argp-help.c:1657 #, fuzzy msgid " [OPTION...]" msgstr "" "\n" "Pengunaan : %s [OPSYEN]...\n" -#: gnu/argp-help.c:1682 +#: gnu/argp-help.c:1684 #, fuzzy, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Cuba '%s --help' untuk maklumat lanjut.\n" -#: gnu/argp-help.c:1710 +#: gnu/argp-help.c:1712 #, fuzzy, c-format msgid "Report bugs to %s.\n" msgstr "" "\n" "Lapor pepijat ke .\n" -#: gnu/argp-help.c:1929 gnu/error.c:183 +#: gnu/argp-help.c:1931 gnu/error.c:183 msgid "Unknown system error" msgstr "Ralat sistem tidak diketahui" @@ -195,16 +195,16 @@ msgstr "%s: opsyen `-W %s' tidak mengizinkan hujah\n" msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: opsyen `%s' memerlukan hujah\n" -#: gnu/obstack.c:425 gnu/obstack.c:427 gnu/xalloc-die.c:36 +#: gnu/obstack.c:423 gnu/obstack.c:425 gnu/xalloc-die.c:36 msgid "memory exhausted" msgstr "memori keletihan" -#: gnu/openat-die.c:36 +#: gnu/openat-die.c:40 #, fuzzy, c-format msgid "unable to record current working directory" msgstr "Tak dapat tukar direktori kerja" -#: gnu/openat-die.c:54 +#: gnu/openat-die.c:59 #, fuzzy, c-format msgid "failed to return to initial working directory" msgstr "Tak dapat simpan direktori kerja" @@ -228,12 +228,12 @@ msgstr "Tak dapat simpan direktori kerja" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: gnu/quotearg.c:274 +#: gnu/quotearg.c:273 msgid "`" msgstr "`" # ui/galeon.glade.h:3 -#: gnu/quotearg.c:275 +#: gnu/quotearg.c:274 msgid "'" msgstr "'" @@ -478,22 +478,22 @@ msgid_plural "%s: Wrote only %lu of %lu bytes" msgstr[0] "%s: Ditulis hanya %lu drpd %lu byte" msgstr[1] "%s: Ditulis hanya %lu drpd %lu byte" -#: lib/paxnames.c:155 +#: lib/paxnames.c:140 #, fuzzy, c-format msgid "Removing leading `%s' from member names" msgstr "Membuang awalan `%.*s' drpd nama ahli" -#: lib/paxnames.c:156 +#: lib/paxnames.c:141 #, fuzzy, c-format msgid "Removing leading `%s' from hard link targets" msgstr "Membuang awalan `%.*s' drpd nama ahli" -#: lib/paxnames.c:169 +#: lib/paxnames.c:154 #, fuzzy msgid "Substituting `.' for empty member name" msgstr "Membuang awalan `%.*s' drpd nama ahli" -#: lib/paxnames.c:170 +#: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" msgstr "" @@ -793,20 +793,20 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "Hanya boleh membaca %lu drpd %lu byte" msgstr[1] "Hanya boleh membaca %lu drpd %lu byte" -#: src/compare.c:105 src/compare.c:382 +#: src/compare.c:105 src/compare.c:383 msgid "Contents differ" msgstr "Kandungan berlainan" -#: src/compare.c:131 src/extract.c:972 src/incremen.c:1462 src/list.c:458 -#: src/list.c:1392 src/xheader.c:711 +#: src/compare.c:131 src/extract.c:984 src/incremen.c:1456 src/list.c:456 +#: src/list.c:1388 src/xheader.c:711 msgid "Unexpected EOF in archive" msgstr "EOF tanpa diduga pada arkib" -#: src/compare.c:179 src/compare.c:195 src/compare.c:308 src/compare.c:406 +#: src/compare.c:179 src/compare.c:195 src/compare.c:309 src/compare.c:407 msgid "File type differs" msgstr "Jenis fail berbeza" -#: src/compare.c:182 src/compare.c:202 src/compare.c:322 +#: src/compare.c:182 src/compare.c:202 src/compare.c:323 msgid "Mode differs" msgstr "Mod berbeza" @@ -822,49 +822,53 @@ msgstr "Gid berbeza" msgid "Mod time differs" msgstr "Masa mod berbeza" -#: src/compare.c:215 src/compare.c:414 +#: src/compare.c:215 src/compare.c:415 msgid "Size differs" msgstr "Saiz berbeza" -#: src/compare.c:263 +#: src/compare.c:264 #, c-format msgid "Not linked to %s" msgstr "Tidak dipautkan ke %s" -#: src/compare.c:287 +#: src/compare.c:288 msgid "Symlink differs" msgstr "Symlink berbeza" -#: src/compare.c:316 +#: src/compare.c:317 msgid "Device number differs" msgstr "Nombor beranti berbeza" -#: src/compare.c:456 +#: src/compare.c:457 #, c-format msgid "Verify " msgstr "Tentusah" -#: src/compare.c:463 +#: src/compare.c:464 #, fuzzy, c-format msgid "%s: Unknown file type `%c', diffed as normal file" msgstr "%s: Jenis fail tak dikenali '%c', berlainan dengan fail normal" -#: src/compare.c:518 +#: src/compare.c:520 msgid "Archive contains file names with leading prefixes removed." msgstr "" -#: src/compare.c:520 +#: src/compare.c:526 +msgid "Archive contains transformed file names." +msgstr "" + +#: src/compare.c:531 msgid "Verification may fail to locate original files." msgstr "" -#: src/compare.c:593 +#: src/compare.c:603 #, fuzzy, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "GAGAL TENTUSAH: %d pengepala tak sah dikesan" msgstr[1] "GAGAL TENTUSAH: %d pengepala tak sah dikesan" -#: src/compare.c:611 src/list.c:222 +#: src/compare.c:621 src/list.c:222 #, c-format msgid "A lone zero block at %s" msgstr "" @@ -915,7 +919,7 @@ msgstr[1] "%s: Fail mengucup sebanyak %s byte; pad dengan sifar" msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: fail adalah pada sistemfail lain; tidak dilonggokkan" -#: src/create.c:1203 src/create.c:1214 src/incremen.c:582 src/incremen.c:588 +#: src/create.c:1203 src/create.c:1214 src/incremen.c:578 src/incremen.c:584 msgid "contents not dumped" msgstr "" @@ -939,7 +943,7 @@ msgstr "%s: fail tidak berubah; tidak dilonggokkan" msgid "%s: file is the archive; not dumped" msgstr "%s: fail adalah arkib; tidak dilonggokkan" -#: src/create.c:1723 src/incremen.c:575 +#: src/create.c:1723 src/incremen.c:571 msgid "directory not dumped" msgstr "" @@ -948,12 +952,12 @@ msgstr "" msgid "%s: file changed as we read it" msgstr "%s: fail berubah bila kami membacanya" -#: src/create.c:1857 +#: src/create.c:1858 #, c-format msgid "%s: socket ignored" msgstr "%s: soket diabaikan" -#: src/create.c:1863 +#: src/create.c:1864 #, c-format msgid "%s: door ignored" msgstr "%s: pintu diabaikan" @@ -981,167 +985,167 @@ msgstr "%s: setem masa %s adalah %lu pada masa akan datang" msgid "%s: Unexpected inconsistency when making directory" msgstr "%s: Ketidakkonsistenan luar dugaan bila membuat direktori" -#: src/extract.c:709 +#: src/extract.c:721 #, c-format msgid "%s: Directory renamed before its status could be extracted" msgstr "%s: Direktori ditukarnama sebelum statusnya boleh diekstrak" -#: src/extract.c:863 +#: src/extract.c:875 msgid "Extracting contiguous files as regular files" msgstr "Mengekstrak fail bersambung sebagai fail biasa" -#: src/extract.c:1197 +#: src/extract.c:1209 msgid "Attempting extraction of symbolic links as hard links" msgstr "Cuba mengekstrak pautan simbolik sebagai pautan keras" -#: src/extract.c:1353 +#: src/extract.c:1365 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Tak dapat ekstrak -- fail bersambung dari volum lain" -#: src/extract.c:1360 src/list.c:1125 +#: src/extract.c:1372 src/list.c:1121 #, fuzzy msgid "Unexpected long name header" msgstr "Penghujungan tanpa diduga data imej PNM" -#: src/extract.c:1367 +#: src/extract.c:1379 #, fuzzy, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Jenis fail tak dikenali '%c', diekstrak sebagai fail biasa" -#: src/extract.c:1393 +#: src/extract.c:1405 #, c-format msgid "Current %s is newer or same age" msgstr "" -#: src/extract.c:1445 +#: src/extract.c:1457 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Tak dapat backup fail ini" -#: src/extract.c:1582 +#: src/extract.c:1594 #, fuzzy, c-format msgid "Cannot rename %s to %s" msgstr "%s: Tak dapat menukarnama ke %s" -#: src/incremen.c:474 src/incremen.c:518 +#: src/incremen.c:473 src/incremen.c:517 #, fuzzy, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Direktori telah ditukarnama" -#: src/incremen.c:486 +#: src/incremen.c:485 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Direktori telah ditukarnama" -#: src/incremen.c:531 +#: src/incremen.c:530 #, c-format msgid "%s: Directory is new" msgstr "%s: Direktori adalah baru" -#: src/incremen.c:956 src/incremen.c:973 +#: src/incremen.c:951 src/incremen.c:968 msgid "Invalid time stamp" msgstr "Setem masa tidak sah" -#: src/incremen.c:1012 +#: src/incremen.c:1007 #, fuzzy msgid "Invalid modification time (seconds)" msgstr "Mod tidak sah diberi pada opsyen" -#: src/incremen.c:1027 +#: src/incremen.c:1022 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:1047 +#: src/incremen.c:1042 msgid "Invalid device number" msgstr "Nombor peranti tidak sah" -#: src/incremen.c:1062 +#: src/incremen.c:1057 msgid "Invalid inode number" msgstr "Nombot inod tidak sah" -#: src/incremen.c:1113 src/incremen.c:1150 +#: src/incremen.c:1108 src/incremen.c:1145 msgid "Field too long while reading snapshot file" msgstr "" -#: src/incremen.c:1120 src/incremen.c:1158 +#: src/incremen.c:1115 src/incremen.c:1153 msgid "Read error in snapshot file" msgstr "" -#: src/incremen.c:1122 src/incremen.c:1162 src/incremen.c:1214 -#: src/incremen.c:1272 +#: src/incremen.c:1117 src/incremen.c:1157 src/incremen.c:1209 +#: src/incremen.c:1267 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "EOF tanpa diduga pada arkib" -#: src/incremen.c:1129 src/incremen.c:1169 +#: src/incremen.c:1124 src/incremen.c:1164 msgid "Unexpected field value in snapshot file" msgstr "" -#: src/incremen.c:1264 +#: src/incremen.c:1259 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1325 src/incremen.c:1328 +#: src/incremen.c:1320 src/incremen.c:1323 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1347 +#: src/incremen.c:1342 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1502 +#: src/incremen.c:1496 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1512 +#: src/incremen.c:1506 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1525 +#: src/incremen.c:1519 msgid "Malformed dumpdir: empty name in 'R'" msgstr "" -#: src/incremen.c:1538 +#: src/incremen.c:1532 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1544 +#: src/incremen.c:1538 msgid "Malformed dumpdir: empty name in 'T'" msgstr "" -#: src/incremen.c:1564 +#: src/incremen.c:1558 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1571 +#: src/incremen.c:1565 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1615 +#: src/incremen.c:1609 #, fuzzy, c-format msgid "Cannot create temporary directory using template %s" msgstr "Tak dapat memperuntukkan memori bagi faktor pemblokan %d" -#: src/incremen.c:1677 +#: src/incremen.c:1670 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1690 +#: src/incremen.c:1683 #, fuzzy, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: fail adalah pada sistemfail lain; tidak dilonggokkan" -#: src/incremen.c:1698 +#: src/incremen.c:1691 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Memadam %s\n" -#: src/incremen.c:1703 +#: src/incremen.c:1696 #, c-format msgid "%s: Cannot remove" msgstr "%s: tak dapat buang" @@ -1161,159 +1165,154 @@ msgstr "blok %s: ** Blok TIADA **\n" msgid "block %s: ** End of File **\n" msgstr "blok %s: ** Akhir Fail **\n" -#: src/list.c:256 src/list.c:1097 src/list.c:1360 +#: src/list.c:256 src/list.c:1093 src/list.c:1356 #, c-format msgid "block %s: " msgstr "blok %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:712 +#: src/list.c:708 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Pengepala kosong dimana nilai %s numerik dijangka" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:767 +#: src/list.c:763 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "Nilai oktal arkib %.*s diluar julat %s; anggap kedua-dua pelengkap" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:778 +#: src/list.c:774 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Nilai oktal arkib %.*s diluar julat %s" -#: src/list.c:799 +#: src/list.c:795 msgid "Archive contains obsolescent base-64 headers" msgstr "" -#: src/list.c:813 +#: src/list.c:809 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "Rentetan %s base-64 ditandatangani arkibadalah diluar julat %s " -#: src/list.c:844 +#: src/list.c:840 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Nilai base-256 arkub adalah diluar julat %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:873 +#: src/list.c:869 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Arkib mengandungi %.*s dimana nilai %s numerik dijangka" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:895 +#: src/list.c:891 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Nilai %s arkib adalah dijuar julat %s %s..%s" -#: src/list.c:1261 +#: src/list.c:1257 #, c-format msgid " link to %s\n" msgstr "Pautan ke %s\n" -#: src/list.c:1269 +#: src/list.c:1265 #, c-format msgid " unknown file type %s\n" msgstr "jenis fail tak diketahui %s\n" -#: src/list.c:1287 +#: src/list.c:1283 #, c-format msgid "--Long Link--\n" msgstr "" -#: src/list.c:1291 +#: src/list.c:1287 #, c-format msgid "--Long Name--\n" msgstr "" -#: src/list.c:1295 +#: src/list.c:1291 #, c-format msgid "--Volume Header--\n" msgstr "--Pengepala Volum--\n" -#: src/list.c:1303 +#: src/list.c:1299 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Bersambung pada byte %s--\n" -#: src/list.c:1365 +#: src/list.c:1361 msgid "Creating directory:" msgstr "Mencipta direktori:" -#: src/misc.c:298 +#: src/misc.c:297 #, fuzzy msgid "Cannot get working directory" msgstr "Tak dapat tukar direktori kerja" -#: src/misc.c:571 +#: src/misc.c:570 #, c-format msgid "Renaming %s to %s\n" msgstr "Menukarnama %s ke %s\n" -#: src/misc.c:580 src/misc.c:599 +#: src/misc.c:579 src/misc.c:598 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: Tak dapat menukarnama ke %s" -#: src/misc.c:604 +#: src/misc.c:603 #, c-format msgid "Renaming %s back to %s\n" msgstr "Menukarnama %s kembali ke %s\n" -#: src/misc.c:851 +#: src/misc.c:850 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Fail dibuang sebelum kami membacanya" -#: src/misc.c:866 -#, fuzzy, c-format -msgid "%s: Directory removed before we read it" -msgstr "%s: Fail dibuang sebelum kami membacanya" - -#: src/misc.c:887 +#: src/misc.c:871 msgid "child process" msgstr "proses anak" -#: src/misc.c:896 +#: src/misc.c:880 msgid "interprocess channel" msgstr "saluran antaraproses" -#: src/names.c:594 +#: src/names.c:590 msgid "Pattern matching characters used in file names" msgstr "" -#: src/names.c:596 +#: src/names.c:592 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" msgstr "" -#: src/names.c:614 src/names.c:630 +#: src/names.c:610 src/names.c:626 #, c-format msgid "%s: Not found in archive" msgstr "%s: Tak dijumpai pada arkib" -#: src/names.c:615 +#: src/names.c:611 #, fuzzy, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Tak dijumpai pada arkib" -#: src/names.c:649 +#: src/names.c:645 #, fuzzy, c-format msgid "Archive label mismatch" msgstr "Arkib tidak dilabelkan supaya memadan %s" -#: src/names.c:953 +#: src/names.c:949 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" -#: src/names.c:959 +#: src/names.c:955 msgid "Only one -C option is allowed with --listed-incremental" msgstr "" @@ -2672,6 +2671,10 @@ msgstr "" msgid "--stat requires file names" msgstr "Nama fail modul" +#, fuzzy +#~ msgid "%s: Directory removed before we read it" +#~ msgstr "%s: Fail dibuang sebelum kami membacanya" + #, fuzzy #~ msgid "Cannot restore working directory" #~ msgstr "Tak dapat simpan direktori kerja" diff --git a/po/nb.gmo b/po/nb.gmo index e1baa17c4ad651f4ddf8274697b871aa9af529de..4fbbf7355510e72ee5728197ff7cb2d9ad3bcc82 100644 GIT binary patch delta 26 hcmX@7d`@{o6Bnfw_XAxs`$W=6)`Fb^vZR2RZ-% diff --git a/po/nb.po b/po/nb.po index eb272831..5c5d1a59 100644 --- a/po/nb.po +++ b/po/nb.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU tar 1.12\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2010-11-07 17:07+0200\n" +"POT-Creation-Date: 2011-03-12 11:53+0200\n" "PO-Revision-Date: 1997-06-05 19:39 MET DST\n" "Last-Translator: Espen Skjelnes Johnsen \n" "Language-Team: Norwegian-bokmål \n" @@ -56,38 +56,38 @@ msgstr "" msgid "Garbage in ARGP_HELP_FMT: %s" msgstr "" -#: gnu/argp-help.c:1246 +#: gnu/argp-help.c:1248 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." msgstr "" -#: gnu/argp-help.c:1639 +#: gnu/argp-help.c:1641 msgid "Usage:" msgstr "" -#: gnu/argp-help.c:1643 +#: gnu/argp-help.c:1645 msgid " or: " msgstr "" -#: gnu/argp-help.c:1655 +#: gnu/argp-help.c:1657 #, fuzzy msgid " [OPTION...]" msgstr "" "\n" "Bruk: %s [FLAGG]...\n" -#: gnu/argp-help.c:1682 +#: gnu/argp-help.c:1684 #, fuzzy, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Tast «%s --help» for mer informasjon.\n" -#: gnu/argp-help.c:1710 +#: gnu/argp-help.c:1712 #, c-format msgid "Report bugs to %s.\n" msgstr "" -#: gnu/argp-help.c:1929 gnu/error.c:183 +#: gnu/argp-help.c:1931 gnu/error.c:183 msgid "Unknown system error" msgstr "Unkjent systemfeil" @@ -193,17 +193,17 @@ msgstr "Gammelt flagg msgid "%s: option '-W %s' requires an argument\n" msgstr "Gammelt flagg «%c» behøver et argument." -#: gnu/obstack.c:425 gnu/obstack.c:427 gnu/xalloc-die.c:36 +#: gnu/obstack.c:423 gnu/obstack.c:425 gnu/xalloc-die.c:36 #, fuzzy msgid "memory exhausted" msgstr "Minne oppbrukt" -#: gnu/openat-die.c:36 +#: gnu/openat-die.c:40 #, fuzzy, c-format msgid "unable to record current working directory" msgstr "Kunne ikke finne navnet på aktiv filkatalog" -#: gnu/openat-die.c:54 +#: gnu/openat-die.c:59 #, c-format msgid "failed to return to initial working directory" msgstr "" @@ -227,11 +227,11 @@ msgstr "" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: gnu/quotearg.c:274 +#: gnu/quotearg.c:273 msgid "`" msgstr "" -#: gnu/quotearg.c:275 +#: gnu/quotearg.c:274 msgid "'" msgstr "" @@ -477,22 +477,22 @@ msgstr[0] "%s: Kunne bare skrive %d av %d bytes'" msgstr[1] "%s: Kunne bare skrive %d av %d bytes'" # -#: lib/paxnames.c:155 +#: lib/paxnames.c:140 #, fuzzy, c-format msgid "Removing leading `%s' from member names" msgstr "Tar bort ledende «/» fra absolutte linker" # -#: lib/paxnames.c:156 +#: lib/paxnames.c:141 #, fuzzy, c-format msgid "Removing leading `%s' from hard link targets" msgstr "Tar bort ledende «/» fra absolutte linker" -#: lib/paxnames.c:169 +#: lib/paxnames.c:154 msgid "Substituting `.' for empty member name" msgstr "" -#: lib/paxnames.c:170 +#: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" msgstr "" @@ -797,22 +797,22 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "Kunne bare lese %d av %ld bytes" msgstr[1] "Kunne bare lese %d av %ld bytes" -#: src/compare.c:105 src/compare.c:382 +#: src/compare.c:105 src/compare.c:383 #, fuzzy msgid "Contents differ" msgstr "Modus er ulik" -#: src/compare.c:131 src/extract.c:972 src/incremen.c:1462 src/list.c:458 -#: src/list.c:1392 src/xheader.c:711 +#: src/compare.c:131 src/extract.c:984 src/incremen.c:1456 src/list.c:456 +#: src/list.c:1388 src/xheader.c:711 msgid "Unexpected EOF in archive" msgstr "Uventet filslutt i arkivet" -#: src/compare.c:179 src/compare.c:195 src/compare.c:308 src/compare.c:406 +#: src/compare.c:179 src/compare.c:195 src/compare.c:309 src/compare.c:407 #, fuzzy msgid "File type differs" msgstr "Størrelse er ulik" -#: src/compare.c:182 src/compare.c:202 src/compare.c:322 +#: src/compare.c:182 src/compare.c:202 src/compare.c:323 msgid "Mode differs" msgstr "Modus er ulik" @@ -828,50 +828,54 @@ msgstr "Gid er ulik" msgid "Mod time differs" msgstr "Modifiseringstid er ulik" -#: src/compare.c:215 src/compare.c:414 +#: src/compare.c:215 src/compare.c:415 msgid "Size differs" msgstr "Størrelse er ulik" -#: src/compare.c:263 +#: src/compare.c:264 #, c-format msgid "Not linked to %s" msgstr "Ikke linket til %s" -#: src/compare.c:287 +#: src/compare.c:288 msgid "Symlink differs" msgstr "Symbolsk link er ulik" -#: src/compare.c:316 +#: src/compare.c:317 #, fuzzy msgid "Device number differs" msgstr "Enhetsnummer er endret" -#: src/compare.c:456 +#: src/compare.c:457 #, c-format msgid "Verify " msgstr "Verifisering " -#: src/compare.c:463 +#: src/compare.c:464 #, fuzzy, c-format msgid "%s: Unknown file type `%c', diffed as normal file" msgstr "Ukjent filtype «%c» for %s, diffet som en vanlig fil" -#: src/compare.c:518 +#: src/compare.c:520 msgid "Archive contains file names with leading prefixes removed." msgstr "" -#: src/compare.c:520 +#: src/compare.c:526 +msgid "Archive contains transformed file names." +msgstr "" + +#: src/compare.c:531 msgid "Verification may fail to locate original files." msgstr "" -#: src/compare.c:593 +#: src/compare.c:603 #, fuzzy, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "VERIFIKASJONSFEIL: %d ukjente arkivhoder funnet" msgstr[1] "VERIFIKASJONSFEIL: %d ukjente arkivhoder funnet" -#: src/compare.c:611 src/list.c:222 +#: src/compare.c:621 src/list.c:222 #, c-format msgid "A lone zero block at %s" msgstr "" @@ -922,7 +926,7 @@ msgstr[1] "Filen %s krympet med %d bytes, fyller ut med nuller" msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: På et annet filesystem. Ikke lagret" -#: src/create.c:1203 src/create.c:1214 src/incremen.c:582 src/incremen.c:588 +#: src/create.c:1203 src/create.c:1214 src/incremen.c:578 src/incremen.c:584 #, fuzzy msgid "contents not dumped" msgstr " (minnet lagret)" @@ -947,7 +951,7 @@ msgstr "%s: er uendret; ikke lagret" msgid "%s: file is the archive; not dumped" msgstr "%s er arkivet; ikke lagret" -#: src/create.c:1723 src/incremen.c:575 +#: src/create.c:1723 src/incremen.c:571 msgid "directory not dumped" msgstr "" @@ -956,12 +960,12 @@ msgstr "" msgid "%s: file changed as we read it" msgstr "" -#: src/create.c:1857 +#: src/create.c:1858 #, c-format msgid "%s: socket ignored" msgstr "" -#: src/create.c:1863 +#: src/create.c:1864 #, c-format msgid "%s: door ignored" msgstr "" @@ -989,169 +993,169 @@ msgstr "" msgid "%s: Unexpected inconsistency when making directory" msgstr "" -#: src/extract.c:709 +#: src/extract.c:721 #, c-format msgid "%s: Directory renamed before its status could be extracted" msgstr "" -#: src/extract.c:863 +#: src/extract.c:875 msgid "Extracting contiguous files as regular files" msgstr "Ekstraherer sammenhengende filer som vanlige filer" -#: src/extract.c:1197 +#: src/extract.c:1209 msgid "Attempting extraction of symbolic links as hard links" msgstr "Forsøker å ekstrahere symbolske linker som harde linker" -#: src/extract.c:1353 +#: src/extract.c:1365 #, fuzzy, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "Kan ikke ekstrahere «%s» -- filen fortsetter fra et tidligere volum" -#: src/extract.c:1360 src/list.c:1125 +#: src/extract.c:1372 src/list.c:1121 #, fuzzy msgid "Unexpected long name header" msgstr "Uventet filslutt i arkivfilen" -#: src/extract.c:1367 +#: src/extract.c:1379 #, fuzzy, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "Ukjent filtype «%c» for %s, ekstrahert som en vanlig fil" -#: src/extract.c:1393 +#: src/extract.c:1405 #, c-format msgid "Current %s is newer or same age" msgstr "" -#: src/extract.c:1445 +#: src/extract.c:1457 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Kunne ikke lage sikkerhetskopi av denne filen" -#: src/extract.c:1582 +#: src/extract.c:1594 #, c-format msgid "Cannot rename %s to %s" msgstr "Kan ikke endre navn på %s til %s" -#: src/incremen.c:474 src/incremen.c:518 +#: src/incremen.c:473 src/incremen.c:517 #, fuzzy, c-format msgid "%s: Directory has been renamed from %s" msgstr "Filkatalogen %s har endret navn" -#: src/incremen.c:486 +#: src/incremen.c:485 #, fuzzy, c-format msgid "%s: Directory has been renamed" msgstr "Filkatalogen %s har endret navn" -#: src/incremen.c:531 +#: src/incremen.c:530 #, fuzzy, c-format msgid "%s: Directory is new" msgstr "Filkatalogen %s er ny" -#: src/incremen.c:956 src/incremen.c:973 +#: src/incremen.c:951 src/incremen.c:968 msgid "Invalid time stamp" msgstr "" -#: src/incremen.c:1012 +#: src/incremen.c:1007 #, fuzzy msgid "Invalid modification time (seconds)" msgstr "Ugyldig modus gitt i flagg" -#: src/incremen.c:1027 +#: src/incremen.c:1022 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:1047 +#: src/incremen.c:1042 msgid "Invalid device number" msgstr "" -#: src/incremen.c:1062 +#: src/incremen.c:1057 msgid "Invalid inode number" msgstr "" -#: src/incremen.c:1113 src/incremen.c:1150 +#: src/incremen.c:1108 src/incremen.c:1145 msgid "Field too long while reading snapshot file" msgstr "" -#: src/incremen.c:1120 src/incremen.c:1158 +#: src/incremen.c:1115 src/incremen.c:1153 #, fuzzy msgid "Read error in snapshot file" msgstr "Lesefeil på %s" -#: src/incremen.c:1122 src/incremen.c:1162 src/incremen.c:1214 -#: src/incremen.c:1272 +#: src/incremen.c:1117 src/incremen.c:1157 src/incremen.c:1209 +#: src/incremen.c:1267 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "Uventet filslutt i arkivfilen" -#: src/incremen.c:1129 src/incremen.c:1169 +#: src/incremen.c:1124 src/incremen.c:1164 #, fuzzy msgid "Unexpected field value in snapshot file" msgstr "Uventet filslutt i arkivfilen" -#: src/incremen.c:1264 +#: src/incremen.c:1259 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1325 src/incremen.c:1328 +#: src/incremen.c:1320 src/incremen.c:1323 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1347 +#: src/incremen.c:1342 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1502 +#: src/incremen.c:1496 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1512 +#: src/incremen.c:1506 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1525 +#: src/incremen.c:1519 msgid "Malformed dumpdir: empty name in 'R'" msgstr "" -#: src/incremen.c:1538 +#: src/incremen.c:1532 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1544 +#: src/incremen.c:1538 msgid "Malformed dumpdir: empty name in 'T'" msgstr "" -#: src/incremen.c:1564 +#: src/incremen.c:1558 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1571 +#: src/incremen.c:1565 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1615 +#: src/incremen.c:1609 #, fuzzy, c-format msgid "Cannot create temporary directory using template %s" msgstr "Kan ikke gå til filkatalogen %s" -#: src/incremen.c:1677 +#: src/incremen.c:1670 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1690 +#: src/incremen.c:1683 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "" -#: src/incremen.c:1698 +#: src/incremen.c:1691 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Sletter %s\n" -#: src/incremen.c:1703 +#: src/incremen.c:1696 #, fuzzy, c-format msgid "%s: Cannot remove" msgstr "Kan ikke slette %s" @@ -1171,159 +1175,154 @@ msgstr "blokk %10ld: ** Blokk med NUL-er **\n" msgid "block %s: ** End of File **\n" msgstr "blokk %10ld: ** Slutt på fil **\n" -#: src/list.c:256 src/list.c:1097 src/list.c:1360 +#: src/list.c:256 src/list.c:1093 src/list.c:1356 #, fuzzy, c-format msgid "block %s: " msgstr "blokk %10ld: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:712 +#: src/list.c:708 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:767 +#: src/list.c:763 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:778 +#: src/list.c:774 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "" -#: src/list.c:799 +#: src/list.c:795 msgid "Archive contains obsolescent base-64 headers" msgstr "" -#: src/list.c:813 +#: src/list.c:809 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "" -#: src/list.c:844 +#: src/list.c:840 #, fuzzy, c-format msgid "Archive base-256 value is out of %s range" msgstr "Dette volumet kommer ute av rekkefølge" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:873 +#: src/list.c:869 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:895 +#: src/list.c:891 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "" -#: src/list.c:1261 +#: src/list.c:1257 #, c-format msgid " link to %s\n" msgstr " link til %s\n" -#: src/list.c:1269 +#: src/list.c:1265 #, fuzzy, c-format msgid " unknown file type %s\n" msgstr " ukjent filtype «%c»\n" -#: src/list.c:1287 +#: src/list.c:1283 #, c-format msgid "--Long Link--\n" msgstr "" -#: src/list.c:1291 +#: src/list.c:1287 #, c-format msgid "--Long Name--\n" msgstr "" -#: src/list.c:1295 +#: src/list.c:1291 #, c-format msgid "--Volume Header--\n" msgstr "--Volumhode--\n" -#: src/list.c:1303 +#: src/list.c:1299 #, fuzzy, c-format msgid "--Continued at byte %s--\n" msgstr "--Fortsetter ved byte %ld--\n" -#: src/list.c:1365 +#: src/list.c:1361 msgid "Creating directory:" msgstr "Lager filkatalog:" -#: src/misc.c:298 +#: src/misc.c:297 #, fuzzy msgid "Cannot get working directory" msgstr "Kan ikke gå til filkatalogen %s" -#: src/misc.c:571 +#: src/misc.c:570 #, fuzzy, c-format msgid "Renaming %s to %s\n" msgstr "Endret navn på %s til %s" -#: src/misc.c:580 src/misc.c:599 +#: src/misc.c:579 src/misc.c:598 #, fuzzy, c-format msgid "%s: Cannot rename to %s" msgstr "Kan ikke endre navn på %s til %s" -#: src/misc.c:604 +#: src/misc.c:603 #, fuzzy, c-format msgid "Renaming %s back to %s\n" msgstr "Endret navn på %s til %s" -#: src/misc.c:851 +#: src/misc.c:850 #, c-format msgid "%s: File removed before we read it" msgstr "" -#: src/misc.c:866 -#, fuzzy, c-format -msgid "%s: Directory removed before we read it" -msgstr "Filkatalogen %s har endret navn" - -#: src/misc.c:887 +#: src/misc.c:871 msgid "child process" msgstr "" -#: src/misc.c:896 +#: src/misc.c:880 msgid "interprocess channel" msgstr "" -#: src/names.c:594 +#: src/names.c:590 msgid "Pattern matching characters used in file names" msgstr "" -#: src/names.c:596 +#: src/names.c:592 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" msgstr "" -#: src/names.c:614 src/names.c:630 +#: src/names.c:610 src/names.c:626 #, c-format msgid "%s: Not found in archive" msgstr "%s: Finnes ikke i arkivet" -#: src/names.c:615 +#: src/names.c:611 #, fuzzy, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Finnes ikke i arkivet" -#: src/names.c:649 +#: src/names.c:645 #, fuzzy, c-format msgid "Archive label mismatch" msgstr "Arkivet er ikke navngitt for å passe med «%s»" -#: src/names.c:953 +#: src/names.c:949 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" -#: src/names.c:959 +#: src/names.c:955 msgid "Only one -C option is allowed with --listed-incremental" msgstr "" @@ -2689,6 +2688,10 @@ msgstr "" msgid "--stat requires file names" msgstr "--Ødelagte filnavn--\n" +#, fuzzy +#~ msgid "%s: Directory removed before we read it" +#~ msgstr "Filkatalogen %s har endret navn" + #, fuzzy #~ msgid "Cannot restore working directory" #~ msgstr "Kan ikke gå til filkatalogen %s" diff --git a/po/nl.gmo b/po/nl.gmo index 2e385fe4f84d83582ff5e1a24204f3a875e5e564..34aa28cd74b7b741feb4b90c84b2f9561603a820 100644 GIT binary patch delta 9896 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 X;;N!?_Kk}ZYgQFiR1dwhwDx}iu&W2u diff --git a/po/nl.po b/po/nl.po index 9395734a..eb80308b 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,4 +1,4 @@ -# Dutch translations for tar. +# Dutch translations for GNU tar. # Copyright (C) 2010 Free Software Foundation, Inc. # This file is distributed under the same license as the tar package. # @@ -8,10 +8,10 @@ #: src/create.c:1552 msgid "" msgstr "" -"Project-Id-Version: tar-1.23.90\n" +"Project-Id-Version: tar-1.25\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2010-11-07 17:07+0200\n" -"PO-Revision-Date: 2010-07-12 10:28+0200\n" +"POT-Creation-Date: 2011-03-12 11:53+0200\n" +"PO-Revision-Date: 2010-12-08 12:01+0100\n" "Last-Translator: Benno Schulenberg \n" "Language-Team: Dutch \n" "Language: nl\n" @@ -61,7 +61,7 @@ msgstr "%.*s: Onbekende parameter in ARGP_HELP_FMT" msgid "Garbage in ARGP_HELP_FMT: %s" msgstr "Rommel in ARGP_HELP_FMT: %s" -#: gnu/argp-help.c:1246 +#: gnu/argp-help.c:1248 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." @@ -69,31 +69,31 @@ msgstr "" "Een argument dat verplicht of optioneel is voor een lange optie, is dat\n" "ook voor de overeenkomstige korte optie." -#: gnu/argp-help.c:1639 +#: gnu/argp-help.c:1641 msgid "Usage:" msgstr "Gebruik: " -#: gnu/argp-help.c:1643 +#: gnu/argp-help.c:1645 msgid " or: " msgstr " of: " -#: gnu/argp-help.c:1655 +#: gnu/argp-help.c:1657 msgid " [OPTION...]" msgstr " [OPTIE...]" -#: gnu/argp-help.c:1682 +#: gnu/argp-help.c:1684 #, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Typ '%s --help' of '%s --usage' voor meer informatie.\n" -#: gnu/argp-help.c:1710 +#: gnu/argp-help.c:1712 #, c-format msgid "Report bugs to %s.\n" msgstr "" "Rapporteer gebreken in het programma aan %s;\n" "meld fouten in de vertaling aan .\n" -#: gnu/argp-help.c:1929 gnu/error.c:183 +#: gnu/argp-help.c:1931 gnu/error.c:183 msgid "Unknown system error" msgstr "Onbekende systeemfout" @@ -199,19 +199,19 @@ msgstr "%s: optie '-W %s' staat geen argument toe\n" msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: optie '-W %s' vereist een argument\n" -#: gnu/obstack.c:425 gnu/obstack.c:427 gnu/xalloc-die.c:36 +#: gnu/obstack.c:423 gnu/obstack.c:425 gnu/xalloc-die.c:36 msgid "memory exhausted" msgstr "onvoldoende geheugen beschikbaar" -#: gnu/openat-die.c:36 +#: gnu/openat-die.c:40 #, c-format msgid "unable to record current working directory" msgstr "kan de huidige werkmap niet vastleggen" -#: gnu/openat-die.c:54 +#: gnu/openat-die.c:59 #, c-format msgid "failed to return to initial working directory" -msgstr "kan niet terugkeren naar de initiële werkmap" +msgstr "kan niet terugkeren naar de oorspronkelijke werkmap" #. TRANSLATORS: #. Get translations for open and closing quotation marks. @@ -232,11 +232,11 @@ msgstr "kan niet terugkeren naar de initiële werkmap" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: gnu/quotearg.c:274 +#: gnu/quotearg.c:273 msgid "`" msgstr "‘" -#: gnu/quotearg.c:275 +#: gnu/quotearg.c:274 msgid "'" msgstr "’" @@ -507,21 +507,21 @@ msgid_plural "%s: Wrote only %lu of %lu bytes" msgstr[0] "%s: Slechts %lu van %lu byte geschreven" msgstr[1] "%s: Slechts %lu van %lu bytes geschreven" -#: lib/paxnames.c:155 +#: lib/paxnames.c:140 #, c-format msgid "Removing leading `%s' from member names" msgstr "Leidende '%s' wordt uit lidnamen weggelaten" -#: lib/paxnames.c:156 +#: lib/paxnames.c:141 #, c-format msgid "Removing leading `%s' from hard link targets" msgstr "Leidende '%s' wordt uit doelen van harde koppelingen weggelaten" -#: lib/paxnames.c:169 +#: lib/paxnames.c:154 msgid "Substituting `.' for empty member name" msgstr "Lege lidnaam wordt vervangen door '.'" -#: lib/paxnames.c:170 +#: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" msgstr "Lege doelnaam van harde koppeling wordt vervangen door '.'" @@ -815,20 +815,20 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "Kon slechts %lu van %lu byte lezen" msgstr[1] "Kon slechts %lu van %lu bytes lezen" -#: src/compare.c:105 src/compare.c:382 +#: src/compare.c:105 src/compare.c:383 msgid "Contents differ" msgstr "Inhouden verschillen" -#: src/compare.c:131 src/extract.c:972 src/incremen.c:1462 src/list.c:458 -#: src/list.c:1392 src/xheader.c:711 +#: src/compare.c:131 src/extract.c:984 src/incremen.c:1456 src/list.c:456 +#: src/list.c:1388 src/xheader.c:711 msgid "Unexpected EOF in archive" msgstr "Onverwacht einde-van-bestand in archief" -#: src/compare.c:179 src/compare.c:195 src/compare.c:308 src/compare.c:406 +#: src/compare.c:179 src/compare.c:195 src/compare.c:309 src/compare.c:407 msgid "File type differs" msgstr "Bestandssoort verschilt" -#: src/compare.c:182 src/compare.c:202 src/compare.c:322 +#: src/compare.c:182 src/compare.c:202 src/compare.c:323 msgid "Mode differs" msgstr "Modus verschilt" @@ -844,49 +844,54 @@ msgstr "GID verschilt" msgid "Mod time differs" msgstr "Wijzigingstijd verschilt" -#: src/compare.c:215 src/compare.c:414 +#: src/compare.c:215 src/compare.c:415 msgid "Size differs" msgstr "Grootte verschilt" -#: src/compare.c:263 +#: src/compare.c:264 #, c-format msgid "Not linked to %s" msgstr "Niet gekoppeld aan %s" -#: src/compare.c:287 +#: src/compare.c:288 msgid "Symlink differs" msgstr "Symbolische koppeling verschilt" -#: src/compare.c:316 +#: src/compare.c:317 msgid "Device number differs" msgstr "Apparaatnummer verschilt" -#: src/compare.c:456 +#: src/compare.c:457 #, c-format msgid "Verify " msgstr "Verifiëren " -#: src/compare.c:463 +#: src/compare.c:464 #, c-format msgid "%s: Unknown file type `%c', diffed as normal file" msgstr "%s: Onbekende bestandssoort '%c'; gedifft als gewoon bestand" -#: src/compare.c:518 +#: src/compare.c:520 msgid "Archive contains file names with leading prefixes removed." msgstr "Archief bevat bestandsnamen waarvan de prefixen verwijderd zijn." -#: src/compare.c:520 +#: src/compare.c:526 +#, fuzzy +msgid "Archive contains transformed file names." +msgstr "Archief bevat ouderwetse grondtal-64 koppen" + +#: src/compare.c:531 msgid "Verification may fail to locate original files." msgstr "Een verificatie kan mogelijk de originele bestanden niet vinden." -#: src/compare.c:593 +#: src/compare.c:603 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "Verificatie is MISLUKT: %d ongeldige kop gevonden" msgstr[1] "Verificatie is MISLUKT: %d ongeldige koppen gevonden" -#: src/compare.c:611 src/list.c:222 +#: src/compare.c:621 src/list.c:222 #, c-format msgid "A lone zero block at %s" msgstr "Een los blok met nullen op %s" @@ -938,7 +943,7 @@ msgstr[1] "%s: Bestand is gekrompen met %s bytes; aangevuld met nullen" msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: bestand staat op een ander bestandssysteem; niet gearchiveerd" -#: src/create.c:1203 src/create.c:1214 src/incremen.c:582 src/incremen.c:588 +#: src/create.c:1203 src/create.c:1214 src/incremen.c:578 src/incremen.c:584 msgid "contents not dumped" msgstr "inhoud niet gearchiveerd" @@ -962,7 +967,7 @@ msgstr "%s: bestand is ongewijzigd; niet gearchiveerd" msgid "%s: file is the archive; not dumped" msgstr "%s: bestand is het archief zelf; niet gearchiveerd" -#: src/create.c:1723 src/incremen.c:575 +#: src/create.c:1723 src/incremen.c:571 msgid "directory not dumped" msgstr "map is niet gearchiveerd" @@ -971,12 +976,12 @@ msgstr "map is niet gearchiveerd" msgid "%s: file changed as we read it" msgstr "%s: bestand is gewijzigd tijdens het lezen" -#: src/create.c:1857 +#: src/create.c:1858 #, c-format msgid "%s: socket ignored" msgstr "%s: socket genegeerd" -#: src/create.c:1863 +#: src/create.c:1864 #, c-format msgid "%s: door ignored" msgstr "%s: deur genegeerd" @@ -1004,167 +1009,167 @@ msgstr "%s: tijdsstempel %s ligt %s seconden in de toekomst" msgid "%s: Unexpected inconsistency when making directory" msgstr "%s: Onverwachte inconsistentie tijdens aanmaken van map" -#: src/extract.c:709 +#: src/extract.c:721 #, c-format msgid "%s: Directory renamed before its status could be extracted" msgstr "%s: Map werd hernoemd voordat de status ervan kon worden bepaald" -#: src/extract.c:863 +#: src/extract.c:875 msgid "Extracting contiguous files as regular files" msgstr "Aaneengesloten bestanden worden uitgepakt als gewone bestanden" -#: src/extract.c:1197 +#: src/extract.c:1209 msgid "Attempting extraction of symbolic links as hard links" msgstr "" "Poging om symbolische koppelingen als harde koppelingen uit te pakken..." -#: src/extract.c:1353 +#: src/extract.c:1365 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Kan niet uitpakken -- bestand gaat door vanuit een ander deel" -#: src/extract.c:1360 src/list.c:1125 +#: src/extract.c:1372 src/list.c:1121 msgid "Unexpected long name header" msgstr "Onverwachte langenaamkop" -#: src/extract.c:1367 +#: src/extract.c:1379 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Onbekende bestandssoort '%c'; uitgepakt als gewoon bestand" -#: src/extract.c:1393 +#: src/extract.c:1405 #, c-format msgid "Current %s is newer or same age" msgstr "Huidige %s is nieuwer of even oud" -#: src/extract.c:1445 +#: src/extract.c:1457 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Kan geen reservekopie van dit bestand maken" -#: src/extract.c:1582 +#: src/extract.c:1594 #, c-format msgid "Cannot rename %s to %s" msgstr "Kan %s niet tot %s hernoemen" -#: src/incremen.c:474 src/incremen.c:518 +#: src/incremen.c:473 src/incremen.c:517 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Map is hernoemd van %s" -#: src/incremen.c:486 +#: src/incremen.c:485 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Map is hernoemd" -#: src/incremen.c:531 +#: src/incremen.c:530 #, c-format msgid "%s: Directory is new" msgstr "%s: Map is nieuw" -#: src/incremen.c:956 src/incremen.c:973 +#: src/incremen.c:951 src/incremen.c:968 msgid "Invalid time stamp" msgstr "Ongeldig tijdsstempel" -#: src/incremen.c:1012 +#: src/incremen.c:1007 msgid "Invalid modification time (seconds)" msgstr "Ongeldige wijzigingstijd (seconden)" -#: src/incremen.c:1027 +#: src/incremen.c:1022 msgid "Invalid modification time (nanoseconds)" msgstr "Ongeldige wijzigingstijd (nanoseconden)" -#: src/incremen.c:1047 +#: src/incremen.c:1042 msgid "Invalid device number" msgstr "Ongeldig apparaatnummer" -#: src/incremen.c:1062 +#: src/incremen.c:1057 msgid "Invalid inode number" msgstr "Ongeldig inode-nummer" -#: src/incremen.c:1113 src/incremen.c:1150 +#: src/incremen.c:1108 src/incremen.c:1145 msgid "Field too long while reading snapshot file" msgstr "Veld is te lang, tijdens lezen van snapshot-bestand" -#: src/incremen.c:1120 src/incremen.c:1158 +#: src/incremen.c:1115 src/incremen.c:1153 msgid "Read error in snapshot file" msgstr "Leesfout tijdens lezen van snapshot-bestand" -#: src/incremen.c:1122 src/incremen.c:1162 src/incremen.c:1214 -#: src/incremen.c:1272 +#: src/incremen.c:1117 src/incremen.c:1157 src/incremen.c:1209 +#: src/incremen.c:1267 msgid "Unexpected EOF in snapshot file" msgstr "Onverwacht einde-van-bestand in snapshot-bestand" -#: src/incremen.c:1129 src/incremen.c:1169 +#: src/incremen.c:1124 src/incremen.c:1164 msgid "Unexpected field value in snapshot file" msgstr "Onverwachte veldwaarde in snapshot-bestand" -#: src/incremen.c:1264 +#: src/incremen.c:1259 msgid "Missing record terminator" msgstr "Ontbrekende record-afsluiting" -#: src/incremen.c:1325 src/incremen.c:1328 +#: src/incremen.c:1320 src/incremen.c:1323 msgid "Bad incremental file format" msgstr "Onjuiste incrementele bestandsindeling" -#: src/incremen.c:1347 +#: src/incremen.c:1342 #, c-format msgid "Unsupported incremental format version: %" msgstr "" "Niet-ondersteunde versie (%) van incrementele bestandsindeling" -#: src/incremen.c:1502 +#: src/incremen.c:1496 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "Onjuiste archiveringsmap: '%c' werd verwacht maar %#3o gevonden" -#: src/incremen.c:1512 +#: src/incremen.c:1506 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Onjuiste archiveringsmap: 'X' staat er dubbel" -#: src/incremen.c:1525 +#: src/incremen.c:1519 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Onjuiste archiveringsmap: lege naam in 'R'" -#: src/incremen.c:1538 +#: src/incremen.c:1532 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Onjuiste archiveringsmap: 'T' werd niet voorafgegaan door 'R'" -#: src/incremen.c:1544 +#: src/incremen.c:1538 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Onjuiste archiveringsmap: lege naam in 'T'" -#: src/incremen.c:1564 +#: src/incremen.c:1558 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" "Onjuiste archiveringsmap: '%c' werd verwacht, maar de gegevens houden op" -#: src/incremen.c:1571 +#: src/incremen.c:1565 msgid "Malformed dumpdir: 'X' never used" msgstr "Onjuiste archiveringsmap: 'X' is nergens gebruikt" -#: src/incremen.c:1615 +#: src/incremen.c:1609 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Kan met sjabloon %s geen tijdelijke map aanmaken" -#: src/incremen.c:1677 +#: src/incremen.c:1670 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Map wordt niet leeggemaakt: kan de status ervan niet bepalen" -#: src/incremen.c:1690 +#: src/incremen.c:1683 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: Map staat op een ander bestandssysteem; niet leeggemaakt" -#: src/incremen.c:1698 +#: src/incremen.c:1691 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Verwijderen van %s...\n" -#: src/incremen.c:1703 +#: src/incremen.c:1696 #, c-format msgid "%s: Cannot remove" msgstr "%s: Kan niet verwijderen" @@ -1184,20 +1189,20 @@ msgstr "blok %s: ** Blok van NUL-tekens **\n" msgid "block %s: ** End of File **\n" msgstr "blok %s: ** Einde-van-bestand **\n" -#: src/list.c:256 src/list.c:1097 src/list.c:1360 +#: src/list.c:256 src/list.c:1093 src/list.c:1356 #, c-format msgid "block %s: " msgstr "blok %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:712 +#: src/list.c:708 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Witruimte in kop waar numerieke waarde voor %s werd verwacht" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:767 +#: src/list.c:763 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1205,114 +1210,108 @@ msgstr "" "aangenomen" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:778 +#: src/list.c:774 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Octaalwaarde %.*s in archief valt buiten bereik voor %s" -#: src/list.c:799 +#: src/list.c:795 msgid "Archive contains obsolescent base-64 headers" msgstr "Archief bevat ouderwetse grondtal-64 koppen" -#: src/list.c:813 +#: src/list.c:809 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "Tekenreeks %s (met grondtal-64-met-teken) valt buiten bereik voor %s" -#: src/list.c:844 +#: src/list.c:840 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Grondtal-256 waarde in archief valt buiten bereik voor %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:873 +#: src/list.c:869 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Archief bevat %.*s waar numerieke waarde voor %s werd verwacht" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:895 +#: src/list.c:891 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Waarde %s in archief valt buiten bereik voor %s (%s..%s)" -#: src/list.c:1261 +#: src/list.c:1257 #, c-format msgid " link to %s\n" msgstr " koppeling naar %s\n" -#: src/list.c:1269 +#: src/list.c:1265 #, c-format msgid " unknown file type %s\n" msgstr " onbekende bestandssoort %s\n" -#: src/list.c:1287 +#: src/list.c:1283 #, c-format msgid "--Long Link--\n" msgstr "--Lange koppeling--\n" -#: src/list.c:1291 +#: src/list.c:1287 #, c-format msgid "--Long Name--\n" msgstr "--Lange naam--\n" -#: src/list.c:1295 +#: src/list.c:1291 #, c-format msgid "--Volume Header--\n" msgstr "--Deelkop--\n" -#: src/list.c:1303 +#: src/list.c:1299 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Verder bij byte %s--\n" -#: src/list.c:1365 +#: src/list.c:1361 msgid "Creating directory:" msgstr "Aanmaken van map:" -#: src/misc.c:298 -#, fuzzy +#: src/misc.c:297 msgid "Cannot get working directory" -msgstr "Kan werkmap niet wijzigen" +msgstr "Kan werkmap niet achterhalen" -#: src/misc.c:571 +#: src/misc.c:570 #, c-format msgid "Renaming %s to %s\n" -msgstr "Hernoemen van %s tot %s...\n" +msgstr "Hernoemen van %s naar %s...\n" -#: src/misc.c:580 src/misc.c:599 +#: src/misc.c:579 src/misc.c:598 #, c-format msgid "%s: Cannot rename to %s" -msgstr "%s: Kan niet tot %s hernoemen" +msgstr "Kan %s niet naar %s hernoemen" -#: src/misc.c:604 +#: src/misc.c:603 #, c-format msgid "Renaming %s back to %s\n" -msgstr "Hernoemen van %s terug tot %s...\n" +msgstr "Hernoemen van %s terug naar %s...\n" -#: src/misc.c:851 +#: src/misc.c:850 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Bestand werd verwijderd voordat het gelezen kon worden" -#: src/misc.c:866 -#, c-format -msgid "%s: Directory removed before we read it" -msgstr "%s: Map werd verwijderd voordat deze gelezen kon worden" - -#: src/misc.c:887 +#: src/misc.c:871 msgid "child process" msgstr "dochterproces" -#: src/misc.c:896 +#: src/misc.c:880 msgid "interprocess channel" msgstr "interproces-kanaal" -#: src/names.c:594 +#: src/names.c:590 msgid "Pattern matching characters used in file names" msgstr "Bestandsnamen bevatten jokertekens." -#: src/names.c:596 +#: src/names.c:592 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" @@ -1320,28 +1319,28 @@ msgstr "" "Gebruik '--wildcards' om patroonovereenkomsten in te schakelen,\n" "of '--no-wildcards' om deze waarschuwing te onderdrukken." -#: src/names.c:614 src/names.c:630 +#: src/names.c:610 src/names.c:626 #, c-format msgid "%s: Not found in archive" msgstr "%s: Komt niet voor in archief" -#: src/names.c:615 +#: src/names.c:611 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Is vereist maar komt niet voor in archief" -#: src/names.c:649 +#: src/names.c:645 #, c-format msgid "Archive label mismatch" msgstr "Archieflabel komt niet overeen" -#: src/names.c:953 +#: src/names.c:949 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" "Met '--listed-incremental' is '-C' niet toegestaan binnen een bestandenlijst" -#: src/names.c:959 +#: src/names.c:955 msgid "Only one -C option is allowed with --listed-incremental" msgstr "Met '--listed-incremental' is slechts één '-C' toegestaan" @@ -1463,7 +1462,7 @@ msgstr "HOOFD[.SUB]" #: src/tar.c:419 msgid "set version of the sparse format to use (implies --sparse)" -msgstr "versie van te gebruiken luchtige indeling (impliceert --sparse)" +msgstr "versie van te gebruiken luchtige indeling (impliceert '--sparse')" #: src/tar.c:421 msgid "handle old GNU-format incremental backup" @@ -1716,7 +1715,7 @@ msgstr "band wisselen na schrijven van AANTAL x 1024 bytes" #: src/tar.c:561 msgid "run script at end of each tape (implies -M)" -msgstr "script uitvoeren aan einde van elke band (impliceert -M)" +msgstr "script uitvoeren aan einde van elke band (impliceert '-M')" #: src/tar.c:564 msgid "use/update the volume number in FILE" @@ -2107,7 +2106,7 @@ msgstr "gedetailleerde uitvoer naar BESTAND sturen" #: src/tar.c:762 msgid "show block number within archive with each message" -msgstr "blokgetal binnen archief tonen bij elk bericht" +msgstr "bloknummer binnen archief tonen bij elk bericht" #: src/tar.c:764 msgid "ask for confirmation for every action" @@ -2115,7 +2114,7 @@ msgstr "bij elke actie om toestemming vragen" #: src/tar.c:767 msgid "show tar defaults" -msgstr "standaardinstellingen van tar tonen" +msgstr "standaardinstellingen van 'tar' tonen" #: src/tar.c:769 msgid "" @@ -2318,11 +2317,12 @@ msgstr "Oude optie '%c' vereist een argument." #: src/tar.c:2374 msgid "--occurrence is meaningless without a file list" -msgstr "'--occurrence' betekent niets zonder een bestandenlijst" +msgstr "Optie '--occurrence' betekent niets zonder een bestandenlijst" #: src/tar.c:2380 msgid "--occurrence cannot be used in the requested operation mode" -msgstr "'--occurrence' kan niet worden gebruikt in de gevraagde werkingsmodus" +msgstr "" +"Optie '--occurrence' kan niet worden gebruikt in de gevraagde werkingsmodus" #: src/tar.c:2398 msgid "Multiple archive files require `-M' option" @@ -2361,7 +2361,7 @@ msgstr "Kan ingepakte archieven niet samenvoegen" #: src/tar.c:2462 msgid "--pax-option can be used only on POSIX archives" -msgstr "optie '--pax' kan alleen worden gebruikt bij POSIX-archieven" +msgstr "Optie '--pax' kan alleen worden gebruikt bij POSIX-archieven" #: src/tar.c:2492 msgid "Volume length cannot be less than record size" @@ -2520,7 +2520,8 @@ msgid "" "genfile manipulates data files for GNU paxutils test suite.\n" "OPTIONS are:\n" msgstr "" -"genfile manipuleert gegevensbestanden voor de testreeksen van GNU paxutils.\n" +"'genfile' manipuleert gegevensbestanden voor de testreeksen van GNU " +"paxutils.\n" "OPTIES zijn:\n" #: tests/genfile.c:127 @@ -2766,5 +2767,8 @@ msgstr "Opdracht is afgebroken\n" msgid "--stat requires file names" msgstr "Optie '--stat' vereist bestandsnamen" +#~ msgid "%s: Directory removed before we read it" +#~ msgstr "%s: Map werd verwijderd voordat deze gelezen kon worden" + #~ msgid "Cannot save working directory" #~ msgstr "Kan werkmap niet opslaan" diff --git a/po/pl.gmo b/po/pl.gmo index e8c8f1fe72e1149f4286953716512bc267841084..dd98b294ad2da252ecf6e029283ac675bbb2a633 100644 GIT binary patch delta 9695 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 delta 9665 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 B%Mkzo diff --git a/po/pl.po b/po/pl.po index c9260277..423a2ef1 100644 --- a/po/pl.po +++ b/po/pl.po @@ -2,14 +2,14 @@ # Copyright (C) 1996, 1997, 2000, 2001, 2003, 2004, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. # This file is distributed under the same license as the tar package. # Rafał Maszkowski , 1996, 1997, 2000, 2001, 2003, 2004, 2006-2010. „” -# Thanks to Jakub Bogusz for remarks and corrections, 2003, 2004, 2007, 2008 +# Thanks to Jakub Bogusz for remarks and corrections, 2003, 2004, 2007, 2008, 2010 #: src/create.c:1552 msgid "" msgstr "" -"Project-Id-Version: tar 1.23.90\n" +"Project-Id-Version: tar 1.24\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2010-11-07 17:07+0200\n" -"PO-Revision-Date: 2010-07-13 14:50+0200\n" +"POT-Creation-Date: 2011-03-12 11:53+0200\n" +"PO-Revision-Date: 2010-10-25 23:10+0200\n" "Last-Translator: Rafał Maszkowski \n" "Language-Team: Polish \n" "Language: pl\n" @@ -59,7 +59,7 @@ msgstr "%.*s: Nieznany parametr ARGP_HELP_FMT" msgid "Garbage in ARGP_HELP_FMT: %s" msgstr "Śmieci w ARGP_HELP_FMT: %s" -#: gnu/argp-help.c:1246 +#: gnu/argp-help.c:1248 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." @@ -67,29 +67,29 @@ msgstr "" "Argumenty obowiązkowe lub opcjonalne dla opcji długich są również " "obowiązkowe lub opcjonalne również dla odpowiadających im opcji krótkich." -#: gnu/argp-help.c:1639 +#: gnu/argp-help.c:1641 msgid "Usage:" msgstr "Składnia:" -#: gnu/argp-help.c:1643 +#: gnu/argp-help.c:1645 msgid " or: " msgstr " albo: " -#: gnu/argp-help.c:1655 +#: gnu/argp-help.c:1657 msgid " [OPTION...]" msgstr "[OPCJE...]" -#: gnu/argp-help.c:1682 +#: gnu/argp-help.c:1684 #, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Użyj `%s --help' albo `%s --usage' żeby otrzymać więcej informacji\n" -#: gnu/argp-help.c:1710 +#: gnu/argp-help.c:1712 #, c-format msgid "Report bugs to %s.\n" msgstr "Raporty o błędach należy wysyłać do %s .\n" -#: gnu/argp-help.c:1929 gnu/error.c:183 +#: gnu/argp-help.c:1931 gnu/error.c:183 msgid "Unknown system error" msgstr "Nieznany błąd systemu" @@ -195,16 +195,16 @@ msgstr "%s: opcja '-W %s' nie może mieć argumentu\n" msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: opcja '-W %s' wymaga argumentu\n" -#: gnu/obstack.c:425 gnu/obstack.c:427 gnu/xalloc-die.c:36 +#: gnu/obstack.c:423 gnu/obstack.c:425 gnu/xalloc-die.c:36 msgid "memory exhausted" msgstr "brak pamięci" -#: gnu/openat-die.c:36 +#: gnu/openat-die.c:40 #, c-format msgid "unable to record current working directory" msgstr "nie udało się zapisać bieżącego katalogu" -#: gnu/openat-die.c:54 +#: gnu/openat-die.c:59 #, c-format msgid "failed to return to initial working directory" msgstr "nie udało się powrócić do początkowego katalogu bieżącego" @@ -228,11 +228,11 @@ msgstr "nie udało się powrócić do początkowego katalogu bieżącego" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: gnu/quotearg.c:274 +#: gnu/quotearg.c:273 msgid "`" msgstr "`" -#: gnu/quotearg.c:275 +#: gnu/quotearg.c:274 msgid "'" msgstr "'" @@ -503,22 +503,22 @@ msgstr[0] "%s: Można było zapisać tylko %lu z %lu bajtu" msgstr[1] "%s: Można było zapisać tylko %lu z %lu bajtów" msgstr[2] "%s: Można było zapisać tylko %lu z %lu bajtów" -#: lib/paxnames.c:155 +#: lib/paxnames.c:140 #, c-format msgid "Removing leading `%s' from member names" msgstr "Usunięcie początkowego `%s' z nazw plików" -#: lib/paxnames.c:156 +#: lib/paxnames.c:141 #, c-format msgid "Removing leading `%s' from hard link targets" msgstr "" "Usunięcie początkowego `%s' z nazw plików wskazywanych przez łącza zwykłe" -#: lib/paxnames.c:169 +#: lib/paxnames.c:154 msgid "Substituting `.' for empty member name" msgstr "Podstawienie `.' zamiast pustej nazwy" -#: lib/paxnames.c:170 +#: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" msgstr "Podstawienie `.' zamiast pustej nazwy wskazywanej przez łącze zwykłe" @@ -818,20 +818,20 @@ msgstr[0] "Można było przeczytać tylko %lu z %lu bajtu" msgstr[1] "Można było przeczytać tylko %lu z %lu bajtów" msgstr[2] "Można było przeczytać tylko %lu z %lu bajtów" -#: src/compare.c:105 src/compare.c:382 +#: src/compare.c:105 src/compare.c:383 msgid "Contents differ" msgstr "Zawartości się różnią" -#: src/compare.c:131 src/extract.c:972 src/incremen.c:1462 src/list.c:458 -#: src/list.c:1392 src/xheader.c:711 +#: src/compare.c:131 src/extract.c:984 src/incremen.c:1456 src/list.c:456 +#: src/list.c:1388 src/xheader.c:711 msgid "Unexpected EOF in archive" msgstr "Nieoczekiwany EOF w archiwum" -#: src/compare.c:179 src/compare.c:195 src/compare.c:308 src/compare.c:406 +#: src/compare.c:179 src/compare.c:195 src/compare.c:309 src/compare.c:407 msgid "File type differs" msgstr "Różne typy plików" -#: src/compare.c:182 src/compare.c:202 src/compare.c:322 +#: src/compare.c:182 src/compare.c:202 src/compare.c:323 msgid "Mode differs" msgstr "Uprawnienia się różnią" @@ -847,42 +847,47 @@ msgstr "Gid się różni" msgid "Mod time differs" msgstr "Czas modyfikacji się różni" -#: src/compare.c:215 src/compare.c:414 +#: src/compare.c:215 src/compare.c:415 msgid "Size differs" msgstr "Rozmiar się różni" -#: src/compare.c:263 +#: src/compare.c:264 #, c-format msgid "Not linked to %s" msgstr "Nie dołączony do %s" -#: src/compare.c:287 +#: src/compare.c:288 msgid "Symlink differs" msgstr "Łącze symboliczne się różni" -#: src/compare.c:316 +#: src/compare.c:317 msgid "Device number differs" msgstr "Różnią się numery urządzeń" -#: src/compare.c:456 +#: src/compare.c:457 #, c-format msgid "Verify " msgstr "Sprawdzanie " -#: src/compare.c:463 +#: src/compare.c:464 #, c-format msgid "%s: Unknown file type `%c', diffed as normal file" msgstr "%s: Nieznany typ pliku `%c' porównywany jako zwykły plik" -#: src/compare.c:518 +#: src/compare.c:520 msgid "Archive contains file names with leading prefixes removed." msgstr "Archiwum zawiera nazwy plików bez początkowych elementów ścieżek." -#: src/compare.c:520 +#: src/compare.c:526 +#, fuzzy +msgid "Archive contains transformed file names." +msgstr "Archiwum zawiera przestarzałe nagłówki base64" + +#: src/compare.c:531 msgid "Verification may fail to locate original files." msgstr "Podczas weryfikacji mogą nie być znalezione pliki lokalne" -#: src/compare.c:593 +#: src/compare.c:603 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" @@ -890,7 +895,7 @@ msgstr[0] "BŁĄD WERYFIKACJI: wykryto %d błędny nagłówek" msgstr[1] "BŁĄD WERYFIKACJI: wykryto %d błędne nagłówki" msgstr[2] "BŁĄD WERYFIKACJI: wykryto %d błędnych nagłówków" -#: src/compare.c:611 src/list.c:222 +#: src/compare.c:621 src/list.c:222 #, c-format msgid "A lone zero block at %s" msgstr "Samotny blok zerowy przy %s" @@ -944,7 +949,7 @@ msgstr[2] "%s: Plik skurczył się o %s bajtów; jest dopełniany zerami" msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: plik w innym systemie plików; nie został zapisany" -#: src/create.c:1203 src/create.c:1214 src/incremen.c:582 src/incremen.c:588 +#: src/create.c:1203 src/create.c:1214 src/incremen.c:578 src/incremen.c:584 msgid "contents not dumped" msgstr "zawartość nie została zapisana" @@ -968,7 +973,7 @@ msgstr "%s: plik jest niezmieniony; nie został zapisany" msgid "%s: file is the archive; not dumped" msgstr "%s: plik jest w tym archiwum; nie został zapisany" -#: src/create.c:1723 src/incremen.c:575 +#: src/create.c:1723 src/incremen.c:571 msgid "directory not dumped" msgstr "katalog nie został zapisany" @@ -977,12 +982,12 @@ msgstr "katalog nie został zapisany" msgid "%s: file changed as we read it" msgstr "%s: plik zmienił się w trakcie czytania" -#: src/create.c:1857 +#: src/create.c:1858 #, c-format msgid "%s: socket ignored" msgstr "%s: zignorowane gniazdo z nazwą" -#: src/create.c:1863 +#: src/create.c:1864 #, c-format msgid "%s: door ignored" msgstr "%s: zignorowany plik door" @@ -1010,164 +1015,164 @@ msgstr "%s: znacznik czasowy %s jest przesunięty o %s s w przyszłość" msgid "%s: Unexpected inconsistency when making directory" msgstr "%s: Nieoczekiwana niespójność przy zakładaniu katalogu" -#: src/extract.c:709 +#: src/extract.c:721 #, c-format msgid "%s: Directory renamed before its status could be extracted" msgstr "%s: Katalog zmienił nazwę zanim można było odtworzyć jego status" -#: src/extract.c:863 +#: src/extract.c:875 msgid "Extracting contiguous files as regular files" msgstr "Odtwarzanie plików ciągłych (nie sparse) jako zwykłych" -#: src/extract.c:1197 +#: src/extract.c:1209 msgid "Attempting extraction of symbolic links as hard links" msgstr "Próba odtworzenia łącza symbolicznego jako zwykłego" -#: src/extract.c:1353 +#: src/extract.c:1365 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Nie można odtworzyć -- plik jest kontynuowany z innej części" -#: src/extract.c:1360 src/list.c:1125 +#: src/extract.c:1372 src/list.c:1121 msgid "Unexpected long name header" msgstr "Niespodziewany nagłówek z długą nazwą" -#: src/extract.c:1367 +#: src/extract.c:1379 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Nieznany typ pliku `%c', odtworzony jako plik zwykły" -#: src/extract.c:1393 +#: src/extract.c:1405 #, c-format msgid "Current %s is newer or same age" msgstr "Aktualny %s jest nowszy albo w tym samym wieku" -#: src/extract.c:1445 +#: src/extract.c:1457 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Nie można było zrobić kopii zapasowej tego pliku" -#: src/extract.c:1582 +#: src/extract.c:1594 #, c-format msgid "Cannot rename %s to %s" msgstr "Nie można przemianować %s na %s" -#: src/incremen.c:474 src/incremen.c:518 +#: src/incremen.c:473 src/incremen.c:517 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Nazwa katalogu została zmieniona z %s" -#: src/incremen.c:486 +#: src/incremen.c:485 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Nazwa katalogu została zmieniona" -#: src/incremen.c:531 +#: src/incremen.c:530 #, c-format msgid "%s: Directory is new" msgstr "%s: Katalog jest nowy" -#: src/incremen.c:956 src/incremen.c:973 +#: src/incremen.c:951 src/incremen.c:968 msgid "Invalid time stamp" msgstr "Błędny czas pliku" -#: src/incremen.c:1012 +#: src/incremen.c:1007 msgid "Invalid modification time (seconds)" msgstr "Błędny czas modyfikacji (sekundy)" -#: src/incremen.c:1027 +#: src/incremen.c:1022 msgid "Invalid modification time (nanoseconds)" msgstr "Błędny czas modyfikacji (nanosekundy)" -#: src/incremen.c:1047 +#: src/incremen.c:1042 msgid "Invalid device number" msgstr "Błędny numer urządzenia" -#: src/incremen.c:1062 +#: src/incremen.c:1057 msgid "Invalid inode number" msgstr "Błędny numer inodu" -#: src/incremen.c:1113 src/incremen.c:1150 +#: src/incremen.c:1108 src/incremen.c:1145 msgid "Field too long while reading snapshot file" msgstr "Za długie pole w pliku migawkowym" -#: src/incremen.c:1120 src/incremen.c:1158 +#: src/incremen.c:1115 src/incremen.c:1153 msgid "Read error in snapshot file" msgstr "Błąd czytania pliku migawkowego" -#: src/incremen.c:1122 src/incremen.c:1162 src/incremen.c:1214 -#: src/incremen.c:1272 +#: src/incremen.c:1117 src/incremen.c:1157 src/incremen.c:1209 +#: src/incremen.c:1267 msgid "Unexpected EOF in snapshot file" msgstr "Nieoczekiwany EOF w pliku migawkowym" -#: src/incremen.c:1129 src/incremen.c:1169 +#: src/incremen.c:1124 src/incremen.c:1164 msgid "Unexpected field value in snapshot file" msgstr "Nieoczekiwana wartość pola w pliku migawkowym" -#: src/incremen.c:1264 +#: src/incremen.c:1259 msgid "Missing record terminator" msgstr "Brakujące zakończenie rekordu" -#: src/incremen.c:1325 src/incremen.c:1328 +#: src/incremen.c:1320 src/incremen.c:1323 msgid "Bad incremental file format" msgstr "Zły format pliku przyrostowego" -#: src/incremen.c:1347 +#: src/incremen.c:1342 #, c-format msgid "Unsupported incremental format version: %" msgstr "Nie obsługiwana wersja formatu przyrostowego: %" -#: src/incremen.c:1502 +#: src/incremen.c:1496 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "Zły format katalogu zrzutów: oczekiwano '%c', znaleziono %#3o" -#: src/incremen.c:1512 +#: src/incremen.c:1506 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Zły format katalogu zrzutów: powtórzone 'X'" -#: src/incremen.c:1525 +#: src/incremen.c:1519 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Zły format katalogu zrzutów: pusta nazwa w 'R'" -#: src/incremen.c:1538 +#: src/incremen.c:1532 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Zły format katalogu zrzutów: 'T' nie jest poprzedzone przez 'R'" -#: src/incremen.c:1544 +#: src/incremen.c:1538 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Zły format katalogu zrzutów: pusta nazwa w 'T'" -#: src/incremen.c:1564 +#: src/incremen.c:1558 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "Zły format katalogu zrzutów: oczekiwano '%c', znaleziono koniec danych" -#: src/incremen.c:1571 +#: src/incremen.c:1565 msgid "Malformed dumpdir: 'X' never used" msgstr "Zły format katalogu zrzutów: nigdy nie użyte 'X'" -#: src/incremen.c:1615 +#: src/incremen.c:1609 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Nie można utworzyć katalogu tymczasowego przy użyciu wzorca %s" -#: src/incremen.c:1677 +#: src/incremen.c:1670 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Bez skasowania katalogu: nie można odczytać stanu" -#: src/incremen.c:1690 +#: src/incremen.c:1683 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: katalog na innym urządzeniu: bez skasowania" -#: src/incremen.c:1698 +#: src/incremen.c:1691 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Usunięcie %s\n" -#: src/incremen.c:1703 +#: src/incremen.c:1696 #, c-format msgid "%s: Cannot remove" msgstr "%s: Nie można usunąć" @@ -1187,20 +1192,20 @@ msgstr "blok %s: ** Blok zer **\n" msgid "block %s: ** End of File **\n" msgstr "blok: %s: ** Koniec pliku **\n" -#: src/list.c:256 src/list.c:1097 src/list.c:1360 +#: src/list.c:256 src/list.c:1093 src/list.c:1356 #, c-format msgid "block %s: " msgstr "blok %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:712 +#: src/list.c:708 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Odstępy w nagłówku zamiast spodziewanej wartości numerycznej %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:767 +#: src/list.c:763 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1208,114 +1213,108 @@ msgstr "" "jak uzupełnienie dwójkowe" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:778 +#: src/list.c:774 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Wartość ósemkowa %.*s w archiwum jest spoza zakresu %s" -#: src/list.c:799 +#: src/list.c:795 msgid "Archive contains obsolescent base-64 headers" msgstr "Archiwum zawiera przestarzałe nagłówki base64" -#: src/list.c:813 +#: src/list.c:809 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "W archiwum jest łańcuch base64 %s spoza zakresu %s" -#: src/list.c:844 +#: src/list.c:840 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Wartość base256 w archiwum jest spoza zakresu %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:873 +#: src/list.c:869 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Archiwum zawiera %.*s tam gdzie oczekiwana była liczba %s" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:895 +#: src/list.c:891 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Wartość %s w archiwum jest spoza zakresu %s %s..%s" -#: src/list.c:1261 +#: src/list.c:1257 #, c-format msgid " link to %s\n" msgstr " łącze do %s\n" -#: src/list.c:1269 +#: src/list.c:1265 #, c-format msgid " unknown file type %s\n" msgstr " nieznany typ pliku %s\n" -#: src/list.c:1287 +#: src/list.c:1283 #, c-format msgid "--Long Link--\n" msgstr "--Długie łącze--\n" -#: src/list.c:1291 +#: src/list.c:1287 #, c-format msgid "--Long Name--\n" msgstr "--Długa nazwa--\n" -#: src/list.c:1295 +#: src/list.c:1291 #, c-format msgid "--Volume Header--\n" msgstr "--Nagłówek części--\n" -#: src/list.c:1303 +#: src/list.c:1299 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Kontynuacja od bajtu %s--\n" -#: src/list.c:1365 +#: src/list.c:1361 msgid "Creating directory:" msgstr "Tworzony jest katalog:" -#: src/misc.c:298 -#, fuzzy +#: src/misc.c:297 msgid "Cannot get working directory" -msgstr "Nie można zmienić katalogu" +msgstr "Nie można odczytać bieżącego katalogu" -#: src/misc.c:571 +#: src/misc.c:570 #, c-format msgid "Renaming %s to %s\n" msgstr "Nazwa %s zmieniona na %s\n" -#: src/misc.c:580 src/misc.c:599 +#: src/misc.c:579 src/misc.c:598 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: Nie można przemianować na %s" -#: src/misc.c:604 +#: src/misc.c:603 #, c-format msgid "Renaming %s back to %s\n" msgstr "Nazwa zmieniona z %s z powrotem na %s\n" -#: src/misc.c:851 +#: src/misc.c:850 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Plik usunięty zanim został przeczytany" -#: src/misc.c:866 -#, c-format -msgid "%s: Directory removed before we read it" -msgstr "%s: Katalog usunięty zanim został przeczytany" - -#: src/misc.c:887 +#: src/misc.c:871 msgid "child process" msgstr "proces potomny" -#: src/misc.c:896 +#: src/misc.c:880 msgid "interprocess channel" msgstr "kanał między procesami" -#: src/names.c:594 +#: src/names.c:590 msgid "Pattern matching characters used in file names" msgstr "W nazwach plików użyto znaków dopasowania wzorców" -#: src/names.c:596 +#: src/names.c:592 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" @@ -1323,29 +1322,29 @@ msgstr "" "Użyj --wildcards aby włączyć porównywanie wzorców albo --no-wildcards żeby " "wyłączyć to ostrzeżenie" -#: src/names.c:614 src/names.c:630 +#: src/names.c:610 src/names.c:626 #, c-format msgid "%s: Not found in archive" msgstr "%s: Nie znalazłem w archiwum" -#: src/names.c:615 +#: src/names.c:611 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Brak podanego wystąpienia pliku w archiwum" -#: src/names.c:649 +#: src/names.c:645 #, c-format msgid "Archive label mismatch" msgstr "Nie pasująca etykieta archiwum" -#: src/names.c:953 +#: src/names.c:949 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" "Nie jest dozwolone używanie opcji -C wewnątrz listy plików razem z --listed-" "incremental" -#: src/names.c:959 +#: src/names.c:955 msgid "Only one -C option is allowed with --listed-incremental" msgstr "Z --listed-incremental można użyć tylko jednej opcji -C" @@ -2761,5 +2760,5 @@ msgstr "Polecenie zakończone\n" msgid "--stat requires file names" msgstr "--stat wymaga podania nazwy pliku" -#~ msgid "Cannot save working directory" -#~ msgstr "Nie można zapisać bieżącego katalogu" +#~ msgid "%s: Directory removed before we read it" +#~ msgstr "%s: Katalog usunięty zanim został przeczytany" diff --git a/po/pt.gmo b/po/pt.gmo index b0e164e01e48ab226e3e8625381a56f4ecc4352a..4d5052fe4f0ed5ab73705f0f29c7fd42b7f4f8ff 100644 GIT binary patch delta 26 icmZ1=yFhlsJ9b_}T?1oXLn8%4Ln~9`&A-`~vH<{Y@(2O| delta 26 icmZ1=yFhlsJ9b_JT|+}%19JsKb1MV$&A-`~vH<{ZEC>kz diff --git a/po/pt.po b/po/pt.po index 5f998483..3efe6d03 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tar 1.11.9\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2010-11-07 17:07+0200\n" +"POT-Creation-Date: 2011-03-12 11:53+0200\n" "PO-Revision-Date: 1996-04-20 21:50\n" "Last-Translator: António José Coutinho \n" "Language-Team: Portuguese \n" @@ -56,7 +56,7 @@ msgstr "" msgid "Garbage in ARGP_HELP_FMT: %s" msgstr "" -#: gnu/argp-help.c:1246 +#: gnu/argp-help.c:1248 #, fuzzy msgid "" "Mandatory or optional arguments to long options are also mandatory or " @@ -65,32 +65,32 @@ msgstr "" "Os argumentos obrigatórios ou opcionais para as opções longas também\n" "são obrigatórios ou opcionais para as correspondentes opções curtas.\n" -#: gnu/argp-help.c:1639 +#: gnu/argp-help.c:1641 msgid "Usage:" msgstr "" -#: gnu/argp-help.c:1643 +#: gnu/argp-help.c:1645 msgid " or: " msgstr "" -#: gnu/argp-help.c:1655 +#: gnu/argp-help.c:1657 #, fuzzy msgid " [OPTION...]" msgstr "" "\n" "Forma de usar: %s [OPÇÃO]...\n" -#: gnu/argp-help.c:1682 +#: gnu/argp-help.c:1684 #, fuzzy, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Para mais informação, tente \"%s --help\".\n" -#: gnu/argp-help.c:1710 +#: gnu/argp-help.c:1712 #, c-format msgid "Report bugs to %s.\n" msgstr "" -#: gnu/argp-help.c:1929 gnu/error.c:183 +#: gnu/argp-help.c:1931 gnu/error.c:183 msgid "Unknown system error" msgstr "Erro desconhecido, do sistema" @@ -197,16 +197,16 @@ msgstr "A antiga op msgid "%s: option '-W %s' requires an argument\n" msgstr "A antiga opção `%c' exige um argumento." -#: gnu/obstack.c:425 gnu/obstack.c:427 gnu/xalloc-die.c:36 +#: gnu/obstack.c:423 gnu/obstack.c:425 gnu/xalloc-die.c:36 msgid "memory exhausted" msgstr "" -#: gnu/openat-die.c:36 +#: gnu/openat-die.c:40 #, fuzzy, c-format msgid "unable to record current working directory" msgstr "Não se conseguiu determinar a directoria corrente" -#: gnu/openat-die.c:54 +#: gnu/openat-die.c:59 #, c-format msgid "failed to return to initial working directory" msgstr "" @@ -230,11 +230,11 @@ msgstr "" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: gnu/quotearg.c:274 +#: gnu/quotearg.c:273 msgid "`" msgstr "" -#: gnu/quotearg.c:275 +#: gnu/quotearg.c:274 msgid "'" msgstr "" @@ -483,21 +483,21 @@ msgid_plural "%s: Wrote only %lu of %lu bytes" msgstr[0] "%s: Apenas se conseguiu escrever %d de um total de %d bytes" msgstr[1] "%s: Apenas se conseguiu escrever %d de um total de %d bytes" -#: lib/paxnames.c:155 +#: lib/paxnames.c:140 #, fuzzy, c-format msgid "Removing leading `%s' from member names" msgstr "Retira-se \"/\" das ligações (\"links\") absolutas " -#: lib/paxnames.c:156 +#: lib/paxnames.c:141 #, fuzzy, c-format msgid "Removing leading `%s' from hard link targets" msgstr "Retira-se \"/\" das ligações (\"links\") absolutas " -#: lib/paxnames.c:169 +#: lib/paxnames.c:154 msgid "Substituting `.' for empty member name" msgstr "" -#: lib/paxnames.c:170 +#: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" msgstr "" @@ -798,22 +798,22 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "%s: Só se pôde ler %d de um total de %ld \"bytes\"\n" msgstr[1] "%s: Só se pôde ler %d de um total de %ld \"bytes\"\n" -#: src/compare.c:105 src/compare.c:382 +#: src/compare.c:105 src/compare.c:383 #, fuzzy msgid "Contents differ" msgstr "Tempo de modificação" -#: src/compare.c:131 src/extract.c:972 src/incremen.c:1462 src/list.c:458 -#: src/list.c:1392 src/xheader.c:711 +#: src/compare.c:131 src/extract.c:984 src/incremen.c:1456 src/list.c:456 +#: src/list.c:1388 src/xheader.c:711 msgid "Unexpected EOF in archive" msgstr "Fim de ficheiro inesperado no arquivo" -#: src/compare.c:179 src/compare.c:195 src/compare.c:308 src/compare.c:406 +#: src/compare.c:179 src/compare.c:195 src/compare.c:309 src/compare.c:407 #, fuzzy msgid "File type differs" msgstr "%s: Ligação (\"link\") simbólica é diferente\n" -#: src/compare.c:182 src/compare.c:202 src/compare.c:322 +#: src/compare.c:182 src/compare.c:202 src/compare.c:323 msgid "Mode differs" msgstr "" @@ -832,54 +832,58 @@ msgstr "%s: %s diferente\n" msgid "Mod time differs" msgstr "Tempo de modificação" -#: src/compare.c:215 src/compare.c:414 +#: src/compare.c:215 src/compare.c:415 #, fuzzy msgid "Size differs" msgstr "%s: Ligação (\"link\") simbólica é diferente\n" -#: src/compare.c:263 +#: src/compare.c:264 #, fuzzy, c-format msgid "Not linked to %s" msgstr "%s: Não está ligado a %s\n" -#: src/compare.c:287 +#: src/compare.c:288 #, fuzzy msgid "Symlink differs" msgstr "%s: Ligação (\"link\") simbólica é diferente\n" -#: src/compare.c:316 +#: src/compare.c:317 #, fuzzy msgid "Device number differs" msgstr "%s: Os números do periférico mudaram\n" -#: src/compare.c:456 +#: src/compare.c:457 #, c-format msgid "Verify " msgstr "Verificação" -#: src/compare.c:463 +#: src/compare.c:464 #, fuzzy, c-format msgid "%s: Unknown file type `%c', diffed as normal file" msgstr "" "Tipo de ficheiro \"%c\" desconhecido para %s; comparado como um ficheiro " "normal" -#: src/compare.c:518 +#: src/compare.c:520 msgid "Archive contains file names with leading prefixes removed." msgstr "" -#: src/compare.c:520 +#: src/compare.c:526 +msgid "Archive contains transformed file names." +msgstr "" + +#: src/compare.c:531 msgid "Verification may fail to locate original files." msgstr "" -#: src/compare.c:593 +#: src/compare.c:603 #, fuzzy, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "ERRO DE VERIFICAÇÃO: Encontraram-se %d cabeçalhos inválidos" msgstr[1] "ERRO DE VERIFICAÇÃO: Encontraram-se %d cabeçalhos inválidos" -#: src/compare.c:611 src/list.c:222 +#: src/compare.c:621 src/list.c:222 #, c-format msgid "A lone zero block at %s" msgstr "" @@ -930,7 +934,7 @@ msgstr[1] "O ficheiro %s diminuiu em %d \"bytes\", ser msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: Está num outro sistema de ficheiros; não será arquivado" -#: src/create.c:1203 src/create.c:1214 src/incremen.c:582 src/incremen.c:588 +#: src/create.c:1203 src/create.c:1214 src/incremen.c:578 src/incremen.c:584 #, fuzzy msgid "contents not dumped" msgstr " (imagem da memória despejada \"core dumped\")" @@ -955,7 +959,7 @@ msgstr "%s: n msgid "%s: file is the archive; not dumped" msgstr "%s é o arquivo; não será arquivado" -#: src/create.c:1723 src/incremen.c:575 +#: src/create.c:1723 src/incremen.c:571 msgid "directory not dumped" msgstr "" @@ -964,12 +968,12 @@ msgstr "" msgid "%s: file changed as we read it" msgstr "" -#: src/create.c:1857 +#: src/create.c:1858 #, c-format msgid "%s: socket ignored" msgstr "" -#: src/create.c:1863 +#: src/create.c:1864 #, c-format msgid "%s: door ignored" msgstr "" @@ -997,173 +1001,173 @@ msgstr "" msgid "%s: Unexpected inconsistency when making directory" msgstr "" -#: src/extract.c:709 +#: src/extract.c:721 #, c-format msgid "%s: Directory renamed before its status could be extracted" msgstr "" -#: src/extract.c:863 +#: src/extract.c:875 msgid "Extracting contiguous files as regular files" msgstr "Estão-se a extrair ficheiros contíguos como sendo ficheiros normais" -#: src/extract.c:1197 +#: src/extract.c:1209 msgid "Attempting extraction of symbolic links as hard links" msgstr "" "Está-se a tentar extrair ligações simbólicas (sym. links) como ligações " "físicas (hard links)" -#: src/extract.c:1353 +#: src/extract.c:1365 #, fuzzy, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "" "Não se pode extraír `%s' -- é a continuação de um ficheiro de outro volume" -#: src/extract.c:1360 src/list.c:1125 +#: src/extract.c:1372 src/list.c:1121 #, fuzzy msgid "Unexpected long name header" msgstr "Fim de ficheiro inesperado no ficheiro de arquivo" -#: src/extract.c:1367 +#: src/extract.c:1379 #, fuzzy, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "" "Tipo \"%c\" do ficheiro \"%s\" desconhecido; extrai-se como um ficheiro " "normal" -#: src/extract.c:1393 +#: src/extract.c:1405 #, c-format msgid "Current %s is newer or same age" msgstr "" -#: src/extract.c:1445 +#: src/extract.c:1457 #, c-format msgid "%s: Was unable to backup this file" msgstr "" -#: src/extract.c:1582 +#: src/extract.c:1594 #, c-format msgid "Cannot rename %s to %s" msgstr "Não se consegue mudar o nome de %s para %s" -#: src/incremen.c:474 src/incremen.c:518 +#: src/incremen.c:473 src/incremen.c:517 #, fuzzy, c-format msgid "%s: Directory has been renamed from %s" msgstr "Mudou-se o nome do directoria %s" -#: src/incremen.c:486 +#: src/incremen.c:485 #, fuzzy, c-format msgid "%s: Directory has been renamed" msgstr "Mudou-se o nome do directoria %s" -#: src/incremen.c:531 +#: src/incremen.c:530 #, fuzzy, c-format msgid "%s: Directory is new" msgstr "O directoria %s é novo" -#: src/incremen.c:956 src/incremen.c:973 +#: src/incremen.c:951 src/incremen.c:968 msgid "Invalid time stamp" msgstr "" -#: src/incremen.c:1012 +#: src/incremen.c:1007 msgid "Invalid modification time (seconds)" msgstr "" -#: src/incremen.c:1027 +#: src/incremen.c:1022 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:1047 +#: src/incremen.c:1042 msgid "Invalid device number" msgstr "" -#: src/incremen.c:1062 +#: src/incremen.c:1057 msgid "Invalid inode number" msgstr "" -#: src/incremen.c:1113 src/incremen.c:1150 +#: src/incremen.c:1108 src/incremen.c:1145 msgid "Field too long while reading snapshot file" msgstr "" -#: src/incremen.c:1120 src/incremen.c:1158 +#: src/incremen.c:1115 src/incremen.c:1153 #, fuzzy msgid "Read error in snapshot file" msgstr "Erro de leitura sobre %s" -#: src/incremen.c:1122 src/incremen.c:1162 src/incremen.c:1214 -#: src/incremen.c:1272 +#: src/incremen.c:1117 src/incremen.c:1157 src/incremen.c:1209 +#: src/incremen.c:1267 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "Fim de ficheiro inesperado no ficheiro de arquivo" -#: src/incremen.c:1129 src/incremen.c:1169 +#: src/incremen.c:1124 src/incremen.c:1164 #, fuzzy msgid "Unexpected field value in snapshot file" msgstr "Fim de ficheiro inesperado no ficheiro de arquivo" -#: src/incremen.c:1264 +#: src/incremen.c:1259 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1325 src/incremen.c:1328 +#: src/incremen.c:1320 src/incremen.c:1323 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1347 +#: src/incremen.c:1342 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1502 +#: src/incremen.c:1496 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1512 +#: src/incremen.c:1506 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1525 +#: src/incremen.c:1519 msgid "Malformed dumpdir: empty name in 'R'" msgstr "" -#: src/incremen.c:1538 +#: src/incremen.c:1532 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1544 +#: src/incremen.c:1538 msgid "Malformed dumpdir: empty name in 'T'" msgstr "" -#: src/incremen.c:1564 +#: src/incremen.c:1558 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1571 +#: src/incremen.c:1565 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1615 +#: src/incremen.c:1609 #, fuzzy, c-format msgid "Cannot create temporary directory using template %s" msgstr "Não se pode mudar para a directoria %s" -#: src/incremen.c:1677 +#: src/incremen.c:1670 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1690 +#: src/incremen.c:1683 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "" -#: src/incremen.c:1698 +#: src/incremen.c:1691 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Apaga-se %s\n" -#: src/incremen.c:1703 +#: src/incremen.c:1696 #, fuzzy, c-format msgid "%s: Cannot remove" msgstr "Não se consegue apagar %s" @@ -1183,159 +1187,154 @@ msgstr "bloco %10ld: ** Bloco de NULs **\n" msgid "block %s: ** End of File **\n" msgstr "bloco %10ld: ** Fim-de-ficheiro **\n" -#: src/list.c:256 src/list.c:1097 src/list.c:1360 +#: src/list.c:256 src/list.c:1093 src/list.c:1356 #, fuzzy, c-format msgid "block %s: " msgstr "bloco %10ld: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:712 +#: src/list.c:708 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:767 +#: src/list.c:763 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:778 +#: src/list.c:774 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "" -#: src/list.c:799 +#: src/list.c:795 msgid "Archive contains obsolescent base-64 headers" msgstr "" -#: src/list.c:813 +#: src/list.c:809 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "" -#: src/list.c:844 +#: src/list.c:840 #, fuzzy, c-format msgid "Archive base-256 value is out of %s range" msgstr "Este volume está fora da sequência" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:873 +#: src/list.c:869 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:895 +#: src/list.c:891 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "" -#: src/list.c:1261 +#: src/list.c:1257 #, c-format msgid " link to %s\n" msgstr " ligação para %s\n" -#: src/list.c:1269 +#: src/list.c:1265 #, fuzzy, c-format msgid " unknown file type %s\n" msgstr " tipo de ficheiro desconhecido \"%c\"\n" -#: src/list.c:1287 +#: src/list.c:1283 #, c-format msgid "--Long Link--\n" msgstr "" -#: src/list.c:1291 +#: src/list.c:1287 #, c-format msgid "--Long Name--\n" msgstr "" -#: src/list.c:1295 +#: src/list.c:1291 #, c-format msgid "--Volume Header--\n" msgstr "--Cabeçalho de volume--\n" -#: src/list.c:1303 +#: src/list.c:1299 #, fuzzy, c-format msgid "--Continued at byte %s--\n" msgstr "--Continua no \"byte\" %ld--\n" -#: src/list.c:1365 +#: src/list.c:1361 msgid "Creating directory:" msgstr "Criação de directoria::" -#: src/misc.c:298 +#: src/misc.c:297 #, fuzzy msgid "Cannot get working directory" msgstr "Não se pode mudar para a directoria %s" -#: src/misc.c:571 +#: src/misc.c:570 #, fuzzy, c-format msgid "Renaming %s to %s\n" msgstr "Mudou-se o nome %s para %s" -#: src/misc.c:580 src/misc.c:599 +#: src/misc.c:579 src/misc.c:598 #, fuzzy, c-format msgid "%s: Cannot rename to %s" msgstr "Não se consegue mudar o nome de %s para %s" -#: src/misc.c:604 +#: src/misc.c:603 #, fuzzy, c-format msgid "Renaming %s back to %s\n" msgstr "Mudou-se o nome %s para %s" -#: src/misc.c:851 +#: src/misc.c:850 #, c-format msgid "%s: File removed before we read it" msgstr "" -#: src/misc.c:866 -#, fuzzy, c-format -msgid "%s: Directory removed before we read it" -msgstr "Mudou-se o nome do directoria %s" - -#: src/misc.c:887 +#: src/misc.c:871 msgid "child process" msgstr "" -#: src/misc.c:896 +#: src/misc.c:880 msgid "interprocess channel" msgstr "" -#: src/names.c:594 +#: src/names.c:590 msgid "Pattern matching characters used in file names" msgstr "" -#: src/names.c:596 +#: src/names.c:592 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" msgstr "" -#: src/names.c:614 src/names.c:630 +#: src/names.c:610 src/names.c:626 #, c-format msgid "%s: Not found in archive" msgstr "%s: Não foi encontrado no arquivo" -#: src/names.c:615 +#: src/names.c:611 #, fuzzy, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Não foi encontrado no arquivo" -#: src/names.c:649 +#: src/names.c:645 #, fuzzy, c-format msgid "Archive label mismatch" msgstr "O arquivo não tem etiqueta e não condiz com %s" -#: src/names.c:953 +#: src/names.c:949 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" -#: src/names.c:959 +#: src/names.c:955 msgid "Only one -C option is allowed with --listed-incremental" msgstr "" @@ -2685,6 +2684,10 @@ msgstr "" msgid "--stat requires file names" msgstr "--Nomes de ficheiros truncados--\n" +#, fuzzy +#~ msgid "%s: Directory removed before we read it" +#~ msgstr "Mudou-se o nome do directoria %s" + #, fuzzy #~ msgid "Cannot restore working directory" #~ msgstr "Não se pode mudar para a directoria %s" diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo index 77ec8ee992205c69e1ad722e22e6b65a9469b4a9..c8f42bf4789d0c04129971f8110891494d0147ca 100644 GIT binary patch delta 26 hcmbObHX&@oYzbaNT?1oXLn8%4Ln~9`%_}4_gaB`V2cG}{ delta 26 hcmbObHX&@oYzbZiT|+}%19JsKb1MV$%_}4_gaB{42c`f3 diff --git a/po/pt_BR.po b/po/pt_BR.po index 184dd427..3518d555 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: tar 1.13.25\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2010-11-07 17:07+0200\n" +"POT-Creation-Date: 2011-03-12 11:53+0200\n" "PO-Revision-Date: 2002-11-27 20:30-0300\n" "Last-Translator: Alexandre Folle de Menezes \n" "Language-Team: Brazilian Portuguese \n" @@ -61,33 +61,33 @@ msgstr "" msgid "Garbage in ARGP_HELP_FMT: %s" msgstr "" -#: gnu/argp-help.c:1246 +#: gnu/argp-help.c:1248 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." msgstr "" -#: gnu/argp-help.c:1639 +#: gnu/argp-help.c:1641 msgid "Usage:" msgstr "" -#: gnu/argp-help.c:1643 +#: gnu/argp-help.c:1645 msgid " or: " msgstr "" -#: gnu/argp-help.c:1655 +#: gnu/argp-help.c:1657 #, fuzzy msgid " [OPTION...]" msgstr "" "\n" "Uso: %s [OPÇÃO]...\n" -#: gnu/argp-help.c:1682 +#: gnu/argp-help.c:1684 #, fuzzy, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Tente `%s --help' para mais informações.\n" -#: gnu/argp-help.c:1710 +#: gnu/argp-help.c:1712 #, fuzzy, c-format msgid "Report bugs to %s.\n" msgstr "" @@ -95,7 +95,7 @@ msgstr "" "Informar erros no programa para .\n" "Informar erros na tradução para .\n" -#: gnu/argp-help.c:1929 gnu/error.c:183 +#: gnu/argp-help.c:1931 gnu/error.c:183 msgid "Unknown system error" msgstr "Erro de sistema desconhecido" @@ -201,16 +201,16 @@ msgstr "%s: a op msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: a opção `%s' exige um argumento\n" -#: gnu/obstack.c:425 gnu/obstack.c:427 gnu/xalloc-die.c:36 +#: gnu/obstack.c:423 gnu/obstack.c:425 gnu/xalloc-die.c:36 msgid "memory exhausted" msgstr "memória esgotada" -#: gnu/openat-die.c:36 +#: gnu/openat-die.c:40 #, fuzzy, c-format msgid "unable to record current working directory" msgstr "Impossível mudar o diretório de trabalho" -#: gnu/openat-die.c:54 +#: gnu/openat-die.c:59 #, fuzzy, c-format msgid "failed to return to initial working directory" msgstr "Impossível salvar diretório de trabalho" @@ -234,11 +234,11 @@ msgstr "Imposs #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: gnu/quotearg.c:274 +#: gnu/quotearg.c:273 msgid "`" msgstr "`" -#: gnu/quotearg.c:275 +#: gnu/quotearg.c:274 msgid "'" msgstr "'" @@ -485,22 +485,22 @@ msgid_plural "%s: Wrote only %lu of %lu bytes" msgstr[0] "%s: Gravados apenas %lu de um total de %lu bytes" msgstr[1] "%s: Gravados apenas %lu de um total de %lu bytes" -#: lib/paxnames.c:155 +#: lib/paxnames.c:140 #, fuzzy, c-format msgid "Removing leading `%s' from member names" msgstr "Removendo `%.*s' inicial dos nomes dos membros" -#: lib/paxnames.c:156 +#: lib/paxnames.c:141 #, fuzzy, c-format msgid "Removing leading `%s' from hard link targets" msgstr "Removendo `%.*s' inicial dos nomes dos membros" -#: lib/paxnames.c:169 +#: lib/paxnames.c:154 #, fuzzy msgid "Substituting `.' for empty member name" msgstr "Removendo `%.*s' inicial dos nomes dos membros" -#: lib/paxnames.c:170 +#: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" msgstr "" @@ -799,20 +799,20 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "Só foi possível ler %lu de %lu bytes" msgstr[1] "Só foi possível ler %lu de %lu bytes" -#: src/compare.c:105 src/compare.c:382 +#: src/compare.c:105 src/compare.c:383 msgid "Contents differ" msgstr "O conteúdo é diferente" -#: src/compare.c:131 src/extract.c:972 src/incremen.c:1462 src/list.c:458 -#: src/list.c:1392 src/xheader.c:711 +#: src/compare.c:131 src/extract.c:984 src/incremen.c:1456 src/list.c:456 +#: src/list.c:1388 src/xheader.c:711 msgid "Unexpected EOF in archive" msgstr "Final-de-arquivo inesperado no arquivo-tar" -#: src/compare.c:179 src/compare.c:195 src/compare.c:308 src/compare.c:406 +#: src/compare.c:179 src/compare.c:195 src/compare.c:309 src/compare.c:407 msgid "File type differs" msgstr "O tipo de arquivo é diferente" -#: src/compare.c:182 src/compare.c:202 src/compare.c:322 +#: src/compare.c:182 src/compare.c:202 src/compare.c:323 msgid "Mode differs" msgstr "Os modos são diferentes" @@ -828,50 +828,55 @@ msgstr "os gid s msgid "Mod time differs" msgstr "Os horários de modificação são diferentes" -#: src/compare.c:215 src/compare.c:414 +#: src/compare.c:215 src/compare.c:415 msgid "Size differs" msgstr "Os tamanhos são diferentes" -#: src/compare.c:263 +#: src/compare.c:264 #, c-format msgid "Not linked to %s" msgstr "Não está \"linkado\" a %s" -#: src/compare.c:287 +#: src/compare.c:288 msgid "Symlink differs" msgstr "O (\"Link\") simbólico é diferente" -#: src/compare.c:316 +#: src/compare.c:317 msgid "Device number differs" msgstr "O número de dispositivo é diferente" -#: src/compare.c:456 +#: src/compare.c:457 #, c-format msgid "Verify " msgstr "Verificar " -#: src/compare.c:463 +#: src/compare.c:464 #, fuzzy, c-format msgid "%s: Unknown file type `%c', diffed as normal file" msgstr "" "%s: Tipo de arquivo \"%c\" desconhecido, comparado como um arquivo normal" -#: src/compare.c:518 +#: src/compare.c:520 msgid "Archive contains file names with leading prefixes removed." msgstr "" -#: src/compare.c:520 +#: src/compare.c:526 +#, fuzzy +msgid "Archive contains transformed file names." +msgstr "o arquivo-tar contém cabeçalhos base-64 obsoletos" + +#: src/compare.c:531 msgid "Verification may fail to locate original files." msgstr "" -#: src/compare.c:593 +#: src/compare.c:603 #, fuzzy, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "ERRO DE VERIFICAÇÃO: detectados %d cabeçalhos inválidos" msgstr[1] "ERRO DE VERIFICAÇÃO: detectados %d cabeçalhos inválidos" -#: src/compare.c:611 src/list.c:222 +#: src/compare.c:621 src/list.c:222 #, c-format msgid "A lone zero block at %s" msgstr "" @@ -922,7 +927,7 @@ msgstr[1] "%s: o arquivo diminuiu %s bytes; completando com zeros" msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: arquivo está em outro sistema de arquivos; não será arquivado" -#: src/create.c:1203 src/create.c:1214 src/incremen.c:582 src/incremen.c:588 +#: src/create.c:1203 src/create.c:1214 src/incremen.c:578 src/incremen.c:584 msgid "contents not dumped" msgstr "" @@ -946,7 +951,7 @@ msgstr "%s: arquivo sem altera msgid "%s: file is the archive; not dumped" msgstr "%s: arquivo é o arquivo-tar; não será arquivado" -#: src/create.c:1723 src/incremen.c:575 +#: src/create.c:1723 src/incremen.c:571 msgid "directory not dumped" msgstr "" @@ -955,12 +960,12 @@ msgstr "" msgid "%s: file changed as we read it" msgstr "%s: arquivo alterado enquanto estava sendo lido" -#: src/create.c:1857 +#: src/create.c:1858 #, c-format msgid "%s: socket ignored" msgstr "%s: \"socket\" ignorado" -#: src/create.c:1863 +#: src/create.c:1864 #, c-format msgid "%s: door ignored" msgstr "%s: porta ignorada" @@ -988,167 +993,167 @@ msgstr "%s: o carimbo de hor msgid "%s: Unexpected inconsistency when making directory" msgstr "%s: Inconsistência inesperada ao criar diretório" -#: src/extract.c:709 +#: src/extract.c:721 #, c-format msgid "%s: Directory renamed before its status could be extracted" msgstr "%s: Diretório renomeado antes de se poder extrair seu estado" -#: src/extract.c:863 +#: src/extract.c:875 msgid "Extracting contiguous files as regular files" msgstr "Extraindo arquivos contíguos como sendo arquivos normais" -#: src/extract.c:1197 +#: src/extract.c:1209 msgid "Attempting extraction of symbolic links as hard links" msgstr "Tentativa de extrair \"links\" simbólicos como \"links\" físicos" -#: src/extract.c:1353 +#: src/extract.c:1365 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Impossível extrair -- arquivo é a continuação de outro volume" -#: src/extract.c:1360 src/list.c:1125 +#: src/extract.c:1372 src/list.c:1121 #, fuzzy msgid "Unexpected long name header" msgstr "Fim de arquivo inesperado nos nomes cifrados" -#: src/extract.c:1367 +#: src/extract.c:1379 #, fuzzy, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Tipo de arquivo '%c' desconhecido; extraindo como arquivo normal" -#: src/extract.c:1393 +#: src/extract.c:1405 #, c-format msgid "Current %s is newer or same age" msgstr "" -#: src/extract.c:1445 +#: src/extract.c:1457 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Impossível fazer backup deste arquivo" -#: src/extract.c:1582 +#: src/extract.c:1594 #, fuzzy, c-format msgid "Cannot rename %s to %s" msgstr "%s: Impossível renomear para %s" -#: src/incremen.c:474 src/incremen.c:518 +#: src/incremen.c:473 src/incremen.c:517 #, fuzzy, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Diretório foi renomeado" -#: src/incremen.c:486 +#: src/incremen.c:485 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Diretório foi renomeado" -#: src/incremen.c:531 +#: src/incremen.c:530 #, c-format msgid "%s: Directory is new" msgstr "%s: O diretório é novo" -#: src/incremen.c:956 src/incremen.c:973 +#: src/incremen.c:951 src/incremen.c:968 msgid "Invalid time stamp" msgstr "Carimbo de horário inválido" -#: src/incremen.c:1012 +#: src/incremen.c:1007 #, fuzzy msgid "Invalid modification time (seconds)" msgstr "Modo inválido informado na opção" -#: src/incremen.c:1027 +#: src/incremen.c:1022 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:1047 +#: src/incremen.c:1042 msgid "Invalid device number" msgstr "Número de dispositivo inválido" -#: src/incremen.c:1062 +#: src/incremen.c:1057 msgid "Invalid inode number" msgstr "Número de inode inválido" -#: src/incremen.c:1113 src/incremen.c:1150 +#: src/incremen.c:1108 src/incremen.c:1145 msgid "Field too long while reading snapshot file" msgstr "" -#: src/incremen.c:1120 src/incremen.c:1158 +#: src/incremen.c:1115 src/incremen.c:1153 msgid "Read error in snapshot file" msgstr "" -#: src/incremen.c:1122 src/incremen.c:1162 src/incremen.c:1214 -#: src/incremen.c:1272 +#: src/incremen.c:1117 src/incremen.c:1157 src/incremen.c:1209 +#: src/incremen.c:1267 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "Final-de-arquivo inesperado no arquivo-tar" -#: src/incremen.c:1129 src/incremen.c:1169 +#: src/incremen.c:1124 src/incremen.c:1164 msgid "Unexpected field value in snapshot file" msgstr "" -#: src/incremen.c:1264 +#: src/incremen.c:1259 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1325 src/incremen.c:1328 +#: src/incremen.c:1320 src/incremen.c:1323 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1347 +#: src/incremen.c:1342 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1502 +#: src/incremen.c:1496 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1512 +#: src/incremen.c:1506 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1525 +#: src/incremen.c:1519 msgid "Malformed dumpdir: empty name in 'R'" msgstr "" -#: src/incremen.c:1538 +#: src/incremen.c:1532 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1544 +#: src/incremen.c:1538 msgid "Malformed dumpdir: empty name in 'T'" msgstr "" -#: src/incremen.c:1564 +#: src/incremen.c:1558 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1571 +#: src/incremen.c:1565 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1615 +#: src/incremen.c:1609 #, fuzzy, c-format msgid "Cannot create temporary directory using template %s" msgstr "Impossível alocar memória para um fator de bloco %d" -#: src/incremen.c:1677 +#: src/incremen.c:1670 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1690 +#: src/incremen.c:1683 #, fuzzy, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: arquivo está em outro sistema de arquivos; não será arquivado" -#: src/incremen.c:1698 +#: src/incremen.c:1691 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Removendo %s\n" -#: src/incremen.c:1703 +#: src/incremen.c:1696 #, c-format msgid "%s: Cannot remove" msgstr "%s: Impossível remover" @@ -1168,20 +1173,20 @@ msgstr "bloco %s: ** Bloco de NULs **\n" msgid "block %s: ** End of File **\n" msgstr "bloco %s: ** Fim-de-arquivo **\n" -#: src/list.c:256 src/list.c:1097 src/list.c:1360 +#: src/list.c:256 src/list.c:1093 src/list.c:1356 #, c-format msgid "block %s: " msgstr "bloco %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:712 +#: src/list.c:708 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Espaço em branco no cabeçalho onde valor numérico `%s' era esperado" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:767 +#: src/list.c:763 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1189,140 +1194,135 @@ msgstr "" "complemento de dois" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:778 +#: src/list.c:774 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "O valor octal do arquivo-tar %.*s está fora de faixa %s" -#: src/list.c:799 +#: src/list.c:795 msgid "Archive contains obsolescent base-64 headers" msgstr "o arquivo-tar contém cabeçalhos base-64 obsoletos" -#: src/list.c:813 +#: src/list.c:809 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "A string base-64 assinada do arquivo-tar %s está fora de faixa %s" -#: src/list.c:844 +#: src/list.c:840 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "O valor base-256 de arquivo-tar está fora da faixa %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:873 +#: src/list.c:869 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "O arquivo-tar contém %.*s onde valor numérico %s era esperado" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:895 +#: src/list.c:891 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "o valor do arquivo-tar %s está fora da faixa %s: %s..%s" -#: src/list.c:1261 +#: src/list.c:1257 #, c-format msgid " link to %s\n" msgstr " link para %s\n" -#: src/list.c:1269 +#: src/list.c:1265 #, c-format msgid " unknown file type %s\n" msgstr " tipo de arquivo \"%s\" desconhecido\n" -#: src/list.c:1287 +#: src/list.c:1283 #, c-format msgid "--Long Link--\n" msgstr "" -#: src/list.c:1291 +#: src/list.c:1287 #, c-format msgid "--Long Name--\n" msgstr "" -#: src/list.c:1295 +#: src/list.c:1291 #, c-format msgid "--Volume Header--\n" msgstr "--Cabeçalho de volume--\n" -#: src/list.c:1303 +#: src/list.c:1299 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Continua no byte %s--\n" -#: src/list.c:1365 +#: src/list.c:1361 msgid "Creating directory:" msgstr "Criando de diretório:" -#: src/misc.c:298 +#: src/misc.c:297 #, fuzzy msgid "Cannot get working directory" msgstr "Impossível mudar o diretório de trabalho" -#: src/misc.c:571 +#: src/misc.c:570 #, c-format msgid "Renaming %s to %s\n" msgstr "Renomeando %s para %s\n" -#: src/misc.c:580 src/misc.c:599 +#: src/misc.c:579 src/misc.c:598 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: Impossível renomear para %s" -#: src/misc.c:604 +#: src/misc.c:603 #, c-format msgid "Renaming %s back to %s\n" msgstr "Renomeando %s de volta para %s\n" -#: src/misc.c:851 +#: src/misc.c:850 #, c-format msgid "%s: File removed before we read it" msgstr "%s: arquivo removido antes de ser lido" -#: src/misc.c:866 -#, fuzzy, c-format -msgid "%s: Directory removed before we read it" -msgstr "%s: arquivo removido antes de ser lido" - -#: src/misc.c:887 +#: src/misc.c:871 msgid "child process" msgstr "processo filho" -#: src/misc.c:896 +#: src/misc.c:880 msgid "interprocess channel" msgstr "canal interprocesso" -#: src/names.c:594 +#: src/names.c:590 msgid "Pattern matching characters used in file names" msgstr "" -#: src/names.c:596 +#: src/names.c:592 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" msgstr "" -#: src/names.c:614 src/names.c:630 +#: src/names.c:610 src/names.c:626 #, c-format msgid "%s: Not found in archive" msgstr "%s: Não foi encontrado no arquivo-tar" -#: src/names.c:615 +#: src/names.c:611 #, fuzzy, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Não foi encontrado no arquivo-tar" -#: src/names.c:649 +#: src/names.c:645 #, fuzzy, c-format msgid "Archive label mismatch" msgstr "O arquivo-tar não rotulado para casar com %s" -#: src/names.c:953 +#: src/names.c:949 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" -#: src/names.c:959 +#: src/names.c:955 msgid "Only one -C option is allowed with --listed-incremental" msgstr "" @@ -2691,6 +2691,10 @@ msgstr "" msgid "--stat requires file names" msgstr "--Nomes de arquivos truncados--\n" +#, fuzzy +#~ msgid "%s: Directory removed before we read it" +#~ msgstr "%s: arquivo removido antes de ser lido" + #, fuzzy #~ msgid "Cannot restore working directory" #~ msgstr "Impossível salvar diretório de trabalho" diff --git a/po/ro.gmo b/po/ro.gmo index bd7f0d1fdd262e872d9f0683100e90d6d49aa873..7a011b6f13fca6077e2ac2f5492656cf5a11b78c 100644 GIT binary patch delta 28 jcmdnEhjHT`#tq!&yoS04#=3?^3WkPOrpB8k%q7(UfxHKk delta 28 jcmdnEhjHT`#tq!&yau|4hPnpk3WnxZ2IiY3%q7(Uf%XTQ diff --git a/po/ro.po b/po/ro.po index d57e049d..c6c17dd6 100644 --- a/po/ro.po +++ b/po/ro.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: tar 1.15.1\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2010-11-07 17:07+0200\n" +"POT-Creation-Date: 2011-03-12 11:53+0200\n" "PO-Revision-Date: 2005-07-15 12:00-0500\n" "Last-Translator: Laurentiu Buzdugan \n" "Language-Team: Romanian \n" @@ -58,7 +58,7 @@ msgstr "%.*s: parametru ARGP_HELP_FMT necunoscut" msgid "Garbage in ARGP_HELP_FMT: %s" msgstr "Gunoi în ARGP_HELP_FMT: %s" -#: gnu/argp-help.c:1246 +#: gnu/argp-help.c:1248 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." @@ -66,30 +66,30 @@ msgstr "" "Argumentele obligatorii sau opþionale pentru opþiunile lungi sunt " "obligatorii sau opþionale ºi pentru opþiunile corespunzãtoare scurte." -#: gnu/argp-help.c:1639 +#: gnu/argp-help.c:1641 msgid "Usage:" msgstr "Folosire:" -#: gnu/argp-help.c:1643 +#: gnu/argp-help.c:1645 msgid " or: " msgstr " sau: " -#: gnu/argp-help.c:1655 +#: gnu/argp-help.c:1657 msgid " [OPTION...]" msgstr " [OPÞIUNE...]" -#: gnu/argp-help.c:1682 +#: gnu/argp-help.c:1684 #, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "" "Încercaþi `%s --help' sau `%s --usage' pentru informaþii suplimentare.\n" -#: gnu/argp-help.c:1710 +#: gnu/argp-help.c:1712 #, c-format msgid "Report bugs to %s.\n" msgstr "Raportaþi bug-uri la %s.\n" -#: gnu/argp-help.c:1929 gnu/error.c:183 +#: gnu/argp-help.c:1931 gnu/error.c:183 msgid "Unknown system error" msgstr "Eroare sistem necunoscutã" @@ -198,16 +198,16 @@ msgstr "%s: op msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: opþiunea `%s' necesitã un argument\n" -#: gnu/obstack.c:425 gnu/obstack.c:427 gnu/xalloc-die.c:36 +#: gnu/obstack.c:423 gnu/obstack.c:425 gnu/xalloc-die.c:36 msgid "memory exhausted" msgstr "memorie epuizatã" -#: gnu/openat-die.c:36 +#: gnu/openat-die.c:40 #, fuzzy, c-format msgid "unable to record current working directory" msgstr "Nu pot schimba directorul în care lucrez" -#: gnu/openat-die.c:54 +#: gnu/openat-die.c:59 #, fuzzy, c-format msgid "failed to return to initial working directory" msgstr "Nu pot salva directorul în care lucrez" @@ -231,11 +231,11 @@ msgstr "Nu pot salva directorul #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: gnu/quotearg.c:274 +#: gnu/quotearg.c:273 msgid "`" msgstr "`" -#: gnu/quotearg.c:275 +#: gnu/quotearg.c:274 msgid "'" msgstr "'" @@ -478,21 +478,21 @@ msgid_plural "%s: Wrote only %lu of %lu bytes" msgstr[0] "%s: Am scris numai %lu din %lu octet" msgstr[1] "%s: Am scris numai %lu din %lu octeþi" -#: lib/paxnames.c:155 +#: lib/paxnames.c:140 #, c-format msgid "Removing leading `%s' from member names" msgstr "Eliminãm primul `%s' din numele membrilor" -#: lib/paxnames.c:156 +#: lib/paxnames.c:141 #, c-format msgid "Removing leading `%s' from hard link targets" msgstr "Eliminãm primul `%s' din destinaþiile hard link" -#: lib/paxnames.c:169 +#: lib/paxnames.c:154 msgid "Substituting `.' for empty member name" msgstr "Înlocuiesc `.' pentru nume de membrii goale" -#: lib/paxnames.c:170 +#: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" msgstr "Înlocuiesc `.' pentru destinaþii hard link goale" @@ -793,20 +793,20 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "Am putut citi doar %lu din %lu octet" msgstr[1] "Am putut citi doar %lu din %lu octeþi" -#: src/compare.c:105 src/compare.c:382 +#: src/compare.c:105 src/compare.c:383 msgid "Contents differ" msgstr "Conþinuturile diferã" -#: src/compare.c:131 src/extract.c:972 src/incremen.c:1462 src/list.c:458 -#: src/list.c:1392 src/xheader.c:711 +#: src/compare.c:131 src/extract.c:984 src/incremen.c:1456 src/list.c:456 +#: src/list.c:1388 src/xheader.c:711 msgid "Unexpected EOF in archive" msgstr "EOF neaºteptat în arhivã" -#: src/compare.c:179 src/compare.c:195 src/compare.c:308 src/compare.c:406 +#: src/compare.c:179 src/compare.c:195 src/compare.c:309 src/compare.c:407 msgid "File type differs" msgstr "Tipul fiºierelor diferã" -#: src/compare.c:182 src/compare.c:202 src/compare.c:322 +#: src/compare.c:182 src/compare.c:202 src/compare.c:323 msgid "Mode differs" msgstr "Modurile diferã" @@ -822,50 +822,55 @@ msgstr "Gid difer msgid "Mod time differs" msgstr "Timp modificare diferã" -#: src/compare.c:215 src/compare.c:414 +#: src/compare.c:215 src/compare.c:415 msgid "Size differs" msgstr "Dimensiunea diferã" -#: src/compare.c:263 +#: src/compare.c:264 #, c-format msgid "Not linked to %s" msgstr "Nu este link-at cãtre %s" -#: src/compare.c:287 +#: src/compare.c:288 msgid "Symlink differs" msgstr "Symlink diferã" -#: src/compare.c:316 +#: src/compare.c:317 msgid "Device number differs" msgstr "Numãr dispozitiv diferã" -#: src/compare.c:456 +#: src/compare.c:457 #, c-format msgid "Verify " msgstr "Verificã " -#: src/compare.c:463 +#: src/compare.c:464 #, fuzzy, c-format msgid "%s: Unknown file type `%c', diffed as normal file" msgstr "" "%s: Tip de fiºier necunoscut '%c', folosesc diff ca pentru un fiºier normal" -#: src/compare.c:518 +#: src/compare.c:520 msgid "Archive contains file names with leading prefixes removed." msgstr "Arhiva conþine nume de fiºiere cu prefixele îndepãrtate." -#: src/compare.c:520 +#: src/compare.c:526 +#, fuzzy +msgid "Archive contains transformed file names." +msgstr "Arhiva conþine antete în baza-64 depãºite" + +#: src/compare.c:531 msgid "Verification may fail to locate original files." msgstr "Verificare ar putea eºua sã gãseascã fiºierele originale." -#: src/compare.c:593 +#: src/compare.c:603 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "VERIFICà EªEC: detectat %d antet invalid" msgstr[1] "VERIFICà EªEC: detectat %d antete invalide" -#: src/compare.c:611 src/list.c:222 +#: src/compare.c:621 src/list.c:222 #, c-format msgid "A lone zero block at %s" msgstr "Un bloc zero singuratic la %s" @@ -916,7 +921,7 @@ msgstr[1] "%s: Fi msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: fiºierul este pe un sistem de fiºiere diferit; nimic generat" -#: src/create.c:1203 src/create.c:1214 src/incremen.c:582 src/incremen.c:588 +#: src/create.c:1203 src/create.c:1214 src/incremen.c:578 src/incremen.c:584 msgid "contents not dumped" msgstr "" @@ -940,7 +945,7 @@ msgstr "%s: fi msgid "%s: file is the archive; not dumped" msgstr "%s: fiºierul este în arhivã; nimic generat" -#: src/create.c:1723 src/incremen.c:575 +#: src/create.c:1723 src/incremen.c:571 #, fuzzy msgid "directory not dumped" msgstr "%s: conþine o etichetã de director cache; nimic generat" @@ -950,12 +955,12 @@ msgstr "%s: con msgid "%s: file changed as we read it" msgstr "%s: fiºier schimbat în timp ce îl citeam" -#: src/create.c:1857 +#: src/create.c:1858 #, c-format msgid "%s: socket ignored" msgstr "%s: socket ignorat" -#: src/create.c:1863 +#: src/create.c:1864 #, c-format msgid "%s: door ignored" msgstr "%s: uºã ignoratã" @@ -983,169 +988,169 @@ msgstr "%s: msgid "%s: Unexpected inconsistency when making directory" msgstr "%s: Inconsistenþã neaºteptatã când cream directorul" -#: src/extract.c:709 +#: src/extract.c:721 #, c-format msgid "%s: Directory renamed before its status could be extracted" msgstr "%s: Director redenumit înainte de a fi putut extrage starea sa" -#: src/extract.c:863 +#: src/extract.c:875 msgid "Extracting contiguous files as regular files" msgstr "Extragem fiºiere contigue ca fiºiere normale" -#: src/extract.c:1197 +#: src/extract.c:1209 msgid "Attempting extraction of symbolic links as hard links" msgstr "Încerc extragerea link-urilor simbolice ca link-uri hard" -#: src/extract.c:1353 +#: src/extract.c:1365 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Nu pot extrage -- fiºierul este continuat din altã arhivã" -#: src/extract.c:1360 src/list.c:1125 +#: src/extract.c:1372 src/list.c:1121 #, fuzzy msgid "Unexpected long name header" msgstr "EOF neaºteptat în numele amestecate" -#: src/extract.c:1367 +#: src/extract.c:1379 #, fuzzy, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Tip de fiºier necunoscut '%c', extras ca fiºier normal" -#: src/extract.c:1393 +#: src/extract.c:1405 #, fuzzy, c-format msgid "Current %s is newer or same age" msgstr "`%s' curent este mai nou" -#: src/extract.c:1445 +#: src/extract.c:1457 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Nu am putut arhiva (backup) acest fiºier" -#: src/extract.c:1582 +#: src/extract.c:1594 #, fuzzy, c-format msgid "Cannot rename %s to %s" msgstr "%s: Nu pot redenumi ca %s" -#: src/incremen.c:474 src/incremen.c:518 +#: src/incremen.c:473 src/incremen.c:517 #, fuzzy, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Directorul a fost redenumit" -#: src/incremen.c:486 +#: src/incremen.c:485 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Directorul a fost redenumit" -#: src/incremen.c:531 +#: src/incremen.c:530 #, c-format msgid "%s: Directory is new" msgstr "%s: Directorul este nou" -#: src/incremen.c:956 src/incremen.c:973 +#: src/incremen.c:951 src/incremen.c:968 msgid "Invalid time stamp" msgstr "Înregistrare timp invalidã" -#: src/incremen.c:1012 +#: src/incremen.c:1007 #, fuzzy msgid "Invalid modification time (seconds)" msgstr "Mod invalid furnizat ca opþiune" -#: src/incremen.c:1027 +#: src/incremen.c:1022 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:1047 +#: src/incremen.c:1042 msgid "Invalid device number" msgstr "Numãr dispozitiv invalid" -#: src/incremen.c:1062 +#: src/incremen.c:1057 msgid "Invalid inode number" msgstr "Numãr inode invalid" -#: src/incremen.c:1113 src/incremen.c:1150 +#: src/incremen.c:1108 src/incremen.c:1145 msgid "Field too long while reading snapshot file" msgstr "" -#: src/incremen.c:1120 src/incremen.c:1158 +#: src/incremen.c:1115 src/incremen.c:1153 msgid "Read error in snapshot file" msgstr "" -#: src/incremen.c:1122 src/incremen.c:1162 src/incremen.c:1214 -#: src/incremen.c:1272 +#: src/incremen.c:1117 src/incremen.c:1157 src/incremen.c:1209 +#: src/incremen.c:1267 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "EOF neaºteptat în arhivã" -#: src/incremen.c:1129 src/incremen.c:1169 +#: src/incremen.c:1124 src/incremen.c:1164 msgid "Unexpected field value in snapshot file" msgstr "" -#: src/incremen.c:1264 +#: src/incremen.c:1259 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1325 src/incremen.c:1328 +#: src/incremen.c:1320 src/incremen.c:1323 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1347 +#: src/incremen.c:1342 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1502 +#: src/incremen.c:1496 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1512 +#: src/incremen.c:1506 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1525 +#: src/incremen.c:1519 #, fuzzy msgid "Malformed dumpdir: empty name in 'R'" msgstr "Argument densitate malformat: '%s'" -#: src/incremen.c:1538 +#: src/incremen.c:1532 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1544 +#: src/incremen.c:1538 #, fuzzy msgid "Malformed dumpdir: empty name in 'T'" msgstr "Argument densitate malformat: '%s'" -#: src/incremen.c:1564 +#: src/incremen.c:1558 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1571 +#: src/incremen.c:1565 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1615 +#: src/incremen.c:1609 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "" -#: src/incremen.c:1677 +#: src/incremen.c:1670 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Nu curãþ director: nu pot determina statistici" -#: src/incremen.c:1690 +#: src/incremen.c:1683 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: directorul este pe un dispozitiv (device) diferit; necurãþat" -#: src/incremen.c:1698 +#: src/incremen.c:1691 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: ªtergem %s\n" -#: src/incremen.c:1703 +#: src/incremen.c:1696 #, c-format msgid "%s: Cannot remove" msgstr "%s: Nu pot ºterge" @@ -1165,20 +1170,20 @@ msgstr "bloc %s: ** Bloc de NUL-uri **\n" msgid "block %s: ** End of File **\n" msgstr "bloc %s: ** Sfârºit de fiºier **\n" -#: src/list.c:256 src/list.c:1097 src/list.c:1360 +#: src/list.c:256 src/list.c:1093 src/list.c:1356 #, c-format msgid "block %s: " msgstr "bloc %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:712 +#: src/list.c:708 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Spaþii libere în antet unde valoare %s numericã aºteptatã" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:767 +#: src/list.c:763 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1186,141 +1191,136 @@ msgstr "" "lui doi" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:778 +#: src/list.c:774 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Valoare octalã arhivã %.*s este în afara %s intervalului" -#: src/list.c:799 +#: src/list.c:795 msgid "Archive contains obsolescent base-64 headers" msgstr "Arhiva conþine antete în baza-64 depãºite" -#: src/list.c:813 +#: src/list.c:809 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "ªir în baza-64 (semnãtura arhivei) %s este în afara %s intervalului" -#: src/list.c:844 +#: src/list.c:840 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Valoare baza-256 a arhivei este în afara %s intervalului" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:873 +#: src/list.c:869 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Arhiva conþine %.*s unde valoare %s numericã aºteptatã" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:895 +#: src/list.c:891 #, fuzzy, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Valoare arhivã %s este în afara %s intervalului %s.%s" -#: src/list.c:1261 +#: src/list.c:1257 #, c-format msgid " link to %s\n" msgstr " link cãtre %s\n" -#: src/list.c:1269 +#: src/list.c:1265 #, c-format msgid " unknown file type %s\n" msgstr " tip fiºier necunoscut %s\n" -#: src/list.c:1287 +#: src/list.c:1283 #, c-format msgid "--Long Link--\n" msgstr "--Link Lung--\n" -#: src/list.c:1291 +#: src/list.c:1287 #, c-format msgid "--Long Name--\n" msgstr "--Nume Lung--\n" -#: src/list.c:1295 +#: src/list.c:1291 #, c-format msgid "--Volume Header--\n" msgstr "--Antet Volum--\n" -#: src/list.c:1303 +#: src/list.c:1299 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Continuat la octet %s--\n" -#: src/list.c:1365 +#: src/list.c:1361 msgid "Creating directory:" msgstr "Creez director:" -#: src/misc.c:298 +#: src/misc.c:297 #, fuzzy msgid "Cannot get working directory" msgstr "Nu pot schimba directorul în care lucrez" -#: src/misc.c:571 +#: src/misc.c:570 #, c-format msgid "Renaming %s to %s\n" msgstr "Redenumesc %s ca %s\n" -#: src/misc.c:580 src/misc.c:599 +#: src/misc.c:579 src/misc.c:598 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: Nu pot redenumi ca %s" -#: src/misc.c:604 +#: src/misc.c:603 #, c-format msgid "Renaming %s back to %s\n" msgstr "Redenumesc %s înapoi ca %s\n" -#: src/misc.c:851 +#: src/misc.c:850 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Fiºier ºters înainte de a-l putea citi" -#: src/misc.c:866 -#, fuzzy, c-format -msgid "%s: Directory removed before we read it" -msgstr "%s: Fiºier ºters înainte de a-l putea citi" - -#: src/misc.c:887 +#: src/misc.c:871 msgid "child process" msgstr "proces copil" -#: src/misc.c:896 +#: src/misc.c:880 msgid "interprocess channel" msgstr "canal între-procese" -#: src/names.c:594 +#: src/names.c:590 #, fuzzy msgid "Pattern matching characters used in file names" msgstr "pattern-urile de excludere potrivesc începutul numelor de fiºiere" -#: src/names.c:596 +#: src/names.c:592 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" msgstr "" -#: src/names.c:614 src/names.c:630 +#: src/names.c:610 src/names.c:626 #, c-format msgid "%s: Not found in archive" msgstr "%s: Nu a fost gãsit în arhivã" -#: src/names.c:615 +#: src/names.c:611 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Lucrul cerut nu a fost gãsit în arhivã" -#: src/names.c:649 +#: src/names.c:645 #, fuzzy, c-format msgid "Archive label mismatch" msgstr "Arhiva nu este etichetatã sã se potriveascã cu %s" -#: src/names.c:953 +#: src/names.c:949 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" -#: src/names.c:959 +#: src/names.c:955 msgid "Only one -C option is allowed with --listed-incremental" msgstr "" @@ -2747,6 +2747,10 @@ msgstr "" msgid "--stat requires file names" msgstr "--Amestecat numele fiºierelor--\n" +#, fuzzy +#~ msgid "%s: Directory removed before we read it" +#~ msgstr "%s: Fiºier ºters înainte de a-l putea citi" + #, fuzzy #~ msgid "Cannot restore working directory" #~ msgstr "Nu pot salva directorul în care lucrez" diff --git a/po/ru.gmo b/po/ru.gmo index ee38d689f7821a225eda58568f17eca323ae46f6..f9ee7dbb04b0c3e60acb5b5c8c7fdc693de3fda8 100644 GIT binary patch delta 12292 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 N!)u$T7I!TU`VS?mnzsM| diff --git a/po/ru.po b/po/ru.po index 79e7529d..24ef953e 100644 --- a/po/ru.po +++ b/po/ru.po @@ -9,10 +9,10 @@ #: src/create.c:1552 msgid "" msgstr "" -"Project-Id-Version: tar 1.23\n" +"Project-Id-Version: tar 1.24\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2010-11-07 17:07+0200\n" -"PO-Revision-Date: 2010-05-08 19:30+0200\n" +"POT-Creation-Date: 2011-03-12 11:53+0200\n" +"PO-Revision-Date: 2010-10-25 12:19+0200\n" "Last-Translator: Pavel Maryanov \n" "Language-Team: Russian \n" "Language: ru\n" @@ -62,7 +62,7 @@ msgstr "%.*s: Неизвестный параметр ARGP_HELP_FMT" msgid "Garbage in ARGP_HELP_FMT: %s" msgstr "Мусор в ARGP_HELP_FMT: %s" -#: gnu/argp-help.c:1246 +#: gnu/argp-help.c:1248 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." @@ -71,31 +71,31 @@ msgstr "" "являются обязательными или необязательными для соответствующих коротких " "параметров." -#: gnu/argp-help.c:1639 +#: gnu/argp-help.c:1641 msgid "Usage:" msgstr "Использование:" -#: gnu/argp-help.c:1643 +#: gnu/argp-help.c:1645 msgid " or: " msgstr " или: " -#: gnu/argp-help.c:1655 +#: gnu/argp-help.c:1657 msgid " [OPTION...]" msgstr " [ПАРАМЕТР...]" -#: gnu/argp-help.c:1682 +#: gnu/argp-help.c:1684 #, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "" "Попробуйте `%s --help' или `%s --usage' для получения дополнительных " "сведений.\n" -#: gnu/argp-help.c:1710 +#: gnu/argp-help.c:1712 #, c-format msgid "Report bugs to %s.\n" msgstr "Отчёты об ошибках отправляйте по адресу: %s.\n" -#: gnu/argp-help.c:1929 gnu/error.c:183 +#: gnu/argp-help.c:1931 gnu/error.c:183 msgid "Unknown system error" msgstr "Неизвестная системная ошибка" @@ -162,9 +162,9 @@ msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: с параметром «%c%s» нельзя использовать аргумент\n" #: gnu/getopt.c:639 gnu/getopt.c:658 -#, fuzzy, c-format +#, c-format msgid "%s: option '--%s' requires an argument\n" -msgstr "%s: для параметра «%s» требуется аргумент\n" +msgstr "%s: для параметра «--%s» требуется аргумент\n" #: gnu/getopt.c:696 gnu/getopt.c:699 #, c-format @@ -197,20 +197,20 @@ msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: с параметром «-W %s» нельзя использовать аргумент\n" #: gnu/getopt.c:964 gnu/getopt.c:982 -#, fuzzy, c-format +#, c-format msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: для параметра «%s» требуется аргумент\n" +msgstr "%s: для параметра «-W %s» требуется аргумент\n" -#: gnu/obstack.c:425 gnu/obstack.c:427 gnu/xalloc-die.c:36 +#: gnu/obstack.c:423 gnu/obstack.c:425 gnu/xalloc-die.c:36 msgid "memory exhausted" msgstr "недостаточно памяти" -#: gnu/openat-die.c:36 +#: gnu/openat-die.c:40 #, c-format msgid "unable to record current working directory" msgstr "невозможно зарегистрировать текущий рабочий каталог" -#: gnu/openat-die.c:54 +#: gnu/openat-die.c:59 #, c-format msgid "failed to return to initial working directory" msgstr "не удалось вернуться в первоначальный рабочий каталог" @@ -234,11 +234,11 @@ msgstr "не удалось вернуться в первоначальный #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: gnu/quotearg.c:274 +#: gnu/quotearg.c:273 msgid "`" msgstr "«" -#: gnu/quotearg.c:275 +#: gnu/quotearg.c:274 msgid "'" msgstr "»" @@ -507,21 +507,21 @@ msgstr[0] "%s: Записан только %lu байт из %lu" msgstr[1] "%s: Записано только %lu байта из %lu" msgstr[2] "%s: Записано только %lu байт из %lu" -#: lib/paxnames.c:155 +#: lib/paxnames.c:140 #, c-format msgid "Removing leading `%s' from member names" msgstr "Удаляется начальный `%s' из имен объектов" -#: lib/paxnames.c:156 +#: lib/paxnames.c:141 #, c-format msgid "Removing leading `%s' from hard link targets" msgstr "Удаляются начальные `%s' из целей жестких ссылок" -#: lib/paxnames.c:169 +#: lib/paxnames.c:154 msgid "Substituting `.' for empty member name" msgstr "`.' заменяются пустыми именами объектов" -#: lib/paxnames.c:170 +#: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" msgstr "`.' заменяются пустыми целями жестких ссылок" @@ -821,20 +821,20 @@ msgstr[0] "Можно было прочитать только %lu байт из msgstr[1] "Можно было прочитать только %lu байта из %lu" msgstr[2] "Можно было прочитать только %lu байт из %lu" -#: src/compare.c:105 src/compare.c:382 +#: src/compare.c:105 src/compare.c:383 msgid "Contents differ" msgstr "Содержимое различно" -#: src/compare.c:131 src/extract.c:972 src/incremen.c:1462 src/list.c:458 -#: src/list.c:1392 src/xheader.c:711 +#: src/compare.c:131 src/extract.c:984 src/incremen.c:1456 src/list.c:456 +#: src/list.c:1388 src/xheader.c:711 msgid "Unexpected EOF in archive" msgstr "Неожиданный конец файла в архиве" -#: src/compare.c:179 src/compare.c:195 src/compare.c:308 src/compare.c:406 +#: src/compare.c:179 src/compare.c:195 src/compare.c:309 src/compare.c:407 msgid "File type differs" msgstr "Типы файлов отличаются" -#: src/compare.c:182 src/compare.c:202 src/compare.c:322 +#: src/compare.c:182 src/compare.c:202 src/compare.c:323 msgid "Mode differs" msgstr "Права доступа отличаются" @@ -850,42 +850,47 @@ msgstr "Gid отличаются" msgid "Mod time differs" msgstr "Время изменения отличается" -#: src/compare.c:215 src/compare.c:414 +#: src/compare.c:215 src/compare.c:415 msgid "Size differs" msgstr "Размеры отличаются" -#: src/compare.c:263 +#: src/compare.c:264 #, c-format msgid "Not linked to %s" msgstr "Не ссылается на %s" -#: src/compare.c:287 +#: src/compare.c:288 msgid "Symlink differs" msgstr "Символические ссылки отличаются" -#: src/compare.c:316 +#: src/compare.c:317 msgid "Device number differs" msgstr "Номера устройств отличаются" -#: src/compare.c:456 +#: src/compare.c:457 #, c-format msgid "Verify " msgstr "Проверка " -#: src/compare.c:463 +#: src/compare.c:464 #, c-format msgid "%s: Unknown file type `%c', diffed as normal file" msgstr "%s: Неизвестный тип файла `%c', сравнён как обычный файл " -#: src/compare.c:518 +#: src/compare.c:520 msgid "Archive contains file names with leading prefixes removed." msgstr "Архив содержит файлы с именами, из которых удалены префиксы." -#: src/compare.c:520 +#: src/compare.c:526 +#, fuzzy +msgid "Archive contains transformed file names." +msgstr "Архив содержит устаревающие заголовки base-64" + +#: src/compare.c:531 msgid "Verification may fail to locate original files." msgstr "При проверке оригинальные файлы могут быть не найдены." -#: src/compare.c:593 +#: src/compare.c:603 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" @@ -893,7 +898,7 @@ msgstr[0] "СБОЙ ПРОВЕРКИ: обнаружен %d неверный з msgstr[1] "СБОЙ ПРОВЕРКИ: обнаружено %d неверных заголовка" msgstr[2] "СБОЙ ПРОВЕРКИ: обнаружено %d неверных заголовков" -#: src/compare.c:611 src/list.c:222 +#: src/compare.c:621 src/list.c:222 #, c-format msgid "A lone zero block at %s" msgstr "Нулевой блок в %s" @@ -945,7 +950,7 @@ msgstr[2] "%s: Файл урезан на %s байт; дополнен нуля msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: файл находится на другой файловой системе; не сброшен" -#: src/create.c:1203 src/create.c:1214 src/incremen.c:582 src/incremen.c:588 +#: src/create.c:1203 src/create.c:1214 src/incremen.c:578 src/incremen.c:584 msgid "contents not dumped" msgstr "содержимое не сброшено" @@ -969,7 +974,7 @@ msgstr "%s: файл не изменён; не сброшен" msgid "%s: file is the archive; not dumped" msgstr "%s: файл является архивом; не сброшен" -#: src/create.c:1723 src/incremen.c:575 +#: src/create.c:1723 src/incremen.c:571 msgid "directory not dumped" msgstr "каталог не сброшен" @@ -978,12 +983,12 @@ msgstr "каталог не сброшен" msgid "%s: file changed as we read it" msgstr "%s: файл изменился во время чтения" -#: src/create.c:1857 +#: src/create.c:1858 #, c-format msgid "%s: socket ignored" msgstr "%s: сокет проигнорирован" -#: src/create.c:1863 +#: src/create.c:1864 #, c-format msgid "%s: door ignored" msgstr "%s: door проигнорирован" @@ -1011,164 +1016,164 @@ msgstr "%s: временная метка %s - %s с в будущем " msgid "%s: Unexpected inconsistency when making directory" msgstr "%s: Неожиданная противоречивость при создании каталога" -#: src/extract.c:709 +#: src/extract.c:721 #, c-format msgid "%s: Directory renamed before its status could be extracted" msgstr "%s: Каталог переименован до того, как мог быть извлечен его статус" -#: src/extract.c:863 +#: src/extract.c:875 msgid "Extracting contiguous files as regular files" msgstr "Непрерывные файлы извлекаются как обычные" -#: src/extract.c:1197 +#: src/extract.c:1209 msgid "Attempting extraction of symbolic links as hard links" msgstr "Выполняется попытка извлечь символические ссылки как жесткие" -#: src/extract.c:1353 +#: src/extract.c:1365 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Невозможно извлечь -- файл продолжается с другого тома" -#: src/extract.c:1360 src/list.c:1125 +#: src/extract.c:1372 src/list.c:1121 msgid "Unexpected long name header" msgstr "Непредвиденный длинный заголовок имени" -#: src/extract.c:1367 +#: src/extract.c:1379 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Неизвестный тип файла `%c', извлечён как обычный файл" -#: src/extract.c:1393 +#: src/extract.c:1405 #, c-format msgid "Current %s is newer or same age" msgstr "Текущий %s более новый или такого же возраста" -#: src/extract.c:1445 +#: src/extract.c:1457 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Невозможно было выполнить резервное копирование этот файла" -#: src/extract.c:1582 +#: src/extract.c:1594 #, c-format msgid "Cannot rename %s to %s" msgstr "Невозможно переименовать %s в %s" -#: src/incremen.c:474 src/incremen.c:518 +#: src/incremen.c:473 src/incremen.c:517 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Каталог был переименован из %s" -#: src/incremen.c:486 +#: src/incremen.c:485 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Каталог был переименован" -#: src/incremen.c:531 +#: src/incremen.c:530 #, c-format msgid "%s: Directory is new" msgstr "%s: Каталог новый" -#: src/incremen.c:956 src/incremen.c:973 +#: src/incremen.c:951 src/incremen.c:968 msgid "Invalid time stamp" msgstr "Неверная временная метка" -#: src/incremen.c:1012 +#: src/incremen.c:1007 msgid "Invalid modification time (seconds)" msgstr "Неверное время изменения (секунды) " -#: src/incremen.c:1027 +#: src/incremen.c:1022 msgid "Invalid modification time (nanoseconds)" msgstr "Неверное время изменения (наносекунды)" -#: src/incremen.c:1047 +#: src/incremen.c:1042 msgid "Invalid device number" msgstr "Неверный номер устройства" -#: src/incremen.c:1062 +#: src/incremen.c:1057 msgid "Invalid inode number" msgstr "Неверный номер inode" -#: src/incremen.c:1113 src/incremen.c:1150 +#: src/incremen.c:1108 src/incremen.c:1145 msgid "Field too long while reading snapshot file" msgstr "Слишком длинное поле при чтении из snapshot-файла" -#: src/incremen.c:1120 src/incremen.c:1158 +#: src/incremen.c:1115 src/incremen.c:1153 msgid "Read error in snapshot file" msgstr "Ошибка чтения snapshot-файла" -#: src/incremen.c:1122 src/incremen.c:1162 src/incremen.c:1214 -#: src/incremen.c:1272 +#: src/incremen.c:1117 src/incremen.c:1157 src/incremen.c:1209 +#: src/incremen.c:1267 msgid "Unexpected EOF in snapshot file" msgstr "Неожиданный конец файла snapshot-файле" -#: src/incremen.c:1129 src/incremen.c:1169 +#: src/incremen.c:1124 src/incremen.c:1164 msgid "Unexpected field value in snapshot file" msgstr "Неожиданное значения поля в snapshot-файле" -#: src/incremen.c:1264 +#: src/incremen.c:1259 msgid "Missing record terminator" msgstr "Отсутствует указатель конца записи" -#: src/incremen.c:1325 src/incremen.c:1328 +#: src/incremen.c:1320 src/incremen.c:1323 msgid "Bad incremental file format" msgstr "Неверный формат инкрементного файла" -#: src/incremen.c:1347 +#: src/incremen.c:1342 #, c-format msgid "Unsupported incremental format version: %" msgstr "Неподдерживаемая версия инкрементного формата: %" -#: src/incremen.c:1502 +#: src/incremen.c:1496 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "Неверно сформирован dump-каталог: ожидался '%c', а найден %#3o" -#: src/incremen.c:1512 +#: src/incremen.c:1506 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Неверно сформирован dump-каталог: 'X' повторяется" -#: src/incremen.c:1525 +#: src/incremen.c:1519 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Неверно сформирован dump-каталог: пустое имя в 'R'" -#: src/incremen.c:1538 +#: src/incremen.c:1532 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Неверно сформирован dump-каталог: перед 'T' не стоит 'R'" -#: src/incremen.c:1544 +#: src/incremen.c:1538 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Неверно сформирован dump-каталог: пустое имя в 'T'" -#: src/incremen.c:1564 +#: src/incremen.c:1558 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "Неверно сформирован dump-каталог: ожидался '%c', а найден конец данных" -#: src/incremen.c:1571 +#: src/incremen.c:1565 msgid "Malformed dumpdir: 'X' never used" msgstr "Неверно сформирован dump-каталог: 'X' ни разу не использован" -#: src/incremen.c:1615 +#: src/incremen.c:1609 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Невозможно создать временный каталог с помощью шаблона %s" -#: src/incremen.c:1677 +#: src/incremen.c:1670 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Каталог не удалён: невозможно выполнить stat" -#: src/incremen.c:1690 +#: src/incremen.c:1683 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: Каталог находится на другом устройстве: не удален" -#: src/incremen.c:1698 +#: src/incremen.c:1691 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Удаляется %s\n" -#: src/incremen.c:1703 +#: src/incremen.c:1696 #, c-format msgid "%s: Cannot remove" msgstr "%s: Невозможно удалить" @@ -1188,20 +1193,20 @@ msgstr "блок %s: ** Блок нулей **\n" msgid "block %s: ** End of File **\n" msgstr "блок %s: ** Конец файла **\n" -#: src/list.c:256 src/list.c:1097 src/list.c:1360 +#: src/list.c:256 src/list.c:1093 src/list.c:1356 #, c-format msgid "block %s: " msgstr "блок %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:712 +#: src/list.c:708 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "В заголовке пустое поле вместо ожидаемого числового значения %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:767 +#: src/list.c:763 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1209,114 +1214,108 @@ msgstr "" "дополнение до двух" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:778 +#: src/list.c:774 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Восьмеричное значение архива %.*s за пределами диапазона %s" -#: src/list.c:799 +#: src/list.c:795 msgid "Archive contains obsolescent base-64 headers" msgstr "Архив содержит устаревающие заголовки base-64" -#: src/list.c:813 +#: src/list.c:809 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "Архив подписан строкой base-64 %s за пределами диапазона %s" -#: src/list.c:844 +#: src/list.c:840 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Значение base-256 архива за пределами диапазона %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:873 +#: src/list.c:869 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Заголовок содержит %.*s вместо ожидаемого числового значения %s" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:895 +#: src/list.c:891 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Значение архива %s за пределами %s диапазона %s..%s" -#: src/list.c:1261 +#: src/list.c:1257 #, c-format msgid " link to %s\n" msgstr " ссылка на %s\n" -#: src/list.c:1269 +#: src/list.c:1265 #, c-format msgid " unknown file type %s\n" msgstr " неизвестный тип файла %s\n" -#: src/list.c:1287 +#: src/list.c:1283 #, c-format msgid "--Long Link--\n" msgstr "--Длинная ссылка--\n" -#: src/list.c:1291 +#: src/list.c:1287 #, c-format msgid "--Long Name--\n" msgstr "--Длинное имя--\n" -#: src/list.c:1295 +#: src/list.c:1291 #, c-format msgid "--Volume Header--\n" msgstr "--Заголовок тома--\n" -#: src/list.c:1303 +#: src/list.c:1299 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Продолжение с позиции %s--\n" -#: src/list.c:1365 +#: src/list.c:1361 msgid "Creating directory:" msgstr "Создание каталога:" -#: src/misc.c:298 -#, fuzzy +#: src/misc.c:297 msgid "Cannot get working directory" -msgstr "Невозможно изменить рабочий каталог" +msgstr "Не удаётся получить рабочий каталог" -#: src/misc.c:571 +#: src/misc.c:570 #, c-format msgid "Renaming %s to %s\n" msgstr "%s переименован в %s\n" -#: src/misc.c:580 src/misc.c:599 +#: src/misc.c:579 src/misc.c:598 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: Невозможно переименовать в %s" -#: src/misc.c:604 +#: src/misc.c:603 #, c-format msgid "Renaming %s back to %s\n" msgstr "%s переименовывается назад в %s\n" -#: src/misc.c:851 +#: src/misc.c:850 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Файла удален до его считывания" -#: src/misc.c:866 -#, c-format -msgid "%s: Directory removed before we read it" -msgstr "%s: каталог удалён до его чтения" - -#: src/misc.c:887 +#: src/misc.c:871 msgid "child process" msgstr "дочерний процесс" -#: src/misc.c:896 +#: src/misc.c:880 msgid "interprocess channel" msgstr "межпроцессорный канал" -#: src/names.c:594 +#: src/names.c:590 msgid "Pattern matching characters used in file names" msgstr "В именах файлов используются символы подстановки" -#: src/names.c:596 +#: src/names.c:592 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" @@ -1324,29 +1323,29 @@ msgstr "" "Используйте --wildcards, чтобы задействовать эти символы, или --no-" "wildcards, чтобы убрать это предепреждение." -#: src/names.c:614 src/names.c:630 +#: src/names.c:610 src/names.c:626 #, c-format msgid "%s: Not found in archive" msgstr "%s: Не найден в архиве" -#: src/names.c:615 +#: src/names.c:611 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Требуемое вхождение не найдено в архиве" -#: src/names.c:649 -#, fuzzy, c-format +#: src/names.c:645 +#, c-format msgid "Archive label mismatch" -msgstr "Метка архива не соответствует %s" +msgstr "Несоответствиве метки архива" -#: src/names.c:953 +#: src/names.c:949 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" "Параметра -C в списке файлов нельзя Использовать с параметром --listed-" "incremental" -#: src/names.c:959 +#: src/names.c:955 msgid "Only one -C option is allowed with --listed-incremental" msgstr "" "С параметром --listed-incremental можно использовать только параметр -C" @@ -2096,13 +2095,12 @@ msgstr "" "префикса SIG" #: src/tar.c:756 -#, fuzzy msgid "print file modification times in UTC" -msgstr "вывод даты изменения файла в формате UTC" +msgstr "вывод времени изменения файла в формате UTC" #: src/tar.c:758 msgid "print file time to its full resolution" -msgstr "" +msgstr "вывод имени файла и его полного разрешения" #: src/tar.c:760 msgid "send verbose output to FILE" @@ -2770,6 +2768,9 @@ msgstr "Команда завершена\n" msgid "--stat requires file names" msgstr "для опции --stat нужны имена файлов" +#~ msgid "%s: Directory removed before we read it" +#~ msgstr "%s: каталог удалён до его чтения" + #~ msgid "Cannot save working directory" #~ msgstr "Невозможно сохранить рабочий каталог" diff --git a/po/sk.gmo b/po/sk.gmo index 887cb28f96920451d2a93883aa4a7f1276f03814..f60c0ee15470c912af3dfd89fde3d7d8ac64225a 100644 GIT binary patch delta 26 hcmZn)ZVKKoRf5-0*T7iU&`811(8|6) delta 26 hcmZn)ZVKKoRf5+**U(Vcz+A!5+{(aw^CF1{0sw5r2krm> diff --git a/po/sk.po b/po/sk.po index ecee94bf..d748940e 100644 --- a/po/sk.po +++ b/po/sk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tar- \n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2010-11-07 17:07+0200\n" +"POT-Creation-Date: 2011-03-12 11:53+0200\n" "PO-Revision-Date: 2002-02-10 12:00CEST\n" "Last-Translator: Martin Lacko \n" "Language-Team: Slovak \n" @@ -57,33 +57,33 @@ msgstr "" msgid "Garbage in ARGP_HELP_FMT: %s" msgstr "" -#: gnu/argp-help.c:1246 +#: gnu/argp-help.c:1248 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." msgstr "" -#: gnu/argp-help.c:1639 +#: gnu/argp-help.c:1641 msgid "Usage:" msgstr "" -#: gnu/argp-help.c:1643 +#: gnu/argp-help.c:1645 msgid " or: " msgstr "" -#: gnu/argp-help.c:1655 +#: gnu/argp-help.c:1657 #, fuzzy msgid " [OPTION...]" msgstr "" "\n" "Pou¾itie: %s [PREPÍNAÈ]...\n" -#: gnu/argp-help.c:1682 +#: gnu/argp-help.c:1684 #, fuzzy, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Viac informácií získate príkazom `%s --help'.\n" -#: gnu/argp-help.c:1710 +#: gnu/argp-help.c:1712 #, fuzzy, c-format msgid "Report bugs to %s.\n" msgstr "" @@ -92,7 +92,7 @@ msgstr "" "pripomienky k pkekladu zasielajte na adresu " "(slovensky).\n" -#: gnu/argp-help.c:1929 gnu/error.c:183 +#: gnu/argp-help.c:1931 gnu/error.c:183 msgid "Unknown system error" msgstr "Neznáma systémová chyba" @@ -198,16 +198,16 @@ msgstr "%s: prep msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: prepínaè `%s' vy¾aduje argument\n" -#: gnu/obstack.c:425 gnu/obstack.c:427 gnu/xalloc-die.c:36 +#: gnu/obstack.c:423 gnu/obstack.c:425 gnu/xalloc-die.c:36 msgid "memory exhausted" msgstr "Pamä» vyèerpaná" -#: gnu/openat-die.c:36 +#: gnu/openat-die.c:40 #, fuzzy, c-format msgid "unable to record current working directory" msgstr "Pracovný adresár nie je mo¾né zmeni»" -#: gnu/openat-die.c:54 +#: gnu/openat-die.c:59 #, fuzzy, c-format msgid "failed to return to initial working directory" msgstr "Pracovný adresár nie je mo¾né uchova»" @@ -231,11 +231,11 @@ msgstr "Pracovn #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: gnu/quotearg.c:274 +#: gnu/quotearg.c:273 msgid "`" msgstr "`" -#: gnu/quotearg.c:275 +#: gnu/quotearg.c:274 msgid "'" msgstr "'" @@ -484,22 +484,22 @@ msgid_plural "%s: Wrote only %lu of %lu bytes" msgstr[0] "%s: Zapísané iba %lu z %lu bajtov" msgstr[1] "%s: Zapísané iba %lu z %lu bajtov" -#: lib/paxnames.c:155 +#: lib/paxnames.c:140 #, fuzzy, c-format msgid "Removing leading `%s' from member names" msgstr "Odstraòujem úvodné `%.*s' z názvov súborov" -#: lib/paxnames.c:156 +#: lib/paxnames.c:141 #, fuzzy, c-format msgid "Removing leading `%s' from hard link targets" msgstr "Odstraòujem úvodné `%.*s' z názvov súborov" -#: lib/paxnames.c:169 +#: lib/paxnames.c:154 #, fuzzy msgid "Substituting `.' for empty member name" msgstr "Odstraòujem úvodné `%.*s' z názvov súborov" -#: lib/paxnames.c:170 +#: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" msgstr "" @@ -797,20 +797,20 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "Dá sa èíta» iba %lu z %lu bajtov" msgstr[1] "Dá sa èíta» iba %lu z %lu bajtov" -#: src/compare.c:105 src/compare.c:382 +#: src/compare.c:105 src/compare.c:383 msgid "Contents differ" msgstr "Obsah sa lí¹i" -#: src/compare.c:131 src/extract.c:972 src/incremen.c:1462 src/list.c:458 -#: src/list.c:1392 src/xheader.c:711 +#: src/compare.c:131 src/extract.c:984 src/incremen.c:1456 src/list.c:456 +#: src/list.c:1388 src/xheader.c:711 msgid "Unexpected EOF in archive" msgstr "Neoèekávaný koniec archívu" -#: src/compare.c:179 src/compare.c:195 src/compare.c:308 src/compare.c:406 +#: src/compare.c:179 src/compare.c:195 src/compare.c:309 src/compare.c:407 msgid "File type differs" msgstr "Typ súboru sa lí¹i" -#: src/compare.c:182 src/compare.c:202 src/compare.c:322 +#: src/compare.c:182 src/compare.c:202 src/compare.c:323 msgid "Mode differs" msgstr "Práva sa lí¹ia" @@ -826,49 +826,54 @@ msgstr "Gid sa l msgid "Mod time differs" msgstr "Èas poslednej úpravy sa lí¹i" -#: src/compare.c:215 src/compare.c:414 +#: src/compare.c:215 src/compare.c:415 msgid "Size differs" msgstr "Veµkos» sa lí¹i" -#: src/compare.c:263 +#: src/compare.c:264 #, c-format msgid "Not linked to %s" msgstr "Nie je odkazom na %s" -#: src/compare.c:287 +#: src/compare.c:288 msgid "Symlink differs" msgstr "Symbolický odkaz sa lí¹i" -#: src/compare.c:316 +#: src/compare.c:317 msgid "Device number differs" msgstr "Èíslo zariadenia sa lí¹i" -#: src/compare.c:456 +#: src/compare.c:457 #, c-format msgid "Verify " msgstr "Overujem " -#: src/compare.c:463 +#: src/compare.c:464 #, fuzzy, c-format msgid "%s: Unknown file type `%c', diffed as normal file" msgstr "%s: Neznámy typ súboru '%c', porovnávaný ako normálny súbor" -#: src/compare.c:518 +#: src/compare.c:520 msgid "Archive contains file names with leading prefixes removed." msgstr "" -#: src/compare.c:520 +#: src/compare.c:526 +#, fuzzy +msgid "Archive contains transformed file names." +msgstr "Archív obsahuje zastaralé base-64 hlavièky" + +#: src/compare.c:531 msgid "Verification may fail to locate original files." msgstr "" -#: src/compare.c:593 +#: src/compare.c:603 #, fuzzy, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "CHYBNÉ OVERENIE: nájdených chybných hlavièiek: %d" msgstr[1] "CHYBNÉ OVERENIE: nájdených chybných hlavièiek: %d" -#: src/compare.c:611 src/list.c:222 +#: src/compare.c:621 src/list.c:222 #, c-format msgid "A lone zero block at %s" msgstr "" @@ -919,7 +924,7 @@ msgstr[1] "%s: S msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: súbor je na inom súborovom systéme; nearchivovaný" -#: src/create.c:1203 src/create.c:1214 src/incremen.c:582 src/incremen.c:588 +#: src/create.c:1203 src/create.c:1214 src/incremen.c:578 src/incremen.c:584 msgid "contents not dumped" msgstr "" @@ -943,7 +948,7 @@ msgstr "%s: s msgid "%s: file is the archive; not dumped" msgstr "%s: súbor je archiv; nearchivovaný" -#: src/create.c:1723 src/incremen.c:575 +#: src/create.c:1723 src/incremen.c:571 msgid "directory not dumped" msgstr "" @@ -952,12 +957,12 @@ msgstr "" msgid "%s: file changed as we read it" msgstr "%s: súbor bol poèas èítania zmenený" -#: src/create.c:1857 +#: src/create.c:1858 #, c-format msgid "%s: socket ignored" msgstr "%s: soket ignorovaný" -#: src/create.c:1863 +#: src/create.c:1864 #, c-format msgid "%s: door ignored" msgstr "%s: dvere ignorované" @@ -985,168 +990,168 @@ msgstr "%s: msgid "%s: Unexpected inconsistency when making directory" msgstr "%s: Neoèakávaná nekonzistencia, pri vytvárení adresára" -#: src/extract.c:709 +#: src/extract.c:721 #, c-format msgid "%s: Directory renamed before its status could be extracted" msgstr "" "%s: Prieèinok bol premenovaný predtým, ako mohol by» extrahovaný jeho stav" -#: src/extract.c:863 +#: src/extract.c:875 msgid "Extracting contiguous files as regular files" msgstr "Súvisle ulo¾ené súbory rozbaµujem ako obyèajné súbory" -#: src/extract.c:1197 +#: src/extract.c:1209 msgid "Attempting extraction of symbolic links as hard links" msgstr "Skú¹am rozbali» symbolické odkazy ako pevné odkazy" -#: src/extract.c:1353 +#: src/extract.c:1365 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Nedá sa rozbali» -- súbor je pokraèovaním iného zväzku" -#: src/extract.c:1360 src/list.c:1125 +#: src/extract.c:1372 src/list.c:1121 #, fuzzy msgid "Unexpected long name header" msgstr "Neoèakávaný koniec v rozsekanom mene" -#: src/extract.c:1367 +#: src/extract.c:1379 #, fuzzy, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Neznámy typ súboru `%c', rozbalený ako normálny súbor" -#: src/extract.c:1393 +#: src/extract.c:1405 #, c-format msgid "Current %s is newer or same age" msgstr "" -#: src/extract.c:1445 +#: src/extract.c:1457 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Tento súbor nebolo mo¾né zálohova»" -#: src/extract.c:1582 +#: src/extract.c:1594 #, fuzzy, c-format msgid "Cannot rename %s to %s" msgstr "%s: nie je mo¾né premenova» na %s" -#: src/incremen.c:474 src/incremen.c:518 +#: src/incremen.c:473 src/incremen.c:517 #, fuzzy, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Adresár bol premenovaný" -#: src/incremen.c:486 +#: src/incremen.c:485 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Adresár bol premenovaný" -#: src/incremen.c:531 +#: src/incremen.c:530 #, c-format msgid "%s: Directory is new" msgstr "%s: Adresár je nový" -#: src/incremen.c:956 src/incremen.c:973 +#: src/incremen.c:951 src/incremen.c:968 msgid "Invalid time stamp" msgstr "Neplatný èas súboru" -#: src/incremen.c:1012 +#: src/incremen.c:1007 #, fuzzy msgid "Invalid modification time (seconds)" msgstr "Zadáné chybné práva" -#: src/incremen.c:1027 +#: src/incremen.c:1022 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:1047 +#: src/incremen.c:1042 msgid "Invalid device number" msgstr "Neplatné èíslo zariadenia" -#: src/incremen.c:1062 +#: src/incremen.c:1057 msgid "Invalid inode number" msgstr "Neplatné èíslo i-uzlu" -#: src/incremen.c:1113 src/incremen.c:1150 +#: src/incremen.c:1108 src/incremen.c:1145 msgid "Field too long while reading snapshot file" msgstr "" -#: src/incremen.c:1120 src/incremen.c:1158 +#: src/incremen.c:1115 src/incremen.c:1153 msgid "Read error in snapshot file" msgstr "" -#: src/incremen.c:1122 src/incremen.c:1162 src/incremen.c:1214 -#: src/incremen.c:1272 +#: src/incremen.c:1117 src/incremen.c:1157 src/incremen.c:1209 +#: src/incremen.c:1267 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "Neoèekávaný koniec archívu" -#: src/incremen.c:1129 src/incremen.c:1169 +#: src/incremen.c:1124 src/incremen.c:1164 msgid "Unexpected field value in snapshot file" msgstr "" -#: src/incremen.c:1264 +#: src/incremen.c:1259 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1325 src/incremen.c:1328 +#: src/incremen.c:1320 src/incremen.c:1323 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1347 +#: src/incremen.c:1342 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1502 +#: src/incremen.c:1496 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1512 +#: src/incremen.c:1506 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1525 +#: src/incremen.c:1519 msgid "Malformed dumpdir: empty name in 'R'" msgstr "" -#: src/incremen.c:1538 +#: src/incremen.c:1532 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1544 +#: src/incremen.c:1538 msgid "Malformed dumpdir: empty name in 'T'" msgstr "" -#: src/incremen.c:1564 +#: src/incremen.c:1558 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1571 +#: src/incremen.c:1565 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1615 +#: src/incremen.c:1609 #, fuzzy, c-format msgid "Cannot create temporary directory using template %s" msgstr "Pre blokový faktor (blokov na záznam) %d nie je mo¾né alokovat pamä»" -#: src/incremen.c:1677 +#: src/incremen.c:1670 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1690 +#: src/incremen.c:1683 #, fuzzy, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: súbor je na inom súborovom systéme; nearchivovaný" -#: src/incremen.c:1698 +#: src/incremen.c:1691 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Ma¾em %s\n" -#: src/incremen.c:1703 +#: src/incremen.c:1696 #, c-format msgid "%s: Cannot remove" msgstr "%s: Nedá sa zmaza»" @@ -1166,20 +1171,20 @@ msgstr "blok %s: ** Blok NUL **\n" msgid "block %s: ** End of File **\n" msgstr "blok %s: ** Konec súboru **\n" -#: src/list.c:256 src/list.c:1097 src/list.c:1360 +#: src/list.c:256 src/list.c:1093 src/list.c:1356 #, c-format msgid "block %s: " msgstr "blok %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:712 +#: src/list.c:708 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Medzery v hlavièke na mieste, kde je oèakávaná èíselná hodnota typu %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:767 +#: src/list.c:763 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1187,140 +1192,135 @@ msgstr "" "complement" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:778 +#: src/list.c:774 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Osmièková hodnota %.*s typu %s je mimo rozsah" -#: src/list.c:799 +#: src/list.c:795 msgid "Archive contains obsolescent base-64 headers" msgstr "Archív obsahuje zastaralé base-64 hlavièky" -#: src/list.c:813 +#: src/list.c:809 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "Hodnota base-64 typu %s je mimo %s rozsah" -#: src/list.c:844 +#: src/list.c:840 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Hodnota base-256 typu %s je mimo rozsah" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:873 +#: src/list.c:869 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Archív obsahuje %.*s tam, kde je oèakaváná èísalná hodnota typu %s" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:895 +#: src/list.c:891 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Hodnota %s typu %s je mimo rozsah %s..%s" -#: src/list.c:1261 +#: src/list.c:1257 #, c-format msgid " link to %s\n" msgstr " odkaz na %s\n" -#: src/list.c:1269 +#: src/list.c:1265 #, c-format msgid " unknown file type %s\n" msgstr " neznámy typ súboru %s\n" -#: src/list.c:1287 +#: src/list.c:1283 #, c-format msgid "--Long Link--\n" msgstr "" -#: src/list.c:1291 +#: src/list.c:1287 #, c-format msgid "--Long Name--\n" msgstr "" -#: src/list.c:1295 +#: src/list.c:1291 #, c-format msgid "--Volume Header--\n" msgstr "--Hlavièka zväzku--\n" -#: src/list.c:1303 +#: src/list.c:1299 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Pokraèované od %s bajtu--\n" -#: src/list.c:1365 +#: src/list.c:1361 msgid "Creating directory:" msgstr "Vytváram adresár:" -#: src/misc.c:298 +#: src/misc.c:297 #, fuzzy msgid "Cannot get working directory" msgstr "Pracovný adresár nie je mo¾né zmeni»" -#: src/misc.c:571 +#: src/misc.c:570 #, c-format msgid "Renaming %s to %s\n" msgstr "Premenovávam %s na %s\n" -#: src/misc.c:580 src/misc.c:599 +#: src/misc.c:579 src/misc.c:598 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: nie je mo¾né premenova» na %s" -#: src/misc.c:604 +#: src/misc.c:603 #, c-format msgid "Renaming %s back to %s\n" msgstr "Premenovávám %s spä» na %s\n" -#: src/misc.c:851 +#: src/misc.c:850 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Súbor zmazaný skôr ako mohl by» èítaný" -#: src/misc.c:866 -#, fuzzy, c-format -msgid "%s: Directory removed before we read it" -msgstr "%s: Súbor zmazaný skôr ako mohl by» èítaný" - -#: src/misc.c:887 +#: src/misc.c:871 msgid "child process" msgstr "potomok" -#: src/misc.c:896 +#: src/misc.c:880 msgid "interprocess channel" msgstr "meziprocesový kanál" -#: src/names.c:594 +#: src/names.c:590 msgid "Pattern matching characters used in file names" msgstr "" -#: src/names.c:596 +#: src/names.c:592 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" msgstr "" -#: src/names.c:614 src/names.c:630 +#: src/names.c:610 src/names.c:626 #, c-format msgid "%s: Not found in archive" msgstr "%s: V archíve nenájdený" -#: src/names.c:615 +#: src/names.c:611 #, fuzzy, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: V archíve nenájdený" -#: src/names.c:649 +#: src/names.c:645 #, fuzzy, c-format msgid "Archive label mismatch" msgstr "Pre vyhodnotenie vzorky `%s' musí by» archív pomenovaný" -#: src/names.c:953 +#: src/names.c:949 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" -#: src/names.c:959 +#: src/names.c:955 msgid "Only one -C option is allowed with --listed-incremental" msgstr "" @@ -2692,6 +2692,10 @@ msgstr "" msgid "--stat requires file names" msgstr "--Rozdelené meno súboru--\n" +#, fuzzy +#~ msgid "%s: Directory removed before we read it" +#~ msgstr "%s: Súbor zmazaný skôr ako mohl by» èítaný" + #, fuzzy #~ msgid "Cannot restore working directory" #~ msgstr "Pracovný adresár nie je mo¾né uchova»" diff --git a/po/sl.gmo b/po/sl.gmo index e9f5c1ead927dc7279c3cbcb515712f6628fd63f..6c142eabdd66009be1b539e7ff2014c30040a04e 100644 GIT binary patch literal 58589 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 DXg;aYu3Q>lrDc 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 KKDFeLlK(%MbXV#C delta 10069 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 DDJhGI diff --git a/po/sl.po b/po/sl.po index a1911535..893df436 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1,16 +1,16 @@ # -*- mode: po; coding: utf-8; -*- Slovenian message catalog for GNU Tar -# Copyright (C) 1996, 1999, 2000, 2001, 2005, 2006, 2007, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996, 1999, 2000, 2001, 2005, 2006, 2007, 2009, 2011 Free Software Foundation, Inc. # This file is distributed under the same license as the tar package. -# Primož Peterlin , 1996, 1999, 2000, 2001, 2005, 2006, 2007, 2009. +# Primož Peterlin , 1996, 1999, 2000, 2001, 2005, 2006, 2007, 2009, 2011. # -# $Id: tar-1.22.sl.po 1.2 2009/05/09 09:09:31 Primoz Exp $ +# $Id: tar-1.25.sl.po,v 1.4 2011/01/14 13:29:40 peterlin Exp $ #: src/create.c:1552 msgid "" msgstr "" -"Project-Id-Version: tar 1.22\n" +"Project-Id-Version: tar 1.25\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2010-11-07 17:07+0200\n" -"PO-Revision-Date: 2009-05-09 11:09+0200\n" +"POT-Creation-Date: 2011-03-12 11:53+0200\n" +"PO-Revision-Date: 2011-01-14 14:29+0100\n" "Last-Translator: Primož Peterlin \n" "Language-Team: Slovenian \n" "Language: sl\n" @@ -60,7 +60,7 @@ msgstr "%.*s: neznan parameter ARGP_HELP_FMT" msgid "Garbage in ARGP_HELP_FMT: %s" msgstr "Smetje v ARGP_HELP_FMT: %s" -#: gnu/argp-help.c:1246 +#: gnu/argp-help.c:1248 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." @@ -68,29 +68,29 @@ msgstr "" "Argumenti, ki so bodisi obvezni bodisi neobvezni za dolge oblike izbir, so " "obvezni/neobvezni tudi za kratke oblike." -#: gnu/argp-help.c:1639 +#: gnu/argp-help.c:1641 msgid "Usage:" msgstr "Uporaba:" -#: gnu/argp-help.c:1643 +#: gnu/argp-help.c:1645 msgid " or: " msgstr " ali: " -#: gnu/argp-help.c:1655 +#: gnu/argp-help.c:1657 msgid " [OPTION...]" msgstr " [IZBIRA...]" -#: gnu/argp-help.c:1682 +#: gnu/argp-help.c:1684 #, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Poskusite »%s --help« ali »%s --usage« za izčrpnejÅ¡a navodila.\n" -#: gnu/argp-help.c:1710 +#: gnu/argp-help.c:1712 #, c-format msgid "Report bugs to %s.\n" msgstr "Poročila o napakah javite na %s.\n" -#: gnu/argp-help.c:1929 gnu/error.c:183 +#: gnu/argp-help.c:1931 gnu/error.c:183 msgid "Unknown system error" msgstr "Neznana sistemska napaka" @@ -142,70 +142,70 @@ msgid "write error" msgstr "napaka pri pisanju" #: gnu/getopt.c:529 gnu/getopt.c:545 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s' is ambiguous\n" -msgstr "%s: izbira »%s« ni enoznačna\n" +msgstr "%s: izbira »%s« ni enopomenska\n" #: gnu/getopt.c:578 gnu/getopt.c:582 -#, fuzzy, c-format +#, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: izbira »--%s« ne dovoljuje argumenta\n" #: gnu/getopt.c:591 gnu/getopt.c:596 -#, fuzzy, c-format +#, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: izbira »%c%s« ne dovoljuje argumenta\n" #: gnu/getopt.c:639 gnu/getopt.c:658 -#, fuzzy, c-format +#, c-format msgid "%s: option '--%s' requires an argument\n" -msgstr "%s: izbira »%s« zahteva argument\n" +msgstr "%s: izbira »--%s« zahteva argument\n" #: gnu/getopt.c:696 gnu/getopt.c:699 -#, fuzzy, c-format +#, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: neprepoznana izbira »--%s«\n" #: gnu/getopt.c:707 gnu/getopt.c:710 -#, fuzzy, c-format +#, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: neprepoznana izbira »%c%s«\n" #: gnu/getopt.c:759 gnu/getopt.c:762 -#, fuzzy, c-format +#, c-format msgid "%s: invalid option -- '%c'\n" -msgstr "%s: neveljavna izbira -- %c\n" +msgstr "%s: neveljavna izbira -- »%c«\n" #: gnu/getopt.c:812 gnu/getopt.c:829 gnu/getopt.c:1037 gnu/getopt.c:1055 -#, fuzzy, c-format +#, c-format msgid "%s: option requires an argument -- '%c'\n" -msgstr "%s: izbira zahteva argument -- %c\n" +msgstr "%s: izbira zahteva argument -- »%c«\n" #: gnu/getopt.c:885 gnu/getopt.c:901 -#, fuzzy, c-format +#, c-format msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: izbira »-W %s« je dvoumna\n" +msgstr "%s: izbira »-W %s« ni enopomenska\n" #: gnu/getopt.c:925 gnu/getopt.c:943 -#, fuzzy, c-format +#, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: izbira »-W %s« ne dovoljuje argumenta\n" #: gnu/getopt.c:964 gnu/getopt.c:982 -#, fuzzy, c-format +#, c-format msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: izbira »%s« zahteva argument\n" +msgstr "%s: izbira »-W %s« zahteva argument\n" -#: gnu/obstack.c:425 gnu/obstack.c:427 gnu/xalloc-die.c:36 +#: gnu/obstack.c:423 gnu/obstack.c:425 gnu/xalloc-die.c:36 msgid "memory exhausted" -msgstr "zmanjkalo pomnilnika" +msgstr "pomnilnik porabljen" -#: gnu/openat-die.c:36 +#: gnu/openat-die.c:40 #, c-format msgid "unable to record current working directory" msgstr "ni mogoče zabeležiti trenutnega imenika" -#: gnu/openat-die.c:54 +#: gnu/openat-die.c:59 #, c-format msgid "failed to return to initial working directory" msgstr "vrnitev v začetni delovni imenik ni mogoča" @@ -229,11 +229,11 @@ msgstr "vrnitev v začetni delovni imenik ni mogoča" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: gnu/quotearg.c:274 +#: gnu/quotearg.c:273 msgid "`" msgstr "»" -#: gnu/quotearg.c:275 +#: gnu/quotearg.c:274 msgid "'" msgstr "«" @@ -260,12 +260,12 @@ msgstr "^[nN]" #: gnu/version-etc.c:76 #, c-format msgid "Packaged by %s (%s)\n" -msgstr "" +msgstr "Priprava paketa: %s (%s)\n" #: gnu/version-etc.c:79 #, c-format msgid "Packaged by %s\n" -msgstr "" +msgstr "Priprava paketa: %s\n" #. TRANSLATORS: Translate "(C)" to the copyright symbol #. (C-in-a-circle), if this symbol is available in the user's @@ -403,34 +403,35 @@ msgstr "" #. "Report translation bugs to <...>\n" with the address for translation #. bugs (typically your translation team's web or email address). #: gnu/version-etc.c:247 -#, fuzzy, c-format +#, c-format msgid "" "\n" "Report bugs to: %s\n" -msgstr "Poročila o napakah javite na %s.\n" +msgstr "" +"\n" +"Poročila o napakah javite na %s.\n" +"Napake v prevodu sporočite na .\n" #: gnu/version-etc.c:249 -#, fuzzy, c-format +#, c-format msgid "Report %s bugs to: %s\n" msgstr "" -"\n" -"Napake v programu sporočite na <%s>.\n" -"Napake v prevodu sporočite na \n" +"Poročila o napakah %s javite na %s.\n" +"Napake v prevodu sporočite na .\n" #: gnu/version-etc.c:253 #, c-format msgid "%s home page: <%s>\n" -msgstr "" +msgstr "Spletna stran %s: <%s>\n" #: gnu/version-etc.c:255 -#, fuzzy, c-format +#, c-format msgid "%s home page: \n" -msgstr "Spletna stran %s: .\n" +msgstr "Spletna stran %s: \n" #: gnu/version-etc.c:258 -#, fuzzy msgid "General help using GNU software: \n" -msgstr "SploÅ¡na pomoč za rabo programja GNU: .\n" +msgstr "SploÅ¡na pomoč za rabo programja GNU: \n" #. TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'. #. Directly translating this to another language will not work, first because @@ -439,7 +440,7 @@ msgstr "SploÅ¡na pomoč za rabo programja GNU: .\n" #: lib/paxerror.c:58 lib/paxerror.c:71 #, c-format msgid "%s: Cannot %s" -msgstr "%s: Ni mogoče %s" +msgstr "%s: Klic funkcije %s ni uspel" # POZOR -- oblike "to stat a file" slovenscina ne pozna #. TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'. @@ -449,7 +450,7 @@ msgstr "%s: Ni mogoče %s" #: lib/paxerror.c:84 #, c-format msgid "%s: Warning: Cannot %s" -msgstr "%s: Opozorilo: Ni mogoče %s" +msgstr "%s: Opozorilo: Klic funkcije %s ni uspel" #: lib/paxerror.c:93 #, c-format @@ -508,21 +509,21 @@ msgstr[1] "%s: Zapisan samo %lu od skupno %lu bajtov" msgstr[2] "%s: Zapisana samo %lu od skupno %lu bajtov" msgstr[3] "%s: Zapisani samo %lu od skupno %lu bajtov" -#: lib/paxnames.c:155 +#: lib/paxnames.c:140 #, c-format msgid "Removing leading `%s' from member names" msgstr "Odstranjujemo vodilne »%s« iz imen elementov" -#: lib/paxnames.c:156 +#: lib/paxnames.c:141 #, c-format msgid "Removing leading `%s' from hard link targets" msgstr "Odstranjujemo vodilne »%s« iz imen trdih povezav" -#: lib/paxnames.c:169 +#: lib/paxnames.c:154 msgid "Substituting `.' for empty member name" msgstr "Nadomeščamo manjkajoča imena elementov s ».«" -#: lib/paxnames.c:170 +#: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" msgstr "Nadomeščamo manjkajoča imena trdih povezav s ».«<" @@ -542,9 +543,9 @@ msgid "stdout" msgstr "standardni izhod" #: lib/rtapelib.c:429 -#, fuzzy, c-format +#, c-format msgid "Cannot connect to %s: resolve failed" -msgstr "Pozicija %s v datoteki %s ni dostopna" +msgstr "Priklop na %s ni mogoč: razreÅ¡itev ni uspela" #: lib/rtapelib.c:515 #, c-format @@ -553,54 +554,47 @@ msgstr "Ni mogoče pognati nelokalne ukazne lupine" #: rmt/rmt.c:432 msgid "Seek direction out of range" -msgstr "Smer pri seek izven obsega" +msgstr "Smer iskanja izven obsega" #: rmt/rmt.c:438 -#, fuzzy msgid "Invalid seek direction" -msgstr "Podana zaščita ni veljavna" +msgstr "Neveljavna smer iskanja" #: rmt/rmt.c:446 -#, fuzzy msgid "Invalid seek offset" -msgstr "Neveljavna oznaka časa" +msgstr "Neveljaven odmik pri seek" #: rmt/rmt.c:452 msgid "Seek offset out of range" msgstr "Odmik pri seek izven obsega" #: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608 -#, fuzzy msgid "Invalid byte count" -msgstr "Neveljavna dolžina traku" +msgstr "Neveljaven Å¡tevec bajtov" #: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625 -#, fuzzy msgid "Byte count out of range" -msgstr "Odmik pri seek izven obsega" +msgstr "Prekoračitev Å¡tevca bajtov" #: rmt/rmt.c:558 -#, fuzzy msgid "Premature eof" -msgstr "rmtd: Predčasen znak za konec datoteke\n" +msgstr "Predčasen znak za konec datoteke" #: rmt/rmt.c:601 -#, fuzzy msgid "Invalid operation code" -msgstr "Glavni načini delovanja:" +msgstr "Neveljavna koda operacije" #: rmt/rmt.c:636 rmt/rmt.c:680 msgid "Operation not supported" -msgstr "" +msgstr "Operacija ni podprta" #: rmt/rmt.c:664 -#, fuzzy msgid "Unexpected arguments" -msgstr "Nepričakovan znak za konec datoteke med predelanimi imeni" +msgstr "Nepričakovani argumenti" #: rmt/rmt.c:689 msgid "Manipulate a tape drive, accepting commands from a remote process" -msgstr "" +msgstr "Nadzor tračne enote, ki bere ukaze iz drugega procesa" #: rmt/rmt.c:696 src/tar.c:424 src/tar.c:428 src/tar.c:558 src/tar.c:573 #: src/tar.c:704 src/tar.c:742 tests/genfile.c:166 @@ -609,7 +603,7 @@ msgstr "N" #: rmt/rmt.c:697 msgid "set debug level" -msgstr "" +msgstr "nastavi raven iskanja napak" #: rmt/rmt.c:698 src/tar.c:422 src/tar.c:563 src/tar.c:639 src/tar.c:643 #: src/tar.c:655 src/tar.c:665 src/tar.c:668 src/tar.c:670 src/tar.c:759 @@ -620,17 +614,17 @@ msgstr "DATOTEKA" #: rmt/rmt.c:699 msgid "set debug output file name" -msgstr "" +msgstr "določi datoteko za izpis iskanja napak" #: rmt/rmt.c:715 rmt/rmt.c:783 -#, fuzzy, c-format +#, c-format msgid "cannot open %s" -msgstr "Ni mogoče odpreti %s" +msgstr "ni mogoče odpreti %s" #: rmt/rmt.c:780 tests/genfile.c:884 tests/genfile.c:901 #, c-format msgid "too many arguments" -msgstr "" +msgstr "preveč argumentov" #: rmt/rmt.c:822 msgid "Garbage command" @@ -826,20 +820,20 @@ msgstr[1] "Prebrati je bilo moč samo %lu od %lu bajta" msgstr[2] "Prebrati je bilo moč samo %lu od %lu bajtov" msgstr[3] "Prebrati je bilo moč samo %lu od %lu bajtov" -#: src/compare.c:105 src/compare.c:382 +#: src/compare.c:105 src/compare.c:383 msgid "Contents differ" msgstr "Vsebina se razlikuje" -#: src/compare.c:131 src/extract.c:972 src/incremen.c:1462 src/list.c:458 -#: src/list.c:1392 src/xheader.c:711 +#: src/compare.c:131 src/extract.c:984 src/incremen.c:1456 src/list.c:456 +#: src/list.c:1388 src/xheader.c:711 msgid "Unexpected EOF in archive" msgstr "Nepričakovan znak za konec datoteke v arhivu" -#: src/compare.c:179 src/compare.c:195 src/compare.c:308 src/compare.c:406 +#: src/compare.c:179 src/compare.c:195 src/compare.c:309 src/compare.c:407 msgid "File type differs" msgstr "Zvrst datoteke se razlikuje" -#: src/compare.c:182 src/compare.c:202 src/compare.c:322 +#: src/compare.c:182 src/compare.c:202 src/compare.c:323 msgid "Mode differs" msgstr "Način se razlikuje" @@ -855,42 +849,47 @@ msgstr "Å tevilka skupine (GID) se razlikuje" msgid "Mod time differs" msgstr "Čas zadnje spremembe se razlikuje" -#: src/compare.c:215 src/compare.c:414 +#: src/compare.c:215 src/compare.c:415 msgid "Size differs" msgstr "Velikost se razlikuje" -#: src/compare.c:263 +#: src/compare.c:264 #, c-format msgid "Not linked to %s" msgstr "Ni povezana z %s" -#: src/compare.c:287 +#: src/compare.c:288 msgid "Symlink differs" msgstr "Simbolna povezava se razlikuje" -#: src/compare.c:316 +#: src/compare.c:317 msgid "Device number differs" msgstr "Å tevilka enote se razlikuje" -#: src/compare.c:456 +#: src/compare.c:457 #, c-format msgid "Verify " msgstr "Preverjanje " -#: src/compare.c:463 +#: src/compare.c:464 #, c-format msgid "%s: Unknown file type `%c', diffed as normal file" msgstr "%s: Neznana vrsta datoteke »%c«, diff kot na navadni datoteki" -#: src/compare.c:518 +#: src/compare.c:520 msgid "Archive contains file names with leading prefixes removed." msgstr "Arhiv vsebuje imena datotek z odstranjenimi vodilnimi predponami." -#: src/compare.c:520 +#: src/compare.c:526 +#, fuzzy +msgid "Archive contains transformed file names." +msgstr "Arhiv vsebuje časovno oznako iz prihodnosti: %s" + +#: src/compare.c:531 msgid "Verification may fail to locate original files." msgstr "Verifikacija morda ne bo uspela locirati izvornih datotek." -#: src/compare.c:593 +#: src/compare.c:603 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" @@ -899,7 +898,7 @@ msgstr[1] "NAPAKA PRI PREVERJANJU: najdena %d neveljavna glava" msgstr[2] "NAPAKA PRI PREVERJANJU: najdeni %d neveljavni glavi" msgstr[3] "NAPAKA PRI PREVERJANJU: najdene %d neveljavne glave" -#: src/compare.c:611 src/list.c:222 +#: src/compare.c:621 src/list.c:222 #, c-format msgid "A lone zero block at %s" msgstr "Osamljeni ničelni blok pri %s" @@ -953,7 +952,7 @@ msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: datoteka je na drugem datotečnem sistemu; brez iznosa" # POZOR Imamo za to kak izraz? -#: src/create.c:1203 src/create.c:1214 src/incremen.c:582 src/incremen.c:588 +#: src/create.c:1203 src/create.c:1214 src/incremen.c:578 src/incremen.c:584 msgid "contents not dumped" msgstr "vsebina ni izneÅ¡ena" @@ -963,9 +962,9 @@ msgid "%s: Unknown file type; file ignored" msgstr "%s: Neznan tip datoteke; datoteka ignorirana" #: src/create.c:1529 -#, fuzzy, c-format +#, c-format msgid "Missing links to %s." -msgstr "Manjkajo povezave na %s.\n" +msgstr "Manjkajo povezave na %s." #: src/create.c:1690 #, c-format @@ -977,21 +976,21 @@ msgstr "%s: datoteka je nespremenjena; brez iznosa" msgid "%s: file is the archive; not dumped" msgstr "%s: datoteka je arhiv; brez iznosa" -#: src/create.c:1723 src/incremen.c:575 +#: src/create.c:1723 src/incremen.c:571 msgid "directory not dumped" -msgstr "imenik ni iznaÅ¡en" +msgstr "imenik ni izneÅ¡en" #: src/create.c:1795 #, c-format msgid "%s: file changed as we read it" msgstr "%s: Datoteka je bila spremenjena med branjem" -#: src/create.c:1857 +#: src/create.c:1858 #, c-format msgid "%s: socket ignored" msgstr "%s: vtičnica ignorirana" -#: src/create.c:1863 +#: src/create.c:1864 #, c-format msgid "%s: door ignored" msgstr "%s: vrata ignorirana" @@ -1019,169 +1018,170 @@ msgstr "%s: oznaka časa %s je %s s v prihodnosti" msgid "%s: Unexpected inconsistency when making directory" msgstr "%s: Nepričakovana neskladnost pri ustvarjanju imenika" -#: src/extract.c:709 +#: src/extract.c:721 #, c-format msgid "%s: Directory renamed before its status could be extracted" -msgstr "%s: Imenik preimenovan, preden je bilo moč izvleči njegov status" +msgstr "%s: Imenik preimenovan, preden je bilo moč restavrirati njegov status" # POZOR! "contiguous files" so datoteke, ki so zapisane na disku # na zaporednih sektorjih (na tistih OS, ki jih podpirajo). -#: src/extract.c:863 +#: src/extract.c:875 msgid "Extracting contiguous files as regular files" -msgstr "Neprekinjene datoteke izvlečemo kot navadne" +msgstr "Neprekinjene datoteke restavriramo kot navadne" # POZOR! Grdo! -#: src/extract.c:1197 +#: src/extract.c:1209 msgid "Attempting extraction of symbolic links as hard links" msgstr "Simbolne povezave poskusimo dearhivirati kot trde" -#: src/extract.c:1353 +#: src/extract.c:1365 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Dearhivacija ni mogoča - datoteka se nadaljuje iz prejÅ¡njega dela" -#: src/extract.c:1360 src/list.c:1125 +#: src/extract.c:1372 src/list.c:1121 msgid "Unexpected long name header" msgstr "Nepričakovano zaglavje z dolgim imenom" -#: src/extract.c:1367 +#: src/extract.c:1379 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Neznana vrsta datoteke »%c«, dearhiviramo kot navadno datoteko" -#: src/extract.c:1393 +#: src/extract.c:1405 #, c-format msgid "Current %s is newer or same age" msgstr "Obstoječa »%s« je novejÅ¡a ali enako stara" -#: src/extract.c:1445 +#: src/extract.c:1457 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Varnostne kopije te datoteke ni moč napraviti" -#: src/extract.c:1582 +#: src/extract.c:1594 #, c-format msgid "Cannot rename %s to %s" msgstr "Preimenovanje %s v %s ni mogoče" -#: src/incremen.c:474 src/incremen.c:518 +#: src/incremen.c:473 src/incremen.c:517 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Imenik je bil preimenovan z %s" -#: src/incremen.c:486 +#: src/incremen.c:485 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Imenik je bil preimenovan" -#: src/incremen.c:531 +#: src/incremen.c:530 #, c-format msgid "%s: Directory is new" msgstr "%s: Imenik je nov" -#: src/incremen.c:956 src/incremen.c:973 +#: src/incremen.c:951 src/incremen.c:968 msgid "Invalid time stamp" msgstr "Neveljavna oznaka časa" -#: src/incremen.c:1012 +#: src/incremen.c:1007 msgid "Invalid modification time (seconds)" msgstr "Neveljaven čas spremembe (sekunde)" -#: src/incremen.c:1027 +#: src/incremen.c:1022 msgid "Invalid modification time (nanoseconds)" msgstr "Neveljaven čas spremembe (nanosekunde)" -#: src/incremen.c:1047 +#: src/incremen.c:1042 msgid "Invalid device number" msgstr "Neveljavna Å¡tevilka enote" -#: src/incremen.c:1062 +#: src/incremen.c:1057 msgid "Invalid inode number" msgstr "Neveljavna Å¡tevilka inoda" -#: src/incremen.c:1113 src/incremen.c:1150 +#: src/incremen.c:1108 src/incremen.c:1145 msgid "Field too long while reading snapshot file" msgstr "Predolgo polje pri branju trenutnega posnetka" -#: src/incremen.c:1120 src/incremen.c:1158 +#: src/incremen.c:1115 src/incremen.c:1153 msgid "Read error in snapshot file" msgstr "Napaka pri branju trenutnega posnetka" -#: src/incremen.c:1122 src/incremen.c:1162 src/incremen.c:1214 -#: src/incremen.c:1272 +#: src/incremen.c:1117 src/incremen.c:1157 src/incremen.c:1209 +#: src/incremen.c:1267 msgid "Unexpected EOF in snapshot file" msgstr "Nepričakovan znak za konec datoteke v trenutnem posnetku" -#: src/incremen.c:1129 src/incremen.c:1169 +#: src/incremen.c:1124 src/incremen.c:1164 msgid "Unexpected field value in snapshot file" msgstr "Nepričakovana vrednost polja v trenutnem posnetku" -#: src/incremen.c:1264 +#: src/incremen.c:1259 msgid "Missing record terminator" msgstr "Manjkajoč zaključek zapisa" -#: src/incremen.c:1325 src/incremen.c:1328 +#: src/incremen.c:1320 src/incremen.c:1323 msgid "Bad incremental file format" msgstr "Okvarjen inkrementalni zapis datoteke" -#: src/incremen.c:1347 +#: src/incremen.c:1342 #, c-format msgid "Unsupported incremental format version: %" msgstr "Nepodprta različica inkrementalnega zapisa: %" -#: src/incremen.c:1502 +#: src/incremen.c:1496 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" -msgstr "" +msgstr "Skladenjska napaka pri imeniku za iznos: pričakovan »%c«, najden %#3o" -#: src/incremen.c:1512 +#: src/incremen.c:1506 msgid "Malformed dumpdir: 'X' duplicated" -msgstr "" +msgstr "Skladenjska napaka pri imeniku za iznos: »X« podvojen" -#: src/incremen.c:1525 -#, fuzzy +#: src/incremen.c:1519 msgid "Malformed dumpdir: empty name in 'R'" -msgstr "Okvarjen argument gostote: »%s«" +msgstr "Skladenjska napaka pri imeniku za iznos: manjkajoče ime pri »R«" -#: src/incremen.c:1538 +#: src/incremen.c:1532 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" +"Skladenjska napaka pri imeniku za iznos: polja »T« ne predhodi polje »R«" -#: src/incremen.c:1544 -#, fuzzy +#: src/incremen.c:1538 msgid "Malformed dumpdir: empty name in 'T'" -msgstr "Okvarjen argument gostote: »%s«" +msgstr "Skladenjska napaka pri imeniku za iznos: manjkajoče ime pri »T«" -#: src/incremen.c:1564 +#: src/incremen.c:1558 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" +"Skladenjska napaka pri imeniku za iznos: pričakovan »%c«, najden konec " +"podatkov" -#: src/incremen.c:1571 +#: src/incremen.c:1565 msgid "Malformed dumpdir: 'X' never used" -msgstr "" +msgstr "Skladenjska napaka pri imeniku za iznos: »X« ni uporabljen" -#: src/incremen.c:1615 +#: src/incremen.c:1609 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Ni mogoče ustvariti začasnega imenika po Å¡abloni %s" -#: src/incremen.c:1677 +#: src/incremen.c:1670 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Imenika ne čistimo: statistika zanj ni dosegljiva" -#: src/incremen.c:1690 +#: src/incremen.c:1683 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: imenik je na drugi napravi; brez čiščenja" -#: src/incremen.c:1698 +#: src/incremen.c:1691 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: BriÅ¡emo %s\n" -#: src/incremen.c:1703 +#: src/incremen.c:1696 #, c-format msgid "%s: Cannot remove" msgstr "%s: Odstranitev ni mogoča" @@ -1201,165 +1201,159 @@ msgstr "blok %s: ** Blok znakov NUL **\n" msgid "block %s: ** End of File **\n" msgstr "blok %s: ** Konec datoteke **\n" -#: src/list.c:256 src/list.c:1097 src/list.c:1360 +#: src/list.c:256 src/list.c:1093 src/list.c:1356 #, c-format msgid "block %s: " msgstr "blok %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:712 +#: src/list.c:708 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Na mestu v glavi, kjer pričakujemo Å¡tevilčno vrednost %s, so presledki" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:767 +#: src/list.c:763 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" "OsmiÅ¡ka vrednost arhiva %.*s izven obsega %s; privzemamo dvojiÅ¡ki komplement" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:778 +#: src/list.c:774 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "OsmiÅ¡ka vrednost arhiva %.*s izven obsega %s" -#: src/list.c:799 +#: src/list.c:795 msgid "Archive contains obsolescent base-64 headers" msgstr "Arhiv vsebuje zastarele glave oblike base-64" -#: src/list.c:813 +#: src/list.c:809 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "Podpis %s oblike base-64 v arhivu je izven obsega %s" -#: src/list.c:844 +#: src/list.c:840 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Vrednost base-256 v arhivu izven obsega %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:873 +#: src/list.c:869 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Arhiv vsebuje %.*s na mestu, kjer pričakujemo Å¡tevilčno vrednost %s" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:895 +#: src/list.c:891 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Vrednost arhiva %s je izven obsega %s: %s..%s" -#: src/list.c:1261 +#: src/list.c:1257 #, c-format msgid " link to %s\n" msgstr " povezava na %s\n" -#: src/list.c:1269 +#: src/list.c:1265 #, c-format msgid " unknown file type %s\n" msgstr " neznan tip datoteke %s\n" -#: src/list.c:1287 +#: src/list.c:1283 #, c-format msgid "--Long Link--\n" msgstr "--Dolga povezava--\n" -#: src/list.c:1291 +#: src/list.c:1287 #, c-format msgid "--Long Name--\n" msgstr "--Dolgo ime--\n" -#: src/list.c:1295 +#: src/list.c:1291 #, c-format msgid "--Volume Header--\n" msgstr "--Glava dela--\n" -#: src/list.c:1303 +#: src/list.c:1299 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Nadaljevanje pri bajtu %s--\n" -#: src/list.c:1365 +#: src/list.c:1361 msgid "Creating directory:" msgstr "Ustvarjamo imenik:" -#: src/misc.c:298 -#, fuzzy +#: src/misc.c:297 msgid "Cannot get working directory" -msgstr "Delovnega imenika ni mogoče spremeniti" +msgstr "Delovnega imenika ni mogoče ugotoviti" -#: src/misc.c:571 +#: src/misc.c:570 #, c-format msgid "Renaming %s to %s\n" msgstr "Preimenujemo %s v %s\n" -#: src/misc.c:580 src/misc.c:599 +#: src/misc.c:579 src/misc.c:598 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: Preimenovanje v %s ni mogoče" -#: src/misc.c:604 +#: src/misc.c:603 #, c-format msgid "Renaming %s back to %s\n" msgstr "Preimenujemo %s nazaj v %s\n" -#: src/misc.c:851 +#: src/misc.c:850 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Datoteka je bila odstranjena, preden smo jo prebrali" -#: src/misc.c:866 -#, fuzzy, c-format -msgid "%s: Directory removed before we read it" -msgstr "%s: Datoteka je bila odstranjena, preden smo jo prebrali" - -#: src/misc.c:887 +#: src/misc.c:871 msgid "child process" msgstr "proces naslednik" -#: src/misc.c:896 +#: src/misc.c:880 msgid "interprocess channel" msgstr "medprocesni kanal" -#: src/names.c:594 -#, fuzzy +#: src/names.c:590 msgid "Pattern matching characters used in file names" -msgstr "vzorci se ujemajo z začetkom imena datoteke" +msgstr "Z vzorcem ujemajoči se znaki, uporabljeni v imenih datotek" -#: src/names.c:596 +#: src/names.c:592 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" msgstr "" +"Uporabite --wildcards, da bi omogočili ujemanje vzorcev, ali --no-wildcards, " +"da izklopite to opozorilo" -#: src/names.c:614 src/names.c:630 +#: src/names.c:610 src/names.c:626 #, c-format msgid "%s: Not found in archive" msgstr "%s: Ni najdeno v arhivu" -#: src/names.c:615 +#: src/names.c:611 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Zahtevane pojavitve ni moč najti v arhivu" -#: src/names.c:649 -#, fuzzy, c-format +#: src/names.c:645 +#, c-format msgid "Archive label mismatch" -msgstr "Arhiv ni označen skladno z %s" +msgstr "Neskladje v oznaki arhiva" -#: src/names.c:953 -#, fuzzy +#: src/names.c:949 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" -msgstr "Izbiri --preserve-order in --listed-incremential sta nezdružljivi" +msgstr "" +"Izbira -C znotraj seznama datotek pri --listed-incremential ni dovoljena" -#: src/names.c:959 -#, fuzzy +#: src/names.c:955 msgid "Only one -C option is allowed with --listed-incremental" -msgstr "Izbiri --preserve-order in --listed-incremential sta nezdružljivi" +msgstr "Samo ena izbira -C je dovoljena pri --listed-incremential" #: src/tar.c:81 #, c-format @@ -1400,7 +1394,7 @@ msgstr "" "druga.\n" " tar -tvf arhiv.tar # Izčrpen seznam datotek v arhivu arhiv." "tar.\n" -" tar -xf arhiv.tar # Izvlečemo vse datoteke iz arhiva arhiv." +" tar -xf arhiv.tar # Restavriramo vse datoteke iz arhiva arhiv." "tar.\n" #: src/tar.c:357 @@ -1432,11 +1426,11 @@ msgstr "Glavni načini delovanja:" #: src/tar.c:390 msgid "list the contents of an archive" -msgstr "izpis vsebine arhiva" +msgstr "izpiÅ¡i vsebino arhiva" #: src/tar.c:392 msgid "extract files from an archive" -msgstr "izvlečenje datoteke iz arhiva" +msgstr "restavriraj datoteke iz arhiva" #: src/tar.c:395 msgid "create a new archive" @@ -1464,7 +1458,7 @@ msgstr "brisanje datotek iz arhiva (ne deluje na traku!)" #: src/tar.c:409 msgid "test the archive volume label and exit" -msgstr "" +msgstr "preizkusi oznako dela arhiva in zaključi" #: src/tar.c:414 msgid "Operation modifiers:" @@ -1476,11 +1470,11 @@ msgstr "ekonomično ravnanje z razprÅ¡enimi datotekami" #: src/tar.c:418 msgid "MAJOR[.MINOR]" -msgstr "" +msgstr "GLAVNI[.POMOŽNI]" #: src/tar.c:419 msgid "set version of the sparse format to use (implies --sparse)" -msgstr "" +msgstr "izberi uporabljeno različico razprÅ¡enega zapisa (implicira --sparse)" #: src/tar.c:421 msgid "handle old GNU-format incremental backup" @@ -1492,7 +1486,7 @@ msgstr "novi zapis GNU za inkrementalne arhive" #: src/tar.c:425 msgid "dump level for created listed-incremental archive" -msgstr "" +msgstr "raven izmeta za ustvarjene inkrementalne arhive" #: src/tar.c:427 msgid "do not exit with nonzero on unreadable files" @@ -1515,9 +1509,8 @@ msgid "archive is seekable" msgstr "po arhivu je mogoče iskati" #: src/tar.c:437 -#, fuzzy msgid "archive is not seekable" -msgstr "po arhivu je mogoče iskati" +msgstr "po arhivu ni mogoče iskati" #: src/tar.c:439 msgid "do not check device numbers when creating incremental archives" @@ -1542,7 +1535,7 @@ msgstr "pobriÅ¡i datoteke, potem ko so arhivirane" #: src/tar.c:455 msgid "don't replace existing files when extracting" -msgstr "pri izvlačenju ne piÅ¡i prek obstoječih datotek" +msgstr "pri restavriranju ne piÅ¡i prek obstoječih datotek" #: src/tar.c:457 msgid "don't replace existing files that are newer than their archive copies" @@ -1550,16 +1543,17 @@ msgstr "ne piÅ¡i prek obstoječih datotek, novejÅ¡ih od arhiviranih" #: src/tar.c:459 msgid "overwrite existing files when extracting" -msgstr "pri izvlačenju piÅ¡i prek obstoječih datotek" +msgstr "pri restavriranju piÅ¡i prek obstoječih datotek" #: src/tar.c:461 msgid "remove each file prior to extracting over it" msgstr "" -"s poprejÅ¡njim brisanjem obstoječih datotek pri izvlačenju istoimenskih novih" +"s poprejÅ¡njim brisanjem obstoječih datotek pri restavriranju istoimenskih " +"novih" #: src/tar.c:463 msgid "empty hierarchies prior to extracting directory" -msgstr "izprazni hierarhije pred izvlačenjem imenikov" +msgstr "izprazni hierarhije pred restavriranjem imenikov" #: src/tar.c:465 msgid "preserve metadata of existing directories" @@ -1567,7 +1561,8 @@ msgstr "ohrani metainformacije o obstoječih imenikih" #: src/tar.c:467 msgid "overwrite metadata of existing directories when extracting (default)" -msgstr "pri izvlačenju piÅ¡i prek metapodatkov obstoječih imenikov (privzeto)" +msgstr "" +"pri restavriranju piÅ¡i prek metapodatkov obstoječih imenikov (privzeto)" #: src/tar.c:473 msgid "Select output stream:" @@ -1575,7 +1570,7 @@ msgstr "Izbira izhodnega toka:" #: src/tar.c:476 msgid "extract files to standard output" -msgstr "datoteke izvleci na standardni izhod" +msgstr "datoteke restavriraj na standardni izhod" #: src/tar.c:477 src/tar.c:536 src/tar.c:538 tests/genfile.c:190 msgid "COMMAND" @@ -1610,9 +1605,8 @@ msgid "DATE-OR-FILE" msgstr "DATUM-ČAS" #: src/tar.c:494 -#, fuzzy msgid "set mtime for added files from DATE-OR-FILE" -msgstr "shrani le datoteke, novejÅ¡e od DATUM-ČAS" +msgstr "nastavi mtime za dodane datoteke iz DATUM-ALI-DATOTEKA" #: src/tar.c:495 msgid "CHANGES" @@ -1638,19 +1632,21 @@ msgstr "" #: src/tar.c:503 msgid "don't extract file modified time" -msgstr "brez izvlačenja časa spremembe" +msgstr "brez restavriranja časa spremembe" #: src/tar.c:505 -#, fuzzy msgid "" "try extracting files with the same ownership as exists in the archive " "(default for superuser)" -msgstr "z ohranitvijo lastniÅ¡tva, če je mogoče" +msgstr "" +"skuÅ¡aj restavrirati datoteke tako, da se ohrani njihov lastnik iz arhiva " +"(privzeto za administratorja)" #: src/tar.c:507 -#, fuzzy msgid "extract files as yourself (default for ordinary users)" -msgstr "pri izvlačenju prepiÅ¡emo lastniÅ¡tvo nase" +msgstr "" +"restavriraj datoteke tako, da postanemo njihov lastnik (privzeto za navadne " +"uporabnike)" #: src/tar.c:509 msgid "always use numbers for user/group names" @@ -1659,7 +1655,7 @@ msgstr "s Å¡tevilčnimi vrednostmi UID/GID namesto imen" #: src/tar.c:511 msgid "extract information about file permissions (default for superuser)" msgstr "" -"izvleci podatke o dovoljenjih za dostop do datotek (privzeto za " +"restavriraj podatke o dovoljenjih za dostop do datotek (privzeto za " "administratorja)" #: src/tar.c:515 @@ -1667,7 +1663,7 @@ msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -"uporabi uporabnikovo masko umask pri izvlačenju dovoljenj za dostop do " +"uporabi uporabnikovo masko umask pri restavriranju dovoljenj za dostop do " "datotek (privzeto za uporabnike)" #: src/tar.c:517 @@ -1683,8 +1679,8 @@ msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -"počakaj do končanega izvlačenja, preden nastavimo čase sprememb in " -"dovoljenja za dostop za izvlečene imenike" +"z nastavljanjem časa sprememb in dovoljenja za dostop za restavrirane " +"imenike počakaj do zaključka restavriranja" #: src/tar.c:525 msgid "cancel the effect of --delay-directory-restore option" @@ -1720,7 +1716,7 @@ msgstr "določi enoto in gostoto zapisa" #: src/tar.c:557 msgid "create/list/extract multi-volume archive" -msgstr "ustvari/pregledaj/izvleci arhiva v več delih" +msgstr "ustvari/preglej/restavriraj arhiv v več delih" #: src/tar.c:559 msgid "change tape after writing NUMBER x 1024 bytes" @@ -1807,13 +1803,12 @@ msgid "same as --format=posix" msgstr "isto kot --format=posix" #: src/tar.c:606 -#, fuzzy msgid "keyword[[:]=value][,keyword[[:]=value]]..." -msgstr "ključna-beseda[[:]=vrednost][,ključna-beseda[[:]=vrednost],...]" +msgstr "ključ[[:]=vrednost][,ključ[[:]=vrednost]]..." #: src/tar.c:607 msgid "control pax keywords" -msgstr "krmilne ključne besede pax" +msgstr "krmilni ključi pax" #: src/tar.c:608 msgid "TEXT" @@ -1824,23 +1819,20 @@ msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" -"ustvari arhiv z imenom dela IME; pri izpisu seznama/izvlečku je lahko IME " -"regularni izraz za ime dela" +"ustvari arhiv z imenom dela IME; pri izpisu seznama/restavriranju je lahko " +"IME regularni izraz za ime dela" #: src/tar.c:614 -#, fuzzy msgid "Compression options:" -msgstr "Nasprotujoče si izbire glede stiskanja arhiva" +msgstr "Izbire glede stiskanja:" #: src/tar.c:616 -#, fuzzy msgid "use archive suffix to determine the compression program" -msgstr "Pisanje na vhod programa za stiskanje ne gre" +msgstr "program za stiskanje ugotovi iz pripone arhiva" #: src/tar.c:618 -#, fuzzy msgid "do not use archive suffix to determine the compression program" -msgstr "Pisanje na vhod programa za stiskanje ne gre" +msgstr "ne ugotavljaj programa za stiskanje iz pripone arhiva" #: src/tar.c:620 msgid "PROG" @@ -1933,7 +1925,7 @@ msgstr "brez imenikov sistema za nadzor različic" #: src/tar.c:675 msgid "exclude backup and lock files" -msgstr "" +msgstr "brez varnostnih kopij in zaklepnih datotek" #: src/tar.c:677 msgid "avoid descending automatically in directories" @@ -2005,9 +1997,8 @@ msgid "File name transformations:" msgstr "Pretvorbe imen datotek:" #: src/tar.c:705 -#, fuzzy msgid "strip NUMBER leading components from file names on extraction" -msgstr "izpusti Å TEVILO vodilnih komponent iz imen datotek" +msgstr "pri restavriranju poreži Å TEVILO vodilnih komponent iz imen datotek" #: src/tar.c:707 msgid "EXPRESSION" @@ -2015,11 +2006,13 @@ msgstr "IZRAZ" #: src/tar.c:708 msgid "use sed replace EXPRESSION to transform file names" -msgstr "" +msgstr "uporabi nadomestitveni IZRAZ programa sed za pretvorbo imen datotek" #: src/tar.c:714 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" +"Izbire ujemanja imen datotek (vpliva tako na vključitvene kot na " +"izključitvene vzorce):" #: src/tar.c:717 msgid "ignore case" @@ -2064,12 +2057,11 @@ msgstr "z izčrpnim izpisom obdelanih datotek" #: src/tar.c:740 msgid "KEYWORD" -msgstr "" +msgstr "KLJUČ" #: src/tar.c:741 -#, fuzzy msgid "warning control" -msgstr "Nadzor nad pisanjem prek:" +msgstr "nadzor opozorila" #: src/tar.c:743 msgid "display progress messages every NUMBERth record (default 10)" @@ -2098,15 +2090,18 @@ msgid "" "SIGQUIT, SIGINT, SIGUSR1 and SIGUSR2; the names without SIG prefix are also " "accepted" msgstr "" +"izpiÅ¡i skupno Å¡tevilo bajtov po obdelavi arhiva; skupaj z argumentom - " +"izpiÅ¡i skupno Å¡tevilo bajtov do prejema SIGNALA; Dovoljeni signali so: " +"SIGHUP, SIGQUIT, SIGINT, SIGUSR1 in SIGUSR2, prepoznana so tudi imena " +"signalov brez predpone SIG-" #: src/tar.c:756 -#, fuzzy msgid "print file modification times in UTC" -msgstr "z izpisom časov sprememb datotek v UTC" +msgstr "izpiÅ¡i čase sprememb datotek v UTC" #: src/tar.c:758 msgid "print file time to its full resolution" -msgstr "" +msgstr "izpiÅ¡i čas datoteke v polni ločljivosti" #: src/tar.c:760 msgid "send verbose output to FILE" @@ -2129,8 +2124,8 @@ msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" -"pri izpisu seznama ali izvlačenju izpiÅ¡i vsak imenik, ki ne ustreza iskalnim " -"pogojem" +"pri izpisu seznama ali restavriranju izpiÅ¡i vsak imenik, ki ne ustreza " +"iskalnim pogojem" #: src/tar.c:771 msgid "show file or archive names after transformation" @@ -2146,11 +2141,11 @@ msgstr "nastavi slog navajanja imen; glej spodaj za veljavne SLOGE" #: src/tar.c:777 msgid "additionally quote characters from STRING" -msgstr "" +msgstr "dodatno navedi znake iz NIZA" #: src/tar.c:779 msgid "disable quoting for characters from STRING" -msgstr "" +msgstr "onemogoči navajanje znakov iz NIZA" #: src/tar.c:784 msgid "Compatibility options:" @@ -2161,7 +2156,7 @@ msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "" -"ob ustvarjanju arhiva isto kot --old-archive; ob izvlačenju isto kot --no-" +"ob ustvarjanju arhiva isto kot --old-archive; ob restavriranju isto kot --no-" "same-owner" #: src/tar.c:792 @@ -2173,16 +2168,15 @@ msgid "disable use of some potentially harmful options" msgstr "onemogoči rabo nekaterih potencialno Å¡kodljivih izbir" #: src/tar.c:930 -#, fuzzy msgid "You may not specify more than one `-Acdtrux' or `--test-label' option" -msgstr "Naenkrat je dovoljena največ ena od izbir »-Acdtrux«" +msgstr "Podate lahko največ eno od izbir »-Acdtrux« ali »--test-label«" #: src/tar.c:940 msgid "Conflicting compression options" msgstr "Nasprotujoče si izbire glede stiskanja arhiva" #: src/tar.c:996 -#, fuzzy, c-format +#, c-format msgid "Unknown signal name: %s" msgstr "Neznano ime signala: %s" @@ -2198,7 +2192,7 @@ msgstr "Nadomeščamo %s za neznan format datuma %s" #: src/tar.c:1057 #, c-format msgid "Option %s: Treating date `%s' as %s" -msgstr "" +msgstr "Izbira %s: Datum »%s« obravnavamo kot %s" #: src/tar.c:1135 #, c-format @@ -2212,14 +2206,13 @@ msgstr "%s: prebrano ime datoteke vsebuje znak \\0" #: src/tar.c:1268 src/tar.c:1272 src/tar.c:1276 src/tar.c:1280 src/tar.c:1284 #: src/tar.c:1288 -#, fuzzy, c-format +#, c-format msgid "filter the archive through %s" -msgstr "filtriraj arhiv skozi gzip" +msgstr "filtriraj arhiv skozi %s" #: src/tar.c:1296 -#, fuzzy msgid "Valid arguments for the --quoting-style option are:" -msgstr "Veljavni argumenti pri izbirah --quoting-style so:" +msgstr "Veljavni argumenti pri izbiri --quoting-style so:" #: src/tar.c:1300 msgid "" @@ -2238,9 +2231,8 @@ msgid "Invalid tape length" msgstr "Neveljavna dolžina traku" #: src/tar.c:1529 -#, fuzzy msgid "Invalid incremental level value" -msgstr "Okvarjen inkrementalni zapis datoteke" +msgstr "Okvarjena vrednost inkrementalne ravni" #: src/tar.c:1575 msgid "More than one threshold date" @@ -2248,20 +2240,19 @@ msgstr "Več kot en pražni podatek" #: src/tar.c:1630 src/tar.c:1633 msgid "Invalid sparse version value" -msgstr "" +msgstr "Neveljavna vrednost razprÅ¡ene različice" #: src/tar.c:1718 msgid "--atime-preserve='system' is not supported on this platform" -msgstr "" +msgstr "izbira --atime-preserve='system' na tem sistemu ni podprta" #: src/tar.c:1743 msgid "--checkpoint value is not an integer" -msgstr "" +msgstr "vrednost --checkpoint ni celo Å¡tevilo" #: src/tar.c:1848 -#, fuzzy msgid "Invalid group" -msgstr "%s: Neveljavna skupina" +msgstr "Neveljavna skupina" #: src/tar.c:1855 msgid "Invalid mode given on option" @@ -2280,6 +2271,8 @@ msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" +"Raba izbire --preserve je odsvetovana, uporabite --preserve-permissions --" +"preserve-order" #: src/tar.c:1975 msgid "Invalid record size" @@ -2339,9 +2332,8 @@ msgid "Cannot combine --listed-incremental with --newer" msgstr "Izbire --listed-incremental ni mogoče kombinirati z --newer" #: src/tar.c:2406 -#, fuzzy msgid "--level is meaningless without --listed-incremental" -msgstr "Izbiri --preserve-order in --listed-incremential sta nezdružljivi" +msgstr "Izbira --level je brez pomena brez izbire --listed-incremential" #: src/tar.c:2423 #, c-format @@ -2389,14 +2381,13 @@ msgid "Options `-Aru' are incompatible with `-f -'" msgstr "Izbire »-Aru« so nezdružljive z »-f -«" #: src/tar.c:2621 -#, fuzzy msgid "You must specify one of the `-Acdtrux' or `--test-label' options" -msgstr "Ena od izbir »-Acdtrux« je obvezna" +msgstr "Ena od izbir »-Acdtrux« ali »--test-label« je obvezna" #: src/tar.c:2675 #, c-format msgid "Exiting with failure status due to previous errors" -msgstr "" +msgstr "Zaradi predhodnih napak zaključujemo s statusom napake" #: src/update.c:86 #, c-format @@ -2408,12 +2399,11 @@ msgstr[2] "%s: Datoteka skrčena za %s bajta" msgstr[3] "%s: Datoteka skrčena za %s bajte" #: src/xheader.c:164 -#, fuzzy, c-format +#, c-format msgid "Keyword %s is unknown or not yet implemented" -msgstr "Ključna beseda %s je bodisi neznana, bodisi Å¡e ni izvedena" +msgstr "Ključ %s je bodisi neznan, bodisi Å¡e ni izveden" #: src/xheader.c:174 -#, fuzzy msgid "Time stamp is out of allowed range" msgstr "Oznaka časa izven obsega" @@ -2425,25 +2415,22 @@ msgstr "Vzorca %s ni mogoče uporabiti" #: src/xheader.c:219 #, c-format msgid "Keyword %s cannot be overridden" -msgstr "Ključne besede %s ni mogoče preklicati" +msgstr "Ključa %s ni mogoče preklicati" #: src/xheader.c:542 -#, fuzzy msgid "Malformed extended header: missing length" -msgstr "PoÅ¡kodovana razÅ¡irjena glava: manjka enačaj" +msgstr "PoÅ¡kodovana razÅ¡irjena glava: manjka dolžina" #: src/xheader.c:550 -#, fuzzy msgid "Extended header length is out of allowed range" -msgstr "Podpis %s oblike base-64 v arhivu je izven obsega %s" +msgstr "Dolžina razÅ¡irjene glave je izven dovoljenega obsega" #: src/xheader.c:557 -#, fuzzy, c-format +#, c-format msgid "Extended header length %*s is out of range" -msgstr "Podpis %s oblike base-64 v arhivu je izven obsega %s" +msgstr "Dolžina razÅ¡irjene glave %*s je izven dovoljenega obsega" #: src/xheader.c:569 -#, fuzzy msgid "Malformed extended header: missing blank after length" msgstr "PoÅ¡kodovana razÅ¡irjena glava: za dolžino manjka presledek" @@ -2452,64 +2439,64 @@ msgid "Malformed extended header: missing equal sign" msgstr "PoÅ¡kodovana razÅ¡irjena glava: manjka enačaj" #: src/xheader.c:583 -#, fuzzy msgid "Malformed extended header: missing newline" -msgstr "PoÅ¡kodovana razÅ¡irjena glava: manjka enačaj" +msgstr "PoÅ¡kodovana razÅ¡irjena glava: manjka znak za novo vrstico" #: src/xheader.c:621 #, c-format msgid "Ignoring unknown extended header keyword `%s'" -msgstr "" +msgstr "Ne upoÅ¡tevamo neznanega ključa razÅ¡irjene glave »%s«" #: src/xheader.c:831 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" -msgstr "" +msgstr "Ustvarjeni par ključ/vrednost je predolg (ključ=%s, dolžina=%s)" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). #: src/xheader.c:863 -#, fuzzy, c-format +#, c-format msgid "Extended header %s=%s is out of range %s..%s" -msgstr "Vrednost arhiva %s je izven obsega %s: %s.%s" +msgstr "Par %s=%s v razÅ¡irjeni glavi je izven obsega %s..%s" #: src/xheader.c:994 src/xheader.c:1024 src/xheader.c:1338 -#, fuzzy, c-format +#, c-format msgid "Malformed extended header: invalid %s=%s" -msgstr "PoÅ¡kodovana razÅ¡irjena glava: manjka enačaj" +msgstr "PoÅ¡kodovana razÅ¡irjena glava: neveljavni %s=%s" #: src/xheader.c:1291 src/xheader.c:1316 src/xheader.c:1366 -#, fuzzy, c-format +#, c-format msgid "Malformed extended header: excess %s=%s" -msgstr "PoÅ¡kodovana razÅ¡irjena glava: manjka enačaj" +msgstr "PoÅ¡kodovana razÅ¡irjena glava: odvečni %s=%s" #: src/xheader.c:1379 -#, fuzzy, c-format +#, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" -msgstr "PoÅ¡kodovana razÅ¡irjena glava: manjka enačaj" +msgstr "" +"PoÅ¡kodovana razÅ¡irjena glava: neveljavni %s: nepričakovani razmejilnik %c" #: src/xheader.c:1389 -#, fuzzy, c-format +#, c-format msgid "Malformed extended header: invalid %s: odd number of values" -msgstr "PoÅ¡kodovana razÅ¡irjena glava: manjka enačaj" +msgstr "PoÅ¡kodovana razÅ¡irjena glava: neveljavni %s: liho Å¡tevilo vrednosti" #: src/checkpoint.c:107 -#, fuzzy, c-format +#, c-format msgid "%s: not a valid timeout" -msgstr "%s: Neveljavna skupina" +msgstr "%s: neveljaven čas preteka" #: src/checkpoint.c:112 #, c-format msgid "%s: unknown checkpoint action" -msgstr "" +msgstr "%s: neznano dejanje za kontrolno točko" #: src/checkpoint.c:132 msgid "write" -msgstr "" +msgstr "zapiÅ¡i" #: src/checkpoint.c:132 msgid "read" -msgstr "" +msgstr "preberi" # POZOR Poglej v source! #. TRANSLATORS: This is a ``checkpoint of write operation'', @@ -2532,262 +2519,258 @@ msgid "Read checkpoint %u" msgstr "Oznaka branja %u" #: tests/genfile.c:111 -#, fuzzy msgid "" "genfile manipulates data files for GNU paxutils test suite.\n" "OPTIONS are:\n" -msgstr "Ustvarimo podatkovne datoteke za testno zbirko GNU tar.\n" +msgstr "" +"genfile pripravi datoteke za testno zbirko GNU paxutils.\n" +"IZBIRE so:\n" #: tests/genfile.c:127 -#, fuzzy msgid "File creation options:" -msgstr "Druge izbire:" +msgstr "Izbire ustvarjenja datotek:" #: tests/genfile.c:128 tests/genfile.c:139 msgid "SIZE" -msgstr "" +msgstr "VELIKOST" #: tests/genfile.c:129 -#, fuzzy msgid "Create file of the given SIZE" -msgstr "ustvari arhiv v navedeni obliki." +msgstr "Ustvari arhiv z navedeno VELIKOSTJO" #: tests/genfile.c:131 -#, fuzzy msgid "Write to file NAME, instead of standard output" -msgstr "datoteke izvleci na standardni izhod" +msgstr "ZapiÅ¡i na podano DATOTEKO namesto na standardni izhod" #: tests/genfile.c:133 -#, fuzzy msgid "Read file names from FILE" -msgstr "Prebranih %s bajtov iz %s" +msgstr "Preberi imena datotek iz podane DATOTEKE" #: tests/genfile.c:135 -#, fuzzy msgid "-T reads null-terminated names" -msgstr "-T prebere z \\000 terminirana imena; onemogoči -C" +msgstr "-T prebere z \\000 terminirana imena" #: tests/genfile.c:137 msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'" -msgstr "" +msgstr "ZapiÅ¡e v datoteko dani VZOREC. VZOREC je lahko 'default' ali 'zeros'" #: tests/genfile.c:140 msgid "Size of a block for sparse file" -msgstr "" +msgstr "Velikost bloka za razprÅ¡eno datoteko" #: tests/genfile.c:142 msgid "Generate sparse file. Rest of the command line gives the file map." msgstr "" +"Ustvari razprÅ¡eno datoteko. Preostanek ukazne vrstice podaja preslikavo " +"datoteke." #: tests/genfile.c:144 msgid "OFFSET" -msgstr "" +msgstr "ODMIK" #: tests/genfile.c:145 -#, fuzzy msgid "Seek to the given offset before writing data" -msgstr "s poskusom preverjanja zapisanega arhiva" +msgstr "pomakni se na dani odmik pred pisanjem podatkov" #: tests/genfile.c:151 msgid "File statistics options:" -msgstr "" +msgstr "Izbire statistike datotek:" #: tests/genfile.c:154 msgid "Print contents of struct stat for each given file. Default FORMAT is: " msgstr "" +"IzpiÅ¡i vsebino strukture stat za vsako od datotek. Privzeti FORMAT je: " #: tests/genfile.c:161 msgid "Synchronous execution options:" -msgstr "" +msgstr "Izbire za sinhrono izvajanje:" #: tests/genfile.c:163 -#, fuzzy msgid "OPTION" -msgstr " [IZBIRA...]" +msgstr "IZBIRA" #: tests/genfile.c:164 msgid "" "Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, " "--unlink" msgstr "" +"Izvedi ARGUMENTE. Uporabno z izbiro --checkpoint in eno od naslednjih izbir: " +"--cut, --append, --touch, --unlink" #: tests/genfile.c:167 msgid "Perform given action (see below) upon reaching checkpoint NUMBER" -msgstr "" +msgstr "Ob dosegu kontrolne točke N izvedi dano dejanje (glejte spodaj)" #: tests/genfile.c:170 msgid "Set date for next --touch option" -msgstr "" +msgstr "Nastavi datum za naslednjo izbiro --touch" #: tests/genfile.c:173 msgid "Display executed checkpoints and exit status of COMMAND" -msgstr "" +msgstr "IzpiÅ¡i izvedene kontrolne točke in izhodni status UKAZA" #: tests/genfile.c:178 msgid "" "Synchronous execution actions. These are executed when checkpoint number " "given by --checkpoint option is reached." msgstr "" +"Dejanja sinhronega izvajanja. Izvedejo se, ko je dosežena ena od kontrolnih " +"točk, podana z izbiro --checkpoint." #: tests/genfile.c:181 msgid "" "Truncate FILE to the size specified by previous --length option (or 0, if it " "is not given)" msgstr "" +"SkrajÅ¡aj DATOTEKO na dolžino, določeno s prejÅ¡njo izbiro --length (ali 0, če " +"ta ni podana)" #: tests/genfile.c:185 msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option." msgstr "" +"Dodaj VELIKOST bajtov DATOTEKI. VELIKOST je podana s prejÅ¡njo izbiro --" +"length." #: tests/genfile.c:188 -#, fuzzy msgid "Update the access and modification times of FILE" -msgstr "%s: Časa zadnje spremembe in dostopa ni možno spremeniti" +msgstr "Posodobi čas dostopa in spremembe za DATOTEKO" #: tests/genfile.c:191 -#, fuzzy msgid "Execute COMMAND" -msgstr "UKAZ" +msgstr "Izvedi UKAZ" #: tests/genfile.c:194 msgid "Unlink FILE" -msgstr "" +msgstr "Odstrani DATOTEKO" #: tests/genfile.c:244 -#, fuzzy, c-format +#, c-format msgid "Invalid size: %s" -msgstr "Neveljavna oznaka časa" +msgstr "Neveljavna velikost: %s" #: tests/genfile.c:249 -#, fuzzy, c-format +#, c-format msgid "Number out of allowed range: %s" -msgstr "Å tevilka inoda izven obsega" +msgstr "Å tevilka izven dovoljenega obsega: %s" #: tests/genfile.c:252 -#, fuzzy, c-format +#, c-format msgid "Negative size: %s" -msgstr "Neveljavna oznaka časa" +msgstr "Negativna velikost: %s" #: tests/genfile.c:265 tests/genfile.c:567 #, c-format msgid "stat(%s) failed" -msgstr "" +msgstr "klic stat(%s) ni uspel" #: tests/genfile.c:268 #, c-format msgid "requested file length %lu, actual %lu" -msgstr "" +msgstr "zahtevana dolžina datoteke %lu, dejanska %lu" #: tests/genfile.c:272 #, c-format msgid "created file is not sparse" -msgstr "" +msgstr "ustvarjena datoteka ni razprÅ¡ena" #: tests/genfile.c:361 #, c-format msgid "Error parsing number near `%s'" -msgstr "" +msgstr "Napaka pri razčlembi Å¡tevila pri »%s«" #: tests/genfile.c:367 -#, fuzzy, c-format +#, c-format msgid "Unknown date format" -msgstr "Neznana sistemska napaka" +msgstr "Neznana format datuma" #: tests/genfile.c:391 msgid "[ARGS...]" -msgstr "" +msgstr "[ARGUMENT...]" #: tests/genfile.c:428 tests/genfile.c:468 tests/genfile.c:521 #: tests/genfile.c:671 tests/genfile.c:685 -#, fuzzy, c-format +#, c-format msgid "cannot open `%s'" -msgstr "Ni mogoče odpreti %s" +msgstr "ni mogoče odpreti »%s«" #: tests/genfile.c:434 -#, fuzzy msgid "cannot seek" -msgstr "Ni mogoče zapreti" +msgstr "klic seek() ni mogoč" #: tests/genfile.c:451 #, c-format msgid "file name contains null character" -msgstr "" +msgstr "datoteka vsebuje znak NUL" #: tests/genfile.c:516 #, c-format msgid "cannot generate sparse files on standard output, use --file option" msgstr "" +"razprÅ¡enih datotek ni mogoče ustvariti na standardnem izhodu, uporabite " +"izbiro --file" #: tests/genfile.c:594 #, c-format msgid "incorrect mask (near `%s')" -msgstr "" +msgstr "nepravilna maska (pri »%s«)" #: tests/genfile.c:600 tests/genfile.c:633 -#, fuzzy, c-format +#, c-format msgid "Unknown field `%s'" -msgstr " neznan tip datoteke %s\n" +msgstr "Neznano polje »%s«" #: tests/genfile.c:660 -#, fuzzy, c-format +#, c-format msgid "cannot set time on `%s'" -msgstr "Ni mogoče do statistike za datoteko %s" +msgstr "ni mogoče nastaviti časa za »%s«" #: tests/genfile.c:699 -#, fuzzy, c-format +#, c-format msgid "cannot unlink `%s'" -msgstr "Ni mogoče odpreti %s" +msgstr "ni mogoče odstraniti »%s«" #: tests/genfile.c:825 #, c-format msgid "Command exited successfully\n" -msgstr "" +msgstr "Ukaz se je uspeÅ¡no zaključil\n" #: tests/genfile.c:827 -#, fuzzy, c-format +#, c-format msgid "Command failed with status %d\n" -msgstr "Naslednik umrl s signalom %d" +msgstr "Ukaz se je zaključil neuspeÅ¡no s statusom %d\n" #: tests/genfile.c:831 #, c-format msgid "Command terminated on signal %d\n" -msgstr "" +msgstr "Ukaz je bil prekinjen s signalom %d\n" #: tests/genfile.c:833 #, c-format msgid "Command stopped on signal %d\n" -msgstr "" +msgstr "Ukaz je bil ustavljen s signalom %d\n" #: tests/genfile.c:836 #, c-format msgid "Command dumped core\n" -msgstr "" +msgstr "Ukaz je izvrgel pomnilniÅ¡ko sliko\n" #: tests/genfile.c:839 #, c-format msgid "Command terminated\n" -msgstr "" +msgstr "Ukaz je bil prekinjen\n" # POZOR Je to res to? #: tests/genfile.c:871 -#, fuzzy, c-format +#, c-format msgid "--stat requires file names" -msgstr "--Predelana imena datotek--\n" - -#, fuzzy -#~ msgid "Cannot restore working directory" -#~ msgstr "Delovnega imenika ni mogoče shraniti" +msgstr "--stat zahteva imena datotek" -#, fuzzy -#~ msgid "Cannot resolve hostname %s" -#~ msgstr "Preimenovanje %s v %s ni mogoče" +#~ msgid "%s: Directory removed before we read it" +#~ msgstr "%s: Imenik je bil odstranjen, preden smo ga prebrali" #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: nedovoljena izbira -- %c\n" -#~ msgid "Reading %s\n" -#~ msgstr "Branje %s\n" - #~ msgid "" #~ "\n" #~ "Report bugs to <%s>.\n" @@ -2797,23 +2780,6 @@ msgstr "--Predelana imena datotek--\n" #~ "Napake v prevodu sporočite na \n" -#~ msgid "filter the archive through bzip2" -#~ msgstr "filtriraj arhiv skozi bzip2" - -#~ msgid "filter the archive through gzip" -#~ msgstr "filtriraj arhiv skozi gzip" - -#~ msgid "filter the archive through compress" -#~ msgstr "filtriraj arhiv skozi compress" - -#, fuzzy -#~ msgid "filter the archive through lzma" -#~ msgstr "filtriraj arhiv skozi gzip" - -#, fuzzy -#~ msgid "filter the archive through lzop" -#~ msgstr "filtriraj arhiv skozi gzip" - #~ msgid "Input string too long" #~ msgstr "Vhodni niz je predolg" @@ -2848,9 +2814,32 @@ msgstr "--Predelana imena datotek--\n" #~ msgid "Premature end of file" #~ msgstr "Predčasen znak za konec datoteke" +#~ msgid "Reading %s\n" +#~ msgstr "Branje %s\n" + #~ msgid "Error is not recoverable: exiting now" #~ msgstr "Napake ni moč popraviti: zapuščamo" +#~ msgid "Cannot save working directory" +#~ msgstr "Delovnega imenika ni mogoče shraniti" + +#~ msgid "filter the archive through bzip2" +#~ msgstr "filtriraj arhiv skozi bzip2" + +#~ msgid "filter the archive through gzip" +#~ msgstr "filtriraj arhiv skozi gzip" + +#~ msgid "filter the archive through compress" +#~ msgstr "filtriraj arhiv skozi compress" + +#, fuzzy +#~ msgid "filter the archive through lzma" +#~ msgstr "filtriraj arhiv skozi gzip" + +#, fuzzy +#~ msgid "filter the archive through lzop" +#~ msgstr "filtriraj arhiv skozi gzip" + #~ msgid "[.]NUMBER" #~ msgstr "[.]N" @@ -3458,9 +3447,6 @@ msgstr "--Predelana imena datotek--\n" #~ msgid "Removing `%.*s' prefix from member names" #~ msgstr "Odstranjujemo predpono ,%.*s` iz imen elementov" -#~ msgid "Archive contains future timestamp %s" -#~ msgstr "Arhiv vsebuje časovno oznako iz prihodnosti: %s" - #~ msgid "%s: Cannot symlink %s %s" #~ msgstr "%s: Simbolna povezava %s %s ni mogoča" diff --git a/po/sv.gmo b/po/sv.gmo index ff37a84c83ee90291aa79369b450fd8fbf44bc8b..0ecbdf9375daa3100700359a00edfd45da6d330d 100644 GIT binary patch delta 9727 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

XvmN{~GZDDm1eH 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 diff --git a/po/sv.po b/po/sv.po index 343803e4..b022314c 100644 --- a/po/sv.po +++ b/po/sv.po @@ -2,15 +2,15 @@ # Copyright © 1996, 2001, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. # This file is distributed under the same license as the tar package. # Jan Djärv , 2000, 2001, 2004, 2006, 2007, 2008, 2009, 2010 -# Revision: 1.102 +# Revision: 1.105 # #: src/create.c:1552 msgid "" msgstr "" -"Project-Id-Version: tar 1.23.90\n" +"Project-Id-Version: tar 1.24\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2010-11-07 17:07+0200\n" -"PO-Revision-Date: 2010-07-15 17:04+0200\n" +"POT-Creation-Date: 2011-03-12 11:53+0200\n" +"PO-Revision-Date: 2010-11-05 11:14+0100\n" "Last-Translator: Jan Djärv \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -59,7 +59,7 @@ msgstr "%.*s: Okänd ARGP_HELP_FMT-parameter" msgid "Garbage in ARGP_HELP_FMT: %s" msgstr "Skräp i ARGP_HELP_FMT: %s" -#: gnu/argp-help.c:1246 +#: gnu/argp-help.c:1248 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." @@ -67,24 +67,24 @@ msgstr "" "Obligatoriska respektive valfria argument för lÃ¥nga flaggor är obligatoriska " "repektive valfria även för motsvarande korta." -#: gnu/argp-help.c:1639 +#: gnu/argp-help.c:1641 msgid "Usage:" msgstr "Användning:" -#: gnu/argp-help.c:1643 +#: gnu/argp-help.c:1645 msgid " or: " msgstr " eller: " -#: gnu/argp-help.c:1655 +#: gnu/argp-help.c:1657 msgid " [OPTION...]" msgstr " [FLAGGA...]" -#: gnu/argp-help.c:1682 +#: gnu/argp-help.c:1684 #, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Försök med \"%s --help\" eller \"%s --usage\" för mer information.\n" -#: gnu/argp-help.c:1710 +#: gnu/argp-help.c:1712 #, c-format msgid "Report bugs to %s.\n" msgstr "" @@ -92,7 +92,7 @@ msgstr "" "Rapportera fel eller synpunkter pÃ¥ översättningen till .\n" -#: gnu/argp-help.c:1929 gnu/error.c:183 +#: gnu/argp-help.c:1931 gnu/error.c:183 msgid "Unknown system error" msgstr "Okänt systemfel" @@ -198,16 +198,16 @@ msgstr "%s: flaggan \"-W %s\" tar inget argument\n" msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: flaggan \"-W %s\" kräver ett argument\n" -#: gnu/obstack.c:425 gnu/obstack.c:427 gnu/xalloc-die.c:36 +#: gnu/obstack.c:423 gnu/obstack.c:425 gnu/xalloc-die.c:36 msgid "memory exhausted" msgstr "minnet slut" -#: gnu/openat-die.c:36 +#: gnu/openat-die.c:40 #, c-format msgid "unable to record current working directory" msgstr "kan inte lagra nuvarande arbetskatalog" -#: gnu/openat-die.c:54 +#: gnu/openat-die.c:59 #, c-format msgid "failed to return to initial working directory" msgstr "kan inte gÃ¥ tillbaka till initial arbetskatalog" @@ -231,11 +231,11 @@ msgstr "kan inte gÃ¥ tillbaka till initial arbetskatalog" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: gnu/quotearg.c:274 +#: gnu/quotearg.c:273 msgid "`" msgstr "\"" -#: gnu/quotearg.c:275 +#: gnu/quotearg.c:274 msgid "'" msgstr "\"" @@ -425,7 +425,7 @@ msgstr "" #: gnu/version-etc.c:253 #, c-format msgid "%s home page: <%s>\n" -msgstr "%s hemsida: <%s>\n" +msgstr "hemsida för %s: <%s>\n" #: gnu/version-etc.c:255 #, c-format @@ -506,21 +506,21 @@ msgid_plural "%s: Wrote only %lu of %lu bytes" msgstr[0] "%s: Skrev bara %lu av %lu byte" msgstr[1] "%s: Skrev bara %lu av %lu byte" -#: lib/paxnames.c:155 +#: lib/paxnames.c:140 #, c-format msgid "Removing leading `%s' from member names" msgstr "Tar bort inledande \"%s\" frÃ¥n namnen i arkivet" -#: lib/paxnames.c:156 +#: lib/paxnames.c:141 #, c-format msgid "Removing leading `%s' from hard link targets" msgstr "Tar bort inledande \"%s\" frÃ¥n mÃ¥l för hÃ¥rda länkar" -#: lib/paxnames.c:169 +#: lib/paxnames.c:154 msgid "Substituting `.' for empty member name" msgstr "Ersätter tomma namn i arkivet med \".\"" -#: lib/paxnames.c:170 +#: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" msgstr "Ersätter tomt mÃ¥l för hÃ¥rd länk med \".\"" @@ -812,20 +812,20 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "Kunde bara läsa %lu av %lu byte" msgstr[1] "Kunde bara läsa %lu av %lu byte" -#: src/compare.c:105 src/compare.c:382 +#: src/compare.c:105 src/compare.c:383 msgid "Contents differ" msgstr "InnehÃ¥llet är olika" -#: src/compare.c:131 src/extract.c:972 src/incremen.c:1462 src/list.c:458 -#: src/list.c:1392 src/xheader.c:711 +#: src/compare.c:131 src/extract.c:984 src/incremen.c:1456 src/list.c:456 +#: src/list.c:1388 src/xheader.c:711 msgid "Unexpected EOF in archive" msgstr "Oväntat filslut i arkivet" -#: src/compare.c:179 src/compare.c:195 src/compare.c:308 src/compare.c:406 +#: src/compare.c:179 src/compare.c:195 src/compare.c:309 src/compare.c:407 msgid "File type differs" msgstr "Filtyper är olika" -#: src/compare.c:182 src/compare.c:202 src/compare.c:322 +#: src/compare.c:182 src/compare.c:202 src/compare.c:323 msgid "Mode differs" msgstr "Rättigheterna är olika" @@ -841,49 +841,54 @@ msgstr "Gid är olika" msgid "Mod time differs" msgstr "Modifieringstiderna är olika" -#: src/compare.c:215 src/compare.c:414 +#: src/compare.c:215 src/compare.c:415 msgid "Size differs" msgstr "Storlekarna är olika" -#: src/compare.c:263 +#: src/compare.c:264 #, c-format msgid "Not linked to %s" msgstr "Inte länkad till %s" -#: src/compare.c:287 +#: src/compare.c:288 msgid "Symlink differs" msgstr "Symboliska länkar är olika" -#: src/compare.c:316 +#: src/compare.c:317 msgid "Device number differs" msgstr "Enhetsnummer är olika" -#: src/compare.c:456 +#: src/compare.c:457 #, c-format msgid "Verify " msgstr "Verifierar " -#: src/compare.c:463 +#: src/compare.c:464 #, c-format msgid "%s: Unknown file type `%c', diffed as normal file" msgstr "%s: Okänd filtyp \"%c\" jämförd som en normal fil" -#: src/compare.c:518 +#: src/compare.c:520 msgid "Archive contains file names with leading prefixes removed." msgstr "Arkivet innehÃ¥ller filnamn med inledande prefix borttaget." -#: src/compare.c:520 +#: src/compare.c:526 +#, fuzzy +msgid "Archive contains transformed file names." +msgstr "Arkivet innehÃ¥ller förÃ¥ldrade \"base-64\"-huvuden" + +#: src/compare.c:531 msgid "Verification may fail to locate original files." msgstr "Verifiering kan misslyckas med att hitta originalfiler." -#: src/compare.c:593 +#: src/compare.c:603 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "VERIFIKATIONSFEL: %d felaktigt arkivhuvud upptäckt" msgstr[1] "VERIFIKATIONSFEL: %d felaktiga arkivhuvuden upptäckta" -#: src/compare.c:611 src/list.c:222 +#: src/compare.c:621 src/list.c:222 #, c-format msgid "A lone zero block at %s" msgstr "Ett ensamt nollblock vid %s" @@ -934,7 +939,7 @@ msgstr[1] "%s: Fil krympte med %s byte, fyller ut med nolltecken" msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: filen finns pÃ¥ ett annat filsystem; inte arkiverad" -#: src/create.c:1203 src/create.c:1214 src/incremen.c:582 src/incremen.c:588 +#: src/create.c:1203 src/create.c:1214 src/incremen.c:578 src/incremen.c:584 msgid "contents not dumped" msgstr "innehÃ¥llet inte arkiverat" @@ -958,7 +963,7 @@ msgstr "%s: filen är oförändrad; inte arkiverad" msgid "%s: file is the archive; not dumped" msgstr "%s: filen är själva arkivet; inte arkiverad" -#: src/create.c:1723 src/incremen.c:575 +#: src/create.c:1723 src/incremen.c:571 msgid "directory not dumped" msgstr "katalog inte arkiverad" @@ -967,12 +972,12 @@ msgstr "katalog inte arkiverad" msgid "%s: file changed as we read it" msgstr "%s: fil ändrades under tiden vi läste den" -#: src/create.c:1857 +#: src/create.c:1858 #, c-format msgid "%s: socket ignored" msgstr "%s: socketfil ignorerad" -#: src/create.c:1863 +#: src/create.c:1864 #, c-format msgid "%s: door ignored" msgstr "%s: door-fil ignorerad" @@ -1000,165 +1005,165 @@ msgstr "%s: tidsvärde %s är %s sekunder i framtiden" msgid "%s: Unexpected inconsistency when making directory" msgstr "%s: Oväntad inkonsistens när katalog skapades" -#: src/extract.c:709 +#: src/extract.c:721 #, c-format msgid "%s: Directory renamed before its status could be extracted" msgstr "%s: Katalog bytte namn innan dess status kunde extraheras" -#: src/extract.c:863 +#: src/extract.c:875 msgid "Extracting contiguous files as regular files" msgstr "Extraherar sammanhängande filer som vanliga filer" -#: src/extract.c:1197 +#: src/extract.c:1209 msgid "Attempting extraction of symbolic links as hard links" msgstr "Försöker extrahera symboliska länkar som hÃ¥rda länkar" -#: src/extract.c:1353 +#: src/extract.c:1365 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Kan inte extrahera -- filen fortsätter frÃ¥n en annan volym" -#: src/extract.c:1360 src/list.c:1125 +#: src/extract.c:1372 src/list.c:1121 msgid "Unexpected long name header" msgstr "Oväntat huvud för lÃ¥ngt filnamn" -#: src/extract.c:1367 +#: src/extract.c:1379 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Okänd filtyp \"%c\", extraherad som en normal fil" -#: src/extract.c:1393 +#: src/extract.c:1405 #, c-format msgid "Current %s is newer or same age" msgstr "Nuvarade \"%s\" är nyare eller lika gammal" -#: src/extract.c:1445 +#: src/extract.c:1457 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Kunde inte säkerhetskopiera denna fil" -#: src/extract.c:1582 +#: src/extract.c:1594 #, c-format msgid "Cannot rename %s to %s" msgstr "Kan inte byta namn pÃ¥ %s till %s" -#: src/incremen.c:474 src/incremen.c:518 +#: src/incremen.c:473 src/incremen.c:517 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Katalogen har bytt namn frÃ¥n %s" -#: src/incremen.c:486 +#: src/incremen.c:485 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Katalogen har bytt namn" -#: src/incremen.c:531 +#: src/incremen.c:530 #, c-format msgid "%s: Directory is new" msgstr "%s: Katalogen är ny" -#: src/incremen.c:956 src/incremen.c:973 +#: src/incremen.c:951 src/incremen.c:968 msgid "Invalid time stamp" msgstr "Ogiltigt värde pÃ¥ tidsvärde" -#: src/incremen.c:1012 +#: src/incremen.c:1007 msgid "Invalid modification time (seconds)" msgstr "Ogiltig modifikationstid (sekunder)" -#: src/incremen.c:1027 +#: src/incremen.c:1022 msgid "Invalid modification time (nanoseconds)" msgstr "Ogiltig modifikationstid (nanosekunder)" -#: src/incremen.c:1047 +#: src/incremen.c:1042 msgid "Invalid device number" msgstr "Ogiltigt enhetsnummer" -#: src/incremen.c:1062 +#: src/incremen.c:1057 msgid "Invalid inode number" msgstr "Ogiltigt inodnummer" -#: src/incremen.c:1113 src/incremen.c:1150 +#: src/incremen.c:1108 src/incremen.c:1145 msgid "Field too long while reading snapshot file" msgstr "Fält för lÃ¥ngt när ögonblicksfil lästes" -#: src/incremen.c:1120 src/incremen.c:1158 +#: src/incremen.c:1115 src/incremen.c:1153 msgid "Read error in snapshot file" msgstr "Läsfel i ögonblicksfil" -#: src/incremen.c:1122 src/incremen.c:1162 src/incremen.c:1214 -#: src/incremen.c:1272 +#: src/incremen.c:1117 src/incremen.c:1157 src/incremen.c:1209 +#: src/incremen.c:1267 msgid "Unexpected EOF in snapshot file" msgstr "Oväntat filslut i ögonblicksfil" -#: src/incremen.c:1129 src/incremen.c:1169 +#: src/incremen.c:1124 src/incremen.c:1164 msgid "Unexpected field value in snapshot file" msgstr "Oväntat fältvärde i ögonblicksfil" -#: src/incremen.c:1264 +#: src/incremen.c:1259 msgid "Missing record terminator" msgstr "Postavslutare fattas" -#: src/incremen.c:1325 src/incremen.c:1328 +#: src/incremen.c:1320 src/incremen.c:1323 msgid "Bad incremental file format" msgstr "Felaktigt filformat för inkrementell säkerhetskopiering" -#: src/incremen.c:1347 +#: src/incremen.c:1342 #, c-format msgid "Unsupported incremental format version: %" msgstr "" "Formatversion för inkrementell säkerhetskopiering stöds inte: %" -#: src/incremen.c:1502 +#: src/incremen.c:1496 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "Felaktig dumpkatalog: förväntade \"%c\" men hittade %#3o" -#: src/incremen.c:1512 +#: src/incremen.c:1506 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Felaktig dumpkatalog: \"X\" duplicerad" -#: src/incremen.c:1525 +#: src/incremen.c:1519 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Felaktig dumpkatalog: tomt namn i \"R\"" -#: src/incremen.c:1538 +#: src/incremen.c:1532 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Felaktig dumpkatalog: \"T\" föregÃ¥s inte av \"R\"" -#: src/incremen.c:1544 +#: src/incremen.c:1538 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Felaktig dumpkatalog: tomt namn i \"T\"" -#: src/incremen.c:1564 +#: src/incremen.c:1558 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "Felaktig dumpkatalog: förväntade \"%c\" men hittade dataslut" -#: src/incremen.c:1571 +#: src/incremen.c:1565 msgid "Malformed dumpdir: 'X' never used" msgstr "Felaktig dumpkatalog: \"X\" används inte" -#: src/incremen.c:1615 +#: src/incremen.c:1609 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Kan inte skapa temporärkatalog med mall %s" -#: src/incremen.c:1677 +#: src/incremen.c:1670 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Rensar inte katalog: kunde inte ta status" -#: src/incremen.c:1690 +#: src/incremen.c:1683 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: katalogen finns pÃ¥ ett annat filsystem; inte rensad" -#: src/incremen.c:1698 +#: src/incremen.c:1691 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Tar bort %s\n" -#: src/incremen.c:1703 +#: src/incremen.c:1696 #, c-format msgid "%s: Cannot remove" msgstr "%s: Kan inte ta bort" @@ -1178,20 +1183,20 @@ msgstr "block %s: ** Block av nolltecken **\n" msgid "block %s: ** End of File **\n" msgstr "block %s: ** Filslut **\n" -#: src/list.c:256 src/list.c:1097 src/list.c:1360 +#: src/list.c:256 src/list.c:1093 src/list.c:1356 #, c-format msgid "block %s: " msgstr "block %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:712 +#: src/list.c:708 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Blanka i huvud där numeriskt värde av typ %s förväntades" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:767 +#: src/list.c:763 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1199,114 +1204,108 @@ msgstr "" "komplement" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:778 +#: src/list.c:774 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Arkivets oktala värde %.*s är utanför intervallet för %s" -#: src/list.c:799 +#: src/list.c:795 msgid "Archive contains obsolescent base-64 headers" msgstr "Arkivet innehÃ¥ller förÃ¥ldrade \"base-64\"-huvuden" -#: src/list.c:813 +#: src/list.c:809 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "Arkivets \"base-64\"-sträng \"%s\" är utanför intervallet för %s" -#: src/list.c:844 +#: src/list.c:840 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Arkivets \"base-256\"-värde är utanför intervallet för %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:873 +#: src/list.c:869 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Arkivet innehÃ¥ller %.*s där ett numeriskt värde av typ %s förväntades" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:895 +#: src/list.c:891 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Arkivets värde %s är utanför intervallet för %s: %s..%s" -#: src/list.c:1261 +#: src/list.c:1257 #, c-format msgid " link to %s\n" msgstr " länk till %s\n" -#: src/list.c:1269 +#: src/list.c:1265 #, c-format msgid " unknown file type %s\n" msgstr " okänd filtyp \"%s\"\n" -#: src/list.c:1287 +#: src/list.c:1283 #, c-format msgid "--Long Link--\n" msgstr "--LÃ¥ng länk--\n" -#: src/list.c:1291 +#: src/list.c:1287 #, c-format msgid "--Long Name--\n" msgstr "--LÃ¥ngt namn--\n" -#: src/list.c:1295 +#: src/list.c:1291 #, c-format msgid "--Volume Header--\n" msgstr "--Volymhuvud--\n" -#: src/list.c:1303 +#: src/list.c:1299 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Fortsätter vid byte %s--\n" -#: src/list.c:1365 +#: src/list.c:1361 msgid "Creating directory:" msgstr "Skapar katalog:" -#: src/misc.c:298 -#, fuzzy +#: src/misc.c:297 msgid "Cannot get working directory" -msgstr "Kan inte byta arbetskatalog" +msgstr "Kan inte avgöra arbetskatalog" -#: src/misc.c:571 +#: src/misc.c:570 #, c-format msgid "Renaming %s to %s\n" msgstr "Byter namn pÃ¥ %s till %s\n" -#: src/misc.c:580 src/misc.c:599 +#: src/misc.c:579 src/misc.c:598 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: Kan inte byta namn till %s" -#: src/misc.c:604 +#: src/misc.c:603 #, c-format msgid "Renaming %s back to %s\n" msgstr "Byter namn pÃ¥ %s tillbaka till %s\n" -#: src/misc.c:851 +#: src/misc.c:850 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Fil borttagen innan vi läste den" -#: src/misc.c:866 -#, c-format -msgid "%s: Directory removed before we read it" -msgstr "%s: Katalog borttagen innan vi läste den" - -#: src/misc.c:887 +#: src/misc.c:871 msgid "child process" msgstr "barnprocess" -#: src/misc.c:896 +#: src/misc.c:880 msgid "interprocess channel" msgstr "interprocesskanal" -#: src/names.c:594 +#: src/names.c:590 msgid "Pattern matching characters used in file names" msgstr "Mönstermatchningstecken används i filnamn" -#: src/names.c:596 +#: src/names.c:592 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" @@ -1314,27 +1313,27 @@ msgstr "" "Använd --wildcards för att slÃ¥ pÃ¥ mönstermatchning, eller --no-wildcards för " "att undertrycka denna varning" -#: src/names.c:614 src/names.c:630 +#: src/names.c:610 src/names.c:626 #, c-format msgid "%s: Not found in archive" msgstr "%s: Fanns inte i arkivet" -#: src/names.c:615 +#: src/names.c:611 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Nödvändig förekomst hittades inte i arkivet" -#: src/names.c:649 +#: src/names.c:645 #, c-format msgid "Archive label mismatch" msgstr "Arkivmärkning stämmer inte överrens" -#: src/names.c:953 +#: src/names.c:949 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "Att används -C i en fillista är inte tillÃ¥tet med --listed-incremental" -#: src/names.c:959 +#: src/names.c:955 msgid "Only one -C option is allowed with --listed-incremental" msgstr "Bara en -C-flagga är tillÃ¥tet med --listed-incremental" @@ -2731,5 +2730,5 @@ msgstr "Kommandot avslutade\n" msgid "--stat requires file names" msgstr "--stat kräver filnamn" -#~ msgid "Cannot save working directory" -#~ msgstr "Kan inte spara arbetskatalog" +#~ msgid "%s: Directory removed before we read it" +#~ msgstr "%s: Katalog borttagen innan vi läste den" diff --git a/po/tar.pot b/po/tar.pot index 65f88861..fd497c59 100644 --- a/po/tar.pot +++ b/po/tar.pot @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2010-11-07 17:07+0200\n" +"POT-Creation-Date: 2011-03-12 11:53+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -59,35 +59,35 @@ msgstr "" msgid "Garbage in ARGP_HELP_FMT: %s" msgstr "" -#: gnu/argp-help.c:1246 +#: gnu/argp-help.c:1248 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." msgstr "" -#: gnu/argp-help.c:1639 +#: gnu/argp-help.c:1641 msgid "Usage:" msgstr "" -#: gnu/argp-help.c:1643 +#: gnu/argp-help.c:1645 msgid " or: " msgstr "" -#: gnu/argp-help.c:1655 +#: gnu/argp-help.c:1657 msgid " [OPTION...]" msgstr "" -#: gnu/argp-help.c:1682 +#: gnu/argp-help.c:1684 #, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "" -#: gnu/argp-help.c:1710 +#: gnu/argp-help.c:1712 #, c-format msgid "Report bugs to %s.\n" msgstr "" -#: gnu/argp-help.c:1929 gnu/error.c:183 +#: gnu/argp-help.c:1931 gnu/error.c:183 msgid "Unknown system error" msgstr "" @@ -193,16 +193,16 @@ msgstr "" msgid "%s: option '-W %s' requires an argument\n" msgstr "" -#: gnu/obstack.c:425 gnu/obstack.c:427 gnu/xalloc-die.c:36 +#: gnu/obstack.c:423 gnu/obstack.c:425 gnu/xalloc-die.c:36 msgid "memory exhausted" msgstr "" -#: gnu/openat-die.c:36 +#: gnu/openat-die.c:40 #, c-format msgid "unable to record current working directory" msgstr "" -#: gnu/openat-die.c:54 +#: gnu/openat-die.c:59 #, c-format msgid "failed to return to initial working directory" msgstr "" @@ -226,11 +226,11 @@ msgstr "" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: gnu/quotearg.c:274 +#: gnu/quotearg.c:273 msgid "`" msgstr "" -#: gnu/quotearg.c:275 +#: gnu/quotearg.c:274 msgid "'" msgstr "" @@ -471,21 +471,21 @@ msgid_plural "%s: Wrote only %lu of %lu bytes" msgstr[0] "" msgstr[1] "" -#: lib/paxnames.c:155 +#: lib/paxnames.c:140 #, c-format msgid "Removing leading `%s' from member names" msgstr "" -#: lib/paxnames.c:156 +#: lib/paxnames.c:141 #, c-format msgid "Removing leading `%s' from hard link targets" msgstr "" -#: lib/paxnames.c:169 +#: lib/paxnames.c:154 msgid "Substituting `.' for empty member name" msgstr "" -#: lib/paxnames.c:170 +#: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" msgstr "" @@ -771,20 +771,20 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "" msgstr[1] "" -#: src/compare.c:105 src/compare.c:382 +#: src/compare.c:105 src/compare.c:383 msgid "Contents differ" msgstr "" -#: src/compare.c:131 src/extract.c:972 src/incremen.c:1462 src/list.c:458 -#: src/list.c:1392 src/xheader.c:711 +#: src/compare.c:131 src/extract.c:984 src/incremen.c:1456 src/list.c:456 +#: src/list.c:1388 src/xheader.c:711 msgid "Unexpected EOF in archive" msgstr "" -#: src/compare.c:179 src/compare.c:195 src/compare.c:308 src/compare.c:406 +#: src/compare.c:179 src/compare.c:195 src/compare.c:309 src/compare.c:407 msgid "File type differs" msgstr "" -#: src/compare.c:182 src/compare.c:202 src/compare.c:322 +#: src/compare.c:182 src/compare.c:202 src/compare.c:323 msgid "Mode differs" msgstr "" @@ -800,49 +800,53 @@ msgstr "" msgid "Mod time differs" msgstr "" -#: src/compare.c:215 src/compare.c:414 +#: src/compare.c:215 src/compare.c:415 msgid "Size differs" msgstr "" -#: src/compare.c:263 +#: src/compare.c:264 #, c-format msgid "Not linked to %s" msgstr "" -#: src/compare.c:287 +#: src/compare.c:288 msgid "Symlink differs" msgstr "" -#: src/compare.c:316 +#: src/compare.c:317 msgid "Device number differs" msgstr "" -#: src/compare.c:456 +#: src/compare.c:457 #, c-format msgid "Verify " msgstr "" -#: src/compare.c:463 +#: src/compare.c:464 #, c-format msgid "%s: Unknown file type `%c', diffed as normal file" msgstr "" -#: src/compare.c:518 +#: src/compare.c:520 msgid "Archive contains file names with leading prefixes removed." msgstr "" -#: src/compare.c:520 +#: src/compare.c:526 +msgid "Archive contains transformed file names." +msgstr "" + +#: src/compare.c:531 msgid "Verification may fail to locate original files." msgstr "" -#: src/compare.c:593 +#: src/compare.c:603 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "" msgstr[1] "" -#: src/compare.c:611 src/list.c:222 +#: src/compare.c:621 src/list.c:222 #, c-format msgid "A lone zero block at %s" msgstr "" @@ -893,7 +897,7 @@ msgstr[1] "" msgid "%s: file is on a different filesystem; not dumped" msgstr "" -#: src/create.c:1203 src/create.c:1214 src/incremen.c:582 src/incremen.c:588 +#: src/create.c:1203 src/create.c:1214 src/incremen.c:578 src/incremen.c:584 msgid "contents not dumped" msgstr "" @@ -917,7 +921,7 @@ msgstr "" msgid "%s: file is the archive; not dumped" msgstr "" -#: src/create.c:1723 src/incremen.c:575 +#: src/create.c:1723 src/incremen.c:571 msgid "directory not dumped" msgstr "" @@ -926,12 +930,12 @@ msgstr "" msgid "%s: file changed as we read it" msgstr "" -#: src/create.c:1857 +#: src/create.c:1858 #, c-format msgid "%s: socket ignored" msgstr "" -#: src/create.c:1863 +#: src/create.c:1864 #, c-format msgid "%s: door ignored" msgstr "" @@ -959,164 +963,164 @@ msgstr "" msgid "%s: Unexpected inconsistency when making directory" msgstr "" -#: src/extract.c:709 +#: src/extract.c:721 #, c-format msgid "%s: Directory renamed before its status could be extracted" msgstr "" -#: src/extract.c:863 +#: src/extract.c:875 msgid "Extracting contiguous files as regular files" msgstr "" -#: src/extract.c:1197 +#: src/extract.c:1209 msgid "Attempting extraction of symbolic links as hard links" msgstr "" -#: src/extract.c:1353 +#: src/extract.c:1365 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "" -#: src/extract.c:1360 src/list.c:1125 +#: src/extract.c:1372 src/list.c:1121 msgid "Unexpected long name header" msgstr "" -#: src/extract.c:1367 +#: src/extract.c:1379 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "" -#: src/extract.c:1393 +#: src/extract.c:1405 #, c-format msgid "Current %s is newer or same age" msgstr "" -#: src/extract.c:1445 +#: src/extract.c:1457 #, c-format msgid "%s: Was unable to backup this file" msgstr "" -#: src/extract.c:1582 +#: src/extract.c:1594 #, c-format msgid "Cannot rename %s to %s" msgstr "" -#: src/incremen.c:474 src/incremen.c:518 +#: src/incremen.c:473 src/incremen.c:517 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "" -#: src/incremen.c:486 +#: src/incremen.c:485 #, c-format msgid "%s: Directory has been renamed" msgstr "" -#: src/incremen.c:531 +#: src/incremen.c:530 #, c-format msgid "%s: Directory is new" msgstr "" -#: src/incremen.c:956 src/incremen.c:973 +#: src/incremen.c:951 src/incremen.c:968 msgid "Invalid time stamp" msgstr "" -#: src/incremen.c:1012 +#: src/incremen.c:1007 msgid "Invalid modification time (seconds)" msgstr "" -#: src/incremen.c:1027 +#: src/incremen.c:1022 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:1047 +#: src/incremen.c:1042 msgid "Invalid device number" msgstr "" -#: src/incremen.c:1062 +#: src/incremen.c:1057 msgid "Invalid inode number" msgstr "" -#: src/incremen.c:1113 src/incremen.c:1150 +#: src/incremen.c:1108 src/incremen.c:1145 msgid "Field too long while reading snapshot file" msgstr "" -#: src/incremen.c:1120 src/incremen.c:1158 +#: src/incremen.c:1115 src/incremen.c:1153 msgid "Read error in snapshot file" msgstr "" -#: src/incremen.c:1122 src/incremen.c:1162 src/incremen.c:1214 -#: src/incremen.c:1272 +#: src/incremen.c:1117 src/incremen.c:1157 src/incremen.c:1209 +#: src/incremen.c:1267 msgid "Unexpected EOF in snapshot file" msgstr "" -#: src/incremen.c:1129 src/incremen.c:1169 +#: src/incremen.c:1124 src/incremen.c:1164 msgid "Unexpected field value in snapshot file" msgstr "" -#: src/incremen.c:1264 +#: src/incremen.c:1259 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1325 src/incremen.c:1328 +#: src/incremen.c:1320 src/incremen.c:1323 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1347 +#: src/incremen.c:1342 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1502 +#: src/incremen.c:1496 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1512 +#: src/incremen.c:1506 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1525 +#: src/incremen.c:1519 msgid "Malformed dumpdir: empty name in 'R'" msgstr "" -#: src/incremen.c:1538 +#: src/incremen.c:1532 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1544 +#: src/incremen.c:1538 msgid "Malformed dumpdir: empty name in 'T'" msgstr "" -#: src/incremen.c:1564 +#: src/incremen.c:1558 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1571 +#: src/incremen.c:1565 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1615 +#: src/incremen.c:1609 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "" -#: src/incremen.c:1677 +#: src/incremen.c:1670 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1690 +#: src/incremen.c:1683 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "" -#: src/incremen.c:1698 +#: src/incremen.c:1691 #, c-format msgid "%s: Deleting %s\n" msgstr "" -#: src/incremen.c:1703 +#: src/incremen.c:1696 #, c-format msgid "%s: Cannot remove" msgstr "" @@ -1136,158 +1140,153 @@ msgstr "" msgid "block %s: ** End of File **\n" msgstr "" -#: src/list.c:256 src/list.c:1097 src/list.c:1360 +#: src/list.c:256 src/list.c:1093 src/list.c:1356 #, c-format msgid "block %s: " msgstr "" #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:712 +#: src/list.c:708 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:767 +#: src/list.c:763 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:778 +#: src/list.c:774 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "" -#: src/list.c:799 +#: src/list.c:795 msgid "Archive contains obsolescent base-64 headers" msgstr "" -#: src/list.c:813 +#: src/list.c:809 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "" -#: src/list.c:844 +#: src/list.c:840 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:873 +#: src/list.c:869 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:895 +#: src/list.c:891 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "" -#: src/list.c:1261 +#: src/list.c:1257 #, c-format msgid " link to %s\n" msgstr "" -#: src/list.c:1269 +#: src/list.c:1265 #, c-format msgid " unknown file type %s\n" msgstr "" -#: src/list.c:1287 +#: src/list.c:1283 #, c-format msgid "--Long Link--\n" msgstr "" -#: src/list.c:1291 +#: src/list.c:1287 #, c-format msgid "--Long Name--\n" msgstr "" -#: src/list.c:1295 +#: src/list.c:1291 #, c-format msgid "--Volume Header--\n" msgstr "" -#: src/list.c:1303 +#: src/list.c:1299 #, c-format msgid "--Continued at byte %s--\n" msgstr "" -#: src/list.c:1365 +#: src/list.c:1361 msgid "Creating directory:" msgstr "" -#: src/misc.c:298 +#: src/misc.c:297 msgid "Cannot get working directory" msgstr "" -#: src/misc.c:571 +#: src/misc.c:570 #, c-format msgid "Renaming %s to %s\n" msgstr "" -#: src/misc.c:580 src/misc.c:599 +#: src/misc.c:579 src/misc.c:598 #, c-format msgid "%s: Cannot rename to %s" msgstr "" -#: src/misc.c:604 +#: src/misc.c:603 #, c-format msgid "Renaming %s back to %s\n" msgstr "" -#: src/misc.c:851 +#: src/misc.c:850 #, c-format msgid "%s: File removed before we read it" msgstr "" -#: src/misc.c:866 -#, c-format -msgid "%s: Directory removed before we read it" -msgstr "" - -#: src/misc.c:887 +#: src/misc.c:871 msgid "child process" msgstr "" -#: src/misc.c:896 +#: src/misc.c:880 msgid "interprocess channel" msgstr "" -#: src/names.c:594 +#: src/names.c:590 msgid "Pattern matching characters used in file names" msgstr "" -#: src/names.c:596 +#: src/names.c:592 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" msgstr "" -#: src/names.c:614 src/names.c:630 +#: src/names.c:610 src/names.c:626 #, c-format msgid "%s: Not found in archive" msgstr "" -#: src/names.c:615 +#: src/names.c:611 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "" -#: src/names.c:649 +#: src/names.c:645 #, c-format msgid "Archive label mismatch" msgstr "" -#: src/names.c:953 +#: src/names.c:949 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" -#: src/names.c:959 +#: src/names.c:955 msgid "Only one -C option is allowed with --listed-incremental" msgstr "" diff --git a/po/tr.gmo b/po/tr.gmo index 0bc7cdf246e2c127ac5a223bd3b19e360d78e22f..149cc32b6d6f78fb23d28d2e173eb93d34037e65 100644 GIT binary patch delta 28 jcmX^6gX!!KrVSEVyoS04#=3?^3WkPOrpB99vowMLna~LT delta 28 jcmX^6gX!!KrVSEVyau|4hPnpk3WnxZ2IiYpvowMLnhFU9 diff --git a/po/tr.po b/po/tr.po index 1bc75da7..abf2ec7c 100644 --- a/po/tr.po +++ b/po/tr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tar 1.18\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2010-11-07 17:07+0200\n" +"POT-Creation-Date: 2011-03-12 11:53+0200\n" "PO-Revision-Date: 2007-07-09 11:30+0300\n" "Last-Translator: Nilgün Belma Bugüner \n" "Language-Team: Turkish \n" @@ -58,7 +58,7 @@ msgstr "%.*s: ARGP_HELP_FMT ile belirtilen parametre bilinmiyor" msgid "Garbage in ARGP_HELP_FMT: %s" msgstr "ARGP_HELP_FMT bozuk: %s" -#: gnu/argp-help.c:1246 +#: gnu/argp-help.c:1248 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." @@ -66,31 +66,31 @@ msgstr "" "Uzun seçenekler için zorunlu veya isteğe bağlı olan argümanlar kısa " "seçenekler için de geçerlidir." -#: gnu/argp-help.c:1639 +#: gnu/argp-help.c:1641 msgid "Usage:" msgstr "Kullanımı:" -#: gnu/argp-help.c:1643 +#: gnu/argp-help.c:1645 msgid " or: " msgstr " veya: " -#: gnu/argp-help.c:1655 +#: gnu/argp-help.c:1657 msgid " [OPTION...]" msgstr " [SEÇENEK...]" -#: gnu/argp-help.c:1682 +#: gnu/argp-help.c:1684 #, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Daha fazla bilgi için `%s --help' veya `%s --usage' yazın.\n" -#: gnu/argp-help.c:1710 +#: gnu/argp-help.c:1712 #, c-format msgid "Report bugs to %s.\n" msgstr "" "Yazılım hatalarını <%s> adresine,\n" "çeviri hatalarını adresine bildiriniz.\n" -#: gnu/argp-help.c:1929 gnu/error.c:183 +#: gnu/argp-help.c:1931 gnu/error.c:183 msgid "Unknown system error" msgstr "Bilinmeyen sistem hatası" @@ -196,16 +196,16 @@ msgstr "%s: `-W %s' seçeneği argümansız kullanılır\n" msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: `%s' seçeneği bir argümanla kullanılır\n" -#: gnu/obstack.c:425 gnu/obstack.c:427 gnu/xalloc-die.c:36 +#: gnu/obstack.c:423 gnu/obstack.c:425 gnu/xalloc-die.c:36 msgid "memory exhausted" msgstr "bellek tükendi" -#: gnu/openat-die.c:36 +#: gnu/openat-die.c:40 #, fuzzy, c-format msgid "unable to record current working directory" msgstr "Çalışma dizini değiştirilemez" -#: gnu/openat-die.c:54 +#: gnu/openat-die.c:59 #, fuzzy, c-format msgid "failed to return to initial working directory" msgstr "Çalışılan dizin kaydedilemez" @@ -229,11 +229,11 @@ msgstr "Çalışılan dizin kaydedilemez" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: gnu/quotearg.c:274 +#: gnu/quotearg.c:273 msgid "`" msgstr "`" -#: gnu/quotearg.c:275 +#: gnu/quotearg.c:274 msgid "'" msgstr "'" @@ -481,21 +481,21 @@ msgid_plural "%s: Wrote only %lu of %lu bytes" msgstr[0] "%1$s: %3$lu baytın sadece %2$lu baytı yazıldı" msgstr[1] "%1$s: %3$lu baytın sadece %2$lu baytı yazıldı" -#: lib/paxnames.c:155 +#: lib/paxnames.c:140 #, c-format msgid "Removing leading `%s' from member names" msgstr "Üye isimlerinden `%s' kaldırılıyor" -#: lib/paxnames.c:156 +#: lib/paxnames.c:141 #, c-format msgid "Removing leading `%s' from hard link targets" msgstr "Sabit bağ hedeflerinden `%s' kaldırılıyor" -#: lib/paxnames.c:169 +#: lib/paxnames.c:154 msgid "Substituting `.' for empty member name" msgstr "Boş üye ismi için `.' ikamesi" -#: lib/paxnames.c:170 +#: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" msgstr "Boş sabit bağ hedefi için `.' ikamesi" @@ -793,20 +793,20 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "Sadece %2$lu baytın %1$lu baytı okunabildi" msgstr[1] "Sadece %2$lu baytın %1$lu baytı okunabildi" -#: src/compare.c:105 src/compare.c:382 +#: src/compare.c:105 src/compare.c:383 msgid "Contents differ" msgstr "İçerikler farklı" -#: src/compare.c:131 src/extract.c:972 src/incremen.c:1462 src/list.c:458 -#: src/list.c:1392 src/xheader.c:711 +#: src/compare.c:131 src/extract.c:984 src/incremen.c:1456 src/list.c:456 +#: src/list.c:1388 src/xheader.c:711 msgid "Unexpected EOF in archive" msgstr "Arşivde beklenmeyen dosya sonu" -#: src/compare.c:179 src/compare.c:195 src/compare.c:308 src/compare.c:406 +#: src/compare.c:179 src/compare.c:195 src/compare.c:309 src/compare.c:407 msgid "File type differs" msgstr "Dosya türleri farklı" -#: src/compare.c:182 src/compare.c:202 src/compare.c:322 +#: src/compare.c:182 src/compare.c:202 src/compare.c:323 msgid "Mode differs" msgstr "Kipleri farklı" @@ -822,49 +822,54 @@ msgstr "Grup-kimlikler farklı" msgid "Mod time differs" msgstr "Değişiklik zamanları farklı" -#: src/compare.c:215 src/compare.c:414 +#: src/compare.c:215 src/compare.c:415 msgid "Size differs" msgstr "Uzunlukları farklı" -#: src/compare.c:263 +#: src/compare.c:264 #, c-format msgid "Not linked to %s" msgstr "%s'e bağlı değil" -#: src/compare.c:287 +#: src/compare.c:288 msgid "Symlink differs" msgstr "Sembolik bağlar farklı" -#: src/compare.c:316 +#: src/compare.c:317 msgid "Device number differs" msgstr "Aygıt numaraları farklı" -#: src/compare.c:456 +#: src/compare.c:457 #, c-format msgid "Verify " msgstr "Doğrulama " -#: src/compare.c:463 +#: src/compare.c:464 #, c-format msgid "%s: Unknown file type `%c', diffed as normal file" msgstr "%s: '%c' dosya türü bilinmiyor, normal dosya olarak karşılaştırıldı" -#: src/compare.c:518 +#: src/compare.c:520 msgid "Archive contains file names with leading prefixes removed." msgstr "Arşivdeki dosya isimleri dosya yolu içermiyor." -#: src/compare.c:520 +#: src/compare.c:526 +#, fuzzy +msgid "Archive contains transformed file names." +msgstr "Arşiv atıl base-64 başlıklar içeriyor" + +#: src/compare.c:531 msgid "Verification may fail to locate original files." msgstr "Doğrulama, özgün dosyaların konumlanmasında başarısız olabilir." -#: src/compare.c:593 +#: src/compare.c:603 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "DOĞRULAMA BAŞARISIZ: %d geçersiz başlık saptandı" msgstr[1] "DOĞRULAMA BAŞARISIZ: %d geçersiz başlık saptandı" -#: src/compare.c:611 src/list.c:222 +#: src/compare.c:621 src/list.c:222 #, c-format msgid "A lone zero block at %s" msgstr "%s de tek başına sıfır bloğu" @@ -916,7 +921,7 @@ msgstr[1] "%s: Dosya %s baytta kaldı; sıfırlarla dolduruluyor" msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: dosya farklı bir dosya sisteminde; dökümlenmedi" -#: src/create.c:1203 src/create.c:1214 src/incremen.c:582 src/incremen.c:588 +#: src/create.c:1203 src/create.c:1214 src/incremen.c:578 src/incremen.c:584 msgid "contents not dumped" msgstr "içerik dökümlenmedi" @@ -940,7 +945,7 @@ msgstr "%s: dosya değişmedi; dökümlenmedi" msgid "%s: file is the archive; not dumped" msgstr "%s: dosya arşivdir; dökümlenmedi" -#: src/create.c:1723 src/incremen.c:575 +#: src/create.c:1723 src/incremen.c:571 msgid "directory not dumped" msgstr "dizin dökümlenmedi" @@ -949,12 +954,12 @@ msgstr "dizin dökümlenmedi" msgid "%s: file changed as we read it" msgstr "%s: dosya okundu olarak imlendi" -#: src/create.c:1857 +#: src/create.c:1858 #, c-format msgid "%s: socket ignored" msgstr "%s: soket yoksayıldı" -#: src/create.c:1863 +#: src/create.c:1864 #, c-format msgid "%s: door ignored" msgstr "%s: kapı yoksayıldı" @@ -982,164 +987,164 @@ msgstr "%s: zaman damgası %s %s s gelecekte" msgid "%s: Unexpected inconsistency when making directory" msgstr "%s: Dizin oluşturulurken anlaşılamayan uyumsuzluk" -#: src/extract.c:709 +#: src/extract.c:721 #, c-format msgid "%s: Directory renamed before its status could be extracted" msgstr "%s: durumu çıkarılamadan dizin ismi değiştirildi" -#: src/extract.c:863 +#: src/extract.c:875 msgid "Extracting contiguous files as regular files" msgstr "Bitişik dosyaları normal dosyalar olarak çıkarıyor" -#: src/extract.c:1197 +#: src/extract.c:1209 msgid "Attempting extraction of symbolic links as hard links" msgstr "Sembolik bağlar, sabit bağlar olarak çıkarılmaya çalışılıyor" -#: src/extract.c:1353 +#: src/extract.c:1365 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Dosya çıkarılamaz -- dosyanın başı diğer bölümde" -#: src/extract.c:1360 src/list.c:1125 +#: src/extract.c:1372 src/list.c:1121 msgid "Unexpected long name header" msgstr "Umulmadık uzun isim başlığı" -#: src/extract.c:1367 +#: src/extract.c:1379 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Bilinmeyen dosya türü '%c', normal dosya olarak çıkartılıyor" -#: src/extract.c:1393 +#: src/extract.c:1405 #, c-format msgid "Current %s is newer or same age" msgstr "Mevcut %s daha yeni ya da yaşıt" -#: src/extract.c:1445 +#: src/extract.c:1457 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Bu dosyayı yedeklemek mümkün olmadı" -#: src/extract.c:1582 +#: src/extract.c:1594 #, c-format msgid "Cannot rename %s to %s" msgstr "%s ismi %s olarak değiştirilemez" -#: src/incremen.c:474 src/incremen.c:518 +#: src/incremen.c:473 src/incremen.c:517 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Dizinin eski adı %s idi" -#: src/incremen.c:486 +#: src/incremen.c:485 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Dizin adı değiştirilmişti" -#: src/incremen.c:531 +#: src/incremen.c:530 #, c-format msgid "%s: Directory is new" msgstr "%s: Dizin yeni" -#: src/incremen.c:956 src/incremen.c:973 +#: src/incremen.c:951 src/incremen.c:968 msgid "Invalid time stamp" msgstr "Geçersiz zaman damgası" -#: src/incremen.c:1012 +#: src/incremen.c:1007 msgid "Invalid modification time (seconds)" msgstr "Değişiklik zamanı (saniye cinsinden) geçersiz" -#: src/incremen.c:1027 +#: src/incremen.c:1022 msgid "Invalid modification time (nanoseconds)" msgstr "Değişiklik zamanı (nanosaniye cinsinden) geçersiz" -#: src/incremen.c:1047 +#: src/incremen.c:1042 msgid "Invalid device number" msgstr "Geçersiz aygıt numarası" -#: src/incremen.c:1062 +#: src/incremen.c:1057 msgid "Invalid inode number" msgstr "Geçersiz düğüm numarası" -#: src/incremen.c:1113 src/incremen.c:1150 +#: src/incremen.c:1108 src/incremen.c:1145 msgid "Field too long while reading snapshot file" msgstr "Anlık görüntü dosyası okunurken alan çok uzun" -#: src/incremen.c:1120 src/incremen.c:1158 +#: src/incremen.c:1115 src/incremen.c:1153 msgid "Read error in snapshot file" msgstr "Anlık görüntü dosyasında okuma hatası" -#: src/incremen.c:1122 src/incremen.c:1162 src/incremen.c:1214 -#: src/incremen.c:1272 +#: src/incremen.c:1117 src/incremen.c:1157 src/incremen.c:1209 +#: src/incremen.c:1267 msgid "Unexpected EOF in snapshot file" msgstr "Anlık görüntü dosyasında beklenmeyen dosya sonu" -#: src/incremen.c:1129 src/incremen.c:1169 +#: src/incremen.c:1124 src/incremen.c:1164 msgid "Unexpected field value in snapshot file" msgstr "Anlık görüntü dosyasında beklenmeyen alan değeri" -#: src/incremen.c:1264 +#: src/incremen.c:1259 msgid "Missing record terminator" msgstr "Kayıt sonlandırıcı eksik" -#: src/incremen.c:1325 src/incremen.c:1328 +#: src/incremen.c:1320 src/incremen.c:1323 msgid "Bad incremental file format" msgstr "Arttırımlı dosya biçimi hatalı" -#: src/incremen.c:1347 +#: src/incremen.c:1342 #, c-format msgid "Unsupported incremental format version: %" msgstr "Desteklenmeyen arttırımlı biçim sürümü: %" -#: src/incremen.c:1502 +#: src/incremen.c:1496 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "dumpdir bozuk: umulan '%c' ama bulunan %#3o" -#: src/incremen.c:1512 +#: src/incremen.c:1506 msgid "Malformed dumpdir: 'X' duplicated" msgstr "dumpdir bozuk: 'X' yinelenmiş" -#: src/incremen.c:1525 +#: src/incremen.c:1519 msgid "Malformed dumpdir: empty name in 'R'" msgstr "dumpdir bozuk: 'R'deki isim boş" -#: src/incremen.c:1538 +#: src/incremen.c:1532 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "dumpdir bozuk: 'T' 'R' ile öncelenmemiş" -#: src/incremen.c:1544 +#: src/incremen.c:1538 msgid "Malformed dumpdir: empty name in 'T'" msgstr "dumpdir bozuk: 'T'deki isim boş" -#: src/incremen.c:1564 +#: src/incremen.c:1558 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "dumpdir bozuk: umulan'%c' ama bulunan veri sonu" -#: src/incremen.c:1571 +#: src/incremen.c:1565 msgid "Malformed dumpdir: 'X' never used" msgstr "dumpdir bozuk: 'X' hiç kullanılmamış" -#: src/incremen.c:1615 +#: src/incremen.c:1609 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "%s şablonu kullanılarak geçici dizin oluşturulamıyor" -#: src/incremen.c:1677 +#: src/incremen.c:1670 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: dizin temizlenmiyor: durumlama yapılamadı" -#: src/incremen.c:1690 +#: src/incremen.c:1683 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: dizin farklı bir aygıtta: temizlenmiyor" -#: src/incremen.c:1698 +#: src/incremen.c:1691 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: %s siliniyor\n" -#: src/incremen.c:1703 +#: src/incremen.c:1696 #, c-format msgid "%s: Cannot remove" msgstr "%s: Kaldırılamaz" @@ -1159,20 +1164,20 @@ msgstr "blok %s: ** NUL bloku **\n" msgid "block %s: ** End of File **\n" msgstr "blok %s: ** Dosya Sonu **\n" -#: src/list.c:256 src/list.c:1097 src/list.c:1360 +#: src/list.c:256 src/list.c:1093 src/list.c:1356 #, c-format msgid "block %s: " msgstr "blok %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:712 +#: src/list.c:708 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Sayısal %s değeri beklenirken başlıkta boşluklar bulundu" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:767 +#: src/list.c:763 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1180,142 +1185,137 @@ msgstr "" "ediliyor" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:778 +#: src/list.c:774 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Arşiv sekizlik değeri %.*s aralığın %s dışında" -#: src/list.c:799 +#: src/list.c:795 msgid "Archive contains obsolescent base-64 headers" msgstr "Arşiv atıl base-64 başlıklar içeriyor" -#: src/list.c:813 +#: src/list.c:809 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "Arşiv imzalı base-64 dizge %s, %s aralığının dışında" -#: src/list.c:844 +#: src/list.c:840 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Arşiv base-256 değeri %s aralığının dışında" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:873 +#: src/list.c:869 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Arşiv %.*s içeriyor, halbuki orada sayısal %s değeri bekleniyor" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:895 +#: src/list.c:891 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Arşiv değeri %s %s türünün %s..%s aralığının dışında" -#: src/list.c:1261 +#: src/list.c:1257 #, c-format msgid " link to %s\n" msgstr " bağı -> %s \n" -#: src/list.c:1269 +#: src/list.c:1265 #, c-format msgid " unknown file type %s\n" msgstr " bilinmeyen dosya türü %s\n" -#: src/list.c:1287 +#: src/list.c:1283 #, c-format msgid "--Long Link--\n" msgstr "--Uzun Bağ--\n" -#: src/list.c:1291 +#: src/list.c:1287 #, c-format msgid "--Long Name--\n" msgstr "--Uzun Ä°sim--\n" -#: src/list.c:1295 +#: src/list.c:1291 #, c-format msgid "--Volume Header--\n" msgstr "--Bölüm Başlığı--\n" -#: src/list.c:1303 +#: src/list.c:1299 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Devamı bayt %s de--\n" -#: src/list.c:1365 +#: src/list.c:1361 msgid "Creating directory:" msgstr "Oluşturulan dizin:" -#: src/misc.c:298 +#: src/misc.c:297 #, fuzzy msgid "Cannot get working directory" msgstr "Çalışma dizini değiştirilemez" -#: src/misc.c:571 +#: src/misc.c:570 #, c-format msgid "Renaming %s to %s\n" msgstr "%s %s olarak değiştiriliyor\n" -#: src/misc.c:580 src/misc.c:599 +#: src/misc.c:579 src/misc.c:598 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: Ä°smi %s olarak değiştirilemez" -#: src/misc.c:604 +#: src/misc.c:603 #, c-format msgid "Renaming %s back to %s\n" msgstr "Gerisin geriye %s %s olarak değiştiriliyor\n" -#: src/misc.c:851 +#: src/misc.c:850 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Dosya okunamadan kaldırıldı" -#: src/misc.c:866 -#, fuzzy, c-format -msgid "%s: Directory removed before we read it" -msgstr "%s: Dosya okunamadan kaldırıldı" - -#: src/misc.c:887 +#: src/misc.c:871 msgid "child process" msgstr "alt süreç" -#: src/misc.c:896 +#: src/misc.c:880 msgid "interprocess channel" msgstr "süreçlerarası kanal" -#: src/names.c:594 +#: src/names.c:590 #, fuzzy msgid "Pattern matching characters used in file names" msgstr "Kalıp eşleme karakterleri dosya isimlerinde kullanılmış. Lütfen," -#: src/names.c:596 +#: src/names.c:592 #, fuzzy msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" msgstr "ya kalıp eşlemeyi etkin kılmak için --wildcards kullanın," -#: src/names.c:614 src/names.c:630 +#: src/names.c:610 src/names.c:626 #, c-format msgid "%s: Not found in archive" msgstr "%s: Arşivde yok" -#: src/names.c:615 +#: src/names.c:611 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Arşivde bulunması gerekirken yok" -#: src/names.c:649 +#: src/names.c:645 #, fuzzy, c-format msgid "Archive label mismatch" msgstr "Arşiv etiketi %s ile eşleşmiyor" -#: src/names.c:953 +#: src/names.c:949 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" -#: src/names.c:959 +#: src/names.c:955 msgid "Only one -C option is allowed with --listed-incremental" msgstr "" @@ -2716,6 +2716,10 @@ msgstr "Komut sonlandı\n" msgid "--stat requires file names" msgstr "--stat seçeneği dosya isimleri gerektirir" +#, fuzzy +#~ msgid "%s: Directory removed before we read it" +#~ msgstr "%s: Dosya okunamadan kaldırıldı" + #, fuzzy #~ msgid "Cannot restore working directory" #~ msgstr "Çalışılan dizin kaydedilemez" diff --git a/po/uk.gmo b/po/uk.gmo index 68126bb4c0f80316d6ff3cb54cf38ae5d5602aa7..ec478670a22384c53e91ca14ddc51302639b7242 100644 GIT binary patch delta 11924 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 ObN}?B+5Vp{9{WE!U4xYX delta 12008 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 J-Mn<-{{b=qc&h*a diff --git a/po/uk.po b/po/uk.po index 389e03f6..1bc42cfc 100644 --- a/po/uk.po +++ b/po/uk.po @@ -6,10 +6,10 @@ #: src/create.c:1552 msgid "" msgstr "" -"Project-Id-Version: tar 1.23.90\n" +"Project-Id-Version: tar 1.24\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2010-11-07 17:07+0200\n" -"PO-Revision-Date: 2010-07-13 12:20+0300\n" +"POT-Creation-Date: 2011-03-12 11:53+0200\n" +"PO-Revision-Date: 2010-10-25 15:22+0300\n" "Last-Translator: Sergey Poznyakoff \n" "Language-Team: Ukrainian \n" "Language: uk\n" @@ -59,37 +59,37 @@ msgstr "%.*s: Невідомий параметр ARGP_HELP_FMT" msgid "Garbage in ARGP_HELP_FMT: %s" msgstr "Хибні дані в ARGP_HELP_FMT: %s" -#: gnu/argp-help.c:1246 +#: gnu/argp-help.c:1248 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." msgstr "" "Аргументи, обов'язкові для довгих ключів, є обов'язковими й для коротких." -#: gnu/argp-help.c:1639 +#: gnu/argp-help.c:1641 msgid "Usage:" msgstr "Використання:" -#: gnu/argp-help.c:1643 +#: gnu/argp-help.c:1645 msgid " or: " msgstr " чи: " -#: gnu/argp-help.c:1655 +#: gnu/argp-help.c:1657 msgid " [OPTION...]" msgstr " [ОПЦІЯ...]" -#: gnu/argp-help.c:1682 +#: gnu/argp-help.c:1684 #, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "" "Спробуйте `%s --help' або `%s --usage' для отримання докладнішого опису.\n" -#: gnu/argp-help.c:1710 +#: gnu/argp-help.c:1712 #, c-format msgid "Report bugs to %s.\n" msgstr "Про помилки звітуйте на <%s>.\n" -#: gnu/argp-help.c:1929 gnu/error.c:183 +#: gnu/argp-help.c:1931 gnu/error.c:183 msgid "Unknown system error" msgstr "Невідома системна помилка" @@ -156,9 +156,9 @@ msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: опція '%c%s' не може мати аргументу\n" #: gnu/getopt.c:639 gnu/getopt.c:658 -#, c-format +#, fuzzy, c-format msgid "%s: option '--%s' requires an argument\n" -msgstr "%s: опція '--%s' вимагає аргументу\n" +msgstr "%s: опція '%s' вимагає аргументу\n" #: gnu/getopt.c:696 gnu/getopt.c:699 #, c-format @@ -191,20 +191,20 @@ msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: опція '-W %s' не може мати аргументу\n" #: gnu/getopt.c:964 gnu/getopt.c:982 -#, c-format +#, fuzzy, c-format msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: опція '-W %s' вимагає аргументу\n" +msgstr "%s: опція '%s' вимагає аргументу\n" -#: gnu/obstack.c:425 gnu/obstack.c:427 gnu/xalloc-die.c:36 +#: gnu/obstack.c:423 gnu/obstack.c:425 gnu/xalloc-die.c:36 msgid "memory exhausted" msgstr "пам'ять вичерпана" -#: gnu/openat-die.c:36 +#: gnu/openat-die.c:40 #, c-format msgid "unable to record current working directory" msgstr "не вдається змінити поточний каталог" -#: gnu/openat-die.c:54 +#: gnu/openat-die.c:59 #, c-format msgid "failed to return to initial working directory" msgstr "не вдається зберегти поточний каталог" @@ -228,11 +228,11 @@ msgstr "не вдається зберегти поточний каталог" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: gnu/quotearg.c:274 +#: gnu/quotearg.c:273 msgid "`" msgstr "`" -#: gnu/quotearg.c:275 +#: gnu/quotearg.c:274 msgid "'" msgstr "'" @@ -504,21 +504,21 @@ msgstr[0] "%s: Вдалося записати тільки %lu з %lu байт msgstr[1] "%s: Вдалося записати тільки %lu з %lu байтів" msgstr[2] "%s: Вдалося записати тільки %lu з %lu байтів" -#: lib/paxnames.c:155 +#: lib/paxnames.c:140 #, c-format msgid "Removing leading `%s' from member names" msgstr "Видалення початкового префіксу `%s' з назв файлів" -#: lib/paxnames.c:156 +#: lib/paxnames.c:141 #, c-format msgid "Removing leading `%s' from hard link targets" msgstr "Видалення початкового префіксу `%s' з назви цілі жорсткого посилання" -#: lib/paxnames.c:169 +#: lib/paxnames.c:154 msgid "Substituting `.' for empty member name" msgstr "Підстановка `.' замість пустої назви файлу" -#: lib/paxnames.c:170 +#: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" msgstr "Підстановка `.' замість пустої назви цілі жорсткого посилання" @@ -815,20 +815,20 @@ msgstr[0] "Вдалося прочитати тільки %lu з %lu байта" msgstr[1] "Вдалося прочитати тільки %lu з %lu байтів" msgstr[2] "Вдалося прочитати тільки %lu з %lu байтів" -#: src/compare.c:105 src/compare.c:382 +#: src/compare.c:105 src/compare.c:383 msgid "Contents differ" msgstr "Різниця у змісті" -#: src/compare.c:131 src/extract.c:972 src/incremen.c:1462 src/list.c:458 -#: src/list.c:1392 src/xheader.c:711 +#: src/compare.c:131 src/extract.c:984 src/incremen.c:1456 src/list.c:456 +#: src/list.c:1388 src/xheader.c:711 msgid "Unexpected EOF in archive" msgstr "Неочікуваний кінець файла в архіві" -#: src/compare.c:179 src/compare.c:195 src/compare.c:308 src/compare.c:406 +#: src/compare.c:179 src/compare.c:195 src/compare.c:309 src/compare.c:407 msgid "File type differs" msgstr "Різниця у типі файлу" -#: src/compare.c:182 src/compare.c:202 src/compare.c:322 +#: src/compare.c:182 src/compare.c:202 src/compare.c:323 msgid "Mode differs" msgstr "Різниця у правах доступу" @@ -844,42 +844,48 @@ msgstr "Різниця у значенні GID" msgid "Mod time differs" msgstr "Різниця у часі модифікації" -#: src/compare.c:215 src/compare.c:414 +#: src/compare.c:215 src/compare.c:415 msgid "Size differs" msgstr "Різниця у розмірі" -#: src/compare.c:263 +#: src/compare.c:264 #, c-format msgid "Not linked to %s" msgstr "Не є посиланням до %s" -#: src/compare.c:287 +#: src/compare.c:288 msgid "Symlink differs" msgstr "Різниця у символічному посиланні" -#: src/compare.c:316 +#: src/compare.c:317 msgid "Device number differs" msgstr "Різниця у номері пристрою" -#: src/compare.c:456 +#: src/compare.c:457 #, c-format msgid "Verify " msgstr "Перевірка " -#: src/compare.c:463 +#: src/compare.c:464 #, c-format msgid "%s: Unknown file type `%c', diffed as normal file" msgstr "%s: Невідомий тип файлу `%c', перевірюється як звичайний файл" -#: src/compare.c:518 +#: src/compare.c:520 msgid "Archive contains file names with leading prefixes removed." msgstr "Архів містить назви файлів без попереджуючих префіксів." -#: src/compare.c:520 +# FIXME: base=64? +#: src/compare.c:526 +#, fuzzy +msgid "Archive contains transformed file names." +msgstr "Архів містить застарілі заголовки з основою 64" + +#: src/compare.c:531 msgid "Verification may fail to locate original files." msgstr "Перевірка може не знайти первинних файлів." -#: src/compare.c:593 +#: src/compare.c:603 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" @@ -887,7 +893,7 @@ msgstr[0] "ПОМИЛКА ПЕРЕВІРКИ: знайдено %d невірни msgstr[1] "ПОМИЛКА ПЕРЕВІРКИ: знайдено %d невірних заголовки" msgstr[2] "ПОМИЛКА ПЕРЕВІРКИ: знайдено %d невірних заголовків" -#: src/compare.c:611 src/list.c:222 +#: src/compare.c:621 src/list.c:222 #, c-format msgid "A lone zero block at %s" msgstr "Самотній блок нулів, зсув %s" @@ -940,7 +946,7 @@ msgstr[2] "%s: Файл скоротився на %s байтів; заповн msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: файл знаходиться в іншої файлової системі; не архівується" -#: src/create.c:1203 src/create.c:1214 src/incremen.c:582 src/incremen.c:588 +#: src/create.c:1203 src/create.c:1214 src/incremen.c:578 src/incremen.c:584 msgid "contents not dumped" msgstr "вміст не архівується" @@ -964,7 +970,7 @@ msgstr "%s: файл не змінено; не архівується" msgid "%s: file is the archive; not dumped" msgstr "%s: файл є архівом; не архівується" -#: src/create.c:1723 src/incremen.c:575 +#: src/create.c:1723 src/incremen.c:571 msgid "directory not dumped" msgstr "каталог не архівується" @@ -973,13 +979,13 @@ msgstr "каталог не архівується" msgid "%s: file changed as we read it" msgstr "%s: файл змінився під час читання" -#: src/create.c:1857 +#: src/create.c:1858 #, c-format msgid "%s: socket ignored" msgstr "%s: гніздо ігнорується" # FIXME: door? -#: src/create.c:1863 +#: src/create.c:1864 #, c-format msgid "%s: door ignored" msgstr "%s: двері ігноруються" @@ -1007,167 +1013,167 @@ msgstr "%s: мітка часу %s зсунута на %s сек. до майб msgid "%s: Unexpected inconsistency when making directory" msgstr "%s: Неочікувана суперечність під час створення каталогу" -#: src/extract.c:709 +#: src/extract.c:721 #, c-format msgid "%s: Directory renamed before its status could be extracted" msgstr "%s: Каталог перейменовано перед тим, як tar встиг витягнути його стан" -#: src/extract.c:863 +#: src/extract.c:875 msgid "Extracting contiguous files as regular files" msgstr "Витягування безперервних файлів у звичайні" -#: src/extract.c:1197 +#: src/extract.c:1209 msgid "Attempting extraction of symbolic links as hard links" msgstr "Спроба перетворити символічні посилання на жорсткі" -#: src/extract.c:1353 +#: src/extract.c:1365 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Не вдається витягнути -- файл починається в іншому томі" -#: src/extract.c:1360 src/list.c:1125 +#: src/extract.c:1372 src/list.c:1121 msgid "Unexpected long name header" msgstr "Неочікуваний кінець файла у заголовку довгої назви" -#: src/extract.c:1367 +#: src/extract.c:1379 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Невідомий тип файлу `%c', спроба витягнути його як звичайний файл" # FIXME: або сучасний? -#: src/extract.c:1393 +#: src/extract.c:1405 #, c-format msgid "Current %s is newer or same age" msgstr "Існуючий файл `%s' є новіший" -#: src/extract.c:1445 +#: src/extract.c:1457 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Не вдалося створити резервну копію цього файла" -#: src/extract.c:1582 +#: src/extract.c:1594 #, c-format msgid "Cannot rename %s to %s" msgstr "Не вдається перейменувати %s на %s" -#: src/incremen.c:474 src/incremen.c:518 +#: src/incremen.c:473 src/incremen.c:517 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Каталог перейменовано з %s" -#: src/incremen.c:486 +#: src/incremen.c:485 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Каталог перейменовано" -#: src/incremen.c:531 +#: src/incremen.c:530 #, c-format msgid "%s: Directory is new" msgstr "%s: Новий каталог" -#: src/incremen.c:956 src/incremen.c:973 +#: src/incremen.c:951 src/incremen.c:968 msgid "Invalid time stamp" msgstr "Невірний час файлу" -#: src/incremen.c:1012 +#: src/incremen.c:1007 msgid "Invalid modification time (seconds)" msgstr "Невірна дата модифікації (секунди)" -#: src/incremen.c:1027 +#: src/incremen.c:1022 msgid "Invalid modification time (nanoseconds)" msgstr "Недійсний час модифікації (наносекунди)" -#: src/incremen.c:1047 +#: src/incremen.c:1042 msgid "Invalid device number" msgstr "Невірний номер пристрою" -#: src/incremen.c:1062 +#: src/incremen.c:1057 msgid "Invalid inode number" msgstr "Невірний номер і-вузла" -#: src/incremen.c:1113 src/incremen.c:1150 +#: src/incremen.c:1108 src/incremen.c:1145 msgid "Field too long while reading snapshot file" msgstr "З файла-знімка прочитано надто довге поле" -#: src/incremen.c:1120 src/incremen.c:1158 +#: src/incremen.c:1115 src/incremen.c:1153 msgid "Read error in snapshot file" msgstr "Помилка читання файла-знімка" -#: src/incremen.c:1122 src/incremen.c:1162 src/incremen.c:1214 -#: src/incremen.c:1272 +#: src/incremen.c:1117 src/incremen.c:1157 src/incremen.c:1209 +#: src/incremen.c:1267 msgid "Unexpected EOF in snapshot file" msgstr "Неочікуваний кінець файла-знімка" -#: src/incremen.c:1129 src/incremen.c:1169 +#: src/incremen.c:1124 src/incremen.c:1164 msgid "Unexpected field value in snapshot file" msgstr "Неочікуваний кінець файла-знімка" -#: src/incremen.c:1264 +#: src/incremen.c:1259 msgid "Missing record terminator" msgstr "Бракує ознаки кінця запису" -#: src/incremen.c:1325 src/incremen.c:1328 +#: src/incremen.c:1320 src/incremen.c:1323 msgid "Bad incremental file format" msgstr "Неправильний формат файла знімку" -#: src/incremen.c:1347 +#: src/incremen.c:1342 #, c-format msgid "Unsupported incremental format version: %" msgstr "Такий інкрементний формат не підтримується: %" -#: src/incremen.c:1502 +#: src/incremen.c:1496 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" "Неправильно сформований dumpdir: очікувалося '%c' натомість знайдено %#3o" -#: src/incremen.c:1512 +#: src/incremen.c:1506 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Неправильно сформований dumpdir: 'X' вказаний двічі" -#: src/incremen.c:1525 +#: src/incremen.c:1519 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Невірний формат dumpdir: пуста назва у `R'" -#: src/incremen.c:1538 +#: src/incremen.c:1532 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Невірний формат dumpdir: `T' без попереднього `R'" -#: src/incremen.c:1544 +#: src/incremen.c:1538 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Невірний формат dumpdir: пуста назва у `T'" -#: src/incremen.c:1564 +#: src/incremen.c:1558 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" "Невірний формат dumpdir: очікувалося `%c', натомість знайдено кінець файла" -#: src/incremen.c:1571 +#: src/incremen.c:1565 msgid "Malformed dumpdir: 'X' never used" msgstr "Невірний формат dumpdir: `X' не використаний" -#: src/incremen.c:1615 +#: src/incremen.c:1609 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Не вдається створити тимчасовий каталог використовуючи шаблон %s" -#: src/incremen.c:1677 +#: src/incremen.c:1670 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Каталог не очищується: не вдалося виконати stat" -#: src/incremen.c:1690 +#: src/incremen.c:1683 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: Каталог знаходиться на іншому пристрої: не очищується" -#: src/incremen.c:1698 +#: src/incremen.c:1691 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Стирання %s\n" -#: src/incremen.c:1703 +#: src/incremen.c:1696 #, c-format msgid "%s: Cannot remove" msgstr "%s: Не вдається видалити" @@ -1187,20 +1193,20 @@ msgstr "блок %s: ** Містить нулі **\n" msgid "block %s: ** End of File **\n" msgstr "блок %s: ** Кінець файлу **\n" -#: src/list.c:256 src/list.c:1097 src/list.c:1360 +#: src/list.c:256 src/list.c:1093 src/list.c:1356 #, c-format msgid "block %s: " msgstr "блок %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:712 +#: src/list.c:708 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Пробіли у заголовку замість очікуваного числового значення типу %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:767 +#: src/list.c:763 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1208,17 +1214,17 @@ msgstr "" "вважається, що це є двійкове доповнення" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:778 +#: src/list.c:774 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Вісімкове значення %.*s знаходиться поза межами діапазону типу %s" # FIXME: base=64? -#: src/list.c:799 +#: src/list.c:795 msgid "Archive contains obsolescent base-64 headers" msgstr "Архів містить застарілі заголовки з основою 64" -#: src/list.c:813 +#: src/list.c:809 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "" @@ -1226,100 +1232,94 @@ msgstr "" "типу %s" # FIXME: base-256 -#: src/list.c:844 +#: src/list.c:840 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Значення з основою 256 поза допустимими межами типу %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:873 +#: src/list.c:869 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Знайдено %.*s замість числового значення типу %s" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:895 +#: src/list.c:891 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Значення %s поза допустимими межами типу %s %s..%s" -#: src/list.c:1261 +#: src/list.c:1257 #, c-format msgid " link to %s\n" msgstr "посилання до %s\n" -#: src/list.c:1269 +#: src/list.c:1265 #, c-format msgid " unknown file type %s\n" msgstr "невідомий тип файла %s\n" -#: src/list.c:1287 +#: src/list.c:1283 #, c-format msgid "--Long Link--\n" msgstr "--Довге посилання--\n" -#: src/list.c:1291 +#: src/list.c:1287 #, c-format msgid "--Long Name--\n" msgstr "--Довга назва--\n" -#: src/list.c:1295 +#: src/list.c:1291 #, c-format msgid "--Volume Header--\n" msgstr "--Заголовок тому--\n" -#: src/list.c:1303 +#: src/list.c:1299 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Продовжується з байту %s--\n" -#: src/list.c:1365 +#: src/list.c:1361 msgid "Creating directory:" msgstr "Створення каталогу:" -#: src/misc.c:298 -#, fuzzy +#: src/misc.c:297 msgid "Cannot get working directory" -msgstr "Не вдається змінити поточний каталог" +msgstr "Не вдається отримати поточний каталог" -#: src/misc.c:571 +#: src/misc.c:570 #, c-format msgid "Renaming %s to %s\n" msgstr "Перейменовано %s у %s\n" -#: src/misc.c:580 src/misc.c:599 +#: src/misc.c:579 src/misc.c:598 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: Не вдається перейменувати на %s" -#: src/misc.c:604 +#: src/misc.c:603 #, c-format msgid "Renaming %s back to %s\n" msgstr "Перейменовано %s назад у %s\n" -#: src/misc.c:851 +#: src/misc.c:850 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Файл було видалено перед тим як tar встиг його прочитати" -#: src/misc.c:866 -#, c-format -msgid "%s: Directory removed before we read it" -msgstr "%s: Каталог було видалено перед тим як tar встиг його прочитати" - -#: src/misc.c:887 +#: src/misc.c:871 msgid "child process" msgstr "процес-нащадок" -#: src/misc.c:896 +#: src/misc.c:880 msgid "interprocess channel" msgstr "канал між процесами" -#: src/names.c:594 +#: src/names.c:590 msgid "Pattern matching characters used in file names" msgstr "Назви файлів містять символи-шаблони" -#: src/names.c:596 +#: src/names.c:592 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" @@ -1327,29 +1327,29 @@ msgstr "" "Користайтеся опцією --wildcards аби увімкнути шаблони, або опцією --no-" "wildcards, щоб позбутися цього повідомлення" -#: src/names.c:614 src/names.c:630 +#: src/names.c:610 src/names.c:626 #, c-format msgid "%s: Not found in archive" msgstr "%s: Не знайдено в архіві" -#: src/names.c:615 +#: src/names.c:611 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Потрібну копію у архіві не знайдено" -#: src/names.c:649 +#: src/names.c:645 #, c-format msgid "Archive label mismatch" msgstr "Незгідність назви тому" -#: src/names.c:953 +#: src/names.c:949 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" "Використання опції -C у переліку файлів разом з опцією --listed-incremental " "не дозволяється" -#: src/names.c:959 +#: src/names.c:955 msgid "Only one -C option is allowed with --listed-incremental" msgstr "Разом з --listed-incremental дозволяється лише одна опція -C" @@ -2759,5 +2759,5 @@ msgstr "Команда завершилася\n" msgid "--stat requires file names" msgstr "опція --stat вимагає назв файлів" -#~ msgid "Cannot save working directory" -#~ msgstr "Не вдається зберегти поточний каталог" +#~ msgid "%s: Directory removed before we read it" +#~ msgstr "%s: Каталог було видалено перед тим як tar встиг його прочитати" diff --git a/po/vi.gmo b/po/vi.gmo index 6ac2015e0ba1fb992f2b616de9db1e936f500012..bd446637d6e0d80c1181ed783b0b0f1f082ae008 100644 GIT binary patch delta 11855 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 A&Hw-a delta 11928 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\n" "Language-Team: Vietnamese \n" @@ -60,7 +60,7 @@ msgstr "%.*s: Tham số không rõ ARGP_HELP_FMT" msgid "Garbage in ARGP_HELP_FMT: %s" msgstr "Có rác trong ARGP_HELP_FMT: %s" -#: gnu/argp-help.c:1246 +#: gnu/argp-help.c:1248 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." @@ -68,29 +68,29 @@ msgstr "" "Tham số ủy nhiệm hay tham số không bắt buộc cho các tùy chọn dài cÅ©ng đồng " "thời là ủy nhiệm hay không bắt buộc cho các tùy chọn ngắn tÆ°Æ¡ng ứng." -#: gnu/argp-help.c:1639 +#: gnu/argp-help.c:1641 msgid "Usage:" msgstr "Sá»­ dụng:" -#: gnu/argp-help.c:1643 +#: gnu/argp-help.c:1645 msgid " or: " msgstr " hoặc: " -#: gnu/argp-help.c:1655 +#: gnu/argp-help.c:1657 msgid " [OPTION...]" msgstr " [TÙY CHỌN...]" -#: gnu/argp-help.c:1682 +#: gnu/argp-help.c:1684 #, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Hãy thá»­ `%s --help' hoặc `%s --usage' để biết thêm thông tin.\n" -#: gnu/argp-help.c:1710 +#: gnu/argp-help.c:1712 #, c-format msgid "Report bugs to %s.\n" msgstr "Báo cáo lỗi tới %s.\n" -#: gnu/argp-help.c:1929 gnu/error.c:183 +#: gnu/argp-help.c:1931 gnu/error.c:183 msgid "Unknown system error" msgstr "Lỗi hệ thống không rõ" @@ -196,16 +196,16 @@ msgstr "%s: tùy chọn « -W %s » không cho phép đối số\n" msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: tùy chọn « -W %s » yêu cầu một đối số\n" -#: gnu/obstack.c:425 gnu/obstack.c:427 gnu/xalloc-die.c:36 +#: gnu/obstack.c:423 gnu/obstack.c:425 gnu/xalloc-die.c:36 msgid "memory exhausted" msgstr "cạn bộ nhớ" -#: gnu/openat-die.c:36 +#: gnu/openat-die.c:40 #, c-format msgid "unable to record current working directory" msgstr "Không thể thu thÆ° mục làm việc hiện thời" -#: gnu/openat-die.c:54 +#: gnu/openat-die.c:59 #, c-format msgid "failed to return to initial working directory" msgstr "không trở được về thÆ° mục làm việc đầu tiên" @@ -229,11 +229,11 @@ msgstr "không trở được về thÆ° mục làm việc đầu tiên" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: gnu/quotearg.c:274 +#: gnu/quotearg.c:273 msgid "`" msgstr "`" -#: gnu/quotearg.c:275 +#: gnu/quotearg.c:274 msgid "'" msgstr "'" @@ -498,21 +498,21 @@ msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" msgstr[0] "%s: Chỉ ghi nhớ %lu từ %lu byte" -#: lib/paxnames.c:155 +#: lib/paxnames.c:140 #, c-format msgid "Removing leading `%s' from member names" msgstr "Xóa bỏ phần dẫn đầu `%s' từ tên của các thành viên" -#: lib/paxnames.c:156 +#: lib/paxnames.c:141 #, c-format msgid "Removing leading `%s' from hard link targets" msgstr "Xóa bỏ phần dẫn đầu `%s' từ đích đến của các liên kết cứng" -#: lib/paxnames.c:169 +#: lib/paxnames.c:154 msgid "Substituting `.' for empty member name" msgstr "Đang thay thế `.' cho tên rỗng của các thành viên" -#: lib/paxnames.c:170 +#: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" msgstr "Đang thay thế `.' cho đích đến rỗng của liên kết cứng" @@ -802,20 +802,20 @@ msgid "Could only read %lu of %lu byte" msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "Chỉ đọc được %lu từ %lu byte" -#: src/compare.c:105 src/compare.c:382 +#: src/compare.c:105 src/compare.c:383 msgid "Contents differ" msgstr "Diff nội dung" -#: src/compare.c:131 src/extract.c:972 src/incremen.c:1462 src/list.c:458 -#: src/list.c:1392 src/xheader.c:711 +#: src/compare.c:131 src/extract.c:984 src/incremen.c:1456 src/list.c:456 +#: src/list.c:1388 src/xheader.c:711 msgid "Unexpected EOF in archive" msgstr "Kết thúc tập tin không mong đợi trong kho lÆ°u" -#: src/compare.c:179 src/compare.c:195 src/compare.c:308 src/compare.c:406 +#: src/compare.c:179 src/compare.c:195 src/compare.c:309 src/compare.c:407 msgid "File type differs" msgstr "Diff dạng tập tin" -#: src/compare.c:182 src/compare.c:202 src/compare.c:322 +#: src/compare.c:182 src/compare.c:202 src/compare.c:323 msgid "Mode differs" msgstr "Diff chế độ" @@ -831,49 +831,54 @@ msgstr "Diff Gid" msgid "Mod time differs" msgstr "Diff thời gian sá»­a đổi" -#: src/compare.c:215 src/compare.c:414 +#: src/compare.c:215 src/compare.c:415 msgid "Size differs" msgstr "Diff kích thước" -#: src/compare.c:263 +#: src/compare.c:264 #, c-format msgid "Not linked to %s" msgstr "Không liên kết tới %s" -#: src/compare.c:287 +#: src/compare.c:288 msgid "Symlink differs" msgstr "Diff liên kết mềm" -#: src/compare.c:316 +#: src/compare.c:317 msgid "Device number differs" msgstr "Diff số thứ tá»± của thiết bị" -#: src/compare.c:456 +#: src/compare.c:457 #, c-format msgid "Verify " msgstr "Kiểm tra " -#: src/compare.c:463 +#: src/compare.c:464 #, c-format msgid "%s: Unknown file type `%c', diffed as normal file" msgstr "" "%s: không rõ dạng tập tin '%c' nên khác biệt (diff) nhÆ° tập tin thông thường" -#: src/compare.c:518 +#: src/compare.c:520 msgid "Archive contains file names with leading prefixes removed." msgstr "Kho lÆ°u chứa tên tập tin không có tiền tố ở đầu." -#: src/compare.c:520 +#: src/compare.c:526 +#, fuzzy +msgid "Archive contains transformed file names." +msgstr "Kho lÆ°u chứa phần đầu base-64 không còn dùng nữa" + +#: src/compare.c:531 msgid "Verification may fail to locate original files." msgstr "Sá»± kiểm tra có thể không định vị được các tập tin gốc." -#: src/compare.c:593 +#: src/compare.c:603 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "LỖI KIỂM TRA: tìm thấy %d phần đầu không đúng" -#: src/compare.c:611 src/list.c:222 +#: src/compare.c:621 src/list.c:222 #, c-format msgid "A lone zero block at %s" msgstr "Một khối không đơn lẻ tại %s" @@ -923,7 +928,7 @@ msgstr[0] "%s: Tập tin được rút ngắn %s byte; độn vào bắng các s msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: tập tin trên một hệ thống tập tin khác; không được dump" -#: src/create.c:1203 src/create.c:1214 src/incremen.c:582 src/incremen.c:588 +#: src/create.c:1203 src/create.c:1214 src/incremen.c:578 src/incremen.c:584 msgid "contents not dumped" msgstr "chÆ°a đổ nội dung" @@ -947,7 +952,7 @@ msgstr "%s: tập tin chÆ°a thay đổi; không được dump" msgid "%s: file is the archive; not dumped" msgstr "%s: tập tin là kho lÆ°u; không được đổ" -#: src/create.c:1723 src/incremen.c:575 +#: src/create.c:1723 src/incremen.c:571 msgid "directory not dumped" msgstr "chÆ°a đổ thÆ° mục" @@ -956,12 +961,12 @@ msgstr "chÆ°a đổ thÆ° mục" msgid "%s: file changed as we read it" msgstr "%s: tập tin đã thay đổi khi chúng ta đọc nó" -#: src/create.c:1857 +#: src/create.c:1858 #, c-format msgid "%s: socket ignored" msgstr "%s: socket bị lờ đi" -#: src/create.c:1863 +#: src/create.c:1864 #, c-format msgid "%s: door ignored" msgstr "%s: cá»­a (door) bị lờ đi" @@ -989,164 +994,164 @@ msgstr "%s: tem thời gian %s là %s giây trong tÆ°Æ¡ng lai" msgid "%s: Unexpected inconsistency when making directory" msgstr "%s: Sá»± mâu thuẫn không mong đợi khi tạo thÆ° mục" -#: src/extract.c:709 +#: src/extract.c:721 #, c-format msgid "%s: Directory renamed before its status could be extracted" msgstr "%s: Đổi tên thÆ° mục trước khi có thể giải phóng trạng thái của nó" -#: src/extract.c:863 +#: src/extract.c:875 msgid "Extracting contiguous files as regular files" msgstr "Giải nén các tập tin liền nhau thành những tập tin thông thường" -#: src/extract.c:1197 +#: src/extract.c:1209 msgid "Attempting extraction of symbolic links as hard links" msgstr "Đang thá»­ giải nén liên kết mềm thành liên kết cứng" -#: src/extract.c:1353 +#: src/extract.c:1365 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Không giải nén được -- tập tin tiếp tục từ khối khác" -#: src/extract.c:1360 src/list.c:1125 +#: src/extract.c:1372 src/list.c:1121 msgid "Unexpected long name header" msgstr "Phần đầu tên dài không mong đợi" -#: src/extract.c:1367 +#: src/extract.c:1379 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Dạng tập tin không rõ '%c' nên giải nén nhÆ° tập tin thông thường" -#: src/extract.c:1393 +#: src/extract.c:1405 #, c-format msgid "Current %s is newer or same age" msgstr "%s hiện thời là mới hay hay cùng thời" -#: src/extract.c:1445 +#: src/extract.c:1457 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Không thể sao lÆ°u tập tin này" -#: src/extract.c:1582 +#: src/extract.c:1594 #, c-format msgid "Cannot rename %s to %s" msgstr "Không thể đổi tên %s thành %s" -#: src/incremen.c:474 src/incremen.c:518 +#: src/incremen.c:473 src/incremen.c:517 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Đã đổi tên thÆ° mục từ %s" -#: src/incremen.c:486 +#: src/incremen.c:485 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Đã đổi tên thÆ° mục" -#: src/incremen.c:531 +#: src/incremen.c:530 #, c-format msgid "%s: Directory is new" msgstr "%s: ThÆ° mục là mới" -#: src/incremen.c:956 src/incremen.c:973 +#: src/incremen.c:951 src/incremen.c:968 msgid "Invalid time stamp" msgstr "Tem thời gian không đúng" -#: src/incremen.c:1012 +#: src/incremen.c:1007 msgid "Invalid modification time (seconds)" msgstr "Thời gian sá»­a đổi không hợp lệ (giây)" -#: src/incremen.c:1027 +#: src/incremen.c:1022 msgid "Invalid modification time (nanoseconds)" msgstr "Thời gian sá»­a đổi không hợp lệ (nanô-giây)" -#: src/incremen.c:1047 +#: src/incremen.c:1042 msgid "Invalid device number" msgstr "Số thứ tá»± thiết bị không đúng" -#: src/incremen.c:1062 +#: src/incremen.c:1057 msgid "Invalid inode number" msgstr "Số thứ tá»± chỉ mục inode sai" -#: src/incremen.c:1113 src/incremen.c:1150 +#: src/incremen.c:1108 src/incremen.c:1145 msgid "Field too long while reading snapshot file" msgstr "Trường quá dài trong khi đọc tập tin ảnh chụp" -#: src/incremen.c:1120 src/incremen.c:1158 +#: src/incremen.c:1115 src/incremen.c:1153 msgid "Read error in snapshot file" msgstr "Lỗi đọc trong tập tin ảnh chụp" -#: src/incremen.c:1122 src/incremen.c:1162 src/incremen.c:1214 -#: src/incremen.c:1272 +#: src/incremen.c:1117 src/incremen.c:1157 src/incremen.c:1209 +#: src/incremen.c:1267 msgid "Unexpected EOF in snapshot file" msgstr "Kết thúc tập tin (EOF) không mong đợi trong tập tin ảnh chụp" -#: src/incremen.c:1129 src/incremen.c:1169 +#: src/incremen.c:1124 src/incremen.c:1164 msgid "Unexpected field value in snapshot file" msgstr "Giá trị trường không mong đợi trong tập tin ảnh chụp" -#: src/incremen.c:1264 +#: src/incremen.c:1259 msgid "Missing record terminator" msgstr "Thiếu dấu giới hạn mục ghi" -#: src/incremen.c:1325 src/incremen.c:1328 +#: src/incremen.c:1320 src/incremen.c:1323 msgid "Bad incremental file format" msgstr "Định dạng tập tin dần sai" -#: src/incremen.c:1347 +#: src/incremen.c:1342 #, c-format msgid "Unsupported incremental format version: %" msgstr "Phiên bản định dạng dần không được hỗ trợ : %" -#: src/incremen.c:1502 +#: src/incremen.c:1496 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "ThÆ° mục đổ dạng sai: mong đợi « %c » còn tìm %#3o" -#: src/incremen.c:1512 +#: src/incremen.c:1506 msgid "Malformed dumpdir: 'X' duplicated" msgstr "ThÆ° mục đổ dạng sai: « X » đã nhân đôi" -#: src/incremen.c:1525 +#: src/incremen.c:1519 msgid "Malformed dumpdir: empty name in 'R'" msgstr "ThÆ° mục đổ dạng sai: tên rỗng trong « R »" -#: src/incremen.c:1538 +#: src/incremen.c:1532 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "ThÆ° mục đổ dạng sai: « T » không có « R » đi trướ" -#: src/incremen.c:1544 +#: src/incremen.c:1538 msgid "Malformed dumpdir: empty name in 'T'" msgstr "ThÆ° mục đổ dạng sai: tên rỗng trong « T »" -#: src/incremen.c:1564 +#: src/incremen.c:1558 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "ThÆ° mục đổ dạng sai: mong đợi « %c » còn tìm kết thúc dữ liệu" -#: src/incremen.c:1571 +#: src/incremen.c:1565 msgid "Malformed dumpdir: 'X' never used" msgstr "ThÆ° mục đổ dạng sai: « X » không bao giờ dùng" -#: src/incremen.c:1615 +#: src/incremen.c:1609 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Không thể tạo thÆ° mục tạm bằng mẫu %s" -#: src/incremen.c:1677 +#: src/incremen.c:1670 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Không làm sạch thÆ° mục: không thể lấy trạng thái (stat)" -#: src/incremen.c:1690 +#: src/incremen.c:1683 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: thÆ° mục trên một thiết bị khác: không làm sạch" -#: src/incremen.c:1698 +#: src/incremen.c:1691 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Đang xóa %s\n" -#: src/incremen.c:1703 +#: src/incremen.c:1696 #, c-format msgid "%s: Cannot remove" msgstr "%s: Không thể xóa bỏ" @@ -1166,134 +1171,129 @@ msgstr "khối %s: ** Khối của các số không (NUL) **\n" msgid "block %s: ** End of File **\n" msgstr "khối %s: ** Kết thúc tập tin **\n" -#: src/list.c:256 src/list.c:1097 src/list.c:1360 +#: src/list.c:256 src/list.c:1093 src/list.c:1356 #, c-format msgid "block %s: " msgstr "khối %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:712 +#: src/list.c:708 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Khoảng trống trong Phần đầu trong khi mong đợi một giá trị số %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:767 +#: src/list.c:763 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" "Giá trị hệ tám %.*s của kho lÆ°u vượt ra phạm vi %s; coi nhÆ° phần bù của hai" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:778 +#: src/list.c:774 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Giá trị hệ tám %.*s của kho lÆ°u vượt ra phạm vi %s" -#: src/list.c:799 +#: src/list.c:795 msgid "Archive contains obsolescent base-64 headers" msgstr "Kho lÆ°u chứa phần đầu base-64 không còn dùng nữa" -#: src/list.c:813 +#: src/list.c:809 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "Kho lÆ°u ký chuỗi base-64 %s vượt ra ngoài vùng %s" -#: src/list.c:844 +#: src/list.c:840 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Giá trị base-256 của kho lÆ°u vượt ra ngoài vùng %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:873 +#: src/list.c:869 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Kho lÆ°u chứa %.*s ở chỗ mong đợi giá trị số %s" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:895 +#: src/list.c:891 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Giá trị kho lÆ°u %s vượt quá phạm vi %s (%s..%s)" -#: src/list.c:1261 +#: src/list.c:1257 #, c-format msgid " link to %s\n" msgstr " liên kết tới %s\n" -#: src/list.c:1269 +#: src/list.c:1265 #, c-format msgid " unknown file type %s\n" msgstr " dạng tập tin không rõ %s\n" -#: src/list.c:1287 +#: src/list.c:1283 #, c-format msgid "--Long Link--\n" msgstr "--Liên kết Dài--\n" -#: src/list.c:1291 +#: src/list.c:1287 #, c-format msgid "--Long Name--\n" msgstr "--Tên Dài--\n" -#: src/list.c:1295 +#: src/list.c:1291 #, c-format msgid "--Volume Header--\n" msgstr "--Phần đầu Khối--\n" -#: src/list.c:1303 +#: src/list.c:1299 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Tiếp tục tại byte %s--\n" -#: src/list.c:1365 +#: src/list.c:1361 msgid "Creating directory:" msgstr "Đang tạo thÆ° mục:" -#: src/misc.c:298 +#: src/misc.c:297 #, fuzzy msgid "Cannot get working directory" msgstr "Không thay đổi được thÆ° mục làm việc" -#: src/misc.c:571 +#: src/misc.c:570 #, c-format msgid "Renaming %s to %s\n" msgstr "Đang đổi tên %s thành %s\n" -#: src/misc.c:580 src/misc.c:599 +#: src/misc.c:579 src/misc.c:598 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: Không thể đổi tên thành %s" -#: src/misc.c:604 +#: src/misc.c:603 #, c-format msgid "Renaming %s back to %s\n" msgstr "Đang đổi tên %s ngược lại thành %s\n" -#: src/misc.c:851 +#: src/misc.c:850 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Tập tin bị xóa trước khi chúng ta đọc nó" -#: src/misc.c:866 -#, c-format -msgid "%s: Directory removed before we read it" -msgstr "%s: ThÆ° mục bị xoá trước khi chúng ta đọc nó" - -#: src/misc.c:887 +#: src/misc.c:871 msgid "child process" msgstr "tiến trình con" -#: src/misc.c:896 +#: src/misc.c:880 msgid "interprocess channel" msgstr "kênh (channel) giữa các tiến trình" -#: src/names.c:594 +#: src/names.c:590 msgid "Pattern matching characters used in file names" msgstr "Tên tập tin chứa ký tá»± khớp mẫu" -#: src/names.c:596 +#: src/names.c:592 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" @@ -1301,29 +1301,29 @@ msgstr "" "Dùng « --wildcards » (ký tá»± đặi diện) để hiệu lá»±c chức năng khớp mẫu,\n" "hoặc « --no-wildcards » để thu hồi cảnh báo này." -#: src/names.c:614 src/names.c:630 +#: src/names.c:610 src/names.c:626 #, c-format msgid "%s: Not found in archive" msgstr "%s: Không tìm thấy trong kho lÆ°u" -#: src/names.c:615 +#: src/names.c:611 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Không tìm thấy phần tá»­ yêu cầu trong kho lÆ°u" -#: src/names.c:649 +#: src/names.c:645 #, c-format msgid "Archive label mismatch" msgstr "Sai khớp nhãn kho lÆ°u" -#: src/names.c:953 +#: src/names.c:949 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" "Sá»­ dụng tuỳ chọn « -C » bên trong danh sách tập tin không được phép với « --" "listed-incremental »" -#: src/names.c:959 +#: src/names.c:955 msgid "Only one -C option is allowed with --listed-incremental" msgstr "Chỉ cho phép một tuỳ chọn « -C » với « --listed-incremental »" @@ -2734,5 +2734,8 @@ msgstr "Lệnh đã chấm dứt\n" msgid "--stat requires file names" msgstr "--stat yêu cầu tên tập tin" +#~ msgid "%s: Directory removed before we read it" +#~ msgstr "%s: ThÆ° mục bị xoá trước khi chúng ta đọc nó" + #~ msgid "Cannot save working directory" #~ msgstr "Không thể ghi nhớ thÆ° mục làm việc" diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo index 63445a72db184e2c2b8b55092e85f668921821e4..8a584d157c09997b716c5db9b269780f43a4c244 100644 GIT binary patch delta 9621 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 Rn{CgXJG!Cf$ojMS{{xOFnc)Bc delta 9618 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\n" "Language-Team: Chinese (simplified) \n" "Language: zh_CN\n" @@ -60,35 +60,35 @@ msgstr "%.*s: 未知的 ARGP_HELP_FMT 参数" msgid "Garbage in ARGP_HELP_FMT: %s" msgstr "ARGP_HELP_FMT 中的参数错误: %s" -#: gnu/argp-help.c:1246 +#: gnu/argp-help.c:1248 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." msgstr "长选项和相应短选项具有相同的强制参数或可选参数。" -#: gnu/argp-help.c:1639 +#: gnu/argp-help.c:1641 msgid "Usage:" msgstr "用法:" -#: gnu/argp-help.c:1643 +#: gnu/argp-help.c:1645 msgid " or: " msgstr " 或: " -#: gnu/argp-help.c:1655 +#: gnu/argp-help.c:1657 msgid " [OPTION...]" msgstr " [选项...]" -#: gnu/argp-help.c:1682 +#: gnu/argp-help.c:1684 #, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "请用“%s --help”或“%s --usage”获得更多信息。\n" -#: gnu/argp-help.c:1710 +#: gnu/argp-help.c:1712 #, c-format msgid "Report bugs to %s.\n" msgstr "将错误报告发送到 %s。\n" -#: gnu/argp-help.c:1929 gnu/error.c:183 +#: gnu/argp-help.c:1931 gnu/error.c:183 msgid "Unknown system error" msgstr "未知的系统错误" @@ -194,16 +194,16 @@ msgstr "%s: 选项\"-W %s\"不要参数\n" msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: 选项\"%s\"需要带参数\n" -#: gnu/obstack.c:425 gnu/obstack.c:427 gnu/xalloc-die.c:36 +#: gnu/obstack.c:423 gnu/obstack.c:425 gnu/xalloc-die.c:36 msgid "memory exhausted" msgstr "内存耗尽" -#: gnu/openat-die.c:36 +#: gnu/openat-die.c:40 #, c-format msgid "unable to record current working directory" msgstr "无法记录当前工作目录" -#: gnu/openat-die.c:54 +#: gnu/openat-die.c:59 #, c-format msgid "failed to return to initial working directory" msgstr "无法回到起始的工作目录" @@ -227,11 +227,11 @@ msgstr "无法回到起始的工作目录" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: gnu/quotearg.c:274 +#: gnu/quotearg.c:273 msgid "`" msgstr "“" -#: gnu/quotearg.c:275 +#: gnu/quotearg.c:274 msgid "'" msgstr "”" @@ -494,21 +494,21 @@ msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" msgstr[0] "%1$s：只写入了 %3$lu 个中的 %2$lu 个字节" -#: lib/paxnames.c:155 +#: lib/paxnames.c:140 #, c-format msgid "Removing leading `%s' from member names" msgstr "从成员名中删除开头的“%s”" -#: lib/paxnames.c:156 +#: lib/paxnames.c:141 #, c-format msgid "Removing leading `%s' from hard link targets" msgstr "从硬连接目标中删除开头的“%s”" -#: lib/paxnames.c:169 +#: lib/paxnames.c:154 msgid "Substituting `.' for empty member name" msgstr "为空成员名替换“.”" -#: lib/paxnames.c:170 +#: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" msgstr "为空的硬连接替换“.”" @@ -794,20 +794,20 @@ msgid "Could only read %lu of %lu byte" msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "仅能读入 %2$lu 中的 %1$lu 个字节" -#: src/compare.c:105 src/compare.c:382 +#: src/compare.c:105 src/compare.c:383 msgid "Contents differ" msgstr "内容不同" -#: src/compare.c:131 src/extract.c:972 src/incremen.c:1462 src/list.c:458 -#: src/list.c:1392 src/xheader.c:711 +#: src/compare.c:131 src/extract.c:984 src/incremen.c:1456 src/list.c:456 +#: src/list.c:1388 src/xheader.c:711 msgid "Unexpected EOF in archive" msgstr "归档文件中异常的 EOF" -#: src/compare.c:179 src/compare.c:195 src/compare.c:308 src/compare.c:406 +#: src/compare.c:179 src/compare.c:195 src/compare.c:309 src/compare.c:407 msgid "File type differs" msgstr "文件类型不同" -#: src/compare.c:182 src/compare.c:202 src/compare.c:322 +#: src/compare.c:182 src/compare.c:202 src/compare.c:323 msgid "Mode differs" msgstr "访问模式不同" @@ -823,48 +823,53 @@ msgstr "Gid 不同" msgid "Mod time differs" msgstr "修改时间不同" -#: src/compare.c:215 src/compare.c:414 +#: src/compare.c:215 src/compare.c:415 msgid "Size differs" msgstr "大小不同" -#: src/compare.c:263 +#: src/compare.c:264 #, c-format msgid "Not linked to %s" msgstr "没有连接到 %s" -#: src/compare.c:287 +#: src/compare.c:288 msgid "Symlink differs" msgstr "符号连接不同" -#: src/compare.c:316 +#: src/compare.c:317 msgid "Device number differs" msgstr "设备号不同" -#: src/compare.c:456 +#: src/compare.c:457 #, c-format msgid "Verify " msgstr "校验" -#: src/compare.c:463 +#: src/compare.c:464 #, c-format msgid "%s: Unknown file type `%c', diffed as normal file" msgstr "%s：未知的文件类型“%c”，与普通文件不同" -#: src/compare.c:518 +#: src/compare.c:520 msgid "Archive contains file names with leading prefixes removed." msgstr "归档包含带有被移除前导字符的文件名。" -#: src/compare.c:520 +#: src/compare.c:526 +#, fuzzy +msgid "Archive contains transformed file names." +msgstr "归档包含过时的 base-64 头" + +#: src/compare.c:531 msgid "Verification may fail to locate original files." msgstr "位于原始文件中的验证可能失败。" -#: src/compare.c:593 +#: src/compare.c:603 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "校验失败：检测到 %d 个无效的头" -#: src/compare.c:611 src/list.c:222 +#: src/compare.c:621 src/list.c:222 #, c-format msgid "A lone zero block at %s" msgstr "在 %s 处一个单独的零块" @@ -914,7 +919,7 @@ msgstr[0] "%s：文件缩小 %s 字节；用零填充" msgid "%s: file is on a different filesystem; not dumped" msgstr "%s：文件在不同的文件系统上；未输出" -#: src/create.c:1203 src/create.c:1214 src/incremen.c:582 src/incremen.c:588 +#: src/create.c:1203 src/create.c:1214 src/incremen.c:578 src/incremen.c:584 msgid "contents not dumped" msgstr "未输出内容" @@ -938,7 +943,7 @@ msgstr "%s: 文件未改变；未输出" msgid "%s: file is the archive; not dumped" msgstr "%s: 文件是归档文件；未输出" -#: src/create.c:1723 src/incremen.c:575 +#: src/create.c:1723 src/incremen.c:571 msgid "directory not dumped" msgstr "未输出目录" @@ -947,12 +952,12 @@ msgstr "未输出目录" msgid "%s: file changed as we read it" msgstr "%s: 在我们读入文件时文件发生了变化" -#: src/create.c:1857 +#: src/create.c:1858 #, c-format msgid "%s: socket ignored" msgstr "%s: 忽略套接字(socket)" -#: src/create.c:1863 +#: src/create.c:1864 #, c-format msgid "%s: door ignored" msgstr "%s: 忽略权限" @@ -980,164 +985,164 @@ msgstr "%s：时间戳 %s 是未来的 %s 秒之后" msgid "%s: Unexpected inconsistency when making directory" msgstr "%s：创建目录时出现意外的不一致" -#: src/extract.c:709 +#: src/extract.c:721 #, c-format msgid "%s: Directory renamed before its status could be extracted" msgstr "%s：目录名在状态信息被获取之前改变了" -#: src/extract.c:863 +#: src/extract.c:875 msgid "Extracting contiguous files as regular files" msgstr "展开紧邻的文件为普通文件" -#: src/extract.c:1197 +#: src/extract.c:1209 msgid "Attempting extraction of symbolic links as hard links" msgstr "正试图将符号连接展开为硬连接" -#: src/extract.c:1353 +#: src/extract.c:1365 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s：无法展开 -- 文件一直延伸至另一卷中" -#: src/extract.c:1360 src/list.c:1125 +#: src/extract.c:1372 src/list.c:1121 msgid "Unexpected long name header" msgstr "异常的长名字头部" -#: src/extract.c:1367 +#: src/extract.c:1379 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s：未知的文件类型“%c”，作为普通文件展开" -#: src/extract.c:1393 +#: src/extract.c:1405 #, c-format msgid "Current %s is newer or same age" msgstr "当前的“%s”更新或一样新" -#: src/extract.c:1445 +#: src/extract.c:1457 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s：无法备份该文件" -#: src/extract.c:1582 +#: src/extract.c:1594 #, c-format msgid "Cannot rename %s to %s" msgstr "无法将 %s 重命名为 %s" -#: src/incremen.c:474 src/incremen.c:518 +#: src/incremen.c:473 src/incremen.c:517 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s：目录已改名，不再是 %s" -#: src/incremen.c:486 +#: src/incremen.c:485 #, c-format msgid "%s: Directory has been renamed" msgstr "%s：目录已被改名" -#: src/incremen.c:531 +#: src/incremen.c:530 #, c-format msgid "%s: Directory is new" msgstr "%s：目录是新的" -#: src/incremen.c:956 src/incremen.c:973 +#: src/incremen.c:951 src/incremen.c:968 msgid "Invalid time stamp" msgstr "无效的时间戳" -#: src/incremen.c:1012 +#: src/incremen.c:1007 msgid "Invalid modification time (seconds)" msgstr "无效的修改时间(秒)" -#: src/incremen.c:1027 +#: src/incremen.c:1022 msgid "Invalid modification time (nanoseconds)" msgstr "无效的修改时间(纳秒)" -#: src/incremen.c:1047 +#: src/incremen.c:1042 msgid "Invalid device number" msgstr "无效的设备号" -#: src/incremen.c:1062 +#: src/incremen.c:1057 msgid "Invalid inode number" msgstr "无效的 inode 号" -#: src/incremen.c:1113 src/incremen.c:1150 +#: src/incremen.c:1108 src/incremen.c:1145 msgid "Field too long while reading snapshot file" msgstr "读取目录文件时字段太长" -#: src/incremen.c:1120 src/incremen.c:1158 +#: src/incremen.c:1115 src/incremen.c:1153 msgid "Read error in snapshot file" msgstr "目录文件读取错误" -#: src/incremen.c:1122 src/incremen.c:1162 src/incremen.c:1214 -#: src/incremen.c:1272 +#: src/incremen.c:1117 src/incremen.c:1157 src/incremen.c:1209 +#: src/incremen.c:1267 msgid "Unexpected EOF in snapshot file" msgstr "目录文件中异常的文件结尾(EOF)" -#: src/incremen.c:1129 src/incremen.c:1169 +#: src/incremen.c:1124 src/incremen.c:1164 msgid "Unexpected field value in snapshot file" msgstr "目录文件中异常的字段值" -#: src/incremen.c:1264 +#: src/incremen.c:1259 msgid "Missing record terminator" msgstr "缺少记录终止符" -#: src/incremen.c:1325 src/incremen.c:1328 +#: src/incremen.c:1320 src/incremen.c:1323 msgid "Bad incremental file format" msgstr "文件格式错误增量" -#: src/incremen.c:1347 +#: src/incremen.c:1342 #, c-format msgid "Unsupported incremental format version: %" msgstr "不支持增量格式版本: %" -#: src/incremen.c:1502 +#: src/incremen.c:1496 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "错误的 dumpdir: 需要“%c”但实际为 %#3o" -#: src/incremen.c:1512 +#: src/incremen.c:1506 msgid "Malformed dumpdir: 'X' duplicated" msgstr "错误的 dumpdir: 重复的“X”" -#: src/incremen.c:1525 +#: src/incremen.c:1519 msgid "Malformed dumpdir: empty name in 'R'" msgstr "错误的 dumpdir: “R”中有空名字" -#: src/incremen.c:1538 +#: src/incremen.c:1532 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "错误的 dumpdir: “R”后未紧接着用“T”" -#: src/incremen.c:1544 +#: src/incremen.c:1538 msgid "Malformed dumpdir: empty name in 'T'" msgstr "错误的 dumpdir: “T”中有空名字" -#: src/incremen.c:1564 +#: src/incremen.c:1558 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "错误的 dumpdir: 需要“%c”但实际为数据结尾" -#: src/incremen.c:1571 +#: src/incremen.c:1565 msgid "Malformed dumpdir: 'X' never used" msgstr "错误的 dumpdir: 从未用过“X”" -#: src/incremen.c:1615 +#: src/incremen.c:1609 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "无法通过模板 %s 创建临时目录" -#: src/incremen.c:1677 +#: src/incremen.c:1670 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s：未清除目录：无法 stat" -#: src/incremen.c:1690 +#: src/incremen.c:1683 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: 目录在不同的设备上: 未清除" -#: src/incremen.c:1698 +#: src/incremen.c:1691 #, c-format msgid "%s: Deleting %s\n" msgstr "%s：正在删除 %s\n" -#: src/incremen.c:1703 +#: src/incremen.c:1696 #, c-format msgid "%s: Cannot remove" msgstr "%s：无法删除" @@ -1157,159 +1162,153 @@ msgstr "块 %s：** 空块 **\n" msgid "block %s: ** End of File **\n" msgstr "块 %s：** 文件结束 **\n" -#: src/list.c:256 src/list.c:1097 src/list.c:1360 +#: src/list.c:256 src/list.c:1093 src/list.c:1356 #, c-format msgid "block %s: " msgstr "块 %s：" #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:712 +#: src/list.c:708 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "头中需要数值 %s 处为空白符" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:767 +#: src/list.c:763 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "归档的八进制值 %.*s 超出范围 %s；假定为其二进制补码" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:778 +#: src/list.c:774 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "归档八进制值 %.*s 超出 %s 的范围" -#: src/list.c:799 +#: src/list.c:795 msgid "Archive contains obsolescent base-64 headers" msgstr "归档包含过时的 base-64 头" -#: src/list.c:813 +#: src/list.c:809 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "归档签署的 base-64 字符串 %s 超出范围 %s" -#: src/list.c:844 +#: src/list.c:840 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "归档的 base-256 值超出范围 %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:873 +#: src/list.c:869 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "归档包含 %.*s 而需要数字值 %s" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:895 +#: src/list.c:891 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "归档值 %s 超出 %s 的范围 %s..%s" -#: src/list.c:1261 +#: src/list.c:1257 #, c-format msgid " link to %s\n" msgstr " 连接到 %s\n" -#: src/list.c:1269 +#: src/list.c:1265 #, c-format msgid " unknown file type %s\n" msgstr " 未知的文件类型 %s\n" -#: src/list.c:1287 +#: src/list.c:1283 #, c-format msgid "--Long Link--\n" msgstr "--长连接--\n" -#: src/list.c:1291 +#: src/list.c:1287 #, c-format msgid "--Long Name--\n" msgstr "--长名--\n" -#: src/list.c:1295 +#: src/list.c:1291 #, c-format msgid "--Volume Header--\n" msgstr "--卷头--\n" -#: src/list.c:1303 +#: src/list.c:1299 #, c-format msgid "--Continued at byte %s--\n" msgstr "--从 %s 字节继续--\n" -#: src/list.c:1365 +#: src/list.c:1361 msgid "Creating directory:" msgstr "正在创建目录：" -#: src/misc.c:298 -#, fuzzy +#: src/misc.c:297 msgid "Cannot get working directory" -msgstr "无法改变工作目录" +msgstr "无法获取工作目录" -#: src/misc.c:571 +#: src/misc.c:570 #, c-format msgid "Renaming %s to %s\n" msgstr "将 %s 改名为 %s\n" -#: src/misc.c:580 src/misc.c:599 +#: src/misc.c:579 src/misc.c:598 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s：无法重命名为 %s" -#: src/misc.c:604 +#: src/misc.c:603 #, c-format msgid "Renaming %s back to %s\n" msgstr "将 %s 的名字改回 %s\n" -#: src/misc.c:851 +#: src/misc.c:850 #, c-format msgid "%s: File removed before we read it" msgstr "%s：文件在我们读入之前被删除了" -#: src/misc.c:866 -#, c-format -msgid "%s: Directory removed before we read it" -msgstr "%s: 文件在读入之前被删除了" - -#: src/misc.c:887 +#: src/misc.c:871 msgid "child process" msgstr "子进程" -#: src/misc.c:896 +#: src/misc.c:880 msgid "interprocess channel" msgstr "进程内通道" -#: src/names.c:594 +#: src/names.c:590 msgid "Pattern matching characters used in file names" msgstr "文件名中所使用的字符匹配模式" -#: src/names.c:596 +#: src/names.c:592 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" msgstr "使用 --wildcards 打开模式匹配，或是 --no-wildcards 来关闭之" -#: src/names.c:614 src/names.c:630 +#: src/names.c:610 src/names.c:626 #, c-format msgid "%s: Not found in archive" msgstr "%s：归档中找不到" -#: src/names.c:615 +#: src/names.c:611 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s：没有在归档中找到需要的" -#: src/names.c:649 +#: src/names.c:645 #, c-format msgid "Archive label mismatch" msgstr "归档卷标不匹配" -#: src/names.c:953 +#: src/names.c:949 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "在文件列表中 -C 选项与 --listed-incremental 选项不许合用" -#: src/names.c:959 +#: src/names.c:955 msgid "Only one -C option is allowed with --listed-incremental" msgstr "仅一个 -C 选项允许与 --listed-incremental 合用" @@ -2669,6 +2668,9 @@ msgstr "命令终止\n" msgid "--stat requires file names" msgstr "--stat 选项需要文件名" +#~ msgid "%s: Directory removed before we read it" +#~ msgstr "%s: 文件在读入之前被删除了" + #~ msgid "Cannot save working directory" #~ msgstr "无法保存工作目录" diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo index cd13a3da9ec40011b4620426a383d27928e1f753..4fe3aba3bd037a80b12dc0540587a43b095f96d3 100644 GIT binary patch delta 28 kcmbR6hiSqerVY)-yoS04#=3?^3WkPOrpB8m6gPMQ0GZ_p#Q*>R delta 28 kcmbR6hiSqerVY)-yau|4hPnpk3WnxZ2IiY56gPMQ0Gb~O%m4rY diff --git a/po/zh_TW.po b/po/zh_TW.po index 8c3b294b..435b10bd 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: tar 1.22\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2010-11-07 17:07+0200\n" +"POT-Creation-Date: 2011-03-12 11:53+0200\n" "PO-Revision-Date: 2009-08-30 00:17+0800\n" "Last-Translator: Wei-Lun Chao \n" "Language-Team: Chinese (traditional) \n" @@ -58,35 +58,35 @@ msgstr "%.*s: 不明的 ARGP_HELP_FMT 參數" msgid "Garbage in ARGP_HELP_FMT: %s" msgstr "ARGP_HELP_FMT 中無用的資訊: %s" -#: gnu/argp-help.c:1246 +#: gnu/argp-help.c:1248 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." msgstr "長選項的必須或可選用的引數也是相對應短選項的必須或可選用的引數。" -#: gnu/argp-help.c:1639 +#: gnu/argp-help.c:1641 msgid "Usage:" msgstr "用法：" -#: gnu/argp-help.c:1643 +#: gnu/argp-help.c:1645 msgid " or: " msgstr " 或：" -#: gnu/argp-help.c:1655 +#: gnu/argp-help.c:1657 msgid " [OPTION...]" msgstr " [選項…]" -#: gnu/argp-help.c:1682 +#: gnu/argp-help.c:1684 #, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "試試「%s --help」或「%s --usage」以獲得更多資訊。\n" -#: gnu/argp-help.c:1710 +#: gnu/argp-help.c:1712 #, c-format msgid "Report bugs to %s.\n" msgstr "請向 %s 回報錯誤。\n" -#: gnu/argp-help.c:1929 gnu/error.c:183 +#: gnu/argp-help.c:1931 gnu/error.c:183 msgid "Unknown system error" msgstr "不明的系統錯誤" @@ -192,16 +192,16 @@ msgstr "%s：選項「-W %s」不允許引數\n" msgid "%s: option '-W %s' requires an argument\n" msgstr "%s：選項「%s」需要一個引數\n" -#: gnu/obstack.c:425 gnu/obstack.c:427 gnu/xalloc-die.c:36 +#: gnu/obstack.c:423 gnu/obstack.c:425 gnu/xalloc-die.c:36 msgid "memory exhausted" msgstr "記憶體已耗盡" -#: gnu/openat-die.c:36 +#: gnu/openat-die.c:40 #, c-format msgid "unable to record current working directory" msgstr "無法記錄目前的工作目錄" -#: gnu/openat-die.c:54 +#: gnu/openat-die.c:59 #, c-format msgid "failed to return to initial working directory" msgstr "回到初始工作目錄時失敗" @@ -225,11 +225,11 @@ msgstr "回到初始工作目錄時失敗" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: gnu/quotearg.c:274 +#: gnu/quotearg.c:273 msgid "`" msgstr "「" -#: gnu/quotearg.c:275 +#: gnu/quotearg.c:274 msgid "'" msgstr "」" @@ -493,21 +493,21 @@ msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" msgstr[0] "%1$s：只能寫入 %3$lu 位元組中的 %2$lu 個" -#: lib/paxnames.c:155 +#: lib/paxnames.c:140 #, c-format msgid "Removing leading `%s' from member names" msgstr "從成員名稱中移除前端的「%s」" -#: lib/paxnames.c:156 +#: lib/paxnames.c:141 #, c-format msgid "Removing leading `%s' from hard link targets" msgstr "從硬式連結目標中移除前端的「%s」" -#: lib/paxnames.c:169 +#: lib/paxnames.c:154 msgid "Substituting `.' for empty member name" msgstr "以「.」來替換空白的成員名稱" -#: lib/paxnames.c:170 +#: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" msgstr "以「.」來替換空白的硬式連結目標" @@ -800,20 +800,20 @@ msgid "Could only read %lu of %lu byte" msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "只能讀取 %2$lu 位元組中的 %1$lu 個" -#: src/compare.c:105 src/compare.c:382 +#: src/compare.c:105 src/compare.c:383 msgid "Contents differ" msgstr "內容不同" -#: src/compare.c:131 src/extract.c:972 src/incremen.c:1462 src/list.c:458 -#: src/list.c:1392 src/xheader.c:711 +#: src/compare.c:131 src/extract.c:984 src/incremen.c:1456 src/list.c:456 +#: src/list.c:1388 src/xheader.c:711 msgid "Unexpected EOF in archive" msgstr "未預期的保存檔結尾" -#: src/compare.c:179 src/compare.c:195 src/compare.c:308 src/compare.c:406 +#: src/compare.c:179 src/compare.c:195 src/compare.c:309 src/compare.c:407 msgid "File type differs" msgstr "檔案類型不同" -#: src/compare.c:182 src/compare.c:202 src/compare.c:322 +#: src/compare.c:182 src/compare.c:202 src/compare.c:323 msgid "Mode differs" msgstr "模式不同" @@ -829,48 +829,53 @@ msgstr "Gid 號碼不同" msgid "Mod time differs" msgstr "修改時間不同" -#: src/compare.c:215 src/compare.c:414 +#: src/compare.c:215 src/compare.c:415 msgid "Size differs" msgstr "大小不同" -#: src/compare.c:263 +#: src/compare.c:264 #, c-format msgid "Not linked to %s" msgstr "並未鏈結至 %s" -#: src/compare.c:287 +#: src/compare.c:288 msgid "Symlink differs" msgstr "符號連結不同" -#: src/compare.c:316 +#: src/compare.c:317 msgid "Device number differs" msgstr "裝置編號不同" -#: src/compare.c:456 +#: src/compare.c:457 #, c-format msgid "Verify " msgstr "驗證 " -#: src/compare.c:463 +#: src/compare.c:464 #, c-format msgid "%s: Unknown file type `%c', diffed as normal file" msgstr "%s：不明檔案類型「%c」，會以普通檔案的方式作比較" -#: src/compare.c:518 +#: src/compare.c:520 msgid "Archive contains file names with leading prefixes removed." msgstr "保存檔包含前置文字被移除的檔案名稱。" -#: src/compare.c:520 +#: src/compare.c:526 +#, fuzzy +msgid "Archive contains transformed file names." +msgstr "保存檔含有過時的 base-64 標頭" + +#: src/compare.c:531 msgid "Verification may fail to locate original files." msgstr "查核動作可能無法找到原始檔案" -#: src/compare.c:593 +#: src/compare.c:603 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "驗證失敗：%d 偵測到無效的標頭" -#: src/compare.c:611 src/list.c:222 +#: src/compare.c:621 src/list.c:222 #, c-format msgid "A lone zero block at %s" msgstr "位於 %s 的孤立零值區塊" @@ -920,7 +925,7 @@ msgstr[0] "%s：檔案縮小了 %s 位元組；以零值填補" msgid "%s: file is on a different filesystem; not dumped" msgstr "%s：檔案位於不同的檔案系統；未傾印" -#: src/create.c:1203 src/create.c:1214 src/incremen.c:582 src/incremen.c:588 +#: src/create.c:1203 src/create.c:1214 src/incremen.c:578 src/incremen.c:584 msgid "contents not dumped" msgstr "內容無法傾印" @@ -944,7 +949,7 @@ msgstr "%s：檔案沒有變更；未傾印" msgid "%s: file is the archive; not dumped" msgstr "%s：檔案是保存檔；未傾印" -#: src/create.c:1723 src/incremen.c:575 +#: src/create.c:1723 src/incremen.c:571 msgid "directory not dumped" msgstr "目錄未傾印" @@ -953,12 +958,12 @@ msgstr "目錄未傾印" msgid "%s: file changed as we read it" msgstr "%s：檔案在讀取時已變更" -#: src/create.c:1857 +#: src/create.c:1858 #, c-format msgid "%s: socket ignored" msgstr "%s：忽略通訊端" -#: src/create.c:1863 +#: src/create.c:1864 #, c-format msgid "%s: door ignored" msgstr "%s：忽略匣門" @@ -986,164 +991,164 @@ msgstr "%s：時間戳記 %s 代表未來的 %s 秒" msgid "%s: Unexpected inconsistency when making directory" msgstr "%s：產生目錄時有未預期的不一致" -#: src/extract.c:709 +#: src/extract.c:721 #, c-format msgid "%s: Directory renamed before its status could be extracted" msgstr "%s：解開目錄狀態之前已更改了名稱" -#: src/extract.c:863 +#: src/extract.c:875 msgid "Extracting contiguous files as regular files" msgstr "正在解開連續檔案為正常檔案" -#: src/extract.c:1197 +#: src/extract.c:1209 msgid "Attempting extraction of symbolic links as hard links" msgstr "嘗試解開符號連結為硬式連結" -#: src/extract.c:1353 +#: src/extract.c:1365 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s：無法解開 -- 檔案延續自其他卷冊" -#: src/extract.c:1360 src/list.c:1125 +#: src/extract.c:1372 src/list.c:1121 msgid "Unexpected long name header" msgstr "未預期的長名稱標頭" -#: src/extract.c:1367 +#: src/extract.c:1379 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s：不明檔案類型「%c」，會以普通檔案的方式解開資料" -#: src/extract.c:1393 +#: src/extract.c:1405 #, c-format msgid "Current %s is newer or same age" msgstr "目前的 %s 較新或相同" -#: src/extract.c:1445 +#: src/extract.c:1457 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s：之前無法備份這個檔案" -#: src/extract.c:1582 +#: src/extract.c:1594 #, c-format msgid "Cannot rename %s to %s" msgstr "無法將 %s 重新命名為 %s" -#: src/incremen.c:474 src/incremen.c:518 +#: src/incremen.c:473 src/incremen.c:517 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s：目錄已從 %s 重新命名" -#: src/incremen.c:486 +#: src/incremen.c:485 #, c-format msgid "%s: Directory has been renamed" msgstr "%s：目錄已被重新命名" -#: src/incremen.c:531 +#: src/incremen.c:530 #, c-format msgid "%s: Directory is new" msgstr "%s：目錄是新的" -#: src/incremen.c:956 src/incremen.c:973 +#: src/incremen.c:951 src/incremen.c:968 msgid "Invalid time stamp" msgstr "無效的時間戳記" -#: src/incremen.c:1012 +#: src/incremen.c:1007 msgid "Invalid modification time (seconds)" msgstr "無效的修改時間 (秒)" -#: src/incremen.c:1027 +#: src/incremen.c:1022 msgid "Invalid modification time (nanoseconds)" msgstr "無效的修改時間 (奈秒)" -#: src/incremen.c:1047 +#: src/incremen.c:1042 msgid "Invalid device number" msgstr "無效的裝置號碼" -#: src/incremen.c:1062 +#: src/incremen.c:1057 msgid "Invalid inode number" msgstr "無效的 inode 號碼" -#: src/incremen.c:1113 src/incremen.c:1150 +#: src/incremen.c:1108 src/incremen.c:1145 msgid "Field too long while reading snapshot file" msgstr "讀取快照檔時欄位太長" -#: src/incremen.c:1120 src/incremen.c:1158 +#: src/incremen.c:1115 src/incremen.c:1153 msgid "Read error in snapshot file" msgstr "讀取快照檔時發生錯誤" -#: src/incremen.c:1122 src/incremen.c:1162 src/incremen.c:1214 -#: src/incremen.c:1272 +#: src/incremen.c:1117 src/incremen.c:1157 src/incremen.c:1209 +#: src/incremen.c:1267 msgid "Unexpected EOF in snapshot file" msgstr "未預期的快照檔結尾" -#: src/incremen.c:1129 src/incremen.c:1169 +#: src/incremen.c:1124 src/incremen.c:1164 msgid "Unexpected field value in snapshot file" msgstr "未預期的快照檔欄位值" -#: src/incremen.c:1264 +#: src/incremen.c:1259 msgid "Missing record terminator" msgstr "缺少記錄終止符號" -#: src/incremen.c:1325 src/incremen.c:1328 +#: src/incremen.c:1320 src/incremen.c:1323 msgid "Bad incremental file format" msgstr "不當的遞增檔案格式" -#: src/incremen.c:1347 +#: src/incremen.c:1342 #, c-format msgid "Unsupported incremental format version: %" msgstr "不受支援的遞增格式版本：%" -#: src/incremen.c:1502 +#: src/incremen.c:1496 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "異常的傾印目錄：預期「%c」但是找到 %#3o" -#: src/incremen.c:1512 +#: src/incremen.c:1506 msgid "Malformed dumpdir: 'X' duplicated" msgstr "異常的傾印目錄：「X」重製" -#: src/incremen.c:1525 +#: src/incremen.c:1519 msgid "Malformed dumpdir: empty name in 'R'" msgstr "異常的傾印目錄：在「R」中有空的名稱" -#: src/incremen.c:1538 +#: src/incremen.c:1532 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "異常的傾印目錄：「R」未在「T」之前" -#: src/incremen.c:1544 +#: src/incremen.c:1538 msgid "Malformed dumpdir: empty name in 'T'" msgstr "異常的傾印目錄：在「T」中有空的名稱" -#: src/incremen.c:1564 +#: src/incremen.c:1558 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "異常的傾印目錄：預期「%c」但是發現資料的結束" -#: src/incremen.c:1571 +#: src/incremen.c:1565 msgid "Malformed dumpdir: 'X' never used" msgstr "異常的傾印目錄：「X」永不使用" -#: src/incremen.c:1615 +#: src/incremen.c:1609 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "無法使用模板 %s 建立暫存目錄" -#: src/incremen.c:1677 +#: src/incremen.c:1670 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s：未能清空目錄；無法顯示狀態" -#: src/incremen.c:1690 +#: src/incremen.c:1683 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s：目錄位於不同的裝置；無法清空" -#: src/incremen.c:1698 +#: src/incremen.c:1691 #, c-format msgid "%s: Deleting %s\n" msgstr "%s：正在刪除 %s\n" -#: src/incremen.c:1703 +#: src/incremen.c:1696 #, c-format msgid "%s: Cannot remove" msgstr "%s：無法移除" @@ -1163,162 +1168,157 @@ msgstr "區塊 %s：** 空值區塊 **\n" msgid "block %s: ** End of File **\n" msgstr "區塊 %s：** 檔案結尾 **\n" -#: src/list.c:256 src/list.c:1097 src/list.c:1360 +#: src/list.c:256 src/list.c:1093 src/list.c:1356 #, c-format msgid "block %s: " msgstr "區塊 %s：" #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:712 +#: src/list.c:708 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "空白出現在標頭中預期為數值 %s 的地方" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:767 +#: src/list.c:763 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "保存檔八進位數值 %.*s 超出 %s 範圍；假定為二的補數" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:778 +#: src/list.c:774 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "保存檔八進位數值 %.*s 超出 %s 範圍" -#: src/list.c:799 +#: src/list.c:795 msgid "Archive contains obsolescent base-64 headers" msgstr "保存檔含有過時的 base-64 標頭" -#: src/list.c:813 +#: src/list.c:809 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "保存檔有號 base-64 字串 %s 超出 %s 範圍" -#: src/list.c:844 +#: src/list.c:840 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "保存檔 base-256 值超出 %s 範圍" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:873 +#: src/list.c:869 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "保存檔包含 %.*s 於預期為數值 %s 的地方" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:895 +#: src/list.c:891 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "保存檔值 %s 已超出 %s 的範圍 %s..%s" -#: src/list.c:1261 +#: src/list.c:1257 #, c-format msgid " link to %s\n" msgstr " 連結到 %s\n" -#: src/list.c:1269 +#: src/list.c:1265 #, c-format msgid " unknown file type %s\n" msgstr " 不明檔案類型 %s\n" -#: src/list.c:1287 +#: src/list.c:1283 #, c-format msgid "--Long Link--\n" msgstr "--長 連 結--\n" -#: src/list.c:1291 +#: src/list.c:1287 #, c-format msgid "--Long Name--\n" msgstr "--長 名 稱--\n" -#: src/list.c:1295 +#: src/list.c:1291 #, c-format msgid "--Volume Header--\n" msgstr "--卷 冊 標 é ­--\n" -#: src/list.c:1303 +#: src/list.c:1299 #, c-format msgid "--Continued at byte %s--\n" msgstr "--於第 %s 位元組繼續--\n" -#: src/list.c:1365 +#: src/list.c:1361 msgid "Creating directory:" msgstr "正在建立目錄：" -#: src/misc.c:298 +#: src/misc.c:297 #, fuzzy msgid "Cannot get working directory" msgstr "無法變更工作目錄" -#: src/misc.c:571 +#: src/misc.c:570 #, c-format msgid "Renaming %s to %s\n" msgstr "正在將 %s 重新命名為 %s\n" -#: src/misc.c:580 src/misc.c:599 +#: src/misc.c:579 src/misc.c:598 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s：無法重新命名為 %s" -#: src/misc.c:604 +#: src/misc.c:603 #, c-format msgid "Renaming %s back to %s\n" msgstr "將 %s 的名稱還原為 %s\n" -#: src/misc.c:851 +#: src/misc.c:850 #, c-format msgid "%s: File removed before we read it" msgstr "%s：讀取檔案之前已被移除" -#: src/misc.c:866 -#, fuzzy, c-format -msgid "%s: Directory removed before we read it" -msgstr "%s：讀取檔案之前已被移除" - -#: src/misc.c:887 +#: src/misc.c:871 msgid "child process" msgstr "子進程" -#: src/misc.c:896 +#: src/misc.c:880 msgid "interprocess channel" msgstr "進程間通道" -#: src/names.c:594 +#: src/names.c:590 #, fuzzy msgid "Pattern matching characters used in file names" msgstr "在檔案名稱中使用的式樣匹配字元。請，" -#: src/names.c:596 +#: src/names.c:592 #, fuzzy msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" msgstr "使用 --wildcards 以啟用式樣匹配，或 --no-wildcards 來" -#: src/names.c:614 src/names.c:630 +#: src/names.c:610 src/names.c:626 #, c-format msgid "%s: Not found in archive" msgstr "%s：在保存檔中找不到" -#: src/names.c:615 +#: src/names.c:611 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s：要求項目在保存檔中找不到" -#: src/names.c:649 +#: src/names.c:645 #, fuzzy, c-format msgid "Archive label mismatch" msgstr "保存檔未標誌為符合 %s" -#: src/names.c:953 +#: src/names.c:949 #, fuzzy msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "--preserve-order 與 --listed-incremental 不相容" -#: src/names.c:959 +#: src/names.c:955 #, fuzzy msgid "Only one -C option is allowed with --listed-incremental" msgstr "--preserve-order 與 --listed-incremental 不相容" @@ -2692,6 +2692,10 @@ msgstr "命令終止\n" msgid "--stat requires file names" msgstr "--stat 需要檔案名稱" +#, fuzzy +#~ msgid "%s: Directory removed before we read it" +#~ msgstr "%s：讀取檔案之前已被移除" + #, fuzzy #~ msgid "Cannot restore working directory" #~ msgstr "無法儲存工作目錄" diff --git a/rmt/Makefile.in b/rmt/Makefile.in index 93f19896..0a78e945 100644 --- a/rmt/Makefile.in +++ b/rmt/Makefile.in @@ -19,7 +19,6 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -40,16 +39,16 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/argmatch.m4 \ - $(top_srcdir)/m4/argp.m4 $(top_srcdir)/m4/asm-underscore.m4 \ - $(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/bison.m4 \ - $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/canonicalize.m4 \ + $(top_srcdir)/m4/argp.m4 $(top_srcdir)/m4/backupfile.m4 \ + $(top_srcdir)/m4/bison.m4 $(top_srcdir)/m4/btowc.m4 \ + $(top_srcdir)/m4/canonicalize.m4 \ $(top_srcdir)/m4/chdir-long.m4 $(top_srcdir)/m4/chown.m4 \ $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/cloexec.m4 \ $(top_srcdir)/m4/close-stream.m4 $(top_srcdir)/m4/close.m4 \ $(top_srcdir)/m4/closeout.m4 $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/d-ino.m4 $(top_srcdir)/m4/dirent-safer.m4 \ - $(top_srcdir)/m4/dirent_h.m4 $(top_srcdir)/m4/dirfd.m4 \ - $(top_srcdir)/m4/dirname.m4 $(top_srcdir)/m4/dos.m4 \ + $(top_srcdir)/m4/configmake.m4 $(top_srcdir)/m4/d-ino.m4 \ + $(top_srcdir)/m4/dirent-safer.m4 $(top_srcdir)/m4/dirent_h.m4 \ + $(top_srcdir)/m4/dirfd.m4 $(top_srcdir)/m4/dirname.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup2.m4 \ $(top_srcdir)/m4/eealloc.m4 $(top_srcdir)/m4/environ.m4 \ $(top_srcdir)/m4/errno_h.m4 $(top_srcdir)/m4/error.m4 \ @@ -74,9 +73,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax_t.m4 \ $(top_srcdir)/m4/inttostr.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ - $(top_srcdir)/m4/langinfo_h.m4 $(top_srcdir)/m4/lchown.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/iswblank.m4 $(top_srcdir)/m4/langinfo_h.m4 \ + $(top_srcdir)/m4/lchown.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ $(top_srcdir)/m4/libunistring-base.m4 \ $(top_srcdir)/m4/link-follow.m4 $(top_srcdir)/m4/link.m4 \ $(top_srcdir)/m4/linkat.m4 $(top_srcdir)/m4/localcharset.m4 \ @@ -87,61 +86,62 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \ $(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \ - $(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdir.m4 \ - $(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mkfifo.m4 \ - $(top_srcdir)/m4/mkfifoat.m4 $(top_srcdir)/m4/mknod.m4 \ - $(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/mmap-anon.m4 \ - $(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/modechange.m4 \ - $(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/nl_langinfo.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/open.m4 \ - $(top_srcdir)/m4/openat.m4 $(top_srcdir)/m4/parse-datetime.m4 \ - $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/paxutils.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf.m4 \ - $(top_srcdir)/m4/priv-set.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ - $(top_srcdir)/m4/rawmemchr.m4 $(top_srcdir)/m4/readlink.m4 \ - $(top_srcdir)/m4/readlinkat.m4 $(top_srcdir)/m4/realloc.m4 \ - $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/rename.m4 \ - $(top_srcdir)/m4/renameat.m4 $(top_srcdir)/m4/rmdir.m4 \ - $(top_srcdir)/m4/rmt.m4 $(top_srcdir)/m4/rpmatch.m4 \ - $(top_srcdir)/m4/rtapelib.m4 $(top_srcdir)/m4/safe-read.m4 \ - $(top_srcdir)/m4/safe-write.m4 $(top_srcdir)/m4/save-cwd.m4 \ - $(top_srcdir)/m4/savedir.m4 $(top_srcdir)/m4/setenv.m4 \ - $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/sleep.m4 \ - $(top_srcdir)/m4/snprintf.m4 $(top_srcdir)/m4/ssize_t.m4 \ - $(top_srcdir)/m4/stat-time.m4 $(top_srcdir)/m4/stat.m4 \ - $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \ - $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio_h.m4 \ - $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/stpcpy.m4 \ - $(top_srcdir)/m4/strcase.m4 $(top_srcdir)/m4/strchrnul.m4 \ - $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ - $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strings_h.m4 \ - $(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \ - $(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \ - $(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \ - $(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \ - $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/symlinkat.m4 \ - $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ - $(top_srcdir)/m4/sysexits.m4 $(top_srcdir)/m4/system.m4 \ - $(top_srcdir)/m4/tempname.m4 $(top_srcdir)/m4/time_h.m4 \ - $(top_srcdir)/m4/time_r.m4 $(top_srcdir)/m4/timespec.m4 \ - $(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/unistd-safer.m4 \ - $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ - $(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/unlocked-io.m4 \ - $(top_srcdir)/m4/utimbuf.m4 $(top_srcdir)/m4/utimens.m4 \ - $(top_srcdir)/m4/utimensat.m4 $(top_srcdir)/m4/utimes.m4 \ - $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \ - $(top_srcdir)/m4/version-etc.m4 $(top_srcdir)/m4/vsnprintf.m4 \ - $(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/wchar_h.m4 \ - $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wcrtomb.m4 \ - $(top_srcdir)/m4/wctype_h.m4 $(top_srcdir)/m4/wcwidth.m4 \ - $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/write.m4 \ - $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xgetcwd.m4 \ - $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/xstrndup.m4 \ - $(top_srcdir)/m4/xstrtol.m4 $(top_srcdir)/m4/xvasprintf.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \ + $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \ + $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkdtemp.m4 \ + $(top_srcdir)/m4/mkfifo.m4 $(top_srcdir)/m4/mkfifoat.m4 \ + $(top_srcdir)/m4/mknod.m4 $(top_srcdir)/m4/mktime.m4 \ + $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ + $(top_srcdir)/m4/modechange.m4 $(top_srcdir)/m4/multiarch.m4 \ + $(top_srcdir)/m4/nl_langinfo.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/open.m4 $(top_srcdir)/m4/openat.m4 \ + $(top_srcdir)/m4/parse-datetime.m4 $(top_srcdir)/m4/pathmax.m4 \ + $(top_srcdir)/m4/paxutils.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/printf.m4 $(top_srcdir)/m4/priv-set.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/quote.m4 \ + $(top_srcdir)/m4/quotearg.m4 $(top_srcdir)/m4/rawmemchr.m4 \ + $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/readlinkat.m4 \ + $(top_srcdir)/m4/realloc.m4 $(top_srcdir)/m4/regex.m4 \ + $(top_srcdir)/m4/rename.m4 $(top_srcdir)/m4/renameat.m4 \ + $(top_srcdir)/m4/rmdir.m4 $(top_srcdir)/m4/rmt.m4 \ + $(top_srcdir)/m4/rpmatch.m4 $(top_srcdir)/m4/rtapelib.m4 \ + $(top_srcdir)/m4/safe-read.m4 $(top_srcdir)/m4/safe-write.m4 \ + $(top_srcdir)/m4/save-cwd.m4 $(top_srcdir)/m4/savedir.m4 \ + $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/size_max.m4 \ + $(top_srcdir)/m4/sleep.m4 $(top_srcdir)/m4/snprintf.m4 \ + $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \ + $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdarg.m4 \ + $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stddef_h.m4 \ + $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdint_h.m4 \ + $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ + $(top_srcdir)/m4/stpcpy.m4 $(top_srcdir)/m4/strcase.m4 \ + $(top_srcdir)/m4/strchrnul.m4 $(top_srcdir)/m4/strdup.m4 \ + $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/string_h.m4 \ + $(top_srcdir)/m4/strings_h.m4 $(top_srcdir)/m4/strndup.m4 \ + $(top_srcdir)/m4/strnlen.m4 $(top_srcdir)/m4/strtoimax.m4 \ + $(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \ + $(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \ + $(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/symlink.m4 \ + $(top_srcdir)/m4/symlinkat.m4 $(top_srcdir)/m4/sys_stat_h.m4 \ + $(top_srcdir)/m4/sys_time_h.m4 $(top_srcdir)/m4/sysexits.m4 \ + $(top_srcdir)/m4/system.m4 $(top_srcdir)/m4/tempname.m4 \ + $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \ + $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \ + $(top_srcdir)/m4/unistd-safer.m4 $(top_srcdir)/m4/unistd_h.m4 \ + $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlinkdir.m4 \ + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/utimbuf.m4 \ + $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimensat.m4 \ + $(top_srcdir)/m4/utimes.m4 $(top_srcdir)/m4/vasnprintf.m4 \ + $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/version-etc.m4 \ + $(top_srcdir)/m4/vsnprintf.m4 $(top_srcdir)/m4/warn-on-use.m4 \ + $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ + $(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wctype_h.m4 \ + $(top_srcdir)/m4/wcwidth.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/write.m4 $(top_srcdir)/m4/xalloc.m4 \ + $(top_srcdir)/m4/xgetcwd.m4 $(top_srcdir)/m4/xsize.m4 \ + $(top_srcdir)/m4/xstrndup.m4 $(top_srcdir)/m4/xstrtol.m4 \ + $(top_srcdir)/m4/xvasprintf.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -180,13 +180,13 @@ DIST_SOURCES = $(rmt_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALLOCA_H = @ALLOCA_H@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ -ASM_SYMBOL_PREFIX = @ASM_SYMBOL_PREFIX@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOM4TE = @AUTOM4TE@ @@ -287,6 +287,8 @@ GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ GNULIB_GRANTPT = @GNULIB_GRANTPT@ GNULIB_IMAXABS = @GNULIB_IMAXABS@ GNULIB_IMAXDIV = @GNULIB_IMAXDIV@ +GNULIB_ISWBLANK = @GNULIB_ISWBLANK@ +GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@ GNULIB_LCHMOD = @GNULIB_LCHMOD@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LINK = @GNULIB_LINK@ @@ -313,6 +315,7 @@ GNULIB_MBSSEP = @GNULIB_MBSSEP@ GNULIB_MBSSPN = @GNULIB_MBSSPN@ GNULIB_MBSSTR = @GNULIB_MBSSTR@ GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@ +GNULIB_MBTOWC = @GNULIB_MBTOWC@ GNULIB_MEMCHR = @GNULIB_MEMCHR@ GNULIB_MEMMEM = @GNULIB_MEMMEM@ GNULIB_MEMPCPY = @GNULIB_MEMPCPY@ @@ -335,6 +338,7 @@ GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ GNULIB_OPEN = @GNULIB_OPEN@ GNULIB_OPENAT = @GNULIB_OPENAT@ GNULIB_PERROR = @GNULIB_PERROR@ +GNULIB_PIPE = @GNULIB_PIPE@ GNULIB_PIPE2 = @GNULIB_PIPE2@ GNULIB_POPEN = @GNULIB_POPEN@ GNULIB_PREAD = @GNULIB_PREAD@ @@ -370,6 +374,7 @@ GNULIB_STRCASESTR = @GNULIB_STRCASESTR@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ +GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ GNULIB_STRNCAT = @GNULIB_STRNCAT@ GNULIB_STRNDUP = @GNULIB_STRNDUP@ GNULIB_STRNLEN = @GNULIB_STRNLEN@ @@ -391,6 +396,7 @@ GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@ GNULIB_TIMEGM = @GNULIB_TIMEGM@ GNULIB_TIME_R = @GNULIB_TIME_R@ GNULIB_TMPFILE = @GNULIB_TMPFILE@ +GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@ GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ @@ -408,11 +414,42 @@ GNULIB_VPRINTF = @GNULIB_VPRINTF@ GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@ GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@ GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@ +GNULIB_WCPCPY = @GNULIB_WCPCPY@ +GNULIB_WCPNCPY = @GNULIB_WCPNCPY@ GNULIB_WCRTOMB = @GNULIB_WCRTOMB@ +GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@ +GNULIB_WCSCAT = @GNULIB_WCSCAT@ +GNULIB_WCSCHR = @GNULIB_WCSCHR@ +GNULIB_WCSCMP = @GNULIB_WCSCMP@ +GNULIB_WCSCOLL = @GNULIB_WCSCOLL@ +GNULIB_WCSCPY = @GNULIB_WCSCPY@ +GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ +GNULIB_WCSDUP = @GNULIB_WCSDUP@ +GNULIB_WCSLEN = @GNULIB_WCSLEN@ +GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ +GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ +GNULIB_WCSNCMP = @GNULIB_WCSNCMP@ +GNULIB_WCSNCPY = @GNULIB_WCSNCPY@ +GNULIB_WCSNLEN = @GNULIB_WCSNLEN@ GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@ +GNULIB_WCSPBRK = @GNULIB_WCSPBRK@ +GNULIB_WCSRCHR = @GNULIB_WCSRCHR@ GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@ +GNULIB_WCSSPN = @GNULIB_WCSSPN@ +GNULIB_WCSSTR = @GNULIB_WCSSTR@ +GNULIB_WCSTOK = @GNULIB_WCSTOK@ +GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@ +GNULIB_WCSXFRM = @GNULIB_WCSXFRM@ GNULIB_WCTOB = @GNULIB_WCTOB@ +GNULIB_WCTOMB = @GNULIB_WCTOMB@ +GNULIB_WCTRANS = @GNULIB_WCTRANS@ +GNULIB_WCTYPE = @GNULIB_WCTYPE@ GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ +GNULIB_WMEMCHR = @GNULIB_WMEMCHR@ +GNULIB_WMEMCMP = @GNULIB_WMEMCMP@ +GNULIB_WMEMCPY = @GNULIB_WMEMCPY@ +GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@ +GNULIB_WMEMSET = @GNULIB_WMEMSET@ GNULIB_WRITE = @GNULIB_WRITE@ GNULIB__EXIT = @GNULIB__EXIT@ GREP = @GREP@ @@ -423,9 +460,13 @@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ +HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ HAVE_DECL_FDOPENDIR = @HAVE_DECL_FDOPENDIR@ HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@ +HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@ +HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ +HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ @@ -433,11 +474,14 @@ HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ +HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ +HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ +HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ HAVE_DECL_STRNCASECMP = @HAVE_DECL_STRNCASECMP@ HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@ HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@ @@ -445,6 +489,8 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ +HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ @@ -458,13 +504,13 @@ HAVE_FCHMODAT = @HAVE_FCHMODAT@ HAVE_FCHOWNAT = @HAVE_FCHOWNAT@ HAVE_FCNTL = @HAVE_FCNTL@ HAVE_FDOPENDIR = @HAVE_FDOPENDIR@ +HAVE_FEATURES_H = @HAVE_FEATURES_H@ HAVE_FSEEKO = @HAVE_FSEEKO@ HAVE_FSTATAT = @HAVE_FSTATAT@ HAVE_FSYNC = @HAVE_FSYNC@ HAVE_FTELLO = @HAVE_FTELLO@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ HAVE_FUTIMENS = @HAVE_FUTIMENS@ -HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@ HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ HAVE_GETGROUPS = @HAVE_GETGROUPS@ HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@ @@ -486,7 +532,6 @@ HAVE_LCHMOD = @HAVE_LCHMOD@ HAVE_LCHOWN = @HAVE_LCHOWN@ HAVE_LINK = @HAVE_LINK@ HAVE_LINKAT = @HAVE_LINKAT@ -HAVE_LOCALTIME_R = @HAVE_LOCALTIME_R@ HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MBRLEN = @HAVE_MBRLEN@ @@ -511,6 +556,7 @@ HAVE_NANOSLEEP = @HAVE_NANOSLEEP@ HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@ HAVE_OPENAT = @HAVE_OPENAT@ HAVE_OS_H = @HAVE_OS_H@ +HAVE_PIPE = @HAVE_PIPE@ HAVE_PIPE2 = @HAVE_PIPE2@ HAVE_PREAD = @HAVE_PREAD@ HAVE_PTSNAME = @HAVE_PTSNAME@ @@ -554,11 +600,9 @@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ -HAVE_TTYNAME_R = @HAVE_TTYNAME_R@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ -HAVE_UNSETENV = @HAVE_UNSETENV@ HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_USLEEP = @HAVE_USLEEP@ HAVE_UTIMENSAT = @HAVE_UTIMENSAT@ @@ -566,11 +610,41 @@ HAVE_VASPRINTF = @HAVE_VASPRINTF@ HAVE_VDPRINTF = @HAVE_VDPRINTF@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ HAVE_WCHAR_T = @HAVE_WCHAR_T@ +HAVE_WCPCPY = @HAVE_WCPCPY@ +HAVE_WCPNCPY = @HAVE_WCPNCPY@ HAVE_WCRTOMB = @HAVE_WCRTOMB@ +HAVE_WCSCASECMP = @HAVE_WCSCASECMP@ +HAVE_WCSCAT = @HAVE_WCSCAT@ +HAVE_WCSCHR = @HAVE_WCSCHR@ +HAVE_WCSCMP = @HAVE_WCSCMP@ +HAVE_WCSCOLL = @HAVE_WCSCOLL@ +HAVE_WCSCPY = @HAVE_WCSCPY@ +HAVE_WCSCSPN = @HAVE_WCSCSPN@ +HAVE_WCSDUP = @HAVE_WCSDUP@ +HAVE_WCSLEN = @HAVE_WCSLEN@ +HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ +HAVE_WCSNCAT = @HAVE_WCSNCAT@ +HAVE_WCSNCMP = @HAVE_WCSNCMP@ +HAVE_WCSNCPY = @HAVE_WCSNCPY@ +HAVE_WCSNLEN = @HAVE_WCSNLEN@ HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@ +HAVE_WCSPBRK = @HAVE_WCSPBRK@ +HAVE_WCSRCHR = @HAVE_WCSRCHR@ HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@ +HAVE_WCSSPN = @HAVE_WCSSPN@ +HAVE_WCSSTR = @HAVE_WCSSTR@ +HAVE_WCSTOK = @HAVE_WCSTOK@ +HAVE_WCSWIDTH = @HAVE_WCSWIDTH@ +HAVE_WCSXFRM = @HAVE_WCSXFRM@ +HAVE_WCTRANS_T = @HAVE_WCTRANS_T@ HAVE_WCTYPE_H = @HAVE_WCTYPE_H@ +HAVE_WCTYPE_T = @HAVE_WCTYPE_T@ HAVE_WINT_T = @HAVE_WINT_T@ +HAVE_WMEMCHR = @HAVE_WMEMCHR@ +HAVE_WMEMCMP = @HAVE_WMEMCMP@ +HAVE_WMEMCPY = @HAVE_WMEMCPY@ +HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ +HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE__BOOL = @HAVE__BOOL@ HAVE__EXIT = @HAVE__EXIT@ INCLUDE_NEXT = @INCLUDE_NEXT@ @@ -695,8 +769,10 @@ REPLACE_FTELLO = @REPLACE_FTELLO@ REPLACE_FUTIMENS = @REPLACE_FUTIMENS@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETDELIM = @REPLACE_GETDELIM@ +REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETLINE = @REPLACE_GETLINE@ +REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ @@ -714,6 +790,7 @@ REPLACE_MBSINIT = @REPLACE_MBSINIT@ REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@ REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@ REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@ +REPLACE_MBTOWC = @REPLACE_MBTOWC@ REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ REPLACE_MKDIR = @REPLACE_MKDIR@ @@ -751,6 +828,7 @@ REPLACE_STPNCPY = @REPLACE_STPNCPY@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ +REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ REPLACE_STRNCAT = @REPLACE_STRNCAT@ REPLACE_STRNDUP = @REPLACE_STRNDUP@ REPLACE_STRNLEN = @REPLACE_STRNLEN@ @@ -776,7 +854,9 @@ REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ +REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ +REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ SET_MAKE = @SET_MAKE@ @@ -843,6 +923,7 @@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +lispdir = @lispdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ diff --git a/scripts/Makefile.in b/scripts/Makefile.in index cd8a8be1..f40ec213 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -21,7 +21,6 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -41,16 +40,16 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/argmatch.m4 \ - $(top_srcdir)/m4/argp.m4 $(top_srcdir)/m4/asm-underscore.m4 \ - $(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/bison.m4 \ - $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/canonicalize.m4 \ + $(top_srcdir)/m4/argp.m4 $(top_srcdir)/m4/backupfile.m4 \ + $(top_srcdir)/m4/bison.m4 $(top_srcdir)/m4/btowc.m4 \ + $(top_srcdir)/m4/canonicalize.m4 \ $(top_srcdir)/m4/chdir-long.m4 $(top_srcdir)/m4/chown.m4 \ $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/cloexec.m4 \ $(top_srcdir)/m4/close-stream.m4 $(top_srcdir)/m4/close.m4 \ $(top_srcdir)/m4/closeout.m4 $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/d-ino.m4 $(top_srcdir)/m4/dirent-safer.m4 \ - $(top_srcdir)/m4/dirent_h.m4 $(top_srcdir)/m4/dirfd.m4 \ - $(top_srcdir)/m4/dirname.m4 $(top_srcdir)/m4/dos.m4 \ + $(top_srcdir)/m4/configmake.m4 $(top_srcdir)/m4/d-ino.m4 \ + $(top_srcdir)/m4/dirent-safer.m4 $(top_srcdir)/m4/dirent_h.m4 \ + $(top_srcdir)/m4/dirfd.m4 $(top_srcdir)/m4/dirname.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup2.m4 \ $(top_srcdir)/m4/eealloc.m4 $(top_srcdir)/m4/environ.m4 \ $(top_srcdir)/m4/errno_h.m4 $(top_srcdir)/m4/error.m4 \ @@ -75,9 +74,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax_t.m4 \ $(top_srcdir)/m4/inttostr.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ - $(top_srcdir)/m4/langinfo_h.m4 $(top_srcdir)/m4/lchown.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/iswblank.m4 $(top_srcdir)/m4/langinfo_h.m4 \ + $(top_srcdir)/m4/lchown.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ $(top_srcdir)/m4/libunistring-base.m4 \ $(top_srcdir)/m4/link-follow.m4 $(top_srcdir)/m4/link.m4 \ $(top_srcdir)/m4/linkat.m4 $(top_srcdir)/m4/localcharset.m4 \ @@ -88,61 +87,62 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \ $(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \ - $(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdir.m4 \ - $(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mkfifo.m4 \ - $(top_srcdir)/m4/mkfifoat.m4 $(top_srcdir)/m4/mknod.m4 \ - $(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/mmap-anon.m4 \ - $(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/modechange.m4 \ - $(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/nl_langinfo.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/open.m4 \ - $(top_srcdir)/m4/openat.m4 $(top_srcdir)/m4/parse-datetime.m4 \ - $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/paxutils.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf.m4 \ - $(top_srcdir)/m4/priv-set.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ - $(top_srcdir)/m4/rawmemchr.m4 $(top_srcdir)/m4/readlink.m4 \ - $(top_srcdir)/m4/readlinkat.m4 $(top_srcdir)/m4/realloc.m4 \ - $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/rename.m4 \ - $(top_srcdir)/m4/renameat.m4 $(top_srcdir)/m4/rmdir.m4 \ - $(top_srcdir)/m4/rmt.m4 $(top_srcdir)/m4/rpmatch.m4 \ - $(top_srcdir)/m4/rtapelib.m4 $(top_srcdir)/m4/safe-read.m4 \ - $(top_srcdir)/m4/safe-write.m4 $(top_srcdir)/m4/save-cwd.m4 \ - $(top_srcdir)/m4/savedir.m4 $(top_srcdir)/m4/setenv.m4 \ - $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/sleep.m4 \ - $(top_srcdir)/m4/snprintf.m4 $(top_srcdir)/m4/ssize_t.m4 \ - $(top_srcdir)/m4/stat-time.m4 $(top_srcdir)/m4/stat.m4 \ - $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \ - $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio_h.m4 \ - $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/stpcpy.m4 \ - $(top_srcdir)/m4/strcase.m4 $(top_srcdir)/m4/strchrnul.m4 \ - $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ - $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strings_h.m4 \ - $(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \ - $(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \ - $(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \ - $(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \ - $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/symlinkat.m4 \ - $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ - $(top_srcdir)/m4/sysexits.m4 $(top_srcdir)/m4/system.m4 \ - $(top_srcdir)/m4/tempname.m4 $(top_srcdir)/m4/time_h.m4 \ - $(top_srcdir)/m4/time_r.m4 $(top_srcdir)/m4/timespec.m4 \ - $(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/unistd-safer.m4 \ - $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ - $(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/unlocked-io.m4 \ - $(top_srcdir)/m4/utimbuf.m4 $(top_srcdir)/m4/utimens.m4 \ - $(top_srcdir)/m4/utimensat.m4 $(top_srcdir)/m4/utimes.m4 \ - $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \ - $(top_srcdir)/m4/version-etc.m4 $(top_srcdir)/m4/vsnprintf.m4 \ - $(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/wchar_h.m4 \ - $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wcrtomb.m4 \ - $(top_srcdir)/m4/wctype_h.m4 $(top_srcdir)/m4/wcwidth.m4 \ - $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/write.m4 \ - $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xgetcwd.m4 \ - $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/xstrndup.m4 \ - $(top_srcdir)/m4/xstrtol.m4 $(top_srcdir)/m4/xvasprintf.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \ + $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \ + $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkdtemp.m4 \ + $(top_srcdir)/m4/mkfifo.m4 $(top_srcdir)/m4/mkfifoat.m4 \ + $(top_srcdir)/m4/mknod.m4 $(top_srcdir)/m4/mktime.m4 \ + $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ + $(top_srcdir)/m4/modechange.m4 $(top_srcdir)/m4/multiarch.m4 \ + $(top_srcdir)/m4/nl_langinfo.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/open.m4 $(top_srcdir)/m4/openat.m4 \ + $(top_srcdir)/m4/parse-datetime.m4 $(top_srcdir)/m4/pathmax.m4 \ + $(top_srcdir)/m4/paxutils.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/printf.m4 $(top_srcdir)/m4/priv-set.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/quote.m4 \ + $(top_srcdir)/m4/quotearg.m4 $(top_srcdir)/m4/rawmemchr.m4 \ + $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/readlinkat.m4 \ + $(top_srcdir)/m4/realloc.m4 $(top_srcdir)/m4/regex.m4 \ + $(top_srcdir)/m4/rename.m4 $(top_srcdir)/m4/renameat.m4 \ + $(top_srcdir)/m4/rmdir.m4 $(top_srcdir)/m4/rmt.m4 \ + $(top_srcdir)/m4/rpmatch.m4 $(top_srcdir)/m4/rtapelib.m4 \ + $(top_srcdir)/m4/safe-read.m4 $(top_srcdir)/m4/safe-write.m4 \ + $(top_srcdir)/m4/save-cwd.m4 $(top_srcdir)/m4/savedir.m4 \ + $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/size_max.m4 \ + $(top_srcdir)/m4/sleep.m4 $(top_srcdir)/m4/snprintf.m4 \ + $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \ + $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdarg.m4 \ + $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stddef_h.m4 \ + $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdint_h.m4 \ + $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ + $(top_srcdir)/m4/stpcpy.m4 $(top_srcdir)/m4/strcase.m4 \ + $(top_srcdir)/m4/strchrnul.m4 $(top_srcdir)/m4/strdup.m4 \ + $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/string_h.m4 \ + $(top_srcdir)/m4/strings_h.m4 $(top_srcdir)/m4/strndup.m4 \ + $(top_srcdir)/m4/strnlen.m4 $(top_srcdir)/m4/strtoimax.m4 \ + $(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \ + $(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \ + $(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/symlink.m4 \ + $(top_srcdir)/m4/symlinkat.m4 $(top_srcdir)/m4/sys_stat_h.m4 \ + $(top_srcdir)/m4/sys_time_h.m4 $(top_srcdir)/m4/sysexits.m4 \ + $(top_srcdir)/m4/system.m4 $(top_srcdir)/m4/tempname.m4 \ + $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \ + $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \ + $(top_srcdir)/m4/unistd-safer.m4 $(top_srcdir)/m4/unistd_h.m4 \ + $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlinkdir.m4 \ + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/utimbuf.m4 \ + $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimensat.m4 \ + $(top_srcdir)/m4/utimes.m4 $(top_srcdir)/m4/vasnprintf.m4 \ + $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/version-etc.m4 \ + $(top_srcdir)/m4/vsnprintf.m4 $(top_srcdir)/m4/warn-on-use.m4 \ + $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ + $(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wctype_h.m4 \ + $(top_srcdir)/m4/wcwidth.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/write.m4 $(top_srcdir)/m4/xalloc.m4 \ + $(top_srcdir)/m4/xgetcwd.m4 $(top_srcdir)/m4/xsize.m4 \ + $(top_srcdir)/m4/xstrndup.m4 $(top_srcdir)/m4/xstrtol.m4 \ + $(top_srcdir)/m4/xvasprintf.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -181,13 +181,13 @@ am__v_at_0 = @ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALLOCA_H = @ALLOCA_H@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ -ASM_SYMBOL_PREFIX = @ASM_SYMBOL_PREFIX@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOM4TE = @AUTOM4TE@ @@ -288,6 +288,8 @@ GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ GNULIB_GRANTPT = @GNULIB_GRANTPT@ GNULIB_IMAXABS = @GNULIB_IMAXABS@ GNULIB_IMAXDIV = @GNULIB_IMAXDIV@ +GNULIB_ISWBLANK = @GNULIB_ISWBLANK@ +GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@ GNULIB_LCHMOD = @GNULIB_LCHMOD@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LINK = @GNULIB_LINK@ @@ -314,6 +316,7 @@ GNULIB_MBSSEP = @GNULIB_MBSSEP@ GNULIB_MBSSPN = @GNULIB_MBSSPN@ GNULIB_MBSSTR = @GNULIB_MBSSTR@ GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@ +GNULIB_MBTOWC = @GNULIB_MBTOWC@ GNULIB_MEMCHR = @GNULIB_MEMCHR@ GNULIB_MEMMEM = @GNULIB_MEMMEM@ GNULIB_MEMPCPY = @GNULIB_MEMPCPY@ @@ -336,6 +339,7 @@ GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ GNULIB_OPEN = @GNULIB_OPEN@ GNULIB_OPENAT = @GNULIB_OPENAT@ GNULIB_PERROR = @GNULIB_PERROR@ +GNULIB_PIPE = @GNULIB_PIPE@ GNULIB_PIPE2 = @GNULIB_PIPE2@ GNULIB_POPEN = @GNULIB_POPEN@ GNULIB_PREAD = @GNULIB_PREAD@ @@ -371,6 +375,7 @@ GNULIB_STRCASESTR = @GNULIB_STRCASESTR@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ +GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ GNULIB_STRNCAT = @GNULIB_STRNCAT@ GNULIB_STRNDUP = @GNULIB_STRNDUP@ GNULIB_STRNLEN = @GNULIB_STRNLEN@ @@ -392,6 +397,7 @@ GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@ GNULIB_TIMEGM = @GNULIB_TIMEGM@ GNULIB_TIME_R = @GNULIB_TIME_R@ GNULIB_TMPFILE = @GNULIB_TMPFILE@ +GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@ GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ @@ -409,11 +415,42 @@ GNULIB_VPRINTF = @GNULIB_VPRINTF@ GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@ GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@ GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@ +GNULIB_WCPCPY = @GNULIB_WCPCPY@ +GNULIB_WCPNCPY = @GNULIB_WCPNCPY@ GNULIB_WCRTOMB = @GNULIB_WCRTOMB@ +GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@ +GNULIB_WCSCAT = @GNULIB_WCSCAT@ +GNULIB_WCSCHR = @GNULIB_WCSCHR@ +GNULIB_WCSCMP = @GNULIB_WCSCMP@ +GNULIB_WCSCOLL = @GNULIB_WCSCOLL@ +GNULIB_WCSCPY = @GNULIB_WCSCPY@ +GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ +GNULIB_WCSDUP = @GNULIB_WCSDUP@ +GNULIB_WCSLEN = @GNULIB_WCSLEN@ +GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ +GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ +GNULIB_WCSNCMP = @GNULIB_WCSNCMP@ +GNULIB_WCSNCPY = @GNULIB_WCSNCPY@ +GNULIB_WCSNLEN = @GNULIB_WCSNLEN@ GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@ +GNULIB_WCSPBRK = @GNULIB_WCSPBRK@ +GNULIB_WCSRCHR = @GNULIB_WCSRCHR@ GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@ +GNULIB_WCSSPN = @GNULIB_WCSSPN@ +GNULIB_WCSSTR = @GNULIB_WCSSTR@ +GNULIB_WCSTOK = @GNULIB_WCSTOK@ +GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@ +GNULIB_WCSXFRM = @GNULIB_WCSXFRM@ GNULIB_WCTOB = @GNULIB_WCTOB@ +GNULIB_WCTOMB = @GNULIB_WCTOMB@ +GNULIB_WCTRANS = @GNULIB_WCTRANS@ +GNULIB_WCTYPE = @GNULIB_WCTYPE@ GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ +GNULIB_WMEMCHR = @GNULIB_WMEMCHR@ +GNULIB_WMEMCMP = @GNULIB_WMEMCMP@ +GNULIB_WMEMCPY = @GNULIB_WMEMCPY@ +GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@ +GNULIB_WMEMSET = @GNULIB_WMEMSET@ GNULIB_WRITE = @GNULIB_WRITE@ GNULIB__EXIT = @GNULIB__EXIT@ GREP = @GREP@ @@ -424,9 +461,13 @@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ +HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ HAVE_DECL_FDOPENDIR = @HAVE_DECL_FDOPENDIR@ HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@ +HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@ +HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ +HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ @@ -434,11 +475,14 @@ HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ +HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ +HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ +HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ HAVE_DECL_STRNCASECMP = @HAVE_DECL_STRNCASECMP@ HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@ HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@ @@ -446,6 +490,8 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ +HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ @@ -459,13 +505,13 @@ HAVE_FCHMODAT = @HAVE_FCHMODAT@ HAVE_FCHOWNAT = @HAVE_FCHOWNAT@ HAVE_FCNTL = @HAVE_FCNTL@ HAVE_FDOPENDIR = @HAVE_FDOPENDIR@ +HAVE_FEATURES_H = @HAVE_FEATURES_H@ HAVE_FSEEKO = @HAVE_FSEEKO@ HAVE_FSTATAT = @HAVE_FSTATAT@ HAVE_FSYNC = @HAVE_FSYNC@ HAVE_FTELLO = @HAVE_FTELLO@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ HAVE_FUTIMENS = @HAVE_FUTIMENS@ -HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@ HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ HAVE_GETGROUPS = @HAVE_GETGROUPS@ HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@ @@ -487,7 +533,6 @@ HAVE_LCHMOD = @HAVE_LCHMOD@ HAVE_LCHOWN = @HAVE_LCHOWN@ HAVE_LINK = @HAVE_LINK@ HAVE_LINKAT = @HAVE_LINKAT@ -HAVE_LOCALTIME_R = @HAVE_LOCALTIME_R@ HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MBRLEN = @HAVE_MBRLEN@ @@ -512,6 +557,7 @@ HAVE_NANOSLEEP = @HAVE_NANOSLEEP@ HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@ HAVE_OPENAT = @HAVE_OPENAT@ HAVE_OS_H = @HAVE_OS_H@ +HAVE_PIPE = @HAVE_PIPE@ HAVE_PIPE2 = @HAVE_PIPE2@ HAVE_PREAD = @HAVE_PREAD@ HAVE_PTSNAME = @HAVE_PTSNAME@ @@ -555,11 +601,9 @@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ -HAVE_TTYNAME_R = @HAVE_TTYNAME_R@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ -HAVE_UNSETENV = @HAVE_UNSETENV@ HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_USLEEP = @HAVE_USLEEP@ HAVE_UTIMENSAT = @HAVE_UTIMENSAT@ @@ -567,11 +611,41 @@ HAVE_VASPRINTF = @HAVE_VASPRINTF@ HAVE_VDPRINTF = @HAVE_VDPRINTF@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ HAVE_WCHAR_T = @HAVE_WCHAR_T@ +HAVE_WCPCPY = @HAVE_WCPCPY@ +HAVE_WCPNCPY = @HAVE_WCPNCPY@ HAVE_WCRTOMB = @HAVE_WCRTOMB@ +HAVE_WCSCASECMP = @HAVE_WCSCASECMP@ +HAVE_WCSCAT = @HAVE_WCSCAT@ +HAVE_WCSCHR = @HAVE_WCSCHR@ +HAVE_WCSCMP = @HAVE_WCSCMP@ +HAVE_WCSCOLL = @HAVE_WCSCOLL@ +HAVE_WCSCPY = @HAVE_WCSCPY@ +HAVE_WCSCSPN = @HAVE_WCSCSPN@ +HAVE_WCSDUP = @HAVE_WCSDUP@ +HAVE_WCSLEN = @HAVE_WCSLEN@ +HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ +HAVE_WCSNCAT = @HAVE_WCSNCAT@ +HAVE_WCSNCMP = @HAVE_WCSNCMP@ +HAVE_WCSNCPY = @HAVE_WCSNCPY@ +HAVE_WCSNLEN = @HAVE_WCSNLEN@ HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@ +HAVE_WCSPBRK = @HAVE_WCSPBRK@ +HAVE_WCSRCHR = @HAVE_WCSRCHR@ HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@ +HAVE_WCSSPN = @HAVE_WCSSPN@ +HAVE_WCSSTR = @HAVE_WCSSTR@ +HAVE_WCSTOK = @HAVE_WCSTOK@ +HAVE_WCSWIDTH = @HAVE_WCSWIDTH@ +HAVE_WCSXFRM = @HAVE_WCSXFRM@ +HAVE_WCTRANS_T = @HAVE_WCTRANS_T@ HAVE_WCTYPE_H = @HAVE_WCTYPE_H@ +HAVE_WCTYPE_T = @HAVE_WCTYPE_T@ HAVE_WINT_T = @HAVE_WINT_T@ +HAVE_WMEMCHR = @HAVE_WMEMCHR@ +HAVE_WMEMCMP = @HAVE_WMEMCMP@ +HAVE_WMEMCPY = @HAVE_WMEMCPY@ +HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ +HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE__BOOL = @HAVE__BOOL@ HAVE__EXIT = @HAVE__EXIT@ INCLUDE_NEXT = @INCLUDE_NEXT@ @@ -696,8 +770,10 @@ REPLACE_FTELLO = @REPLACE_FTELLO@ REPLACE_FUTIMENS = @REPLACE_FUTIMENS@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETDELIM = @REPLACE_GETDELIM@ +REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETLINE = @REPLACE_GETLINE@ +REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ @@ -715,6 +791,7 @@ REPLACE_MBSINIT = @REPLACE_MBSINIT@ REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@ REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@ REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@ +REPLACE_MBTOWC = @REPLACE_MBTOWC@ REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ REPLACE_MKDIR = @REPLACE_MKDIR@ @@ -752,6 +829,7 @@ REPLACE_STPNCPY = @REPLACE_STPNCPY@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ +REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ REPLACE_STRNCAT = @REPLACE_STRNCAT@ REPLACE_STRNDUP = @REPLACE_STRNDUP@ REPLACE_STRNLEN = @REPLACE_STRNLEN@ @@ -777,7 +855,9 @@ REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ +REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ +REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ SET_MAKE = @SET_MAKE@ @@ -844,6 +924,7 @@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +lispdir = @lispdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ diff --git a/scripts/backup.in b/scripts/backup.in index 6a50e51d..37bfed36 100644 --- a/scripts/backup.in +++ b/scripts/backup.in @@ -72,8 +72,9 @@ do --l=*|--le=*|--lev=*|--leve=*|--level=*) DUMP_LEVEL=$optarg ;; + -l?*) DUMP_LEVEL=`expr $option : '-l\(.*\)'`;; -l|--l|--le|--lev|--leve|--level) - prev=$option + prev=--level ;; --verb=*|--verbo=*|--verbos=*|--verbose=*) VERBOSE=$optarg @@ -81,14 +82,13 @@ do -v|--verb|--verbo|--verbos|--verbose) VERBOSE=100 ;; - -v*) VERBOSE=`expr $option : "-v\(.*\)"`;; + -v*) VERBOSE=`expr $option : '-v\(.*\)'`;; --t=*|--ti=*|--tim=*|--time=*) TIME=$optarg ;; - -t) prev=--t;; - -t*) TIME=`expr $option : "-t\(.*\)"`;; - --t|--ti|--tim|--time) - prev=$option + -t?*) TIME=`expr $option : '-t\(.*\)'`;; + -t|--t|--ti|--tim|--time) + prev=--time ;; -V|--v|--ve|--ver|--vers|--versi|--versio|--version) echo "backup (@PACKAGE_NAME@) @VERSION@" diff --git a/scripts/restore.in b/scripts/restore.in index efc320ad..2f86bacf 100644 --- a/scripts/restore.in +++ b/scripts/restore.in @@ -60,8 +60,9 @@ do --l=*|--le=*|--lev=*|--leve=*|--level=*) DUMP_LEVEL=$optarg ;; + -l?*) DUMP_LEVEL=`expr $option : '-l\(.*\)'`;; -l|--l|--le|--lev|--leve|--level) - prev=$option + prev=--level ;; --verb=*|--verbo=*|--verbos=*|--verbose=*) VERBOSE=$optarg @@ -69,7 +70,7 @@ do -v|--verb|--verbo|--verbos|--verbose) VERBOSE=100 ;; - -v*) VERBOSE=`expr $option : "-v\(.*\)"`;; + -v*) VERBOSE=`expr $option : '-v\(.*\)'`;; -V|--v|--ve|--ver|--vers|--versi|--versio|--version) echo "restore (@PACKAGE_NAME@) @VERSION@" license diff --git a/src/Makefile.in b/src/Makefile.in index 41151f21..1e6fbd21 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -25,7 +25,6 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -47,16 +46,16 @@ DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/argmatch.m4 \ - $(top_srcdir)/m4/argp.m4 $(top_srcdir)/m4/asm-underscore.m4 \ - $(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/bison.m4 \ - $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/canonicalize.m4 \ + $(top_srcdir)/m4/argp.m4 $(top_srcdir)/m4/backupfile.m4 \ + $(top_srcdir)/m4/bison.m4 $(top_srcdir)/m4/btowc.m4 \ + $(top_srcdir)/m4/canonicalize.m4 \ $(top_srcdir)/m4/chdir-long.m4 $(top_srcdir)/m4/chown.m4 \ $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/cloexec.m4 \ $(top_srcdir)/m4/close-stream.m4 $(top_srcdir)/m4/close.m4 \ $(top_srcdir)/m4/closeout.m4 $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/d-ino.m4 $(top_srcdir)/m4/dirent-safer.m4 \ - $(top_srcdir)/m4/dirent_h.m4 $(top_srcdir)/m4/dirfd.m4 \ - $(top_srcdir)/m4/dirname.m4 $(top_srcdir)/m4/dos.m4 \ + $(top_srcdir)/m4/configmake.m4 $(top_srcdir)/m4/d-ino.m4 \ + $(top_srcdir)/m4/dirent-safer.m4 $(top_srcdir)/m4/dirent_h.m4 \ + $(top_srcdir)/m4/dirfd.m4 $(top_srcdir)/m4/dirname.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup2.m4 \ $(top_srcdir)/m4/eealloc.m4 $(top_srcdir)/m4/environ.m4 \ $(top_srcdir)/m4/errno_h.m4 $(top_srcdir)/m4/error.m4 \ @@ -81,9 +80,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax_t.m4 \ $(top_srcdir)/m4/inttostr.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ - $(top_srcdir)/m4/langinfo_h.m4 $(top_srcdir)/m4/lchown.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/iswblank.m4 $(top_srcdir)/m4/langinfo_h.m4 \ + $(top_srcdir)/m4/lchown.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ $(top_srcdir)/m4/libunistring-base.m4 \ $(top_srcdir)/m4/link-follow.m4 $(top_srcdir)/m4/link.m4 \ $(top_srcdir)/m4/linkat.m4 $(top_srcdir)/m4/localcharset.m4 \ @@ -94,61 +93,62 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \ $(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \ - $(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdir.m4 \ - $(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mkfifo.m4 \ - $(top_srcdir)/m4/mkfifoat.m4 $(top_srcdir)/m4/mknod.m4 \ - $(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/mmap-anon.m4 \ - $(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/modechange.m4 \ - $(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/nl_langinfo.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/open.m4 \ - $(top_srcdir)/m4/openat.m4 $(top_srcdir)/m4/parse-datetime.m4 \ - $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/paxutils.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf.m4 \ - $(top_srcdir)/m4/priv-set.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ - $(top_srcdir)/m4/rawmemchr.m4 $(top_srcdir)/m4/readlink.m4 \ - $(top_srcdir)/m4/readlinkat.m4 $(top_srcdir)/m4/realloc.m4 \ - $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/rename.m4 \ - $(top_srcdir)/m4/renameat.m4 $(top_srcdir)/m4/rmdir.m4 \ - $(top_srcdir)/m4/rmt.m4 $(top_srcdir)/m4/rpmatch.m4 \ - $(top_srcdir)/m4/rtapelib.m4 $(top_srcdir)/m4/safe-read.m4 \ - $(top_srcdir)/m4/safe-write.m4 $(top_srcdir)/m4/save-cwd.m4 \ - $(top_srcdir)/m4/savedir.m4 $(top_srcdir)/m4/setenv.m4 \ - $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/sleep.m4 \ - $(top_srcdir)/m4/snprintf.m4 $(top_srcdir)/m4/ssize_t.m4 \ - $(top_srcdir)/m4/stat-time.m4 $(top_srcdir)/m4/stat.m4 \ - $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \ - $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio_h.m4 \ - $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/stpcpy.m4 \ - $(top_srcdir)/m4/strcase.m4 $(top_srcdir)/m4/strchrnul.m4 \ - $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ - $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strings_h.m4 \ - $(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \ - $(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \ - $(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \ - $(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \ - $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/symlinkat.m4 \ - $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ - $(top_srcdir)/m4/sysexits.m4 $(top_srcdir)/m4/system.m4 \ - $(top_srcdir)/m4/tempname.m4 $(top_srcdir)/m4/time_h.m4 \ - $(top_srcdir)/m4/time_r.m4 $(top_srcdir)/m4/timespec.m4 \ - $(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/unistd-safer.m4 \ - $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ - $(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/unlocked-io.m4 \ - $(top_srcdir)/m4/utimbuf.m4 $(top_srcdir)/m4/utimens.m4 \ - $(top_srcdir)/m4/utimensat.m4 $(top_srcdir)/m4/utimes.m4 \ - $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \ - $(top_srcdir)/m4/version-etc.m4 $(top_srcdir)/m4/vsnprintf.m4 \ - $(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/wchar_h.m4 \ - $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wcrtomb.m4 \ - $(top_srcdir)/m4/wctype_h.m4 $(top_srcdir)/m4/wcwidth.m4 \ - $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/write.m4 \ - $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xgetcwd.m4 \ - $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/xstrndup.m4 \ - $(top_srcdir)/m4/xstrtol.m4 $(top_srcdir)/m4/xvasprintf.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \ + $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \ + $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkdtemp.m4 \ + $(top_srcdir)/m4/mkfifo.m4 $(top_srcdir)/m4/mkfifoat.m4 \ + $(top_srcdir)/m4/mknod.m4 $(top_srcdir)/m4/mktime.m4 \ + $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ + $(top_srcdir)/m4/modechange.m4 $(top_srcdir)/m4/multiarch.m4 \ + $(top_srcdir)/m4/nl_langinfo.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/open.m4 $(top_srcdir)/m4/openat.m4 \ + $(top_srcdir)/m4/parse-datetime.m4 $(top_srcdir)/m4/pathmax.m4 \ + $(top_srcdir)/m4/paxutils.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/printf.m4 $(top_srcdir)/m4/priv-set.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/quote.m4 \ + $(top_srcdir)/m4/quotearg.m4 $(top_srcdir)/m4/rawmemchr.m4 \ + $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/readlinkat.m4 \ + $(top_srcdir)/m4/realloc.m4 $(top_srcdir)/m4/regex.m4 \ + $(top_srcdir)/m4/rename.m4 $(top_srcdir)/m4/renameat.m4 \ + $(top_srcdir)/m4/rmdir.m4 $(top_srcdir)/m4/rmt.m4 \ + $(top_srcdir)/m4/rpmatch.m4 $(top_srcdir)/m4/rtapelib.m4 \ + $(top_srcdir)/m4/safe-read.m4 $(top_srcdir)/m4/safe-write.m4 \ + $(top_srcdir)/m4/save-cwd.m4 $(top_srcdir)/m4/savedir.m4 \ + $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/size_max.m4 \ + $(top_srcdir)/m4/sleep.m4 $(top_srcdir)/m4/snprintf.m4 \ + $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \ + $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdarg.m4 \ + $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stddef_h.m4 \ + $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdint_h.m4 \ + $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ + $(top_srcdir)/m4/stpcpy.m4 $(top_srcdir)/m4/strcase.m4 \ + $(top_srcdir)/m4/strchrnul.m4 $(top_srcdir)/m4/strdup.m4 \ + $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/string_h.m4 \ + $(top_srcdir)/m4/strings_h.m4 $(top_srcdir)/m4/strndup.m4 \ + $(top_srcdir)/m4/strnlen.m4 $(top_srcdir)/m4/strtoimax.m4 \ + $(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \ + $(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \ + $(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/symlink.m4 \ + $(top_srcdir)/m4/symlinkat.m4 $(top_srcdir)/m4/sys_stat_h.m4 \ + $(top_srcdir)/m4/sys_time_h.m4 $(top_srcdir)/m4/sysexits.m4 \ + $(top_srcdir)/m4/system.m4 $(top_srcdir)/m4/tempname.m4 \ + $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \ + $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \ + $(top_srcdir)/m4/unistd-safer.m4 $(top_srcdir)/m4/unistd_h.m4 \ + $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlinkdir.m4 \ + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/utimbuf.m4 \ + $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimensat.m4 \ + $(top_srcdir)/m4/utimes.m4 $(top_srcdir)/m4/vasnprintf.m4 \ + $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/version-etc.m4 \ + $(top_srcdir)/m4/vsnprintf.m4 $(top_srcdir)/m4/warn-on-use.m4 \ + $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ + $(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wctype_h.m4 \ + $(top_srcdir)/m4/wcwidth.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/write.m4 $(top_srcdir)/m4/xalloc.m4 \ + $(top_srcdir)/m4/xgetcwd.m4 $(top_srcdir)/m4/xsize.m4 \ + $(top_srcdir)/m4/xstrndup.m4 $(top_srcdir)/m4/xstrtol.m4 \ + $(top_srcdir)/m4/xvasprintf.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -196,13 +196,13 @@ HEADERS = $(noinst_HEADERS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALLOCA_H = @ALLOCA_H@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ -ASM_SYMBOL_PREFIX = @ASM_SYMBOL_PREFIX@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOM4TE = @AUTOM4TE@ @@ -303,6 +303,8 @@ GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ GNULIB_GRANTPT = @GNULIB_GRANTPT@ GNULIB_IMAXABS = @GNULIB_IMAXABS@ GNULIB_IMAXDIV = @GNULIB_IMAXDIV@ +GNULIB_ISWBLANK = @GNULIB_ISWBLANK@ +GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@ GNULIB_LCHMOD = @GNULIB_LCHMOD@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LINK = @GNULIB_LINK@ @@ -329,6 +331,7 @@ GNULIB_MBSSEP = @GNULIB_MBSSEP@ GNULIB_MBSSPN = @GNULIB_MBSSPN@ GNULIB_MBSSTR = @GNULIB_MBSSTR@ GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@ +GNULIB_MBTOWC = @GNULIB_MBTOWC@ GNULIB_MEMCHR = @GNULIB_MEMCHR@ GNULIB_MEMMEM = @GNULIB_MEMMEM@ GNULIB_MEMPCPY = @GNULIB_MEMPCPY@ @@ -351,6 +354,7 @@ GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ GNULIB_OPEN = @GNULIB_OPEN@ GNULIB_OPENAT = @GNULIB_OPENAT@ GNULIB_PERROR = @GNULIB_PERROR@ +GNULIB_PIPE = @GNULIB_PIPE@ GNULIB_PIPE2 = @GNULIB_PIPE2@ GNULIB_POPEN = @GNULIB_POPEN@ GNULIB_PREAD = @GNULIB_PREAD@ @@ -386,6 +390,7 @@ GNULIB_STRCASESTR = @GNULIB_STRCASESTR@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ +GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ GNULIB_STRNCAT = @GNULIB_STRNCAT@ GNULIB_STRNDUP = @GNULIB_STRNDUP@ GNULIB_STRNLEN = @GNULIB_STRNLEN@ @@ -407,6 +412,7 @@ GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@ GNULIB_TIMEGM = @GNULIB_TIMEGM@ GNULIB_TIME_R = @GNULIB_TIME_R@ GNULIB_TMPFILE = @GNULIB_TMPFILE@ +GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@ GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ @@ -424,11 +430,42 @@ GNULIB_VPRINTF = @GNULIB_VPRINTF@ GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@ GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@ GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@ +GNULIB_WCPCPY = @GNULIB_WCPCPY@ +GNULIB_WCPNCPY = @GNULIB_WCPNCPY@ GNULIB_WCRTOMB = @GNULIB_WCRTOMB@ +GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@ +GNULIB_WCSCAT = @GNULIB_WCSCAT@ +GNULIB_WCSCHR = @GNULIB_WCSCHR@ +GNULIB_WCSCMP = @GNULIB_WCSCMP@ +GNULIB_WCSCOLL = @GNULIB_WCSCOLL@ +GNULIB_WCSCPY = @GNULIB_WCSCPY@ +GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ +GNULIB_WCSDUP = @GNULIB_WCSDUP@ +GNULIB_WCSLEN = @GNULIB_WCSLEN@ +GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ +GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ +GNULIB_WCSNCMP = @GNULIB_WCSNCMP@ +GNULIB_WCSNCPY = @GNULIB_WCSNCPY@ +GNULIB_WCSNLEN = @GNULIB_WCSNLEN@ GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@ +GNULIB_WCSPBRK = @GNULIB_WCSPBRK@ +GNULIB_WCSRCHR = @GNULIB_WCSRCHR@ GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@ +GNULIB_WCSSPN = @GNULIB_WCSSPN@ +GNULIB_WCSSTR = @GNULIB_WCSSTR@ +GNULIB_WCSTOK = @GNULIB_WCSTOK@ +GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@ +GNULIB_WCSXFRM = @GNULIB_WCSXFRM@ GNULIB_WCTOB = @GNULIB_WCTOB@ +GNULIB_WCTOMB = @GNULIB_WCTOMB@ +GNULIB_WCTRANS = @GNULIB_WCTRANS@ +GNULIB_WCTYPE = @GNULIB_WCTYPE@ GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ +GNULIB_WMEMCHR = @GNULIB_WMEMCHR@ +GNULIB_WMEMCMP = @GNULIB_WMEMCMP@ +GNULIB_WMEMCPY = @GNULIB_WMEMCPY@ +GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@ +GNULIB_WMEMSET = @GNULIB_WMEMSET@ GNULIB_WRITE = @GNULIB_WRITE@ GNULIB__EXIT = @GNULIB__EXIT@ GREP = @GREP@ @@ -439,9 +476,13 @@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ +HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ HAVE_DECL_FDOPENDIR = @HAVE_DECL_FDOPENDIR@ HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@ +HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@ +HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ +HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ @@ -449,11 +490,14 @@ HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ +HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ +HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ +HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ HAVE_DECL_STRNCASECMP = @HAVE_DECL_STRNCASECMP@ HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@ HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@ @@ -461,6 +505,8 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ +HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ @@ -474,13 +520,13 @@ HAVE_FCHMODAT = @HAVE_FCHMODAT@ HAVE_FCHOWNAT = @HAVE_FCHOWNAT@ HAVE_FCNTL = @HAVE_FCNTL@ HAVE_FDOPENDIR = @HAVE_FDOPENDIR@ +HAVE_FEATURES_H = @HAVE_FEATURES_H@ HAVE_FSEEKO = @HAVE_FSEEKO@ HAVE_FSTATAT = @HAVE_FSTATAT@ HAVE_FSYNC = @HAVE_FSYNC@ HAVE_FTELLO = @HAVE_FTELLO@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ HAVE_FUTIMENS = @HAVE_FUTIMENS@ -HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@ HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ HAVE_GETGROUPS = @HAVE_GETGROUPS@ HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@ @@ -502,7 +548,6 @@ HAVE_LCHMOD = @HAVE_LCHMOD@ HAVE_LCHOWN = @HAVE_LCHOWN@ HAVE_LINK = @HAVE_LINK@ HAVE_LINKAT = @HAVE_LINKAT@ -HAVE_LOCALTIME_R = @HAVE_LOCALTIME_R@ HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MBRLEN = @HAVE_MBRLEN@ @@ -527,6 +572,7 @@ HAVE_NANOSLEEP = @HAVE_NANOSLEEP@ HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@ HAVE_OPENAT = @HAVE_OPENAT@ HAVE_OS_H = @HAVE_OS_H@ +HAVE_PIPE = @HAVE_PIPE@ HAVE_PIPE2 = @HAVE_PIPE2@ HAVE_PREAD = @HAVE_PREAD@ HAVE_PTSNAME = @HAVE_PTSNAME@ @@ -570,11 +616,9 @@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ -HAVE_TTYNAME_R = @HAVE_TTYNAME_R@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ -HAVE_UNSETENV = @HAVE_UNSETENV@ HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_USLEEP = @HAVE_USLEEP@ HAVE_UTIMENSAT = @HAVE_UTIMENSAT@ @@ -582,11 +626,41 @@ HAVE_VASPRINTF = @HAVE_VASPRINTF@ HAVE_VDPRINTF = @HAVE_VDPRINTF@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ HAVE_WCHAR_T = @HAVE_WCHAR_T@ +HAVE_WCPCPY = @HAVE_WCPCPY@ +HAVE_WCPNCPY = @HAVE_WCPNCPY@ HAVE_WCRTOMB = @HAVE_WCRTOMB@ +HAVE_WCSCASECMP = @HAVE_WCSCASECMP@ +HAVE_WCSCAT = @HAVE_WCSCAT@ +HAVE_WCSCHR = @HAVE_WCSCHR@ +HAVE_WCSCMP = @HAVE_WCSCMP@ +HAVE_WCSCOLL = @HAVE_WCSCOLL@ +HAVE_WCSCPY = @HAVE_WCSCPY@ +HAVE_WCSCSPN = @HAVE_WCSCSPN@ +HAVE_WCSDUP = @HAVE_WCSDUP@ +HAVE_WCSLEN = @HAVE_WCSLEN@ +HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ +HAVE_WCSNCAT = @HAVE_WCSNCAT@ +HAVE_WCSNCMP = @HAVE_WCSNCMP@ +HAVE_WCSNCPY = @HAVE_WCSNCPY@ +HAVE_WCSNLEN = @HAVE_WCSNLEN@ HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@ +HAVE_WCSPBRK = @HAVE_WCSPBRK@ +HAVE_WCSRCHR = @HAVE_WCSRCHR@ HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@ +HAVE_WCSSPN = @HAVE_WCSSPN@ +HAVE_WCSSTR = @HAVE_WCSSTR@ +HAVE_WCSTOK = @HAVE_WCSTOK@ +HAVE_WCSWIDTH = @HAVE_WCSWIDTH@ +HAVE_WCSXFRM = @HAVE_WCSXFRM@ +HAVE_WCTRANS_T = @HAVE_WCTRANS_T@ HAVE_WCTYPE_H = @HAVE_WCTYPE_H@ +HAVE_WCTYPE_T = @HAVE_WCTYPE_T@ HAVE_WINT_T = @HAVE_WINT_T@ +HAVE_WMEMCHR = @HAVE_WMEMCHR@ +HAVE_WMEMCMP = @HAVE_WMEMCMP@ +HAVE_WMEMCPY = @HAVE_WMEMCPY@ +HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ +HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE__BOOL = @HAVE__BOOL@ HAVE__EXIT = @HAVE__EXIT@ INCLUDE_NEXT = @INCLUDE_NEXT@ @@ -711,8 +785,10 @@ REPLACE_FTELLO = @REPLACE_FTELLO@ REPLACE_FUTIMENS = @REPLACE_FUTIMENS@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETDELIM = @REPLACE_GETDELIM@ +REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETLINE = @REPLACE_GETLINE@ +REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ @@ -730,6 +806,7 @@ REPLACE_MBSINIT = @REPLACE_MBSINIT@ REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@ REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@ REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@ +REPLACE_MBTOWC = @REPLACE_MBTOWC@ REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ REPLACE_MKDIR = @REPLACE_MKDIR@ @@ -767,6 +844,7 @@ REPLACE_STPNCPY = @REPLACE_STPNCPY@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ +REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ REPLACE_STRNCAT = @REPLACE_STRNCAT@ REPLACE_STRNDUP = @REPLACE_STRNDUP@ REPLACE_STRNLEN = @REPLACE_STRNLEN@ @@ -792,7 +870,9 @@ REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ +REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ +REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ SET_MAKE = @SET_MAKE@ @@ -859,6 +939,7 @@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +lispdir = @lispdir@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ diff --git a/src/common.h b/src/common.h index 69097b3f..0b9bd7a1 100644 --- a/src/common.h +++ b/src/common.h @@ -632,8 +632,6 @@ void seek_diag_details (char const *name, off_t offset); void stat_diag (char const *name); void file_removed_diag (const char *name, bool top_level, void (*diagfn) (char const *name)); -void dir_removed_diag (char const *name, bool top_level, - void (*diagfn) (char const *name)); void write_error_details (char const *name, size_t status, size_t size); void write_fatal (char const *name) __attribute__ ((noreturn)); void write_fatal_details (char const *name, ssize_t status, size_t size) @@ -680,7 +678,6 @@ bool excluded_name (char const *name); void add_avoided_name (char const *name); bool is_avoided_name (char const *name); -bool is_individual_file (char const *name); bool contains_dot_dot (char const *name); @@ -779,6 +776,7 @@ void set_transform_expr (const char *expr); bool transform_name (char **pinput, int type); bool transform_name_fp (char **pinput, int type, char *(*fun)(char *, void *), void *); +bool transform_program_p (void); /* Module suffix.c */ void set_compression_program_by_suffix (const char *name, const char *defprog); diff --git a/src/compare.c b/src/compare.c index 6b7e6d87..273269a1 100644 --- a/src/compare.c +++ b/src/compare.c @@ -234,7 +234,8 @@ diff_file (void) else read_and_process (¤t_stat_info, process_rawdata); - if (atime_preserve_option == replace_atime_preserve) + if (atime_preserve_option == replace_atime_preserve + && stat_data.st_size != 0) { struct timespec atime = get_stat_atime (&stat_data); if (set_file_atime (diff_handle, chdir_fd, file_name, atime) @@ -512,13 +513,22 @@ diff_archive (void) void verify_volume (void) { + int may_fail = 0; if (removed_prefixes_p ()) { WARN((0, 0, _("Archive contains file names with leading prefixes removed."))); + may_fail = 1; + } + if (transform_program_p ()) + { WARN((0, 0, - _("Verification may fail to locate original files."))); + _("Archive contains transformed file names."))); + may_fail = 1; } + if (may_fail) + WARN((0, 0, + _("Verification may fail to locate original files."))); if (!diff_buffer) diff_init (); @@ -611,8 +621,10 @@ verify_volume (void) (0, 0, _("A lone zero block at %s"), STRINGIFY_BIGINT (current_block_ordinal (), buf))); } + continue; } + decode_header (current_header, ¤t_stat_info, ¤t_format, 1); diff_archive (); tar_stat_destroy (¤t_stat_info); } diff --git a/src/create.c b/src/create.c index a1e90a33..43b5a4c2 100644 --- a/src/create.c +++ b/src/create.c @@ -1678,9 +1678,9 @@ dump_file0 (struct tar_stat_info *st, char const *name, char const *p) put in the archive. This check is omitted if incremental_option is set *and* the - requested file is not explicitely listed in the command line. */ + requested file is not explicitly listed in the command line. */ - if (!(incremental_option && !is_individual_file (p)) + if (! (incremental_option && ! top_level) && !S_ISDIR (st->stat.st_mode) && OLDER_TAR_STAT_TIME (*st, m) && (!after_date_option || OLDER_TAR_STAT_TIME (*st, c))) @@ -1797,6 +1797,7 @@ dump_file0 (struct tar_stat_info *st, char const *name, char const *p) set_exit_status (TAREXIT_DIFFERS); } else if (atime_preserve_option == replace_atime_preserve + && fd && (is_dir || original_size != 0) && set_file_atime (fd, parentfd, name, st->atime) != 0) utime_error (p); } diff --git a/src/extract.c b/src/extract.c index 6711f873..aaea56ed 100644 --- a/src/extract.c +++ b/src/extract.c @@ -609,6 +609,18 @@ maybe_recoverable (char *file_name, bool regular, bool *interdir_made) switch (e) { case ELOOP: + + /* With open ("symlink", O_NOFOLLOW|...), POSIX says errno == ELOOP, + but some operating systems do not conform to the standard. */ +#ifdef EFTYPE + /* NetBSD uses errno == EFTYPE; see . */ + case EFTYPE: +#endif + /* FreeBSD 8.1 uses errno == EMLINK. */ + case EMLINK: + /* Tru64 5.1B uses errno == ENOTSUP. */ + case ENOTSUP: + if (! regular || old_files_option != OVERWRITE_OLD_FILES || dereference_option) break; diff --git a/src/incremen.c b/src/incremen.c index 628ff296..b2ab5bf0 100644 --- a/src/incremen.c +++ b/src/incremen.c @@ -426,7 +426,6 @@ procdir (const char *name_buffer, struct tar_stat_info *st, { struct directory *directory; struct stat *stat_data = &st->stat; - dev_t device = st->parent ? st->parent->stat.st_dev : 0; bool nfs = NFS_FILE_STAT (*stat_data); if ((directory = find_directory (name_buffer)) != NULL) @@ -540,11 +539,8 @@ procdir (const char *name_buffer, struct tar_stat_info *st, } } - /* If the directory is on another device and --one-file-system was given, - omit it... */ - if (one_file_system_option && device != stat_data->st_dev - /* ... except if it was explicitely given in the command line */ - && !is_individual_file (name_buffer)) + if (one_file_system_option && st->parent + && stat_data->st_dev != st->parent->stat.st_dev) /* FIXME: WARNOPT (WARN_XDEV, (0, 0, @@ -783,8 +779,7 @@ scan_directory (struct tar_stat_info *st) namebuf_free (nbuf); - if (dirp) - free (dirp); + free (dirp); return directory; } @@ -1352,8 +1347,7 @@ read_directory_file (void) if (ferror (listed_incremental_stream)) read_error (listed_incremental_option); - if (buf) - free (buf); + free (buf); } /* Output incremental data for the directory ENTRY to the file DATA. @@ -1664,8 +1658,7 @@ try_purge_directory (char const *directory_name) { const char *entry; struct stat st; - if (p) - free (p); + free (p); p = new_name (directory_name, cur); if (deref_stat (p, &st) != 0) diff --git a/src/list.c b/src/list.c index a70f0d38..cf2de096 100644 --- a/src/list.c +++ b/src/list.c @@ -433,15 +433,13 @@ read_header (union block **return_block, struct tar_stat_info *info, if (header->header.typeflag == GNUTYPE_LONGNAME) { - if (next_long_name) - free (next_long_name); + free (next_long_name); next_long_name = header_copy; next_long_name_blocks = size / BLOCKSIZE; } else { - if (next_long_link) - free (next_long_link); + free (next_long_link); next_long_link = header_copy; next_long_link_blocks = size / BLOCKSIZE; } @@ -500,8 +498,7 @@ read_header (union block **return_block, struct tar_stat_info *info, struct posix_header const *h = &header->header; char namebuf[sizeof h->prefix + 1 + NAME_FIELD_SIZE + 1]; - if (recent_long_name) - free (recent_long_name); + free (recent_long_name); if (next_long_name) { @@ -532,8 +529,7 @@ read_header (union block **return_block, struct tar_stat_info *info, assign_string (&info->file_name, name); info->had_trailing_slash = strip_trailing_slashes (info->file_name); - if (recent_long_link) - free (recent_long_link); + free (recent_long_link); if (next_long_link) { diff --git a/src/misc.c b/src/misc.c index cb12947a..b75f2ab4 100644 --- a/src/misc.c +++ b/src/misc.c @@ -37,8 +37,7 @@ void assign_string (char **string, const char *value) { - if (*string) - free (*string); + free (*string); *string = value ? xstrdup (value) : 0; } @@ -856,21 +855,6 @@ file_removed_diag (const char *name, bool top_level, diagfn (name); } -void -dir_removed_diag (const char *name, bool top_level, - void (*diagfn) (char const *name)) -{ - if (!top_level && errno == ENOENT) - { - WARNOPT (WARN_FILE_REMOVED, - (0, 0, _("%s: Directory removed before we read it"), - quotearg_colon (name))); - set_exit_status (TAREXIT_DIFFERS); - } - else - diagfn (name); -} - void write_fatal_details (char const *name, ssize_t status, size_t size) { diff --git a/src/names.c b/src/names.c index 6e214bfa..ba4d509e 100644 --- a/src/names.c +++ b/src/names.c @@ -47,8 +47,6 @@ static char *cached_no_such_gname; static uid_t cached_no_such_uid; static gid_t cached_no_such_gid; -static void register_individual_file (char const *name); - /* Given UID, find the corresponding UNAME. */ void uid_to_uname (uid_t uid, char **uname) @@ -360,8 +358,6 @@ name_next_elt (int change_dirs) { if (unquote_option) unquote_string (name_buffer); - if (incremental_option) - register_individual_file (name_buffer); entry.type = ep->type; entry.v.name = name_buffer; return &entry; @@ -1151,28 +1147,6 @@ excluded_name (char const *name) { return excluded_file_name (excluded, name + FILE_SYSTEM_PREFIX_LEN (name)); } - -static Hash_table *individual_file_table; - -static void -register_individual_file (char const *name) -{ - struct stat st; - - if (deref_stat (name, &st) != 0) - return; /* Will be complained about later */ - if (S_ISDIR (st.st_mode)) - return; - - hash_string_insert (&individual_file_table, name); -} - -bool -is_individual_file (char const *name) -{ - return hash_string_lookup (individual_file_table, name); -} - /* Return the size of the prefix of FILE_NAME that is removed after diff --git a/src/sparse.c b/src/sparse.c index 9680b605..4b2f982a 100644 --- a/src/sparse.c +++ b/src/sparse.c @@ -991,7 +991,7 @@ pax_dump_header_1 (struct tar_sparse_file *file) off_t size = 0; struct sp_array *map = file->stat_info->sparse_map; char *save_file_name = file->stat_info->file_name; - + #define COPY_STRING(b,dst,src) do \ { \ char *endp = b->buffer + BLOCKSIZE; \ @@ -1029,8 +1029,11 @@ pax_dump_header_1 (struct tar_sparse_file *file) xheader_store ("GNU.sparse.name", file->stat_info, NULL); xheader_store ("GNU.sparse.realsize", file->stat_info, NULL); - file->stat_info->file_name = xheader_format_name (file->stat_info, - "%d/GNUSparseFile.%p/%f", 0); + file->stat_info->file_name = + xheader_format_name (file->stat_info, "%d/GNUSparseFile.%p/%f", 0); + /* Make sure the created header name is shorter than NAME_FIELD_SIZE: */ + if (strlen (file->stat_info->file_name) > NAME_FIELD_SIZE) + file->stat_info->file_name[NAME_FIELD_SIZE] = 0; blk = start_header (file->stat_info); /* Store the effective (shrunken) file size */ diff --git a/src/transform.c b/src/transform.c index c35133fa..77aa0a29 100644 --- a/src/transform.c +++ b/src/transform.c @@ -628,3 +628,9 @@ transform_name (char **pinput, int type) { return transform_name_fp (pinput, type, NULL, NULL); } + +bool +transform_program_p (void) +{ + return transform_head != NULL; +} diff --git a/tests/Makefile.am b/tests/Makefile.am index 12e8c1b2..ab7d104d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -110,6 +110,7 @@ TESTSUITE_AT = \ listed01.at\ listed02.at\ listed03.at\ + listed04.at\ long01.at\ longv7.at\ lustar01.at\ @@ -145,6 +146,7 @@ TESTSUITE_AT = \ sparse01.at\ sparse02.at\ sparse03.at\ + sparse04.at\ sparsemv.at\ sparsemvp.at\ spmvp00.at\ @@ -157,6 +159,7 @@ TESTSUITE_AT = \ volsize.at\ volume.at\ verbose.at\ + verify.at\ version.at\ xform-h.at\ xform01.at\ diff --git a/tests/Makefile.in b/tests/Makefile.in index ec1bace0..1db0c26d 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -26,7 +26,6 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -48,16 +47,16 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/argmatch.m4 \ - $(top_srcdir)/m4/argp.m4 $(top_srcdir)/m4/asm-underscore.m4 \ - $(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/bison.m4 \ - $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/canonicalize.m4 \ + $(top_srcdir)/m4/argp.m4 $(top_srcdir)/m4/backupfile.m4 \ + $(top_srcdir)/m4/bison.m4 $(top_srcdir)/m4/btowc.m4 \ + $(top_srcdir)/m4/canonicalize.m4 \ $(top_srcdir)/m4/chdir-long.m4 $(top_srcdir)/m4/chown.m4 \ $(top_srcdir)/m4/clock_time.m4 $(top_srcdir)/m4/cloexec.m4 \ $(top_srcdir)/m4/close-stream.m4 $(top_srcdir)/m4/close.m4 \ $(top_srcdir)/m4/closeout.m4 $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/d-ino.m4 $(top_srcdir)/m4/dirent-safer.m4 \ - $(top_srcdir)/m4/dirent_h.m4 $(top_srcdir)/m4/dirfd.m4 \ - $(top_srcdir)/m4/dirname.m4 $(top_srcdir)/m4/dos.m4 \ + $(top_srcdir)/m4/configmake.m4 $(top_srcdir)/m4/d-ino.m4 \ + $(top_srcdir)/m4/dirent-safer.m4 $(top_srcdir)/m4/dirent_h.m4 \ + $(top_srcdir)/m4/dirfd.m4 $(top_srcdir)/m4/dirname.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup2.m4 \ $(top_srcdir)/m4/eealloc.m4 $(top_srcdir)/m4/environ.m4 \ $(top_srcdir)/m4/errno_h.m4 $(top_srcdir)/m4/error.m4 \ @@ -82,9 +81,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax_t.m4 \ $(top_srcdir)/m4/inttostr.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ - $(top_srcdir)/m4/langinfo_h.m4 $(top_srcdir)/m4/lchown.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/iswblank.m4 $(top_srcdir)/m4/langinfo_h.m4 \ + $(top_srcdir)/m4/lchown.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ $(top_srcdir)/m4/libunistring-base.m4 \ $(top_srcdir)/m4/link-follow.m4 $(top_srcdir)/m4/link.m4 \ $(top_srcdir)/m4/linkat.m4 $(top_srcdir)/m4/localcharset.m4 \ @@ -95,61 +94,62 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \ $(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \ - $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \ - $(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdir.m4 \ - $(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mkfifo.m4 \ - $(top_srcdir)/m4/mkfifoat.m4 $(top_srcdir)/m4/mknod.m4 \ - $(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/mmap-anon.m4 \ - $(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/modechange.m4 \ - $(top_srcdir)/m4/multiarch.m4 $(top_srcdir)/m4/nl_langinfo.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/open.m4 \ - $(top_srcdir)/m4/openat.m4 $(top_srcdir)/m4/parse-datetime.m4 \ - $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/paxutils.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf.m4 \ - $(top_srcdir)/m4/priv-set.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ - $(top_srcdir)/m4/rawmemchr.m4 $(top_srcdir)/m4/readlink.m4 \ - $(top_srcdir)/m4/readlinkat.m4 $(top_srcdir)/m4/realloc.m4 \ - $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/rename.m4 \ - $(top_srcdir)/m4/renameat.m4 $(top_srcdir)/m4/rmdir.m4 \ - $(top_srcdir)/m4/rmt.m4 $(top_srcdir)/m4/rpmatch.m4 \ - $(top_srcdir)/m4/rtapelib.m4 $(top_srcdir)/m4/safe-read.m4 \ - $(top_srcdir)/m4/safe-write.m4 $(top_srcdir)/m4/save-cwd.m4 \ - $(top_srcdir)/m4/savedir.m4 $(top_srcdir)/m4/setenv.m4 \ - $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/sleep.m4 \ - $(top_srcdir)/m4/snprintf.m4 $(top_srcdir)/m4/ssize_t.m4 \ - $(top_srcdir)/m4/stat-time.m4 $(top_srcdir)/m4/stat.m4 \ - $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \ - $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio_h.m4 \ - $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/stpcpy.m4 \ - $(top_srcdir)/m4/strcase.m4 $(top_srcdir)/m4/strchrnul.m4 \ - $(top_srcdir)/m4/strdup.m4 $(top_srcdir)/m4/strerror.m4 \ - $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strings_h.m4 \ - $(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \ - $(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \ - $(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \ - $(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \ - $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/symlinkat.m4 \ - $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ - $(top_srcdir)/m4/sysexits.m4 $(top_srcdir)/m4/system.m4 \ - $(top_srcdir)/m4/tempname.m4 $(top_srcdir)/m4/time_h.m4 \ - $(top_srcdir)/m4/time_r.m4 $(top_srcdir)/m4/timespec.m4 \ - $(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/unistd-safer.m4 \ - $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ - $(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/unlocked-io.m4 \ - $(top_srcdir)/m4/utimbuf.m4 $(top_srcdir)/m4/utimens.m4 \ - $(top_srcdir)/m4/utimensat.m4 $(top_srcdir)/m4/utimes.m4 \ - $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \ - $(top_srcdir)/m4/version-etc.m4 $(top_srcdir)/m4/vsnprintf.m4 \ - $(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/wchar_h.m4 \ - $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wcrtomb.m4 \ - $(top_srcdir)/m4/wctype_h.m4 $(top_srcdir)/m4/wcwidth.m4 \ - $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/write.m4 \ - $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xgetcwd.m4 \ - $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/xstrndup.m4 \ - $(top_srcdir)/m4/xstrtol.m4 $(top_srcdir)/m4/xvasprintf.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \ + $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \ + $(top_srcdir)/m4/mkdir.m4 $(top_srcdir)/m4/mkdtemp.m4 \ + $(top_srcdir)/m4/mkfifo.m4 $(top_srcdir)/m4/mkfifoat.m4 \ + $(top_srcdir)/m4/mknod.m4 $(top_srcdir)/m4/mktime.m4 \ + $(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \ + $(top_srcdir)/m4/modechange.m4 $(top_srcdir)/m4/multiarch.m4 \ + $(top_srcdir)/m4/nl_langinfo.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/open.m4 $(top_srcdir)/m4/openat.m4 \ + $(top_srcdir)/m4/parse-datetime.m4 $(top_srcdir)/m4/pathmax.m4 \ + $(top_srcdir)/m4/paxutils.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/printf.m4 $(top_srcdir)/m4/priv-set.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/quote.m4 \ + $(top_srcdir)/m4/quotearg.m4 $(top_srcdir)/m4/rawmemchr.m4 \ + $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/readlinkat.m4 \ + $(top_srcdir)/m4/realloc.m4 $(top_srcdir)/m4/regex.m4 \ + $(top_srcdir)/m4/rename.m4 $(top_srcdir)/m4/renameat.m4 \ + $(top_srcdir)/m4/rmdir.m4 $(top_srcdir)/m4/rmt.m4 \ + $(top_srcdir)/m4/rpmatch.m4 $(top_srcdir)/m4/rtapelib.m4 \ + $(top_srcdir)/m4/safe-read.m4 $(top_srcdir)/m4/safe-write.m4 \ + $(top_srcdir)/m4/save-cwd.m4 $(top_srcdir)/m4/savedir.m4 \ + $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/size_max.m4 \ + $(top_srcdir)/m4/sleep.m4 $(top_srcdir)/m4/snprintf.m4 \ + $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \ + $(top_srcdir)/m4/stat.m4 $(top_srcdir)/m4/stdarg.m4 \ + $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stddef_h.m4 \ + $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdint_h.m4 \ + $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ + $(top_srcdir)/m4/stpcpy.m4 $(top_srcdir)/m4/strcase.m4 \ + $(top_srcdir)/m4/strchrnul.m4 $(top_srcdir)/m4/strdup.m4 \ + $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/string_h.m4 \ + $(top_srcdir)/m4/strings_h.m4 $(top_srcdir)/m4/strndup.m4 \ + $(top_srcdir)/m4/strnlen.m4 $(top_srcdir)/m4/strtoimax.m4 \ + $(top_srcdir)/m4/strtol.m4 $(top_srcdir)/m4/strtoll.m4 \ + $(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \ + $(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/symlink.m4 \ + $(top_srcdir)/m4/symlinkat.m4 $(top_srcdir)/m4/sys_stat_h.m4 \ + $(top_srcdir)/m4/sys_time_h.m4 $(top_srcdir)/m4/sysexits.m4 \ + $(top_srcdir)/m4/system.m4 $(top_srcdir)/m4/tempname.m4 \ + $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \ + $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \ + $(top_srcdir)/m4/unistd-safer.m4 $(top_srcdir)/m4/unistd_h.m4 \ + $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlinkdir.m4 \ + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/utimbuf.m4 \ + $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimensat.m4 \ + $(top_srcdir)/m4/utimes.m4 $(top_srcdir)/m4/vasnprintf.m4 \ + $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/version-etc.m4 \ + $(top_srcdir)/m4/vsnprintf.m4 $(top_srcdir)/m4/warn-on-use.m4 \ + $(top_srcdir)/m4/wchar_h.m4 $(top_srcdir)/m4/wchar_t.m4 \ + $(top_srcdir)/m4/wcrtomb.m4 $(top_srcdir)/m4/wctype_h.m4 \ + $(top_srcdir)/m4/wcwidth.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/write.m4 $(top_srcdir)/m4/xalloc.m4 \ + $(top_srcdir)/m4/xgetcwd.m4 $(top_srcdir)/m4/xsize.m4 \ + $(top_srcdir)/m4/xstrndup.m4 $(top_srcdir)/m4/xstrtol.m4 \ + $(top_srcdir)/m4/xvasprintf.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -187,13 +187,13 @@ DIST_SOURCES = $(genfile_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALLOCA_H = @ALLOCA_H@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ -ASM_SYMBOL_PREFIX = @ASM_SYMBOL_PREFIX@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOM4TE = @AUTOM4TE@ @@ -294,6 +294,8 @@ GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ GNULIB_GRANTPT = @GNULIB_GRANTPT@ GNULIB_IMAXABS = @GNULIB_IMAXABS@ GNULIB_IMAXDIV = @GNULIB_IMAXDIV@ +GNULIB_ISWBLANK = @GNULIB_ISWBLANK@ +GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@ GNULIB_LCHMOD = @GNULIB_LCHMOD@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LINK = @GNULIB_LINK@ @@ -320,6 +322,7 @@ GNULIB_MBSSEP = @GNULIB_MBSSEP@ GNULIB_MBSSPN = @GNULIB_MBSSPN@ GNULIB_MBSSTR = @GNULIB_MBSSTR@ GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@ +GNULIB_MBTOWC = @GNULIB_MBTOWC@ GNULIB_MEMCHR = @GNULIB_MEMCHR@ GNULIB_MEMMEM = @GNULIB_MEMMEM@ GNULIB_MEMPCPY = @GNULIB_MEMPCPY@ @@ -342,6 +345,7 @@ GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ GNULIB_OPEN = @GNULIB_OPEN@ GNULIB_OPENAT = @GNULIB_OPENAT@ GNULIB_PERROR = @GNULIB_PERROR@ +GNULIB_PIPE = @GNULIB_PIPE@ GNULIB_PIPE2 = @GNULIB_PIPE2@ GNULIB_POPEN = @GNULIB_POPEN@ GNULIB_PREAD = @GNULIB_PREAD@ @@ -377,6 +381,7 @@ GNULIB_STRCASESTR = @GNULIB_STRCASESTR@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ +GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ GNULIB_STRNCAT = @GNULIB_STRNCAT@ GNULIB_STRNDUP = @GNULIB_STRNDUP@ GNULIB_STRNLEN = @GNULIB_STRNLEN@ @@ -398,6 +403,7 @@ GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@ GNULIB_TIMEGM = @GNULIB_TIMEGM@ GNULIB_TIME_R = @GNULIB_TIME_R@ GNULIB_TMPFILE = @GNULIB_TMPFILE@ +GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@ GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ @@ -415,11 +421,42 @@ GNULIB_VPRINTF = @GNULIB_VPRINTF@ GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@ GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@ GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@ +GNULIB_WCPCPY = @GNULIB_WCPCPY@ +GNULIB_WCPNCPY = @GNULIB_WCPNCPY@ GNULIB_WCRTOMB = @GNULIB_WCRTOMB@ +GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@ +GNULIB_WCSCAT = @GNULIB_WCSCAT@ +GNULIB_WCSCHR = @GNULIB_WCSCHR@ +GNULIB_WCSCMP = @GNULIB_WCSCMP@ +GNULIB_WCSCOLL = @GNULIB_WCSCOLL@ +GNULIB_WCSCPY = @GNULIB_WCSCPY@ +GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ +GNULIB_WCSDUP = @GNULIB_WCSDUP@ +GNULIB_WCSLEN = @GNULIB_WCSLEN@ +GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ +GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ +GNULIB_WCSNCMP = @GNULIB_WCSNCMP@ +GNULIB_WCSNCPY = @GNULIB_WCSNCPY@ +GNULIB_WCSNLEN = @GNULIB_WCSNLEN@ GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@ +GNULIB_WCSPBRK = @GNULIB_WCSPBRK@ +GNULIB_WCSRCHR = @GNULIB_WCSRCHR@ GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@ +GNULIB_WCSSPN = @GNULIB_WCSSPN@ +GNULIB_WCSSTR = @GNULIB_WCSSTR@ +GNULIB_WCSTOK = @GNULIB_WCSTOK@ +GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@ +GNULIB_WCSXFRM = @GNULIB_WCSXFRM@ GNULIB_WCTOB = @GNULIB_WCTOB@ +GNULIB_WCTOMB = @GNULIB_WCTOMB@ +GNULIB_WCTRANS = @GNULIB_WCTRANS@ +GNULIB_WCTYPE = @GNULIB_WCTYPE@ GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ +GNULIB_WMEMCHR = @GNULIB_WMEMCHR@ +GNULIB_WMEMCMP = @GNULIB_WMEMCMP@ +GNULIB_WMEMCPY = @GNULIB_WMEMCPY@ +GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@ +GNULIB_WMEMSET = @GNULIB_WMEMSET@ GNULIB_WRITE = @GNULIB_WRITE@ GNULIB__EXIT = @GNULIB__EXIT@ GREP = @GREP@ @@ -430,9 +467,13 @@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ +HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ HAVE_DECL_FDOPENDIR = @HAVE_DECL_FDOPENDIR@ HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@ +HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@ +HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ +HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ @@ -440,11 +481,14 @@ HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ +HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ +HAVE_DECL_SETENV = @HAVE_DECL_SETENV@ HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ +HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@ HAVE_DECL_STRNCASECMP = @HAVE_DECL_STRNCASECMP@ HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@ HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@ @@ -452,6 +496,8 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ +HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ @@ -465,13 +511,13 @@ HAVE_FCHMODAT = @HAVE_FCHMODAT@ HAVE_FCHOWNAT = @HAVE_FCHOWNAT@ HAVE_FCNTL = @HAVE_FCNTL@ HAVE_FDOPENDIR = @HAVE_FDOPENDIR@ +HAVE_FEATURES_H = @HAVE_FEATURES_H@ HAVE_FSEEKO = @HAVE_FSEEKO@ HAVE_FSTATAT = @HAVE_FSTATAT@ HAVE_FSYNC = @HAVE_FSYNC@ HAVE_FTELLO = @HAVE_FTELLO@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ HAVE_FUTIMENS = @HAVE_FUTIMENS@ -HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@ HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ HAVE_GETGROUPS = @HAVE_GETGROUPS@ HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@ @@ -493,7 +539,6 @@ HAVE_LCHMOD = @HAVE_LCHMOD@ HAVE_LCHOWN = @HAVE_LCHOWN@ HAVE_LINK = @HAVE_LINK@ HAVE_LINKAT = @HAVE_LINKAT@ -HAVE_LOCALTIME_R = @HAVE_LOCALTIME_R@ HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MBRLEN = @HAVE_MBRLEN@ @@ -518,6 +563,7 @@ HAVE_NANOSLEEP = @HAVE_NANOSLEEP@ HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@ HAVE_OPENAT = @HAVE_OPENAT@ HAVE_OS_H = @HAVE_OS_H@ +HAVE_PIPE = @HAVE_PIPE@ HAVE_PIPE2 = @HAVE_PIPE2@ HAVE_PREAD = @HAVE_PREAD@ HAVE_PTSNAME = @HAVE_PTSNAME@ @@ -561,11 +607,9 @@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ -HAVE_TTYNAME_R = @HAVE_TTYNAME_R@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ -HAVE_UNSETENV = @HAVE_UNSETENV@ HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_USLEEP = @HAVE_USLEEP@ HAVE_UTIMENSAT = @HAVE_UTIMENSAT@ @@ -573,11 +617,41 @@ HAVE_VASPRINTF = @HAVE_VASPRINTF@ HAVE_VDPRINTF = @HAVE_VDPRINTF@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ HAVE_WCHAR_T = @HAVE_WCHAR_T@ +HAVE_WCPCPY = @HAVE_WCPCPY@ +HAVE_WCPNCPY = @HAVE_WCPNCPY@ HAVE_WCRTOMB = @HAVE_WCRTOMB@ +HAVE_WCSCASECMP = @HAVE_WCSCASECMP@ +HAVE_WCSCAT = @HAVE_WCSCAT@ +HAVE_WCSCHR = @HAVE_WCSCHR@ +HAVE_WCSCMP = @HAVE_WCSCMP@ +HAVE_WCSCOLL = @HAVE_WCSCOLL@ +HAVE_WCSCPY = @HAVE_WCSCPY@ +HAVE_WCSCSPN = @HAVE_WCSCSPN@ +HAVE_WCSDUP = @HAVE_WCSDUP@ +HAVE_WCSLEN = @HAVE_WCSLEN@ +HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ +HAVE_WCSNCAT = @HAVE_WCSNCAT@ +HAVE_WCSNCMP = @HAVE_WCSNCMP@ +HAVE_WCSNCPY = @HAVE_WCSNCPY@ +HAVE_WCSNLEN = @HAVE_WCSNLEN@ HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@ +HAVE_WCSPBRK = @HAVE_WCSPBRK@ +HAVE_WCSRCHR = @HAVE_WCSRCHR@ HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@ +HAVE_WCSSPN = @HAVE_WCSSPN@ +HAVE_WCSSTR = @HAVE_WCSSTR@ +HAVE_WCSTOK = @HAVE_WCSTOK@ +HAVE_WCSWIDTH = @HAVE_WCSWIDTH@ +HAVE_WCSXFRM = @HAVE_WCSXFRM@ +HAVE_WCTRANS_T = @HAVE_WCTRANS_T@ HAVE_WCTYPE_H = @HAVE_WCTYPE_H@ +HAVE_WCTYPE_T = @HAVE_WCTYPE_T@ HAVE_WINT_T = @HAVE_WINT_T@ +HAVE_WMEMCHR = @HAVE_WMEMCHR@ +HAVE_WMEMCMP = @HAVE_WMEMCMP@ +HAVE_WMEMCPY = @HAVE_WMEMCPY@ +HAVE_WMEMMOVE = @HAVE_WMEMMOVE@ +HAVE_WMEMSET = @HAVE_WMEMSET@ HAVE__BOOL = @HAVE__BOOL@ HAVE__EXIT = @HAVE__EXIT@ INCLUDE_NEXT = @INCLUDE_NEXT@ @@ -702,8 +776,10 @@ REPLACE_FTELLO = @REPLACE_FTELLO@ REPLACE_FUTIMENS = @REPLACE_FUTIMENS@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETDELIM = @REPLACE_GETDELIM@ +REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETLINE = @REPLACE_GETLINE@ +REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ @@ -721,6 +797,7 @@ REPLACE_MBSINIT = @REPLACE_MBSINIT@ REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@ REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@ REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@ +REPLACE_MBTOWC = @REPLACE_MBTOWC@ REPLACE_MEMCHR = @REPLACE_MEMCHR@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ REPLACE_MKDIR = @REPLACE_MKDIR@ @@ -758,6 +835,7 @@ REPLACE_STPNCPY = @REPLACE_STPNCPY@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ +REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ REPLACE_STRNCAT = @REPLACE_STRNCAT@ REPLACE_STRNDUP = @REPLACE_STRNDUP@ REPLACE_STRNLEN = @REPLACE_STRNLEN@ @@ -783,7 +861,9 @@ REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ +REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ REPLACE_WCTOB = @REPLACE_WCTOB@ +REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ SET_MAKE = @SET_MAKE@ @@ -850,6 +930,7 @@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +lispdir = @lispdir@ localedir = $(datadir)/locale localstatedir = @localstatedir@ mandir = @mandir@ @@ -937,6 +1018,7 @@ TESTSUITE_AT = \ listed01.at\ listed02.at\ listed03.at\ + listed04.at\ long01.at\ longv7.at\ lustar01.at\ @@ -972,6 +1054,7 @@ TESTSUITE_AT = \ sparse01.at\ sparse02.at\ sparse03.at\ + sparse04.at\ sparsemv.at\ sparsemvp.at\ spmvp00.at\ @@ -984,6 +1067,7 @@ TESTSUITE_AT = \ volsize.at\ volume.at\ verbose.at\ + verify.at\ version.at\ xform-h.at\ xform01.at\ diff --git a/tests/backup01.at b/tests/backup01.at index 83d1bea0..cf0a9077 100644 --- a/tests/backup01.at +++ b/tests/backup01.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright (C) 2009 Free Software Foundation, Inc. +# Copyright (C) 2009-2010 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 @@ -34,6 +34,7 @@ AT_SETUP([extracting existing dir with --backup]) AT_KEYWORDS([extract backup backup01]) AT_TAR_CHECK([ +unset VERSION_CONTROL mkdir dir1 dir2 echo bla > dir1/file1 tar cf test.tar dir1 dir2 diff --git a/tests/listed04.at b/tests/listed04.at new file mode 100644 index 00000000..239998d2 --- /dev/null +++ b/tests/listed04.at @@ -0,0 +1,47 @@ +# Process this file with autom4te to create testsuite. -*- Autotest -*- + +# Test suite for GNU tar. +# Copyright (C) 2010 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 3, 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, see . + +# This checks for the bug reported by Martin Weigel +# . +# The test is derived from the ideas in Jean-Louis Martineau's followup email +# . + +AT_SETUP([--listed-incremental and --one-file-system]) +AT_KEYWORDS([listed incremental listed04]) + +AT_TAR_CHECK([ + +mkdir dir +echo a >dir/a +echo b >dir/b + +tar --one-file-system -cvf archive.tar -g archive.incr dir || exit +tar -tf archive.tar || exit +], +[0], +[dir/ +dir/a +dir/b +dir/ +dir/a +dir/b +], +[tar: dir: Directory is new +],[],[],[gnu]) + +AT_CLEANUP diff --git a/tests/package.m4 b/tests/package.m4 index b134bb2d..b708753b 100644 --- a/tests/package.m4 +++ b/tests/package.m4 @@ -1,6 +1,6 @@ # Signature of the current package. m4_define([AT_PACKAGE_NAME], [GNU tar]) m4_define([AT_PACKAGE_TARNAME], [tar]) -m4_define([AT_PACKAGE_VERSION], [1.25]) -m4_define([AT_PACKAGE_STRING], [GNU tar 1.25]) +m4_define([AT_PACKAGE_VERSION], [1.26]) +m4_define([AT_PACKAGE_STRING], [GNU tar 1.26]) m4_define([AT_PACKAGE_BUGREPORT], [bug-tar@gnu.org]) diff --git a/tests/remfiles01.at b/tests/remfiles01.at index 6212efbd..1fb0fadc 100644 --- a/tests/remfiles01.at +++ b/tests/remfiles01.at @@ -32,6 +32,7 @@ unset TAR_OPTIONS AT_CHECK([ AT_UNPRIVILEGED_PREREQ AT_GZIP_PREREQ +AT_SIGPIPE_PREREQ AT_SORT_PREREQ mkdir dir diff --git a/tests/sigpipe.at b/tests/sigpipe.at index 4a3282b4..dff94f6c 100644 --- a/tests/sigpipe.at +++ b/tests/sigpipe.at @@ -26,6 +26,8 @@ AT_KEYWORDS([sigpipe]) # <20100319184141.GC30047@wo.int.altlinux.org> AT_CHECK([ +AT_SIGPIPE_PREREQ + genfile --length 2048 --file first genfile --length 2048 --file second genfile --length 2049 --file third diff --git a/tests/sparse04.at b/tests/sparse04.at new file mode 100644 index 00000000..4d41be7c --- /dev/null +++ b/tests/sparse04.at @@ -0,0 +1,47 @@ +# Process this file with autom4te to create testsuite. -*- Autotest -*- +# +# Test suite for GNU tar. +# Copyright (C) 2010 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 3, 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. + +AT_SETUP([storing long sparse file names]) +AT_KEYWORDS([sparse sparse04]) + +# Description: Tar versions from 1.15.92 to 1.25 would incorrectly +# store sparse file names longer than 100 characters in pax mode. +# Namely, the `path' keyword of the produced PAX header would contain the +# crafted name of the header itself, instead of that of the file. +# Reported by: Kamil Dudka +# References: <201011250026.44908.kdudka@redhat.com>, +# http://lists.gnu.org/archive/html/bug-tar/2010-11/msg00099.html + +m4_define([NAME_111], + [123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960]) + +AT_TAR_CHECK([ +genfile --sparse --file NAME_111 --block-size 512 8M A || AT_SKIP_TEST +tar -c --sparse --posix NAME_111 | tar t +], +[0], +[NAME_111 +], +[], +[], +[], +[pax]) + +AT_CLEANUP diff --git a/tests/testsuite b/tests/testsuite index d6c96478..89cc84e7 100755 --- a/tests/testsuite +++ b/tests/testsuite @@ -621,7 +621,7 @@ at_change_dir=false # List of the tested programs. at_tested='tar' # List of the all the test groups. -at_groups_all=' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118' +at_groups_all=' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121' # As many question marks as there are digits in the last test group number. # Used to normalize the test group numbers so that `ls' lists them in # numerical order. @@ -683,68 +683,71 @@ at_help_all="1;version.at:19;tar version;; 54;listed01.at:26;--listed for individual files;listed incremental listed01; 55;listed02.at:28;working --listed;listed incremental listed02; 56;listed03.at:22;incremental dump when the parent directory is unreadable;listed incremental listed03; -57;incr03.at:28;renamed files in incrementals;incremental incr03 rename; -58;incr04.at:29;proper icontents initialization;incremental incr04 icontents; -59;incr05.at:19;incremental dumps with -C;incremental incr05; -60;incr06.at:19;incremental dumps of nested directories;incremental incr06; -61;filerem01.at:34;file removed as we read it (ca. 22 seconds);create incremental filechange filerem filerem01; -62;filerem02.at:24;toplevel file removed (ca. 24 seconds);create incremental filechange filerem filerem02; -63;rename01.at:24;renamed dirs in incrementals;incremental rename rename01; -64;rename02.at:24;move between hierarchies;incremental rename rename02; -65;rename03.at:23;cyclic renames;incremental rename rename03 cyclic-rename; -66;rename04.at:27;renamed directory containing subdirectories;incremental rename04 rename; -67;rename05.at:24;renamed subdirectories;incremental rename05 rename; -68;chtype.at:27;changed file types in incrementals;incremental chtype; -69;ignfail.at:23;ignfail;ignfail; -70;link01.at:33;link count gt 2;hardlinks link01; -71;link02.at:32;preserve hard links with --remove-files;hardlinks link02; -72;link03.at:24;working -l with --remove-files;hardlinks link03; -73;link04.at:29;link count is 1 but multiple occurrences;hardlinks link04; -74;longv7.at:24;long names in V7 archives;longname longv7; -75;long01.at:28;long file names divisible by block size;longname long512; -76;lustar01.at:21;ustar: unsplittable file name;longname ustar lustar01; -77;lustar02.at:21;ustar: unsplittable path name;longname ustar lustar02; -78;lustar03.at:21;ustar: splitting long names;longname ustar lustar03; -79;multiv01.at:23;multivolume dumps from pipes;multivolume multiv multiv01; -80;multiv02.at:28;skipping a straddling member;multivolume multiv multiv02; -81;multiv03.at:30;MV archive & long filenames;multivolume multiv multiv03; -82;multiv04.at:36;split directory members in a MV archive;multivolume multiv incremental multiv04; -83;multiv05.at:26;Restoring after an out of sync volume;multivolume multiv multiv05 sync; -84;multiv06.at:27;Multivolumes with L=record_size;multivolume multiv multiv06; -85;multiv07.at:26;volumes split at an extended header;multivolume multiv multiv07 xsplit; -86;multiv08.at:23;multivolume header creation;multivolume multiv multiv08; -87;old.at:23;old archives;old; -88;recurse.at:21;recurse;recurse; -89;same-order01.at:26;working -C with --same-order;same-order same-order01; -90;same-order02.at:25;multiple -C options;same-order same-order02; -91;shortrec.at:25;short records;shortrec; -92;sparse01.at:21;sparse files;sparse sparse01; -93;sparse02.at:21;extracting sparse file over a pipe;sparse sparse02; -94;sparse03.at:21;storing sparse files > 8G;sparse sparse03; -95;sparsemv.at:21;sparse files in MV archives;sparse multiv sparsemv; -96;spmvp00.at:21;sparse files in PAX MV archives, v.0.0;sparse multivolume multiv sparsemvp sparsemvp00; -97;spmvp01.at:21;sparse files in PAX MV archives, v.0.1;sparse multiv sparsemvp sparsemvp01; -98;spmvp10.at:21;sparse files in PAX MV archives, v.1.0;sparse multivolume multiv sparsemvp sparsemvp10; -99;update.at:28;update unchanged directories;update update00; -100;update01.at:29;update directories;update update01; -101;update02.at:26;update changed files;update update02; -102;volume.at:23;volume;volume volcheck; -103;volsize.at:29;volume header size;volume volsize; -104;comprec.at:21;compressed format recognition;comprec; -105;shortfile.at:26;short input files;shortfile shortfile0; -106;shortupd.at:29;updating short archives;shortfile shortfile1 shortupd; -107;truncate.at:29;truncate;truncate filechange; -108;grow.at:24;grow;grow filechange; -109;remfiles01.at:28;remove-files with compression;create remove-files remfiles01 gzip; -110;remfiles02.at:28;remove-files with compression: grand-child;create remove-files remfiles02 gzip; -111;remfiles03.at:28;remove-files with symbolic links;create remove-files remfiles03; -112;sigpipe.at:19;sigpipe handling;sigpipe; -113;gtarfail.at:21;gtarfail;star gtarfail; -114;gtarfail2.at:21;gtarfail2;star gtarfail2; -115;multi-fail.at:21;multi-fail;star multivolume multiv multi-fail; -116;ustar-big-2g.at:21;ustar-big-2g;star ustar-big-2g; -117;ustar-big-8g.at:21;ustar-big-8g;star ustar-big-8g; -118;pax-big-10g.at:21;pax-big-10g;star pax-big-10g; +57;listed04.at:24;--listed-incremental and --one-file-system;listed incremental listed04; +58;incr03.at:28;renamed files in incrementals;incremental incr03 rename; +59;incr04.at:29;proper icontents initialization;incremental incr04 icontents; +60;incr05.at:19;incremental dumps with -C;incremental incr05; +61;incr06.at:19;incremental dumps of nested directories;incremental incr06; +62;filerem01.at:34;file removed as we read it (ca. 22 seconds);create incremental filechange filerem filerem01; +63;filerem02.at:24;toplevel file removed (ca. 24 seconds);create incremental filechange filerem filerem02; +64;rename01.at:24;renamed dirs in incrementals;incremental rename rename01; +65;rename02.at:24;move between hierarchies;incremental rename rename02; +66;rename03.at:23;cyclic renames;incremental rename rename03 cyclic-rename; +67;rename04.at:27;renamed directory containing subdirectories;incremental rename04 rename; +68;rename05.at:24;renamed subdirectories;incremental rename05 rename; +69;chtype.at:27;changed file types in incrementals;incremental chtype; +70;ignfail.at:23;ignfail;ignfail; +71;link01.at:33;link count gt 2;hardlinks link01; +72;link02.at:32;preserve hard links with --remove-files;hardlinks link02; +73;link03.at:24;working -l with --remove-files;hardlinks link03; +74;link04.at:29;link count is 1 but multiple occurrences;hardlinks link04; +75;longv7.at:24;long names in V7 archives;longname longv7; +76;long01.at:28;long file names divisible by block size;longname long512; +77;lustar01.at:21;ustar: unsplittable file name;longname ustar lustar01; +78;lustar02.at:21;ustar: unsplittable path name;longname ustar lustar02; +79;lustar03.at:21;ustar: splitting long names;longname ustar lustar03; +80;multiv01.at:23;multivolume dumps from pipes;multivolume multiv multiv01; +81;multiv02.at:28;skipping a straddling member;multivolume multiv multiv02; +82;multiv03.at:30;MV archive & long filenames;multivolume multiv multiv03; +83;multiv04.at:36;split directory members in a MV archive;multivolume multiv incremental multiv04; +84;multiv05.at:26;Restoring after an out of sync volume;multivolume multiv multiv05 sync; +85;multiv06.at:27;Multivolumes with L=record_size;multivolume multiv multiv06; +86;multiv07.at:26;volumes split at an extended header;multivolume multiv multiv07 xsplit; +87;multiv08.at:23;multivolume header creation;multivolume multiv multiv08; +88;old.at:23;old archives;old; +89;recurse.at:21;recurse;recurse; +90;same-order01.at:26;working -C with --same-order;same-order same-order01; +91;same-order02.at:25;multiple -C options;same-order same-order02; +92;shortrec.at:25;short records;shortrec; +93;sparse01.at:21;sparse files;sparse sparse01; +94;sparse02.at:21;extracting sparse file over a pipe;sparse sparse02; +95;sparse03.at:21;storing sparse files > 8G;sparse sparse03; +96;sparse04.at:21;storing long sparse file names;sparse sparse04; +97;sparsemv.at:21;sparse files in MV archives;sparse multiv sparsemv; +98;spmvp00.at:21;sparse files in PAX MV archives, v.0.0;sparse multivolume multiv sparsemvp sparsemvp00; +99;spmvp01.at:21;sparse files in PAX MV archives, v.0.1;sparse multiv sparsemvp sparsemvp01; +100;spmvp10.at:21;sparse files in PAX MV archives, v.1.0;sparse multivolume multiv sparsemvp sparsemvp10; +101;update.at:28;update unchanged directories;update update00; +102;update01.at:29;update directories;update update01; +103;update02.at:26;update changed files;update update02; +104;verify.at:25;verify;verify; +105;volume.at:23;volume;volume volcheck; +106;volsize.at:29;volume header size;volume volsize; +107;comprec.at:21;compressed format recognition;comprec; +108;shortfile.at:26;short input files;shortfile shortfile0; +109;shortupd.at:29;updating short archives;shortfile shortfile1 shortupd; +110;truncate.at:29;truncate;truncate filechange; +111;grow.at:24;grow;grow filechange; +112;remfiles01.at:28;remove-files with compression;create remove-files remfiles01 gzip; +113;remfiles02.at:28;remove-files with compression: grand-child;create remove-files remfiles02 gzip; +114;remfiles03.at:28;remove-files with symbolic links;create remove-files remfiles03; +115;sigpipe.at:19;sigpipe handling;sigpipe; +116;gtarfail.at:21;gtarfail;star gtarfail; +117;gtarfail2.at:21;gtarfail2;star gtarfail2; +118;multi-fail.at:21;multi-fail;star multivolume multiv multi-fail; +119;ustar-big-2g.at:21;ustar-big-2g;star ustar-big-2g; +120;ustar-big-8g.at:21;ustar-big-8g;star ustar-big-8g; +121;pax-big-10g.at:21;pax-big-10g;star pax-big-10g; " # at_func_validate_ranges [NAME...] @@ -756,7 +759,7 @@ at_func_validate_ranges () for at_grp do eval at_value=\$$at_grp - if test $at_value -lt 1 || test $at_value -gt 118; then + if test $at_value -lt 1 || test $at_value -gt 121; then $as_echo "invalid test group: $at_value" >&2 exit 1 fi @@ -993,7 +996,7 @@ fi # List of tests. if $at_list_p; then cat <<_ATEOF || at_write_fail=1 -GNU tar 1.25 test suite test groups: +GNU tar 1.26 test suite test groups: NUM: FILE-NAME:LINE TEST-GROUP-NAME KEYWORDS @@ -1022,7 +1025,7 @@ _ATEOF exit $at_write_fail fi if $at_version_p; then - $as_echo "$as_me (GNU tar 1.25)" && + $as_echo "$as_me (GNU tar 1.26)" && cat <<\_ACEOF || at_write_fail=1 Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 @@ -1205,13 +1208,13 @@ exec 5>>"$at_suite_log" # Banners and logs. cat <<\_ASBOX ## ------------------------ ## -## GNU tar 1.25 test suite. ## +## GNU tar 1.26 test suite. ## ## ------------------------ ## _ASBOX { cat <<\_ASBOX ## ------------------------ ## -## GNU tar 1.25 test suite. ## +## GNU tar 1.26 test suite. ## ## ------------------------ ## _ASBOX echo @@ -1451,7 +1454,7 @@ IFS=$as_save_IFS if test -f "$as_dir/$at_program"; then { - $as_echo "$at_srcdir/testsuite.at:104: $as_dir/$at_program --version" + $as_echo "$at_srcdir/testsuite.at:112: $as_dir/$at_program --version" "$as_dir/$at_program" --version &5 2>&1 @@ -1943,7 +1946,7 @@ _ASBOX $as_echo "Please send \`${at_testdir+${at_testdir}/}$as_me.log' and all information you think might help: To: - Subject: [GNU tar 1.25] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly} + Subject: [GNU tar 1.26] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly} " if test $at_debug_p = false; then echo @@ -1985,7 +1988,7 @@ fi at_status=$? at_failed=false at_func_diff_devnull "$at_stderr" || at_failed=: -echo >>"$at_stdout"; $as_echo "tar (GNU tar) 1.25 +echo >>"$at_stdout"; $as_echo "tar (GNU tar) 1.26 " | \ $at_diff - "$at_stdout" || at_failed=: at_func_check_status 0 $at_status "$at_srcdir/version.at:21" @@ -18112,6 +18115,7 @@ TAR_OPTIONS=\"-H v7\" export TAR_OPTIONS rm -rf * +unset VERSION_CONTROL mkdir dir1 dir2 echo bla > dir1/file1 tar cf test.tar dir1 dir2 @@ -18130,6 +18134,7 @@ TAR_OPTIONS="-H v7" export TAR_OPTIONS rm -rf * +unset VERSION_CONTROL mkdir dir1 dir2 echo bla > dir1/file1 tar cf test.tar dir1 dir2 @@ -18146,6 +18151,7 @@ TAR_OPTIONS="-H v7" export TAR_OPTIONS rm -rf * +unset VERSION_CONTROL mkdir dir1 dir2 echo bla > dir1/file1 tar cf test.tar dir1 dir2 @@ -18176,6 +18182,7 @@ TAR_OPTIONS=\"-H oldgnu\" export TAR_OPTIONS rm -rf * +unset VERSION_CONTROL mkdir dir1 dir2 echo bla > dir1/file1 tar cf test.tar dir1 dir2 @@ -18194,6 +18201,7 @@ TAR_OPTIONS="-H oldgnu" export TAR_OPTIONS rm -rf * +unset VERSION_CONTROL mkdir dir1 dir2 echo bla > dir1/file1 tar cf test.tar dir1 dir2 @@ -18210,6 +18218,7 @@ TAR_OPTIONS="-H oldgnu" export TAR_OPTIONS rm -rf * +unset VERSION_CONTROL mkdir dir1 dir2 echo bla > dir1/file1 tar cf test.tar dir1 dir2 @@ -18240,6 +18249,7 @@ TAR_OPTIONS=\"-H ustar\" export TAR_OPTIONS rm -rf * +unset VERSION_CONTROL mkdir dir1 dir2 echo bla > dir1/file1 tar cf test.tar dir1 dir2 @@ -18258,6 +18268,7 @@ TAR_OPTIONS="-H ustar" export TAR_OPTIONS rm -rf * +unset VERSION_CONTROL mkdir dir1 dir2 echo bla > dir1/file1 tar cf test.tar dir1 dir2 @@ -18274,6 +18285,7 @@ TAR_OPTIONS="-H ustar" export TAR_OPTIONS rm -rf * +unset VERSION_CONTROL mkdir dir1 dir2 echo bla > dir1/file1 tar cf test.tar dir1 dir2 @@ -18304,6 +18316,7 @@ TAR_OPTIONS=\"-H posix\" export TAR_OPTIONS rm -rf * +unset VERSION_CONTROL mkdir dir1 dir2 echo bla > dir1/file1 tar cf test.tar dir1 dir2 @@ -18322,6 +18335,7 @@ TAR_OPTIONS="-H posix" export TAR_OPTIONS rm -rf * +unset VERSION_CONTROL mkdir dir1 dir2 echo bla > dir1/file1 tar cf test.tar dir1 dir2 @@ -18338,6 +18352,7 @@ TAR_OPTIONS="-H posix" export TAR_OPTIONS rm -rf * +unset VERSION_CONTROL mkdir dir1 dir2 echo bla > dir1/file1 tar cf test.tar dir1 dir2 @@ -18368,6 +18383,7 @@ TAR_OPTIONS=\"-H gnu\" export TAR_OPTIONS rm -rf * +unset VERSION_CONTROL mkdir dir1 dir2 echo bla > dir1/file1 tar cf test.tar dir1 dir2 @@ -18386,6 +18402,7 @@ TAR_OPTIONS="-H gnu" export TAR_OPTIONS rm -rf * +unset VERSION_CONTROL mkdir dir1 dir2 echo bla > dir1/file1 tar cf test.tar dir1 dir2 @@ -18402,6 +18419,7 @@ TAR_OPTIONS="-H gnu" export TAR_OPTIONS rm -rf * +unset VERSION_CONTROL mkdir dir1 dir2 echo bla > dir1/file1 tar cf test.tar dir1 dir2 @@ -20686,15 +20704,116 @@ $at_traceon; } at_status=`cat "$at_status_file"` #AT_STOP_56 #AT_START_57 -# 57. incr03.at:28: renamed files in incrementals +# 57. listed04.at:24: --listed-incremental and --one-file-system +at_setup_line='listed04.at:24' +at_desc="--listed-incremental and --one-file-system" +$at_quiet $as_echo_n " 57: $at_desc " +at_xfail=no + test -f $XFAILFILE && at_xfail=yes +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "57. listed04.at:24: testing ..." + $at_traceon + + + + + + { $at_traceoff +$as_echo "$at_srcdir/listed04.at:27: +mkdir gnu +(cd gnu +TEST_TAR_FORMAT=gnu +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H gnu\" +export TAR_OPTIONS +rm -rf * + + +mkdir dir +echo a >dir/a +echo b >dir/b + +tar --one-file-system -cvf archive.tar -g archive.incr dir || exit +tar -tf archive.tar || exit +)" +echo listed04.at:27 >"$at_check_line_file" + +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; +mkdir gnu +(cd gnu +TEST_TAR_FORMAT=gnu +export TEST_TAR_FORMAT +TAR_OPTIONS="-H gnu" +export TAR_OPTIONS +rm -rf * + + +mkdir dir +echo a >dir/a +echo b >dir/b + +tar --one-file-system -cvf archive.tar -g archive.incr dir || exit +tar -tf archive.tar || exit +) ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; +mkdir gnu +(cd gnu +TEST_TAR_FORMAT=gnu +export TEST_TAR_FORMAT +TAR_OPTIONS="-H gnu" +export TAR_OPTIONS +rm -rf * + + +mkdir dir +echo a >dir/a +echo b >dir/b + +tar --one-file-system -cvf archive.tar -g archive.incr dir || exit +tar -tf archive.tar || exit +) ) >"$at_stdout" 2>"$at_stderr" +fi +at_status=$? +at_failed=false +echo >>"$at_stderr"; $as_echo "tar: dir: Directory is new +" | \ + $at_diff - "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo "dir/ +dir/a +dir/b +dir/ +dir/a +dir/b +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/listed04.at:27" + +$at_failed && at_func_log_failure +$at_traceon; } + + + + + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_57 +#AT_START_58 +# 58. incr03.at:28: renamed files in incrementals at_setup_line='incr03.at:28' at_desc="renamed files in incrementals" -$at_quiet $as_echo_n " 57: $at_desc " +$at_quiet $as_echo_n " 58: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "57. incr03.at:28: testing ..." + $as_echo "58. incr03.at:28: testing ..." $at_traceon @@ -21158,17 +21277,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_57 -#AT_START_58 -# 58. incr04.at:29: proper icontents initialization +#AT_STOP_58 +#AT_START_59 +# 59. incr04.at:29: proper icontents initialization at_setup_line='incr04.at:29' at_desc="proper icontents initialization" -$at_quiet $as_echo_n " 58: $at_desc " +$at_quiet $as_echo_n " 59: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "58. incr04.at:29: testing ..." + $as_echo "59. incr04.at:29: testing ..." $at_traceon @@ -21910,17 +22029,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_58 -#AT_START_59 -# 59. incr05.at:19: incremental dumps with -C +#AT_STOP_59 +#AT_START_60 +# 60. incr05.at:19: incremental dumps with -C at_setup_line='incr05.at:19' at_desc="incremental dumps with -C" -$at_quiet $as_echo_n " 59: $at_desc " +$at_quiet $as_echo_n " 60: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "59. incr05.at:19: testing ..." + $as_echo "60. incr05.at:19: testing ..." $at_traceon @@ -22204,17 +22323,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_59 -#AT_START_60 -# 60. incr06.at:19: incremental dumps of nested directories +#AT_STOP_60 +#AT_START_61 +# 61. incr06.at:19: incremental dumps of nested directories at_setup_line='incr06.at:19' at_desc="incremental dumps of nested directories" -$at_quiet $as_echo_n " 60: $at_desc " +$at_quiet $as_echo_n " 61: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "60. incr06.at:19: testing ..." + $as_echo "61. incr06.at:19: testing ..." $at_traceon @@ -22642,17 +22761,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_60 -#AT_START_61 -# 61. filerem01.at:34: file removed as we read it (ca. 22 seconds) +#AT_STOP_61 +#AT_START_62 +# 62. filerem01.at:34: file removed as we read it (ca. 22 seconds) at_setup_line='filerem01.at:34' at_desc="file removed as we read it (ca. 22 seconds)" -$at_quiet $as_echo_n " 61: $at_desc " +$at_quiet $as_echo_n " 62: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "61. filerem01.at:34: testing ..." + $as_echo "62. filerem01.at:34: testing ..." $at_traceon @@ -22867,17 +22986,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_61 -#AT_START_62 -# 62. filerem02.at:24: toplevel file removed (ca. 24 seconds) +#AT_STOP_62 +#AT_START_63 +# 63. filerem02.at:24: toplevel file removed (ca. 24 seconds) at_setup_line='filerem02.at:24' at_desc="toplevel file removed (ca. 24 seconds)" -$at_quiet $as_echo_n " 62: $at_desc " +$at_quiet $as_echo_n " 63: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "62. filerem02.at:24: testing ..." + $as_echo "63. filerem02.at:24: testing ..." $at_traceon @@ -23056,17 +23175,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_62 -#AT_START_63 -# 63. rename01.at:24: renamed dirs in incrementals +#AT_STOP_63 +#AT_START_64 +# 64. rename01.at:24: renamed dirs in incrementals at_setup_line='rename01.at:24' at_desc="renamed dirs in incrementals" -$at_quiet $as_echo_n " 63: $at_desc " +$at_quiet $as_echo_n " 64: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "63. rename01.at:24: testing ..." + $as_echo "64. rename01.at:24: testing ..." $at_traceon @@ -23575,17 +23694,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_63 -#AT_START_64 -# 64. rename02.at:24: move between hierarchies +#AT_STOP_64 +#AT_START_65 +# 65. rename02.at:24: move between hierarchies at_setup_line='rename02.at:24' at_desc="move between hierarchies" -$at_quiet $as_echo_n " 64: $at_desc " +$at_quiet $as_echo_n " 65: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "64. rename02.at:24: testing ..." + $as_echo "65. rename02.at:24: testing ..." $at_traceon @@ -24163,17 +24282,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_64 -#AT_START_65 -# 65. rename03.at:23: cyclic renames +#AT_STOP_65 +#AT_START_66 +# 66. rename03.at:23: cyclic renames at_setup_line='rename03.at:23' at_desc="cyclic renames" -$at_quiet $as_echo_n " 65: $at_desc " +$at_quiet $as_echo_n " 66: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "65. rename03.at:23: testing ..." + $as_echo "66. rename03.at:23: testing ..." $at_traceon @@ -24898,17 +25017,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_65 -#AT_START_66 -# 66. rename04.at:27: renamed directory containing subdirectories +#AT_STOP_66 +#AT_START_67 +# 67. rename04.at:27: renamed directory containing subdirectories at_setup_line='rename04.at:27' at_desc="renamed directory containing subdirectories" -$at_quiet $as_echo_n " 66: $at_desc " +$at_quiet $as_echo_n " 67: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "66. rename04.at:27: testing ..." + $as_echo "67. rename04.at:27: testing ..." $at_traceon @@ -25372,17 +25491,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_66 -#AT_START_67 -# 67. rename05.at:24: renamed subdirectories +#AT_STOP_67 +#AT_START_68 +# 68. rename05.at:24: renamed subdirectories at_setup_line='rename05.at:24' at_desc="renamed subdirectories" -$at_quiet $as_echo_n " 67: $at_desc " +$at_quiet $as_echo_n " 68: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "67. rename05.at:24: testing ..." + $as_echo "68. rename05.at:24: testing ..." $at_traceon @@ -25855,17 +25974,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_67 -#AT_START_68 -# 68. chtype.at:27: changed file types in incrementals +#AT_STOP_68 +#AT_START_69 +# 69. chtype.at:27: changed file types in incrementals at_setup_line='chtype.at:27' at_desc="changed file types in incrementals" -$at_quiet $as_echo_n " 68: $at_desc " +$at_quiet $as_echo_n " 69: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "68. chtype.at:27: testing ..." + $as_echo "69. chtype.at:27: testing ..." $at_traceon @@ -26320,17 +26439,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_68 -#AT_START_69 -# 69. ignfail.at:23: ignfail +#AT_STOP_69 +#AT_START_70 +# 70. ignfail.at:23: ignfail at_setup_line='ignfail.at:23' at_desc="ignfail" -$at_quiet $as_echo_n " 69: $at_desc " +$at_quiet $as_echo_n " 70: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "69. ignfail.at:23: testing ..." + $as_echo "70. ignfail.at:23: testing ..." $at_traceon @@ -27249,17 +27368,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_69 -#AT_START_70 -# 70. link01.at:33: link count gt 2 +#AT_STOP_70 +#AT_START_71 +# 71. link01.at:33: link count gt 2 at_setup_line='link01.at:33' at_desc="link count gt 2" -$at_quiet $as_echo_n " 70: $at_desc " +$at_quiet $as_echo_n " 71: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "70. link01.at:33: testing ..." + $as_echo "71. link01.at:33: testing ..." $at_traceon @@ -27713,17 +27832,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_70 -#AT_START_71 -# 71. link02.at:32: preserve hard links with --remove-files +#AT_STOP_71 +#AT_START_72 +# 72. link02.at:32: preserve hard links with --remove-files at_setup_line='link02.at:32' at_desc="preserve hard links with --remove-files" -$at_quiet $as_echo_n " 71: $at_desc " +$at_quiet $as_echo_n " 72: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "71. link02.at:32: testing ..." + $as_echo "72. link02.at:32: testing ..." $at_traceon @@ -28082,17 +28201,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_71 -#AT_START_72 -# 72. link03.at:24: working -l with --remove-files +#AT_STOP_72 +#AT_START_73 +# 73. link03.at:24: working -l with --remove-files at_setup_line='link03.at:24' at_desc="working -l with --remove-files" -$at_quiet $as_echo_n " 72: $at_desc " +$at_quiet $as_echo_n " 73: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "72. link03.at:24: testing ..." + $as_echo "73. link03.at:24: testing ..." $at_traceon @@ -28653,17 +28772,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_72 -#AT_START_73 -# 73. link04.at:29: link count is 1 but multiple occurrences +#AT_STOP_73 +#AT_START_74 +# 74. link04.at:29: link count is 1 but multiple occurrences at_setup_line='link04.at:29' at_desc="link count is 1 but multiple occurrences" -$at_quiet $as_echo_n " 73: $at_desc " +$at_quiet $as_echo_n " 74: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "73. link04.at:29: testing ..." + $as_echo "74. link04.at:29: testing ..." $at_traceon @@ -29222,17 +29341,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_73 -#AT_START_74 -# 74. longv7.at:24: long names in V7 archives +#AT_STOP_74 +#AT_START_75 +# 75. longv7.at:24: long names in V7 archives at_setup_line='longv7.at:24' at_desc="long names in V7 archives" -$at_quiet $as_echo_n " 74: $at_desc " +$at_quiet $as_echo_n " 75: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "74. longv7.at:24: testing ..." + $as_echo "75. longv7.at:24: testing ..." $at_traceon @@ -29320,17 +29439,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_74 -#AT_START_75 -# 75. long01.at:28: long file names divisible by block size +#AT_STOP_75 +#AT_START_76 +# 76. long01.at:28: long file names divisible by block size at_setup_line='long01.at:28' at_desc="long file names divisible by block size" -$at_quiet $as_echo_n " 75: $at_desc " +$at_quiet $as_echo_n " 76: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "75. long01.at:28: testing ..." + $as_echo "76. long01.at:28: testing ..." $at_traceon @@ -29478,17 +29597,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_75 -#AT_START_76 -# 76. lustar01.at:21: ustar: unsplittable file name +#AT_STOP_76 +#AT_START_77 +# 77. lustar01.at:21: ustar: unsplittable file name at_setup_line='lustar01.at:21' at_desc="ustar: unsplittable file name" -$at_quiet $as_echo_n " 76: $at_desc " +$at_quiet $as_echo_n " 77: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "76. lustar01.at:21: testing ..." + $as_echo "77. lustar01.at:21: testing ..." $at_traceon @@ -29560,17 +29679,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_76 -#AT_START_77 -# 77. lustar02.at:21: ustar: unsplittable path name +#AT_STOP_77 +#AT_START_78 +# 78. lustar02.at:21: ustar: unsplittable path name at_setup_line='lustar02.at:21' at_desc="ustar: unsplittable path name" -$at_quiet $as_echo_n " 77: $at_desc " +$at_quiet $as_echo_n " 78: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "77. lustar02.at:21: testing ..." + $as_echo "78. lustar02.at:21: testing ..." $at_traceon @@ -29649,17 +29768,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_77 -#AT_START_78 -# 78. lustar03.at:21: ustar: splitting long names +#AT_STOP_78 +#AT_START_79 +# 79. lustar03.at:21: ustar: splitting long names at_setup_line='lustar03.at:21' at_desc="ustar: splitting long names" -$at_quiet $as_echo_n " 78: $at_desc " +$at_quiet $as_echo_n " 79: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "78. lustar03.at:21: testing ..." + $as_echo "79. lustar03.at:21: testing ..." $at_traceon @@ -29744,17 +29863,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_78 -#AT_START_79 -# 79. multiv01.at:23: multivolume dumps from pipes +#AT_STOP_79 +#AT_START_80 +# 80. multiv01.at:23: multivolume dumps from pipes at_setup_line='multiv01.at:23' at_desc="multivolume dumps from pipes" -$at_quiet $as_echo_n " 79: $at_desc " +$at_quiet $as_echo_n " 80: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "79. multiv01.at:23: testing ..." + $as_echo "80. multiv01.at:23: testing ..." $at_traceon @@ -30165,17 +30284,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_79 -#AT_START_80 -# 80. multiv02.at:28: skipping a straddling member +#AT_STOP_80 +#AT_START_81 +# 81. multiv02.at:28: skipping a straddling member at_setup_line='multiv02.at:28' at_desc="skipping a straddling member" -$at_quiet $as_echo_n " 80: $at_desc " +$at_quiet $as_echo_n " 81: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "80. multiv02.at:28: testing ..." + $as_echo "81. multiv02.at:28: testing ..." $at_traceon @@ -30429,17 +30548,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_80 -#AT_START_81 -# 81. multiv03.at:30: MV archive & long filenames +#AT_STOP_81 +#AT_START_82 +# 82. multiv03.at:30: MV archive & long filenames at_setup_line='multiv03.at:30' at_desc="MV archive & long filenames" -$at_quiet $as_echo_n " 81: $at_desc " +$at_quiet $as_echo_n " 82: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "81. multiv03.at:30: testing ..." + $as_echo "82. multiv03.at:30: testing ..." $at_traceon @@ -30727,17 +30846,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_81 -#AT_START_82 -# 82. multiv04.at:36: split directory members in a MV archive +#AT_STOP_82 +#AT_START_83 +# 83. multiv04.at:36: split directory members in a MV archive at_setup_line='multiv04.at:36' at_desc="split directory members in a MV archive" -$at_quiet $as_echo_n " 82: $at_desc " +$at_quiet $as_echo_n " 83: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "82. multiv04.at:36: testing ..." + $as_echo "83. multiv04.at:36: testing ..." $at_traceon @@ -30951,17 +31070,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_82 -#AT_START_83 -# 83. multiv05.at:26: Restoring after an out of sync volume +#AT_STOP_83 +#AT_START_84 +# 84. multiv05.at:26: Restoring after an out of sync volume at_setup_line='multiv05.at:26' at_desc="Restoring after an out of sync volume" -$at_quiet $as_echo_n " 83: $at_desc " +$at_quiet $as_echo_n " 84: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "83. multiv05.at:26: testing ..." + $as_echo "84. multiv05.at:26: testing ..." $at_traceon @@ -31124,17 +31243,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_83 -#AT_START_84 -# 84. multiv06.at:27: Multivolumes with L=record_size +#AT_STOP_84 +#AT_START_85 +# 85. multiv06.at:27: Multivolumes with L=record_size at_setup_line='multiv06.at:27' at_desc="Multivolumes with L=record_size" -$at_quiet $as_echo_n " 84: $at_desc " +$at_quiet $as_echo_n " 85: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "84. multiv06.at:27: testing ..." + $as_echo "85. multiv06.at:27: testing ..." $at_traceon @@ -31296,19 +31415,19 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_84 -#AT_START_85 -# 85. multiv07.at:26: volumes split at an extended header +#AT_STOP_85 +#AT_START_86 +# 86. multiv07.at:26: volumes split at an extended header at_setup_line='multiv07.at:26' at_desc="volumes split at an extended header" -$at_quiet $as_echo_n " 85: $at_desc " +$at_quiet $as_echo_n " 86: $at_desc " at_xfail=no test -f \$XFAILFILE && at_xfail=yes test -f $XFAILFILE && at_xfail=yes test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "85. multiv07.at:26: testing ..." + $as_echo "86. multiv07.at:26: testing ..." $at_traceon @@ -31381,17 +31500,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_85 -#AT_START_86 -# 86. multiv08.at:23: multivolume header creation +#AT_STOP_86 +#AT_START_87 +# 87. multiv08.at:23: multivolume header creation at_setup_line='multiv08.at:23' at_desc="multivolume header creation" -$at_quiet $as_echo_n " 86: $at_desc " +$at_quiet $as_echo_n " 87: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "86. multiv08.at:23: testing ..." + $as_echo "87. multiv08.at:23: testing ..." $at_traceon @@ -31479,16 +31598,16 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_86 -#AT_START_87 -# 87. old.at:23: old archives +#AT_STOP_87 +#AT_START_88 +# 88. old.at:23: old archives at_setup_line='old.at:23' at_desc="old archives" -$at_quiet $as_echo_n " 87: $at_desc " +$at_quiet $as_echo_n " 88: $at_desc " at_xfail=no echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "87. old.at:23: testing ..." + $as_echo "88. old.at:23: testing ..." $at_traceon @@ -31534,17 +31653,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_87 -#AT_START_88 -# 88. recurse.at:21: recurse +#AT_STOP_88 +#AT_START_89 +# 89. recurse.at:21: recurse at_setup_line='recurse.at:21' at_desc="recurse" -$at_quiet $as_echo_n " 88: $at_desc " +$at_quiet $as_echo_n " 89: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "88. recurse.at:21: testing ..." + $as_echo "89. recurse.at:21: testing ..." $at_traceon @@ -31863,17 +31982,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_88 -#AT_START_89 -# 89. same-order01.at:26: working -C with --same-order +#AT_STOP_89 +#AT_START_90 +# 90. same-order01.at:26: working -C with --same-order at_setup_line='same-order01.at:26' at_desc="working -C with --same-order" -$at_quiet $as_echo_n " 89: $at_desc " +$at_quiet $as_echo_n " 90: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "89. same-order01.at:26: testing ..." + $as_echo "90. same-order01.at:26: testing ..." $at_traceon @@ -32317,17 +32436,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_89 -#AT_START_90 -# 90. same-order02.at:25: multiple -C options +#AT_STOP_90 +#AT_START_91 +# 91. same-order02.at:25: multiple -C options at_setup_line='same-order02.at:25' at_desc="multiple -C options" -$at_quiet $as_echo_n " 90: $at_desc " +$at_quiet $as_echo_n " 91: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "90. same-order02.at:25: testing ..." + $as_echo "91. same-order02.at:25: testing ..." $at_traceon @@ -32821,17 +32940,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_90 -#AT_START_91 -# 91. shortrec.at:25: short records +#AT_STOP_91 +#AT_START_92 +# 92. shortrec.at:25: short records at_setup_line='shortrec.at:25' at_desc="short records" -$at_quiet $as_echo_n " 91: $at_desc " +$at_quiet $as_echo_n " 92: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "91. shortrec.at:25: testing ..." + $as_echo "92. shortrec.at:25: testing ..." $at_traceon @@ -33200,17 +33319,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_91 -#AT_START_92 -# 92. sparse01.at:21: sparse files +#AT_STOP_92 +#AT_START_93 +# 93. sparse01.at:21: sparse files at_setup_line='sparse01.at:21' at_desc="sparse files" -$at_quiet $as_echo_n " 92: $at_desc " +$at_quiet $as_echo_n " 93: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "92. sparse01.at:21: testing ..." + $as_echo "93. sparse01.at:21: testing ..." $at_traceon @@ -33491,17 +33610,17 @@ done $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_92 -#AT_START_93 -# 93. sparse02.at:21: extracting sparse file over a pipe +#AT_STOP_93 +#AT_START_94 +# 94. sparse02.at:21: extracting sparse file over a pipe at_setup_line='sparse02.at:21' at_desc="extracting sparse file over a pipe" -$at_quiet $as_echo_n " 93: $at_desc " +$at_quiet $as_echo_n " 94: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "93. sparse02.at:21: testing ..." + $as_echo "94. sparse02.at:21: testing ..." $at_traceon @@ -33720,17 +33839,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_93 -#AT_START_94 -# 94. sparse03.at:21: storing sparse files > 8G +#AT_STOP_94 +#AT_START_95 +# 95. sparse03.at:21: storing sparse files > 8G at_setup_line='sparse03.at:21' at_desc="storing sparse files > 8G" -$at_quiet $as_echo_n " 94: $at_desc " +$at_quiet $as_echo_n " 95: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "94. sparse03.at:21: testing ..." + $as_echo "95. sparse03.at:21: testing ..." $at_traceon @@ -33850,17 +33969,106 @@ done $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_94 -#AT_START_95 -# 95. sparsemv.at:21: sparse files in MV archives +#AT_STOP_95 +#AT_START_96 +# 96. sparse04.at:21: storing long sparse file names +at_setup_line='sparse04.at:21' +at_desc="storing long sparse file names" +$at_quiet $as_echo_n " 96: $at_desc " +at_xfail=no + test -f $XFAILFILE && at_xfail=yes +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "96. sparse04.at:21: testing ..." + $at_traceon + + + +# Description: Tar versions from 1.15.92 to 1.25 would incorrectly +# store sparse file names longer than 100 characters in pax mode. +# Namely, the `path' keyword of the produced PAX header would contain the +# crafted name of the header itself, instead of that of the file. +# Reported by: Kamil Dudka +# References: <201011250026.44908.kdudka@redhat.com>, +# http://lists.gnu.org/archive/html/bug-tar/2010-11/msg00099.html + + + + + + { $at_traceoff +$as_echo "$at_srcdir/sparse04.at:35: +mkdir pax +(cd pax +TEST_TAR_FORMAT=pax +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H pax\" +export TAR_OPTIONS +rm -rf * + +genfile --sparse --file 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960 --block-size 512 8M A || exit 77 +tar -c --sparse --posix 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960 | tar t +)" +echo sparse04.at:35 >"$at_check_line_file" + +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; +mkdir pax +(cd pax +TEST_TAR_FORMAT=pax +export TEST_TAR_FORMAT +TAR_OPTIONS="-H pax" +export TAR_OPTIONS +rm -rf * + +genfile --sparse --file 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960 --block-size 512 8M A || exit 77 +tar -c --sparse --posix 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960 | tar t +) ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; +mkdir pax +(cd pax +TEST_TAR_FORMAT=pax +export TEST_TAR_FORMAT +TAR_OPTIONS="-H pax" +export TAR_OPTIONS +rm -rf * + +genfile --sparse --file 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960 --block-size 512 8M A || exit 77 +tar -c --sparse --posix 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960 | tar t +) ) >"$at_stdout" 2>"$at_stderr" +fi +at_status=$? +at_failed=false +at_func_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo "123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960 +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/sparse04.at:35" + +$at_failed && at_func_log_failure +$at_traceon; } + + + + + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_96 +#AT_START_97 +# 97. sparsemv.at:21: sparse files in MV archives at_setup_line='sparsemv.at:21' at_desc="sparse files in MV archives" -$at_quiet $as_echo_n " 95: $at_desc " +$at_quiet $as_echo_n " 97: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "95. sparsemv.at:21: testing ..." + $as_echo "97. sparsemv.at:21: testing ..." $at_traceon @@ -34105,17 +34313,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_95 -#AT_START_96 -# 96. spmvp00.at:21: sparse files in PAX MV archives, v.0.0 +#AT_STOP_97 +#AT_START_98 +# 98. spmvp00.at:21: sparse files in PAX MV archives, v.0.0 at_setup_line='spmvp00.at:21' at_desc="sparse files in PAX MV archives, v.0.0" -$at_quiet $as_echo_n " 96: $at_desc " +$at_quiet $as_echo_n " 98: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "96. spmvp00.at:21: testing ..." + $as_echo "98. spmvp00.at:21: testing ..." $at_traceon @@ -34242,17 +34450,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_96 -#AT_START_97 -# 97. spmvp01.at:21: sparse files in PAX MV archives, v.0.1 +#AT_STOP_98 +#AT_START_99 +# 99. spmvp01.at:21: sparse files in PAX MV archives, v.0.1 at_setup_line='spmvp01.at:21' at_desc="sparse files in PAX MV archives, v.0.1" -$at_quiet $as_echo_n " 97: $at_desc " +$at_quiet $as_echo_n " 99: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "97. spmvp01.at:21: testing ..." + $as_echo "99. spmvp01.at:21: testing ..." $at_traceon @@ -34379,17 +34587,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_97 -#AT_START_98 -# 98. spmvp10.at:21: sparse files in PAX MV archives, v.1.0 +#AT_STOP_99 +#AT_START_100 +# 100. spmvp10.at:21: sparse files in PAX MV archives, v.1.0 at_setup_line='spmvp10.at:21' at_desc="sparse files in PAX MV archives, v.1.0" -$at_quiet $as_echo_n " 98: $at_desc " +$at_quiet $as_echo_n "100: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "98. spmvp10.at:21: testing ..." + $as_echo "100. spmvp10.at:21: testing ..." $at_traceon @@ -34516,17 +34724,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_98 -#AT_START_99 -# 99. update.at:28: update unchanged directories +#AT_STOP_100 +#AT_START_101 +# 101. update.at:28: update unchanged directories at_setup_line='update.at:28' at_desc="update unchanged directories" -$at_quiet $as_echo_n " 99: $at_desc " +$at_quiet $as_echo_n "101: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "99. update.at:28: testing ..." + $as_echo "101. update.at:28: testing ..." $at_traceon @@ -34985,17 +35193,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_99 -#AT_START_100 -# 100. update01.at:29: update directories +#AT_STOP_101 +#AT_START_102 +# 102. update01.at:29: update directories at_setup_line='update01.at:29' at_desc="update directories" -$at_quiet $as_echo_n "100: $at_desc " +$at_quiet $as_echo_n "102: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "100. update01.at:29: testing ..." + $as_echo "102. update01.at:29: testing ..." $at_traceon @@ -35519,17 +35727,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_100 -#AT_START_101 -# 101. update02.at:26: update changed files +#AT_STOP_102 +#AT_START_103 +# 103. update02.at:26: update changed files at_setup_line='update02.at:26' at_desc="update changed files" -$at_quiet $as_echo_n "101: $at_desc " +$at_quiet $as_echo_n "103: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "101. update02.at:26: testing ..." + $as_echo "103. update02.at:26: testing ..." $at_traceon @@ -36053,17 +36261,321 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_101 -#AT_START_102 -# 102. volume.at:23: volume +#AT_STOP_103 +#AT_START_104 +# 104. verify.at:25: verify +at_setup_line='verify.at:25' +at_desc="verify" +$at_quiet $as_echo_n "104: $at_desc " +at_xfail=no + test -f $XFAILFILE && at_xfail=yes +echo "# -*- compilation -*-" >> "$at_group_log" +( + $as_echo "104. verify.at:25: testing ..." + $at_traceon + + + + + + { $at_traceoff +$as_echo "$at_srcdir/verify.at:28: +mkdir v7 +(cd v7 +TEST_TAR_FORMAT=v7 +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H v7\" +export TAR_OPTIONS +rm -rf * + +touch foo +tar -cvf archive.tar --verify foo +)" +echo verify.at:28 >"$at_check_line_file" + +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; +mkdir v7 +(cd v7 +TEST_TAR_FORMAT=v7 +export TEST_TAR_FORMAT +TAR_OPTIONS="-H v7" +export TAR_OPTIONS +rm -rf * + +touch foo +tar -cvf archive.tar --verify foo +) ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; +mkdir v7 +(cd v7 +TEST_TAR_FORMAT=v7 +export TEST_TAR_FORMAT +TAR_OPTIONS="-H v7" +export TAR_OPTIONS +rm -rf * + +touch foo +tar -cvf archive.tar --verify foo +) ) >"$at_stdout" 2>"$at_stderr" +fi +at_status=$? +at_failed=false +at_func_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo "foo +Verify foo +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/verify.at:28" + +$at_failed && at_func_log_failure +$at_traceon; } + + { $at_traceoff +$as_echo "$at_srcdir/verify.at:28: +mkdir oldgnu +(cd oldgnu +TEST_TAR_FORMAT=oldgnu +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H oldgnu\" +export TAR_OPTIONS +rm -rf * + +touch foo +tar -cvf archive.tar --verify foo +)" +echo verify.at:28 >"$at_check_line_file" + +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; +mkdir oldgnu +(cd oldgnu +TEST_TAR_FORMAT=oldgnu +export TEST_TAR_FORMAT +TAR_OPTIONS="-H oldgnu" +export TAR_OPTIONS +rm -rf * + +touch foo +tar -cvf archive.tar --verify foo +) ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; +mkdir oldgnu +(cd oldgnu +TEST_TAR_FORMAT=oldgnu +export TEST_TAR_FORMAT +TAR_OPTIONS="-H oldgnu" +export TAR_OPTIONS +rm -rf * + +touch foo +tar -cvf archive.tar --verify foo +) ) >"$at_stdout" 2>"$at_stderr" +fi +at_status=$? +at_failed=false +at_func_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo "foo +Verify foo +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/verify.at:28" + +$at_failed && at_func_log_failure +$at_traceon; } + + { $at_traceoff +$as_echo "$at_srcdir/verify.at:28: +mkdir ustar +(cd ustar +TEST_TAR_FORMAT=ustar +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H ustar\" +export TAR_OPTIONS +rm -rf * + +touch foo +tar -cvf archive.tar --verify foo +)" +echo verify.at:28 >"$at_check_line_file" + +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; +mkdir ustar +(cd ustar +TEST_TAR_FORMAT=ustar +export TEST_TAR_FORMAT +TAR_OPTIONS="-H ustar" +export TAR_OPTIONS +rm -rf * + +touch foo +tar -cvf archive.tar --verify foo +) ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; +mkdir ustar +(cd ustar +TEST_TAR_FORMAT=ustar +export TEST_TAR_FORMAT +TAR_OPTIONS="-H ustar" +export TAR_OPTIONS +rm -rf * + +touch foo +tar -cvf archive.tar --verify foo +) ) >"$at_stdout" 2>"$at_stderr" +fi +at_status=$? +at_failed=false +at_func_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo "foo +Verify foo +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/verify.at:28" + +$at_failed && at_func_log_failure +$at_traceon; } + + { $at_traceoff +$as_echo "$at_srcdir/verify.at:28: +mkdir posix +(cd posix +TEST_TAR_FORMAT=posix +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H posix\" +export TAR_OPTIONS +rm -rf * + +touch foo +tar -cvf archive.tar --verify foo +)" +echo verify.at:28 >"$at_check_line_file" + +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; +mkdir posix +(cd posix +TEST_TAR_FORMAT=posix +export TEST_TAR_FORMAT +TAR_OPTIONS="-H posix" +export TAR_OPTIONS +rm -rf * + +touch foo +tar -cvf archive.tar --verify foo +) ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; +mkdir posix +(cd posix +TEST_TAR_FORMAT=posix +export TEST_TAR_FORMAT +TAR_OPTIONS="-H posix" +export TAR_OPTIONS +rm -rf * + +touch foo +tar -cvf archive.tar --verify foo +) ) >"$at_stdout" 2>"$at_stderr" +fi +at_status=$? +at_failed=false +at_func_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo "foo +Verify foo +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/verify.at:28" + +$at_failed && at_func_log_failure +$at_traceon; } + + { $at_traceoff +$as_echo "$at_srcdir/verify.at:28: +mkdir gnu +(cd gnu +TEST_TAR_FORMAT=gnu +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H gnu\" +export TAR_OPTIONS +rm -rf * + +touch foo +tar -cvf archive.tar --verify foo +)" +echo verify.at:28 >"$at_check_line_file" + +if { echo 'Not enabling shell tracing (command contains an embedded newline)' + false; }; then + ( $at_traceon; +mkdir gnu +(cd gnu +TEST_TAR_FORMAT=gnu +export TEST_TAR_FORMAT +TAR_OPTIONS="-H gnu" +export TAR_OPTIONS +rm -rf * + +touch foo +tar -cvf archive.tar --verify foo +) ) >"$at_stdout" 2>"$at_stder1" + at_func_filter_trace $? +else + ( :; +mkdir gnu +(cd gnu +TEST_TAR_FORMAT=gnu +export TEST_TAR_FORMAT +TAR_OPTIONS="-H gnu" +export TAR_OPTIONS +rm -rf * + +touch foo +tar -cvf archive.tar --verify foo +) ) >"$at_stdout" 2>"$at_stderr" +fi +at_status=$? +at_failed=false +at_func_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo "foo +Verify foo +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_func_check_status 0 $at_status "$at_srcdir/verify.at:28" + +$at_failed && at_func_log_failure +$at_traceon; } + + + + + $at_traceoff + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 | eval $at_tee_pipe +at_status=`cat "$at_status_file"` +#AT_STOP_104 +#AT_START_105 +# 105. volume.at:23: volume at_setup_line='volume.at:23' at_desc="volume" -$at_quiet $as_echo_n "102: $at_desc " +$at_quiet $as_echo_n "105: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "102. volume.at:23: testing ..." + $as_echo "105. volume.at:23: testing ..." $at_traceon @@ -36281,17 +36793,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_102 -#AT_START_103 -# 103. volsize.at:29: volume header size +#AT_STOP_105 +#AT_START_106 +# 106. volsize.at:29: volume header size at_setup_line='volsize.at:29' at_desc="volume header size" -$at_quiet $as_echo_n "103: $at_desc " +$at_quiet $as_echo_n "106: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "103. volsize.at:29: testing ..." + $as_echo "106. volsize.at:29: testing ..." $at_traceon @@ -36800,17 +37312,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_103 -#AT_START_104 -# 104. comprec.at:21: compressed format recognition +#AT_STOP_106 +#AT_START_107 +# 107. comprec.at:21: compressed format recognition at_setup_line='comprec.at:21' at_desc="compressed format recognition" -$at_quiet $as_echo_n "104: $at_desc " +$at_quiet $as_echo_n "107: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "104. comprec.at:21: testing ..." + $as_echo "107. comprec.at:21: testing ..." $at_traceon @@ -37230,17 +37742,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_104 -#AT_START_105 -# 105. shortfile.at:26: short input files +#AT_STOP_107 +#AT_START_108 +# 108. shortfile.at:26: short input files at_setup_line='shortfile.at:26' at_desc="short input files" -$at_quiet $as_echo_n "105: $at_desc " +$at_quiet $as_echo_n "108: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "105. shortfile.at:26: testing ..." + $as_echo "108. shortfile.at:26: testing ..." $at_traceon @@ -37310,17 +37822,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_105 -#AT_START_106 -# 106. shortupd.at:29: updating short archives +#AT_STOP_108 +#AT_START_109 +# 109. shortupd.at:29: updating short archives at_setup_line='shortupd.at:29' at_desc="updating short archives" -$at_quiet $as_echo_n "106: $at_desc " +$at_quiet $as_echo_n "109: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "106. shortupd.at:29: testing ..." + $as_echo "109. shortupd.at:29: testing ..." $at_traceon @@ -37599,17 +38111,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_106 -#AT_START_107 -# 107. truncate.at:29: truncate +#AT_STOP_109 +#AT_START_110 +# 110. truncate.at:29: truncate at_setup_line='truncate.at:29' at_desc="truncate" -$at_quiet $as_echo_n "107: $at_desc " +$at_quiet $as_echo_n "110: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "107. truncate.at:29: testing ..." + $as_echo "110. truncate.at:29: testing ..." $at_traceon @@ -37626,13 +38138,12 @@ TAR_OPTIONS=\"-H v7\" export TAR_OPTIONS rm -rf * -genfile --file foo --length 50000k +genfile --file foo --length 200k genfile --file baz -genfile --run --checkpoint 10 --length 49995k --truncate foo -- tar --checkpoint -vcf bar foo baz +genfile --run --checkpoint 10 --length 195k --truncate foo -- tar --checkpoint --checkpoint-action=echo --checkpoint-action=sleep=1 -vcf bar foo baz echo Exit status: \$? echo separator -sleep 1 -genfile --file foo --seek 49995k --length 5k --pattern=zeros +genfile --file foo --seek 195k --length 5k --pattern=zeros tar dvf bar)" echo truncate.at:32 >"$at_check_line_file" @@ -37647,13 +38158,12 @@ TAR_OPTIONS="-H v7" export TAR_OPTIONS rm -rf * -genfile --file foo --length 50000k +genfile --file foo --length 200k genfile --file baz -genfile --run --checkpoint 10 --length 49995k --truncate foo -- tar --checkpoint -vcf bar foo baz +genfile --run --checkpoint 10 --length 195k --truncate foo -- tar --checkpoint --checkpoint-action=echo --checkpoint-action=sleep=1 -vcf bar foo baz echo Exit status: $? echo separator -sleep 1 -genfile --file foo --seek 49995k --length 5k --pattern=zeros +genfile --file foo --seek 195k --length 5k --pattern=zeros tar dvf bar) ) >"$at_stdout" 2>"$at_stder1" at_func_filter_trace $? else @@ -37666,13 +38176,12 @@ TAR_OPTIONS="-H v7" export TAR_OPTIONS rm -rf * -genfile --file foo --length 50000k +genfile --file foo --length 200k genfile --file baz -genfile --run --checkpoint 10 --length 49995k --truncate foo -- tar --checkpoint -vcf bar foo baz +genfile --run --checkpoint 10 --length 195k --truncate foo -- tar --checkpoint --checkpoint-action=echo --checkpoint-action=sleep=1 -vcf bar foo baz echo Exit status: $? echo separator -sleep 1 -genfile --file foo --seek 49995k --length 5k --pattern=zeros +genfile --file foo --seek 195k --length 5k --pattern=zeros tar dvf bar) ) >"$at_stdout" 2>"$at_stderr" fi at_status=$? @@ -37704,13 +38213,12 @@ TAR_OPTIONS=\"-H oldgnu\" export TAR_OPTIONS rm -rf * -genfile --file foo --length 50000k +genfile --file foo --length 200k genfile --file baz -genfile --run --checkpoint 10 --length 49995k --truncate foo -- tar --checkpoint -vcf bar foo baz +genfile --run --checkpoint 10 --length 195k --truncate foo -- tar --checkpoint --checkpoint-action=echo --checkpoint-action=sleep=1 -vcf bar foo baz echo Exit status: \$? echo separator -sleep 1 -genfile --file foo --seek 49995k --length 5k --pattern=zeros +genfile --file foo --seek 195k --length 5k --pattern=zeros tar dvf bar)" echo truncate.at:32 >"$at_check_line_file" @@ -37725,13 +38233,12 @@ TAR_OPTIONS="-H oldgnu" export TAR_OPTIONS rm -rf * -genfile --file foo --length 50000k +genfile --file foo --length 200k genfile --file baz -genfile --run --checkpoint 10 --length 49995k --truncate foo -- tar --checkpoint -vcf bar foo baz +genfile --run --checkpoint 10 --length 195k --truncate foo -- tar --checkpoint --checkpoint-action=echo --checkpoint-action=sleep=1 -vcf bar foo baz echo Exit status: $? echo separator -sleep 1 -genfile --file foo --seek 49995k --length 5k --pattern=zeros +genfile --file foo --seek 195k --length 5k --pattern=zeros tar dvf bar) ) >"$at_stdout" 2>"$at_stder1" at_func_filter_trace $? else @@ -37744,13 +38251,12 @@ TAR_OPTIONS="-H oldgnu" export TAR_OPTIONS rm -rf * -genfile --file foo --length 50000k +genfile --file foo --length 200k genfile --file baz -genfile --run --checkpoint 10 --length 49995k --truncate foo -- tar --checkpoint -vcf bar foo baz +genfile --run --checkpoint 10 --length 195k --truncate foo -- tar --checkpoint --checkpoint-action=echo --checkpoint-action=sleep=1 -vcf bar foo baz echo Exit status: $? echo separator -sleep 1 -genfile --file foo --seek 49995k --length 5k --pattern=zeros +genfile --file foo --seek 195k --length 5k --pattern=zeros tar dvf bar) ) >"$at_stdout" 2>"$at_stderr" fi at_status=$? @@ -37782,13 +38288,12 @@ TAR_OPTIONS=\"-H ustar\" export TAR_OPTIONS rm -rf * -genfile --file foo --length 50000k +genfile --file foo --length 200k genfile --file baz -genfile --run --checkpoint 10 --length 49995k --truncate foo -- tar --checkpoint -vcf bar foo baz +genfile --run --checkpoint 10 --length 195k --truncate foo -- tar --checkpoint --checkpoint-action=echo --checkpoint-action=sleep=1 -vcf bar foo baz echo Exit status: \$? echo separator -sleep 1 -genfile --file foo --seek 49995k --length 5k --pattern=zeros +genfile --file foo --seek 195k --length 5k --pattern=zeros tar dvf bar)" echo truncate.at:32 >"$at_check_line_file" @@ -37803,13 +38308,12 @@ TAR_OPTIONS="-H ustar" export TAR_OPTIONS rm -rf * -genfile --file foo --length 50000k +genfile --file foo --length 200k genfile --file baz -genfile --run --checkpoint 10 --length 49995k --truncate foo -- tar --checkpoint -vcf bar foo baz +genfile --run --checkpoint 10 --length 195k --truncate foo -- tar --checkpoint --checkpoint-action=echo --checkpoint-action=sleep=1 -vcf bar foo baz echo Exit status: $? echo separator -sleep 1 -genfile --file foo --seek 49995k --length 5k --pattern=zeros +genfile --file foo --seek 195k --length 5k --pattern=zeros tar dvf bar) ) >"$at_stdout" 2>"$at_stder1" at_func_filter_trace $? else @@ -37822,13 +38326,12 @@ TAR_OPTIONS="-H ustar" export TAR_OPTIONS rm -rf * -genfile --file foo --length 50000k +genfile --file foo --length 200k genfile --file baz -genfile --run --checkpoint 10 --length 49995k --truncate foo -- tar --checkpoint -vcf bar foo baz +genfile --run --checkpoint 10 --length 195k --truncate foo -- tar --checkpoint --checkpoint-action=echo --checkpoint-action=sleep=1 -vcf bar foo baz echo Exit status: $? echo separator -sleep 1 -genfile --file foo --seek 49995k --length 5k --pattern=zeros +genfile --file foo --seek 195k --length 5k --pattern=zeros tar dvf bar) ) >"$at_stdout" 2>"$at_stderr" fi at_status=$? @@ -37860,13 +38363,12 @@ TAR_OPTIONS=\"-H posix\" export TAR_OPTIONS rm -rf * -genfile --file foo --length 50000k +genfile --file foo --length 200k genfile --file baz -genfile --run --checkpoint 10 --length 49995k --truncate foo -- tar --checkpoint -vcf bar foo baz +genfile --run --checkpoint 10 --length 195k --truncate foo -- tar --checkpoint --checkpoint-action=echo --checkpoint-action=sleep=1 -vcf bar foo baz echo Exit status: \$? echo separator -sleep 1 -genfile --file foo --seek 49995k --length 5k --pattern=zeros +genfile --file foo --seek 195k --length 5k --pattern=zeros tar dvf bar)" echo truncate.at:32 >"$at_check_line_file" @@ -37881,13 +38383,12 @@ TAR_OPTIONS="-H posix" export TAR_OPTIONS rm -rf * -genfile --file foo --length 50000k +genfile --file foo --length 200k genfile --file baz -genfile --run --checkpoint 10 --length 49995k --truncate foo -- tar --checkpoint -vcf bar foo baz +genfile --run --checkpoint 10 --length 195k --truncate foo -- tar --checkpoint --checkpoint-action=echo --checkpoint-action=sleep=1 -vcf bar foo baz echo Exit status: $? echo separator -sleep 1 -genfile --file foo --seek 49995k --length 5k --pattern=zeros +genfile --file foo --seek 195k --length 5k --pattern=zeros tar dvf bar) ) >"$at_stdout" 2>"$at_stder1" at_func_filter_trace $? else @@ -37900,13 +38401,12 @@ TAR_OPTIONS="-H posix" export TAR_OPTIONS rm -rf * -genfile --file foo --length 50000k +genfile --file foo --length 200k genfile --file baz -genfile --run --checkpoint 10 --length 49995k --truncate foo -- tar --checkpoint -vcf bar foo baz +genfile --run --checkpoint 10 --length 195k --truncate foo -- tar --checkpoint --checkpoint-action=echo --checkpoint-action=sleep=1 -vcf bar foo baz echo Exit status: $? echo separator -sleep 1 -genfile --file foo --seek 49995k --length 5k --pattern=zeros +genfile --file foo --seek 195k --length 5k --pattern=zeros tar dvf bar) ) >"$at_stdout" 2>"$at_stderr" fi at_status=$? @@ -37938,13 +38438,12 @@ TAR_OPTIONS=\"-H gnu\" export TAR_OPTIONS rm -rf * -genfile --file foo --length 50000k +genfile --file foo --length 200k genfile --file baz -genfile --run --checkpoint 10 --length 49995k --truncate foo -- tar --checkpoint -vcf bar foo baz +genfile --run --checkpoint 10 --length 195k --truncate foo -- tar --checkpoint --checkpoint-action=echo --checkpoint-action=sleep=1 -vcf bar foo baz echo Exit status: \$? echo separator -sleep 1 -genfile --file foo --seek 49995k --length 5k --pattern=zeros +genfile --file foo --seek 195k --length 5k --pattern=zeros tar dvf bar)" echo truncate.at:32 >"$at_check_line_file" @@ -37959,13 +38458,12 @@ TAR_OPTIONS="-H gnu" export TAR_OPTIONS rm -rf * -genfile --file foo --length 50000k +genfile --file foo --length 200k genfile --file baz -genfile --run --checkpoint 10 --length 49995k --truncate foo -- tar --checkpoint -vcf bar foo baz +genfile --run --checkpoint 10 --length 195k --truncate foo -- tar --checkpoint --checkpoint-action=echo --checkpoint-action=sleep=1 -vcf bar foo baz echo Exit status: $? echo separator -sleep 1 -genfile --file foo --seek 49995k --length 5k --pattern=zeros +genfile --file foo --seek 195k --length 5k --pattern=zeros tar dvf bar) ) >"$at_stdout" 2>"$at_stder1" at_func_filter_trace $? else @@ -37978,13 +38476,12 @@ TAR_OPTIONS="-H gnu" export TAR_OPTIONS rm -rf * -genfile --file foo --length 50000k +genfile --file foo --length 200k genfile --file baz -genfile --run --checkpoint 10 --length 49995k --truncate foo -- tar --checkpoint -vcf bar foo baz +genfile --run --checkpoint 10 --length 195k --truncate foo -- tar --checkpoint --checkpoint-action=echo --checkpoint-action=sleep=1 -vcf bar foo baz echo Exit status: $? echo separator -sleep 1 -genfile --file foo --seek 49995k --length 5k --pattern=zeros +genfile --file foo --seek 195k --length 5k --pattern=zeros tar dvf bar) ) >"$at_stdout" 2>"$at_stderr" fi at_status=$? @@ -38013,17 +38510,17 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_107 -#AT_START_108 -# 108. grow.at:24: grow +#AT_STOP_110 +#AT_START_111 +# 111. grow.at:24: grow at_setup_line='grow.at:24' at_desc="grow" -$at_quiet $as_echo_n "108: $at_desc " +$at_quiet $as_echo_n "111: $at_desc " at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "108. grow.at:24: testing ..." + $as_echo "111. grow.at:24: testing ..." $at_traceon @@ -38342,16 +38839,16 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_108 -#AT_START_109 -# 109. remfiles01.at:28: remove-files with compression +#AT_STOP_111 +#AT_START_112 +# 112. remfiles01.at:28: remove-files with compression at_setup_line='remfiles01.at:28' at_desc="remove-files with compression" -$at_quiet $as_echo_n "109: $at_desc " +$at_quiet $as_echo_n "112: $at_desc " at_xfail=no echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "109. remfiles01.at:28: testing ..." + $as_echo "112. remfiles01.at:28: testing ..." $at_traceon @@ -38371,6 +38868,11 @@ test $result -eq 0 && exit 77 cat /dev/null | gzip - > /dev/null 2>&1 || exit 77 +case `(cat "$at_myself" 2>&3 | :) 3>&1 >/dev/null` in #( +?*) exit 77;; +esac + + test -z "`sort < /dev/null 2>&1`" || exit 77 @@ -38415,6 +38917,11 @@ test $result -eq 0 && exit 77 cat /dev/null | gzip - > /dev/null 2>&1 || exit 77 +case `(cat "$at_myself" 2>&3 | :) 3>&1 >/dev/null` in #( +?*) exit 77;; +esac + + test -z "`sort < /dev/null 2>&1`" || exit 77 @@ -38457,6 +38964,11 @@ test $result -eq 0 && exit 77 cat /dev/null | gzip - > /dev/null 2>&1 || exit 77 +case `(cat "$at_myself" 2>&3 | :) 3>&1 >/dev/null` in #( +?*) exit 77;; +esac + + test -z "`sort < /dev/null 2>&1`" || exit 77 @@ -38507,16 +39019,16 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_109 -#AT_START_110 -# 110. remfiles02.at:28: remove-files with compression: grand-child +#AT_STOP_112 +#AT_START_113 +# 113. remfiles02.at:28: remove-files with compression: grand-child at_setup_line='remfiles02.at:28' at_desc="remove-files with compression: grand-child" -$at_quiet $as_echo_n "110: $at_desc " +$at_quiet $as_echo_n "113: $at_desc " at_xfail=no echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "110. remfiles02.at:28: testing ..." + $as_echo "113. remfiles02.at:28: testing ..." $at_traceon @@ -38615,16 +39127,16 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_110 -#AT_START_111 -# 111. remfiles03.at:28: remove-files with symbolic links +#AT_STOP_113 +#AT_START_114 +# 114. remfiles03.at:28: remove-files with symbolic links at_setup_line='remfiles03.at:28' at_desc="remove-files with symbolic links" -$at_quiet $as_echo_n "111: $at_desc " +$at_quiet $as_echo_n "114: $at_desc " at_xfail=no echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "111. remfiles03.at:28: testing ..." + $as_echo "114. remfiles03.at:28: testing ..." $at_traceon @@ -38674,16 +39186,16 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_111 -#AT_START_112 -# 112. sigpipe.at:19: sigpipe handling +#AT_STOP_114 +#AT_START_115 +# 115. sigpipe.at:19: sigpipe handling at_setup_line='sigpipe.at:19' at_desc="sigpipe handling" -$at_quiet $as_echo_n "112: $at_desc " +$at_quiet $as_echo_n "115: $at_desc " at_xfail=no echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "112. sigpipe.at:19: testing ..." + $as_echo "115. sigpipe.at:19: testing ..." $at_traceon @@ -38696,6 +39208,12 @@ echo "# -*- compilation -*-" >> "$at_group_log" { $at_traceoff $as_echo "$at_srcdir/sigpipe.at:28: + +case `(cat "$at_myself" 2>&3 | :) 3>&1 >/dev/null` in #( +?*) exit 77;; +esac + + genfile --length 2048 --file first genfile --length 2048 --file second genfile --length 2049 --file third @@ -38710,6 +39228,12 @@ echo sigpipe.at:28 >"$at_check_line_file" if { echo 'Not enabling shell tracing (command contains an embedded newline)' false; }; then ( $at_traceon; + +case `(cat "$at_myself" 2>&3 | :) 3>&1 >/dev/null` in #( +?*) exit 77;; +esac + + genfile --length 2048 --file first genfile --length 2048 --file second genfile --length 2049 --file third @@ -38722,6 +39246,12 @@ tar cf archive first second third at_func_filter_trace $? else ( :; + +case `(cat "$at_myself" 2>&3 | :) 3>&1 >/dev/null` in #( +?*) exit 77;; +esac + + genfile --length 2048 --file first genfile --length 2048 --file second genfile --length 2049 --file third @@ -38746,16 +39276,16 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_112 -#AT_START_113 -# 113. gtarfail.at:21: gtarfail +#AT_STOP_115 +#AT_START_116 +# 116. gtarfail.at:21: gtarfail at_setup_line='gtarfail.at:21' at_desc="gtarfail" -$at_quiet $as_echo_n "113: $at_desc " +$at_quiet $as_echo_n "116: $at_desc " at_xfail=no echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "113. gtarfail.at:21: testing ..." + $as_echo "116. gtarfail.at:21: testing ..." $at_traceon @@ -38815,16 +39345,16 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_113 -#AT_START_114 -# 114. gtarfail2.at:21: gtarfail2 +#AT_STOP_116 +#AT_START_117 +# 117. gtarfail2.at:21: gtarfail2 at_setup_line='gtarfail2.at:21' at_desc="gtarfail2" -$at_quiet $as_echo_n "114: $at_desc " +$at_quiet $as_echo_n "117: $at_desc " at_xfail=no echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "114. gtarfail2.at:21: testing ..." + $as_echo "117. gtarfail2.at:21: testing ..." $at_traceon @@ -38885,16 +39415,16 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_114 -#AT_START_115 -# 115. multi-fail.at:21: multi-fail +#AT_STOP_117 +#AT_START_118 +# 118. multi-fail.at:21: multi-fail at_setup_line='multi-fail.at:21' at_desc="multi-fail" -$at_quiet $as_echo_n "115: $at_desc " +$at_quiet $as_echo_n "118: $at_desc " at_xfail=no echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "115. multi-fail.at:21: testing ..." + $as_echo "118. multi-fail.at:21: testing ..." $at_traceon @@ -39015,16 +39545,16 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_115 -#AT_START_116 -# 116. ustar-big-2g.at:21: ustar-big-2g +#AT_STOP_118 +#AT_START_119 +# 119. ustar-big-2g.at:21: ustar-big-2g at_setup_line='ustar-big-2g.at:21' at_desc="ustar-big-2g" -$at_quiet $as_echo_n "116: $at_desc " +$at_quiet $as_echo_n "119: $at_desc " at_xfail=no echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "116. ustar-big-2g.at:21: testing ..." + $as_echo "119. ustar-big-2g.at:21: testing ..." $at_traceon @@ -39102,16 +39632,16 @@ done $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_116 -#AT_START_117 -# 117. ustar-big-8g.at:21: ustar-big-8g +#AT_STOP_119 +#AT_START_120 +# 120. ustar-big-8g.at:21: ustar-big-8g at_setup_line='ustar-big-8g.at:21' at_desc="ustar-big-8g" -$at_quiet $as_echo_n "117: $at_desc " +$at_quiet $as_echo_n "120: $at_desc " at_xfail=no echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "117. ustar-big-8g.at:21: testing ..." + $as_echo "120. ustar-big-8g.at:21: testing ..." $at_traceon @@ -39189,16 +39719,16 @@ done $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_117 -#AT_START_118 -# 118. pax-big-10g.at:21: pax-big-10g +#AT_STOP_120 +#AT_START_121 +# 121. pax-big-10g.at:21: pax-big-10g at_setup_line='pax-big-10g.at:21' at_desc="pax-big-10g" -$at_quiet $as_echo_n "118: $at_desc " +$at_quiet $as_echo_n "121: $at_desc " at_xfail=no echo "# -*- compilation -*-" >> "$at_group_log" ( - $as_echo "118. pax-big-10g.at:21: testing ..." + $as_echo "121. pax-big-10g.at:21: testing ..." $at_traceon @@ -39276,4 +39806,4 @@ done $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe at_status=`cat "$at_status_file"` -#AT_STOP_118 +#AT_STOP_121 diff --git a/tests/testsuite.at b/tests/testsuite.at index d18b16e5..a62e79f6 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -1,7 +1,8 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2010 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 @@ -80,6 +81,13 @@ m4_define([AT_GZIP_PREREQ],[ cat /dev/null | m4_if([$1],[],gzip,[$1]) - > /dev/null 2>&1 || AT_SKIP_TEST ]) +dnl AT_SIGPIPE_PREREQ - Skip test unless SIGPIPE handling is the default +m4_define([AT_SIGPIPE_PREREQ],[ +case `(cat "$at_myself" 2>&3 | :) 3>&1 >/dev/null` in #( +?*) AT_SKIP_TEST;; +esac +]) + dnl AT_SORT_PREREQ - Skip test if sort utility outputs unwanted data on stderr m4_define([AT_SORT_PREREQ],[ test -z "`sort < /dev/null 2>&1`" || AT_SKIP_TEST @@ -174,6 +182,7 @@ m4_include([incr02.at]) m4_include([listed01.at]) m4_include([listed02.at]) m4_include([listed03.at]) +m4_include([listed04.at]) m4_include([incr03.at]) m4_include([incr04.at]) m4_include([incr05.at]) @@ -223,6 +232,7 @@ m4_include([shortrec.at]) m4_include([sparse01.at]) m4_include([sparse02.at]) m4_include([sparse03.at]) +m4_include([sparse04.at]) m4_include([sparsemv.at]) m4_include([spmvp00.at]) m4_include([spmvp01.at]) @@ -232,6 +242,8 @@ m4_include([update.at]) m4_include([update01.at]) m4_include([update02.at]) +m4_include([verify.at]) + m4_include([volume.at]) m4_include([volsize.at]) diff --git a/tests/truncate.at b/tests/truncate.at index 65f1e34e..973cbc16 100644 --- a/tests/truncate.at +++ b/tests/truncate.at @@ -30,13 +30,12 @@ AT_SETUP([truncate]) AT_KEYWORDS([truncate filechange]) AT_TAR_CHECK([ -genfile --file foo --length 50000k +genfile --file foo --length 200k genfile --file baz -genfile --run --checkpoint 10 --length 49995k --truncate foo -- tar --checkpoint -vcf bar foo baz +genfile --run --checkpoint 10 --length 195k --truncate foo -- tar --checkpoint --checkpoint-action=echo --checkpoint-action=sleep=1 -vcf bar foo baz echo Exit status: $? echo separator -sleep 1 -genfile --file foo --seek 49995k --length 5k --pattern=zeros +genfile --file foo --seek 195k --length 5k --pattern=zeros tar dvf bar], [1], [foo diff --git a/tests/verify.at b/tests/verify.at new file mode 100644 index 00000000..98ba22b6 --- /dev/null +++ b/tests/verify.at @@ -0,0 +1,37 @@ +# Process this file with autom4te to create testsuite. -*- Autotest -*- + +# Test suite for GNU tar. +# Copyright (C) 2010 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 3, 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. + +# Check that tar --verify works. +# Problem reported by Gilles Espinasse in +# . + +AT_SETUP([verify]) +AT_KEYWORDS([verify]) + +AT_TAR_CHECK([ +touch foo +tar -cvf archive.tar --verify foo +], +[0], +[foo +Verify foo +]) + +AT_CLEANUP -- 2.30.2